1

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -626,10 +626,11 @@ public class StorageQualitycheckController {
             @ApiImplicitParam(name = "checktype", value = "检查的类型", paramType = "query"),
             @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query"),
             @ApiImplicitParam(name = "historyStatus", value = "数据状态", paramType = "query"),
-            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
+            @ApiImplicitParam(name = "processState", value = "1扦样化验待处理 2化验已处理", paramType = "query")
     })
     public PageInfo<StorageQualitycheck> newListPage(Integer pageNum, Integer pageSize, Integer houseId, Integer wareId,
-                                                  String checkType, String checkResult, Integer historyStatus, Integer orgId) {
+                                                  String checkType, String checkResult, Integer historyStatus, Integer orgId, Integer processState) {
 
         List<StorageQualitycheck> list = null;
         PageInfo<StorageQualitycheck> pageInfo = null;
@@ -637,7 +638,7 @@ public class StorageQualitycheckController {
         	if (pageNum!=null && pageSize!=null) {
         		PageHelper.startPage(pageNum, pageSize);
         	}
-			list = storageQualitycheckService.getList(houseId, wareId, checkType, checkResult, historyStatus, orgId);
+			list = storageQualitycheckService.getList(houseId, wareId, checkType, checkResult, historyStatus, orgId, processState);
 			pageInfo = new PageInfo<StorageQualitycheck>(list);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -812,14 +813,15 @@ public class StorageQualitycheckController {
             @ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "query"),
             @ApiImplicitParam(name = "checkType", value = "检验类型(0:自检,3:出库检验,4:春秋普查,5:第三方检查)", paramType = "query"),
             @ApiImplicitParam(name = "historyStatus", value = "数据状态(0:新数据,1:已归档数据)", paramType = "query"),
-            @ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query")
+            @ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query"),
+            @ApiImplicitParam(name = "processState", value = "1扦样化验待处理 2化验已处理", paramType = "query")
     })
     public  Map<String, Object> queryCheckDataDetail(Integer houseId, Integer wareId, String checkType, 
-			Integer historyStatus, Integer orgId){
+			Integer historyStatus, Integer orgId, Integer processState){
 
     	Map<String, Object> retMap = null;
     	try {
-			retMap = storageQualitycheckService.queryCheckDataDetail(houseId, wareId, checkType, historyStatus, orgId);
+			retMap = storageQualitycheckService.queryCheckDataDetail(houseId, wareId, checkType, historyStatus, orgId, processState);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.xml

@@ -1873,15 +1873,14 @@
 
   <select id="queryByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" resultMap="BaseResultMap">
     select * from(
-    select
-    row_number() over(partition by sqk.id order by sqk.id desc) rn,
-    <include refid="ExtBase_Column_List" />,
-    bs.storeHouse_name storehouseName,
-    bw.warehouse_name wareHouseName
-    from
-    storage_qualitycheck sqk
-    left join basic_storehouse bs on bs.storehouse_id = sqk.house_id
-    left join basic_warehouse bw on bw.warehouse_id = sqk.warehouse_id
+      select
+        row_number() over(partition by sqk.id order by sqk.id desc) rn,
+        <include refid="ExtBase_Column_List" />,
+        bs.storeHouse_name storehouseName,
+        bw.warehouse_name wareHouseName
+      from storage_qualitycheck sqk
+      left join basic_storehouse bs on bs.storehouse_id = sqk.house_id
+      left join basic_warehouse bw on bw.warehouse_id = sqk.warehouse_id
     ) sq
     <where>
       <if test="houseId !=null">

src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheckExample.java

@@ -3037,6 +3037,16 @@ public class StorageQualitycheckExample {
             return (Criteria) this;
         }
 
+        public Criteria andTypeUpdateEqualTo(String value) {
+        	addCriterion("type_update =", value, "typeUpdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andProcessStateEqualTo(Integer value) {
+        	addCriterion("process_state =", value, "processState");
+            return (Criteria) this;
+        }
+
         public Criteria andCheckTypeIsNull() {
             addCriterion("check_type is null");
             return (Criteria) this;

src/main/java/com/chinaitop/depot/storage/service/StorageQualitycheckService.java

@@ -152,11 +152,12 @@ public interface StorageQualitycheckService {
 	 * @param checkType 检验类型(0:自检,3:出库检验,4:春秋普查,5:第三方检查)
 	 * @param historyStatus 数据状态(0:新数据,1:已归档数据)
 	 * @param orgId 组织机构ID
+	 * @param processState 1扦样化验待处理 2化验已处理
 	 * @return
 	 * @throws Exception
 	 */
 	List<StorageQualitycheck> getList(Integer houseId, Integer wareId, String checkType, String checkResult,
-			Integer historyStatus, Integer orgId) throws Exception;
+			Integer historyStatus, Integer orgId, Integer processState) throws Exception;
 
 	/**
 	 * 按条件查询质检数据详情
@@ -165,9 +166,10 @@ public interface StorageQualitycheckService {
 	 * @param checkType 检验类型(0:自检,3:出库检验,4:春秋普查,5:第三方检查)
 	 * @param historyStatus 数据状态(0:新数据,1:已归档数据)
 	 * @param orgId 组织机构ID
+	 * @param processState 1扦样化验待处理 2化验已处理
 	 * @return
 	 * @throws Exception 
 	 */
 	Map<String, Object> queryCheckDataDetail(Integer houseId, Integer wareId, String checkType, 
-			Integer historyStatus, Integer orgId) throws Exception;
+			Integer historyStatus, Integer orgId, Integer processState) throws Exception;
 }

src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -429,14 +429,13 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 
 	@Override
 	public List<StorageQualitycheck> getList(Integer houseId, Integer wareId, String checkType, String checkResult,
-			Integer historyStatus, Integer orgId) throws Exception {
+			Integer historyStatus, Integer orgId, Integer processState) throws Exception {
 		StorageQualitycheckExample example = new StorageQualitycheckExample();
     	Criteria criteria = example.createCriteria();
 
-        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+    	//0:初检 1：验收 2：质量普查 3：出库,5:第三方检验
         if (StringUtils.isNotBlank(checkType)){
-        	//criteria.andTypeEqualTo(checkType);
-        	criteria.andCheckTypeEqualTo(checkType);
+        	criteria.andTypeUpdateEqualTo(checkType);
         }
         // 仓房id.
         if (houseId != null) {
@@ -451,15 +450,22 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
         	criteria.andOrgIdEqualTo(orgId);
         }
 
+        //1扦样化验待处理 2化验已处理
+        if (null != processState) {
+        	criteria.andProcessStateEqualTo(processState);
+        }
+
         //检验结果（0：合格 , 1 :不合格）
         if (StringUtils.isNotBlank(checkResult)) {
         	criteria.andCheckResultEqualTo(checkResult);
         }
-        //数据状态
+        //数据状态(0:最新数据  1:历史数据)
         if (null != historyStatus) {
-        	//0:最新数据  1:历史数据
         	criteria.andHistoryStatusEqualTo(historyStatus);
         }
+        //查询从质量管理功能里面添加到数据库的数据
+        criteria.andFlagTypeIsNull();
+
         List<StorageQualitycheck> list = qualitycheckMapper.selectByExample(example);
 
 		return list;
@@ -467,8 +473,8 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 
 	@Override
 	public Map<String, Object> queryCheckDataDetail(Integer houseId, Integer wareId, String checkType,
-			Integer historyStatus, Integer orgId) throws Exception {
-		List<StorageQualitycheck> list = getList(houseId, wareId, checkType, null, historyStatus, orgId);
+			Integer historyStatus, Integer orgId, Integer processState) throws Exception {
+		List<StorageQualitycheck> list = getList(houseId, wareId, checkType, null, historyStatus, orgId, processState);
 		Map<String, Object> retMap = null;
 		if (null != list && list.size() > 0) {
 			Integer id = list.get(0).getId();