.

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

@@ -20,19 +20,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.chinaitop.depot.storage.model.StorageFoodbasicinfo;
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
-import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
-import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
 import com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSonExample;
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
 import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
 import com.chinaitop.depot.storage.utils.DataSynchronization;
 import com.chinaitop.depot.storage.utils.ParameterUtil;
-import com.chinaitop.depot.utils.HttpUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -634,43 +630,19 @@ public class StorageQualitycheckController {
     })
     public PageInfo<StorageQualitycheck> newListPage(Integer pageNum, Integer pageSize, Integer houseId, Integer wareId,
                                                   String checkType, String checkResult, Integer historyStatus, Integer orgId) {
-    	StorageQualitycheckExample example = new StorageQualitycheckExample();
-    	Criteria criteria = example.createCriteria();
 
-        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
-        if (StringUtils.isNotBlank(checkType)){
-        	//criteria.andTypeEqualTo(checkType);
-        	criteria.andCheckTypeEqualTo(checkType);
-        }
-        // 仓房id.
-        if (houseId != null) {
-        	criteria.andHouseIdEqualTo(houseId);
-        }
-        // 货位id.
-        if (wareId != null) {
-        	criteria.andWarehouseIdEqualTo(wareId);
-        }
-        // 粮库id.
-        if (orgId != null) {
-        	criteria.andOrgIdEqualTo(orgId);
-        }
-
-        //检验结果（0：合格 , 1 :不合格）
-        if (StringUtils.isNotBlank(checkResult)) {
-        	criteria.andCheckResultEqualTo(checkResult);
-        }
-        //数据状态
-        if (null != historyStatus) {
-        	//0:最新数据  1:历史数据
-        	criteria.andHistoryStatusEqualTo(historyStatus);
-        }
-
-        if (pageNum!=null && pageSize!=null) {
-            PageHelper.startPage(pageNum, pageSize);
-        }
-        List<StorageQualitycheck> list = storageQualitycheckService.findByCondition(example);
+        List<StorageQualitycheck> list = null;
+        PageInfo<StorageQualitycheck> pageInfo = null;
+        try {
+        	if (pageNum!=null && pageSize!=null) {
+        		PageHelper.startPage(pageNum, pageSize);
+        	}
+			list = storageQualitycheckService.getList(houseId, wareId, checkType, checkResult, historyStatus, orgId);
+			pageInfo = new PageInfo<StorageQualitycheck>(list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 
-        PageInfo<StorageQualitycheck> pageInfo = new PageInfo<StorageQualitycheck>(list);
         return pageInfo;
     }
 
@@ -832,6 +804,26 @@ public class StorageQualitycheckController {
         }
         return modelMap;
     }
-    
 
+    @RequestMapping(value="/queryCheckDataDetail", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据条件查找一条质检数据详情", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @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")
+    })
+    public  Map<String, Object> queryCheckDataDetail(Integer houseId, Integer wareId, String checkType, 
+			Integer historyStatus, Integer orgId){
+
+    	Map<String, Object> retMap = null;
+    	try {
+			retMap = storageQualitycheckService.queryCheckDataDetail(houseId, wareId, checkType, historyStatus, orgId);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+        return retMap;
+    }
 }

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

@@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @RestController
 @RequestMapping(value = {"/xwkZljc"})
-@Api(value= "XwkZljcController", description = "质量管理控制类")
+@Api(value= "XwkZljcController", description = "质量管理-第三方质检控制类")
 public class XwkZljcController {
     @Resource
     private XwkZljcServiceImpl xwkZljcServiceImpl;

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

@@ -1,15 +1,14 @@
 package com.chinaitop.depot.storage.service;
 
+import java.util.List;
+import java.util.Map;
+
 import com.alibaba.fastjson.JSONArray;
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
 import com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
-
 public interface StorageQualitycheckService {
 
 	/**
@@ -145,4 +144,30 @@ public interface StorageQualitycheckService {
 	Map<String, Object> getcheckByIds(Integer id);
 
 	int deleteStorageQualitycheckInspection(StorageQualitycheckInspectionExample example);
+
+	/**
+	 * 按条件查询质检数据列表
+	 * @param houseId 仓房ID
+	 * @param wareId 货位ID
+	 * @param checkType 检验类型(0:自检,3:出库检验,4:春秋普查,5:第三方检查)
+	 * @param historyStatus 数据状态(0:新数据,1:已归档数据)
+	 * @param orgId 组织机构ID
+	 * @return
+	 * @throws Exception
+	 */
+	List<StorageQualitycheck> getList(Integer houseId, Integer wareId, String checkType, String checkResult,
+			Integer historyStatus, Integer orgId) throws Exception;
+
+	/**
+	 * 按条件查询质检数据详情
+	 * @param houseId 仓房ID
+	 * @param wareId 货位ID
+	 * @param checkType 检验类型(0:自检,3:出库检验,4:春秋普查,5:第三方检查)
+	 * @param historyStatus 数据状态(0:新数据,1:已归档数据)
+	 * @param orgId 组织机构ID
+	 * @return
+	 * @throws Exception 
+	 */
+	Map<String, Object> queryCheckDataDetail(Integer houseId, Integer wareId, String checkType, 
+			Integer historyStatus, Integer orgId) throws Exception;
 }

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

@@ -23,6 +23,7 @@ import com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper;
 import com.chinaitop.depot.storage.mapper.StorageQualitycheckSonMapper;
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
+import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
 import com.chinaitop.depot.storage.model.StorageQualitycheckInspection;
 import com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
@@ -425,4 +426,54 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 			}
 		}
 	}
+
+	@Override
+	public List<StorageQualitycheck> getList(Integer houseId, Integer wareId, String checkType, String checkResult,
+			Integer historyStatus, Integer orgId) throws Exception {
+		StorageQualitycheckExample example = new StorageQualitycheckExample();
+    	Criteria criteria = example.createCriteria();
+
+        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+        if (StringUtils.isNotBlank(checkType)){
+        	//criteria.andTypeEqualTo(checkType);
+        	criteria.andCheckTypeEqualTo(checkType);
+        }
+        // 仓房id.
+        if (houseId != null) {
+        	criteria.andHouseIdEqualTo(houseId);
+        }
+        // 货位id.
+        if (wareId != null) {
+        	criteria.andWarehouseIdEqualTo(wareId);
+        }
+        // 粮库id.
+        if (orgId != null) {
+        	criteria.andOrgIdEqualTo(orgId);
+        }
+
+        //检验结果（0：合格 , 1 :不合格）
+        if (StringUtils.isNotBlank(checkResult)) {
+        	criteria.andCheckResultEqualTo(checkResult);
+        }
+        //数据状态
+        if (null != historyStatus) {
+        	//0:最新数据  1:历史数据
+        	criteria.andHistoryStatusEqualTo(historyStatus);
+        }
+        List<StorageQualitycheck> list = qualitycheckMapper.selectByExample(example);
+
+		return list;
+	}
+
+	@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);
+		Map<String, Object> retMap = null;
+		if (null != list && list.size() > 0) {
+			Integer id = list.get(0).getId();
+			retMap = loadDataById(id);
+		}
+		return retMap;
+	}
 }