剩下的除了智能仓房的查询

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

@@ -53,13 +53,11 @@ public class CrkRecordController {
             @ApiImplicitParam(name = "houseId", value = "仓号", paramType = "query"),
             @ApiImplicitParam(name = "warehouseId", value = "货位号 ", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
-            @ApiImplicitParam(name = "cph", value = "车牌号", paramType = "query"),
-            @ApiImplicitParam(name = "bizNo", value = "入站单号", paramType = "query"),
-            @ApiImplicitParam(name = "hcph", value = "火车皮号", paramType = "query")
+            @ApiImplicitParam(name = "cph", value = "车牌号", paramType = "query")
     })
     public PageInfo<Map<String, Object>> getQcCrkPageList(Integer pageNum, Integer pageSize,
                                                           String cazylx, String pz, String beginDate, String endDate, Integer houseId,
-                                                          Integer warehouseId, Integer orgId, String cph, String bizNo, String hcph) {
+                                                          Integer warehouseId, Integer orgId, String cph) {
         Map<String, Object> map = new HashMap<String, Object>();
         if (null != cazylx && !"".equals(cazylx)) {
             if (cazylx.equals("1")) {
@@ -89,12 +87,6 @@ public class CrkRecordController {
         if (cph != null && !"".equals(cph)) {
             map.put("cph", "%"+cph+"%");
         }
-        if (bizNo != null && !"".equals(bizNo)) {
-            map.put("bizNo", "%"+bizNo+"%");
-        }
-        if (hcph != null && !"".equals(hcph)) {
-            map.put("hcph", "%"+hcph+"%");
-        }
         if (pageNum != null && pageSize != null) {
             PageHelper.startPage(pageNum, pageSize);
         }
@@ -114,11 +106,13 @@ public class CrkRecordController {
             @ApiImplicitParam(name = "endDate", value = "截止日期 ", paramType = "query"),
             @ApiImplicitParam(name = "houseId", value = "仓号", paramType = "query"),
             @ApiImplicitParam(name = "warehouseId", value = "货位号 ", paramType = "query"),
-            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
+            @ApiImplicitParam(name = "bizNo", value = "入站单号", paramType = "query"),
+            @ApiImplicitParam(name = "hcph", value = "火车皮号", paramType = "query")
     })
     public PageInfo<Map<String, Object>> getHcCrkPageList(Integer pageNum, Integer pageSize,
                                                           String cazylx, String pz, String beginDate, String endDate, Integer houseId,
-                                                          Integer warehouseId, Integer orgId) {
+                                                          Integer warehouseId, Integer orgId, String hcph, String bizNo) {
         Map<String, Object> map = new HashMap<String, Object>();
         if (null != cazylx && !"".equals(cazylx)) {
             if (cazylx.equals("1")) {
@@ -145,6 +139,12 @@ public class CrkRecordController {
         if (orgId != null && !"".equals(orgId)) {
             map.put("orgId", orgId);
         }
+        if (bizNo != null && !"".equals(bizNo)) {
+            map.put("bizNo", "%"+bizNo+"%");
+        }
+        if (hcph != null && !"".equals(hcph)) {
+            map.put("hcph", "%"+hcph+"%");
+        }
         if (pageNum != null && pageSize != null) {
             PageHelper.startPage(pageNum, pageSize);
         }

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

@@ -168,6 +168,38 @@ public class FcbgzController {
 
 		return result_map;
 	}
+
+	@RequestMapping(value="/queryTestingData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="温湿度检测用", notes = "查询温湿度检测详情需要的值")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="orgId", value = "单位ID", paramType = "query"),
+		@ApiImplicitParam(name="houseId", value="仓房ID ", paramType="query"),
+		@ApiImplicitParam(name="modifyData", value="检测时间 ", paramType="query")
+	})
+	public List<DataKcglFcbgzDefault> queryTestingData(String orgId, Integer houseId, String modifyData) {
+		List<DataKcglFcbgzDefault> data = null;
+		DataKcglFcbgzDefaultExample example = new DataKcglFcbgzDefaultExample();
+		Criteria criteria = example.createCriteria();
+		try {
+			if (ParameterUtil.isnotnull(orgId)) {
+				criteria.andUnitidEqualTo(orgId);
+			}
+			if (ParameterUtil.isnotnull(houseId)) {
+				criteria.andChEqualTo(houseId);
+			}
+			if (ParameterUtil.isnotnull(modifyData)) {
+				criteria.andRqLessThanOrEqualTo(ParameterUtil.string2date(modifyData));
+			}
+
+			example.setOrderByClause("ch,rq desc");
+
+			data = fcbgzService.findByList(example);
+		} catch (Exception e1) {
+			e1.printStackTrace();
+		}
+
+		return data;
+	}
 	
 	@RequestMapping(value="/queryRkZsList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="查询出入库入库追溯列表", notes = "支持分页")

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

@@ -18,7 +18,7 @@
 			b.sjcfbh as houseName,
 			b.sjhwID as wareId,
 			b.sjhwbh as wareName,
-			DATE_FORMAT(b.BuildDate,'%Y-%m-%d %H:%i:%s') as rq,
+			DATE_FORMAT(b.cpzsj,'%Y-%m-%d %H:%i:%s') as rq,
 			d.htbh AS htbh,
 			d.jhdbh AS jhbh,
 			CASE WHEN CHAR_LENGTH(b.bz)>10 THEN SUBSTR(b.bz,1,10) ELSE b.bz END AS bz
@@ -46,7 +46,7 @@
 			b.sjckchmc as houseName,
 			b.sjhwh as wareId,
 			b.sjhwhmc as wareName,
-			DATE_FORMAT(b.BuildDate,'%Y-%m-%d %H:%i:%s') as rq,
+			DATE_FORMAT(b.jmsj,'%Y-%m-%d %H:%i:%s') as rq,
 			d.htbh AS htbh,
 			d.jhdbh AS jhbh,
 			'' AS bz
@@ -107,7 +107,7 @@
 			b.sjcfbh AS houseName,
 			b.sjhwID AS wareId,
 			b.sjhwbh AS wareName,
-			DATE_FORMAT(b.BuildDate, '%Y-%m-%d %H:%i:%s') AS rq,
+			DATE_FORMAT(b.cpzsj, '%Y-%m-%d %H:%i:%s') AS rq,
 			d.htbh AS htbh,
 			d.jhdbh AS jhbh
 		FROM data_crkyw_cmz_default a
@@ -132,7 +132,7 @@
 				b.sjckchmc AS houseName,
 				b.sjhwh AS wareId,
 				b.sjhwhmc AS wareName,
-				DATE_FORMAT(b.BuildDate, '%Y-%m-%d %H:%i:%s') AS rq,
+				DATE_FORMAT(b.jmsj, '%Y-%m-%d %H:%i:%s') AS rq,
 				e.htbh AS htbh,
 				e.jhdbh AS jhbh
 			FROM data_crkyw_ckcpz_default a
@@ -163,9 +163,12 @@
 	<if test="lspz != null">
 		AND crkRecord.lspz = #{lspz}
 	</if>
-	<!--<if test="orderType != null">
-		order by crkRecord.rq #{orderType, jdbcType=VARCHAR}
-	</if>-->
+	<if test="bizNo != null">
+	  AND crkRecord.bizNo like #{bizNo}
+	</if>
+	<if test="hcph != null">
+	  AND crkRecord.hcph like #{hcph}
+	</if>
 	order by crkRecord.rq DESC
   </select>
   <select id="queryJyxxNew" resultType="java.util.Map" parameterType="java.util.Map">
@@ -279,7 +282,7 @@
 							b.sjcfbh AS houseName,
 							b.sjhwID AS wareId,
 							b.sjhwbh AS wareName,
-							DATE_FORMAT(b.BuildDate, '%Y-%m-%d') AS rq,
+							DATE_FORMAT(b.cpzsj, '%Y-%m-%d') AS rq,
 							d.htbh AS htbh,
 							d.jhdbh AS jhbh
 						FROM
@@ -305,7 +308,7 @@
 								b.sjckchmc AS houseName,
 								b.sjhwh AS wareId,
 								b.sjhwhmc AS wareName,
-								DATE_FORMAT(b.BuildDate, '%Y-%m-%d') AS rq,
+								DATE_FORMAT(b.jmsj, '%Y-%m-%d') AS rq,
 							    d.htbh AS htbh,
 							    d.jhdbh AS jhbh
 							FROM
@@ -348,7 +351,7 @@
 								b.sjcfbh AS houseName,
 								b.sjhwID AS wareId,
 								b.sjhwbh AS wareName,
-								DATE_FORMAT(b.BuildDate, '%Y-%m-%d') AS rq,
+								DATE_FORMAT(b.cpzsj, '%Y-%m-%d') AS rq,
 							    d.htbh AS htbh,
 							    d.jhdbh AS jhbh
 							FROM
@@ -374,7 +377,7 @@
 									b.sjckchmc AS houseName,
 									b.sjhwh AS wareId,
 									b.sjhwhmc AS wareName,
-									DATE_FORMAT(b.BuildDate, '%Y-%m-%d') AS rq,
+									DATE_FORMAT(b.jmsj, '%Y-%m-%d') AS rq,
 							    	e.htbh AS htbh,
 							    	e.jhdbh AS jhbh
 								FROM
@@ -546,7 +549,7 @@
 				b.sjckchmc AS houseName,
 				b.sjhwh AS wareId,
 				b.sjhwhmc AS wareName,
-				DATE_FORMAT(b.BuildDate, '%Y-%m-%d') AS rq
+				DATE_FORMAT(b.jmsj, '%Y-%m-%d') AS rq
 			FROM
 				data_crkyw_ckrmdj_default a
 				INNER JOIN data_crkyw_ckcmz_default b ON a.BizNo = b.BizNo
@@ -563,7 +566,7 @@
 				b.sjckchmc AS houseName,
 				b.sjhwh AS wareId,
 				b.sjhwhmc AS wareName,
-				DATE_FORMAT(b.BuildDate, '%Y-%m-%d') AS '出入库日期'
+				DATE_FORMAT(b.jmsj, '%Y-%m-%d') AS '出入库日期'
 			FROM
 				data_crkyw_ckcpz_default a
 				INNER JOIN data_crkyw_ckcmz_default b ON a.BizNo = b.BizNo