设备和查询追溯新增查询条件

src/main/java/com/chinaitop/depot/supervise/controller/GrainConditionController.java

@@ -41,11 +41,15 @@ public class GrainConditionController {
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "houseNo", value = "仓房id", paramType = "query"),
-            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query"),
+            @ApiImplicitParam(name = "TestStartDate", value = "检测日期开始", paramType = "query"),
+            @ApiImplicitParam(name = "TestEndDate", value = "检测日期结束", paramType = "query")
     })
-    public PageInfo<Map<String,Object>> getDataList(Integer pageNum, Integer pageSize,String houseNo, String orgId){
+    public PageInfo<Map<String,Object>> getDataList(Integer pageNum, Integer pageSize,String houseNo, String orgId, String TestStartDate, String TestEndDate){
         PageHelper.startPage(pageNum, pageSize);
-        List<Map<String,Object>> retList = grainConditionService.getDataList(houseNo, orgId);
+
+
+        List<Map<String,Object>> retList = grainConditionService.getDataList(houseNo, orgId,TestStartDate, TestEndDate);
         PageInfo<Map<String,Object>> pageInfo = new PageInfo<Map<String,Object>>(retList);
         return pageInfo;
     }

src/main/java/com/chinaitop/depot/supervise/mapper/TestDatasMapper.xml

@@ -91,6 +91,12 @@
       <if test="houseNo != null" >
           AND si.storehouse_code = #{houseNo,jdbcType=VARCHAR}
       </if>
+      <if test="TestStartDate !=null">
+          and STR_TO_DATE(t2.time, '%Y-%m-%d')  <![CDATA[ >= ]]> #{TestStartDate}
+      </if>
+      <if test="TestEndDate !=null">
+          and STR_TO_DATE(t2.time, '%Y-%m-%d')  &lt;= #{TestEndDate}
+      </if>
   </select>
 
   <select id="selectByDays" resultType="java.util.Map" parameterType="java.util.Map" >

src/main/java/com/chinaitop/depot/supervise/service/GrainConditionService.java

@@ -7,7 +7,7 @@ public interface GrainConditionService {
      * 获取最新仓房温度列表
      * @return
      */
-    List<Map<String,Object>> getDataList(String houseNo, String orgId);
+    List<Map<String,Object>> getDataList(String houseNo, String orgId, String TestStartDate, String TestEndDate);
 
     List<Map<String,Object>> getThreeCondition(Map<String,Object> example);
 

src/main/java/com/chinaitop/depot/supervise/service/impl/GrainConditionServiceImpl.java

@@ -25,11 +25,15 @@ public class GrainConditionServiceImpl implements GrainConditionService {
      * @return
      */
     @Override
-    public List<Map<String, Object>> getDataList(String houseNo, String orgId) {
+    public List<Map<String, Object>> getDataList(String houseNo, String orgId, String TestStartDate, String TestEndDate) {
         Map<String,String> map = new HashMap<String, String>();
         if(!StringUtils.isEmpty(houseNo)){
             map.put("houseNo",houseNo);
         }
+        if(ParameterUtil.isnotnull(TestStartDate) && ParameterUtil.isnotnull(TestEndDate)){
+            map.put("TestStartDate",TestStartDate);
+            map.put("TestEndDate",TestEndDate);
+        }
         map.put("orgId",orgId);
         return testDatasMapper.getDataList(map);
     }