查询追溯质检信息功能修改

src/main/java/com/chinaitop/agile/controller/CrkRecordController.java

@@ -150,9 +150,10 @@ public class CrkRecordController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "bizNo", value = "单据编号", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
-            @ApiImplicitParam(name = "ywlx", value = "业务类型", paramType = "query")
+            @ApiImplicitParam(name = "ywlx", value = "业务类型", paramType = "query"),
+            @ApiImplicitParam(name = "lspz", value = "粮食品种", paramType = "query")
     })
-    public Map<String, Object> detail(String bizNo, Integer orgId, String ywlx) {
+    public Map<String, Object> detail(String bizNo, Integer orgId, String ywlx, String lspz) {
         /**
          * 分为出库和入库
          * 基本信息
@@ -177,10 +178,13 @@ public class CrkRecordController {
         }
 
         /* 查询出入库质检信息 */
-        List<Map<String, Object>> zjxxMap = crkRecordService.queryJyxx(conditionMap);
-        if (null != zjxxMap && zjxxMap.size() > 0) {
-            modelMap.put("zjxx", zjxxMap.get(0));
+        List<Map<String, Object>> zjxxMap = crkRecordService.queryJyxxNew(conditionMap);
+        modelMap.put("zjxx", zjxxMap);
+        if (null != lspz && !"".equals(lspz)) {
+        	conditionMap.put("lspz", lspz);
         }
+        String parent_id = crkRecordService.queryDataLspz(conditionMap);
+        modelMap.put("parentId", parent_id);
 
         /* 查询出入库称重信息 */
         List<Map<String, Object>> czxx = crkRecordService.queryCzxx(conditionMap);

src/main/java/com/chinaitop/agile/controller/FcbgzController.java

@@ -70,7 +70,13 @@ public class FcbgzController {
 		}
 		/* 数据方向 (1入库,-1出库)*/
 		if (null != direction) {
-			criteria.andDirectionEqualTo(direction);
+			if (direction == 1) {
+				//收入数量大于0
+				criteria.andSrslGreaterThan(0d);
+			} else {
+				//支出数量大于0
+				criteria.andZcslGreaterThan(0d);
+			}
 		}
 		if (null != modifyData) {
 			Date date = ParameterUtil.string2datetime(modifyData);
@@ -162,4 +168,55 @@ public class FcbgzController {
 
 		return result_map;
 	}
+	
+	@RequestMapping(value="/queryRkZsList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="查询出入库入库追溯列表", notes = "支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name="pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name="orgId", value = "单位ID", paramType = "query"),
+		@ApiImplicitParam(name="houseId", value="仓房ID ", paramType="query"),
+		@ApiImplicitParam(name="warehouseId", value="货位ID", paramType="query")
+	})
+	public PageInfo<Map<String, Object>> queryRkZsList(Integer pageNum, Integer pageSize, 
+			Integer orgId, Integer houseId, Integer warehouseId) {
+
+		Map<String, Object> param_map = new HashMap<String, Object>();
+		if (null != pageNum && null != pageSize) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		/* 单位 */
+		if (null != orgId) {
+			param_map.put("orgId", orgId.toString());
+		}
+		/* 仓房 */
+		if (null != houseId) {
+			param_map.put("ch", houseId);
+		}
+		/* 货位 */
+		if (null != warehouseId) {
+			param_map.put("hwh", warehouseId);
+		}
+		List<Map<String, Object>> list = null;
+		try {
+			list = fcbgzService.queryRkZsList(param_map);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
+
+		return pageInfo;
+	}
+
+	@RequestMapping(value="/queryCrkJyxx", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="查询一条出入库入库数据的化验信息", notes = "查询一条出入库入库数据的化验信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="id", value="数据ID", paramType="query")
+	})
+	public Map<String, Object> queryCrkJyxx(String id) {
+
+        Map<String, Object> modelMap = fcbgzService.queryCrkJyxx(id);
+
+		return modelMap;
+	}
 }

src/main/java/com/chinaitop/agile/mapper/CrkRecordMapper.java

@@ -82,4 +82,20 @@ public interface CrkRecordMapper {
 	 * @return
 	 */
 	List<Map<String, Object>> queryCkData(Map<String, Object> map);
+
+	/**
+	 * 按条件查询出入库质检信息
+	 * 
+	 * @param conditionMap
+	 * @return
+	 */
+	List<Map<String, Object>> queryJyxxNew(Map<String, Object> conditionMap);
+
+	/**
+	 * 查询粮食品种对应的指标项出入库字典ID
+	 * 
+	 * @param conditionMap
+	 * @return
+	 */
+	Map<String, Object> queryDataLspz(Map<String, Object> conditionMap);
 }

src/main/java/com/chinaitop/agile/mapper/CrkRecordMapper.xml

@@ -145,6 +145,18 @@
 	</if>-->
 	order by crkRecord.rq DESC
   </select>
+  <select id="queryJyxxNew" resultType="java.util.Map" parameterType="java.util.Map">
+  	select b.zbxmc zbxmc,c.enumitemname enumname,b.jyz jyz,b.jykl jykl,b.jykj jykj,c.parentid parentid
+	from data_crkyw_jyxx_default a
+	left join data_crkyw_jyxx_flt_001 b on b.maindataid=a.dataid
+	left join enumitem c on c.enumitemid=b.zbxmc and c.enumid='1046'
+	where 1=1 and a.bizno=#{bizNo}
+  </select>
+  <select id="queryDataLspz" resultType="java.util.Map" parameterType="java.util.Map">
+  	select enumitemid from enumitem 
+	where enumitemcode=(select enumitemcode from enumitem where enumitemid=#{lspz} and enumid='1060') 
+	and enumid='1046'
+  </select>
   <select id="queryJyxx" resultType="java.util.Map"  parameterType="java.util.Map">
   	SELECT
 		max(case QualityIndex when '杂质总量(%)' then sg0302003 else '' end) as 'zzzl',

src/main/java/com/chinaitop/agile/mapper/DataKcglFcbgzDefaultMapper.java

@@ -47,4 +47,27 @@ public interface DataKcglFcbgzDefaultMapper {
      */
     List<Map<String, Object>> selectHouseKeepAccountData(Map<String, Object> map);
 
+    /**
+     * 按条件查询出入库质检信息
+     * 
+     * @param conditionMap
+     * @return
+     */
+	List<Map<String, Object>> queryCrkJyxx(Map<String, Object> conditionMap);
+
+	/**
+	 * 查询粮食品种对应的指标项出入库字典ID
+	 * 
+	 * @param conditionMap
+	 * @return
+	 */
+	Map<String, Object> queryDataLspz(Map<String, Object> conditionMap);
+
+	/**
+	 * 入库查询追溯列表
+	 * 
+	 * @param conditionMap
+	 * @return
+	 */
+	List<Map<String, Object>> queryRkZsList(Map<String, Object> conditionMap);
 }

src/main/java/com/chinaitop/agile/mapper/DataKcglFcbgzDefaultMapper.xml

@@ -730,4 +730,37 @@
         and newtab.pz = #{pzStr}
     </if>
   </select>
+  <!-- 查询一条出入库记录的化验数据 -->
+  <select id="queryCrkJyxx" parameterType="java.util.Map" resultType="java.util.Map">
+  	select a.pz lspz,d.zbxmc zbxmc,e.enumitemname enumname,d.jyz jyz,d.jykl jykl,d.jykj jykj,e.parentid parentid
+	from data_kcgl_fcbgz_default a 
+	left join data_kcgl_xckc_default b on b.dataid=a.dataid
+	left join data_crkyw_jyxx_default c on c.bizno=b.bizno
+	left join data_crkyw_jyxx_flt_001 d on d.maindataid=c.dataid
+	left join enumitem e on e.enumitemid=d.zbxmc and e.enumid='1046'
+	where 1=1 and a.dataid=#{id}
+  </select>
+  <!-- 查询一个品种的化验项顶级ID -->
+  <select id="queryDataLspz" resultType="java.util.Map" parameterType="java.util.Map">
+  	select enumitemid from enumitem 
+	where enumitemcode=(select enumitemcode from enumitem where enumitemid=#{lspz} and enumid='1060') 
+	and enumid='1046'
+  </select>
+  <!-- 查询出入库的汽车入库追溯列表 -->
+  <select id="queryRkZsList" resultType="java.util.Map" parameterType="java.util.Map">
+  	select a.* 
+	FROM data_kcgl_fcbgz_default a
+	LEFT JOIN data_kcgl_xckc_default b on b.DataID=a.DataID
+	WHERE 1=1 AND a.UnitID='211' AND b.bizno LIKE 'qcrk%' 
+	<if test="ch != null">
+        and a.ch = #{ch} 
+    </if>
+    <if test="hwh != null">
+        and a.hwh = #{hwh} 
+    </if>
+    <if test="orgId != null">
+    	and a.UnitID=#{orgId}
+    </if>
+    order by a.ModifyDate desc
+  </select>
 </mapper>

src/main/java/com/chinaitop/agile/service/CrkRecordService.java

@@ -79,4 +79,20 @@ public interface CrkRecordService {
 	 * @return
 	 */
 	List<Map<String, Object>> queryCkData(Map<String, Object> map);
+
+	/**
+	 * 按条件查询出入库质检信息
+	 * 
+	 * @param conditionMap
+	 * @return
+	 */
+	List<Map<String, Object>> queryJyxxNew(Map<String, Object> conditionMap);
+
+	/**
+	 * 查询粮食品种对应的指标项出入库字典ID
+	 * 
+	 * @param conditionMap
+	 * @return
+	 */
+	String queryDataLspz(Map<String, Object> conditionMap);
 }

src/main/java/com/chinaitop/agile/service/DataKcglFcbgzDefaultService.java

@@ -1,6 +1,7 @@
 package com.chinaitop.agile.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.chinaitop.agile.model.DataKcglFcbgzDefault;
 import com.chinaitop.agile.model.DataKcglFcbgzDefaultExample;
@@ -32,4 +33,20 @@ public interface DataKcglFcbgzDefaultService {
 	 * @return
 	 */
 	DataKcglFcbgzDefault findByIdFcbgzData(String id);
+
+	/**
+	 * 查询一条出入库数据的化验信息
+	 * 
+	 * @param id 分仓保管账表id
+	 * @return
+	 */
+	Map<String, Object> queryCrkJyxx(String id);
+
+	/**
+	 * 查询出入库入库追溯列表
+	 * 
+	 * @param param_map
+	 * @return
+	 */
+	List<Map<String, Object>> queryRkZsList(Map<String, Object> param_map);
 }

src/main/java/com/chinaitop/agile/service/impl/CrkRecordServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 import com.chinaitop.agile.mapper.CrkRecordMapper;
@@ -92,4 +93,15 @@ public class CrkRecordServiceImpl implements CrkRecordService {
 	public List<Map<String, Object>> queryCkData(Map<String, Object> map) {
 		return crkRecordMapper.queryCkData(map);
 	}
+
+	@Override
+	public List<Map<String, Object>> queryJyxxNew(Map<String, Object> conditionMap) {
+		return crkRecordMapper.queryJyxxNew(conditionMap);
+	}
+
+	@Override
+	public String queryDataLspz(Map<String, Object> conditionMap) {
+		Map<String, Object> map = crkRecordMapper.queryDataLspz(conditionMap);
+		return ObjectUtils.toString(map.get("enumitemid"), "");
+	}
 }

src/main/java/com/chinaitop/agile/service/impl/DataKcglFcbgzDefaultServiceImpl.java

@@ -1,10 +1,13 @@
 package com.chinaitop.agile.service.impl;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 import com.chinaitop.agile.mapper.DataKcglFcbgzDefaultMapper;
@@ -54,4 +57,36 @@ public class DataKcglFcbgzDefaultServiceImpl implements DataKcglFcbgzDefaultServ
 		return mapper.selectByPrimaryKey(id);
 	}
 
+	@Override
+	public Map<String, Object> queryCrkJyxx(String id) {
+		/* 返回结果  */
+		Map<String, Object> result_map = new HashMap<String, Object>();
+
+		/* 查询条件  */
+		Map<String, Object> conditionMap = new HashMap<String, Object>();
+		conditionMap.put("id", id);
+
+		/* 查询化验项信息 */
+		List<Map<String, Object>> list = mapper.queryCrkJyxx(conditionMap);
+
+		/* 查询对应品种的化验项的顶级ID */
+		String lspz = "";
+		if (null != list && list.size() > 0) {
+			result_map.put("zjxx", list);
+			lspz = ObjectUtils.toString(list.get(0).get("lspz"), "");
+			conditionMap.put("lspz", lspz);
+			Map<String, Object> lspzid_map = mapper.queryDataLspz(conditionMap);
+			result_map.put("parentId", ObjectUtils.toString(lspzid_map.get("enumitemid"), ""));
+		} else {
+			result_map.put("zjxx", "");
+			result_map.put("parentId", "");
+		}
+		return result_map;
+	}
+
+	@Override
+	public List<Map<String, Object>> queryRkZsList(Map<String, Object> param_map) {
+		return mapper.queryRkZsList(param_map);
+	}
+
 }