|
@@ -11,6 +11,7 @@ import com.uas.mes.api.pdashop.service.QualityService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -73,7 +74,10 @@ public class QualityServiceImpl implements QualityService {
|
|
|
SqlRowList rs = baseDao.queryForRowSet("select sr_id,sr_code,to_char(sr_date,'YYYY-MM-DD HH24:MI:SS') sr_date,sr_sourcetype,sr_sccode,sr_scname," +
|
|
|
"sr_devcode,sr_makecode,sr_itemcode,sr_sendtype,sr_sendmanname from SampleReport where sr_id=?",sr_id);
|
|
|
if(rs.next()){
|
|
|
- return rs.getResultList();
|
|
|
+ List<Map<String,Object>> list = new ArrayList<>();
|
|
|
+ list.add(rs.getCurrentMap());
|
|
|
+ list.add(rs.getCurrentMap());
|
|
|
+ return list;
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
@@ -83,7 +87,10 @@ public class QualityServiceImpl implements QualityService {
|
|
|
SqlRowList rs = baseDao.queryForRowSet("select sr_id,sr_code,to_char(sr_date,'YYYY-MM-DD HH24:MI:SS') sr_date,sr_sourcetype,sr_sccode,sr_scname," +
|
|
|
"sr_devcode,sr_makecode,sr_itemcode,sr_sendtype,sr_sendmanname from SampleReport where sr_id=?",sr_id);
|
|
|
if(rs.next()){
|
|
|
- return rs.getResultList();
|
|
|
+ List<Map<String,Object>> list = new ArrayList<>();
|
|
|
+ list.add(rs.getCurrentMap());
|
|
|
+ list.add(rs.getCurrentMap());
|
|
|
+ return list;
|
|
|
}
|
|
|
throw new APIErrorException(APIErrorException.APIErrorCode.BUSINESS_FAILED,"单据不存在或者已经删除!");
|
|
|
}
|