代储新增查询条件

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentPeopleController.java

@@ -42,18 +42,20 @@ public class AgentPeopleController {
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "PeopleName", value = "人员名称", paramType = "query"),
-            @ApiImplicitParam(name = "agentDepotName", value = "粮库名称", paramType = "query"),
+            @ApiImplicitParam(name = "agentDepotId", value = "粮库名称", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
     })
-    public PageInfo<BusinessAgentPeople> getAgentPeopleList(Integer pageNum, Integer pageSize,String PeopleName,String agentDepotName,String orgId){
+    public PageInfo<BusinessAgentPeople> getAgentPeopleList(Integer pageNum, Integer pageSize,String PeopleName,String agentDepotId,String orgId){
 
         BusinessAgentPeopleExample example = new BusinessAgentPeopleExample();
         BusinessAgentPeopleExample.Criteria criteria = example.createCriteria();
         criteria.andOrgIdEqualTo(Integer.valueOf(orgId));
+        if(ParameterUtil.isnotnull(agentDepotId)){
+            criteria.andDepotIdEqualTo(Integer.valueOf(agentDepotId));
+        }
         if(ParameterUtil.isnotnull(PeopleName)){
             criteria.andPeopleNameLike("%"+PeopleName+"%");
         }
-
         example.setOrderByClause("updatetime desc");
         PageHelper.startPage(pageNum, pageSize);
         List<BusinessAgentPeople> list = agentPeopleService.getAgentList(example);

src/main/java/com/chinaitop/depot/agent/quality/controller/AgentQualityController.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.agent.quality.controller;
 
 
+import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.agent.basic.service.agentService;
 import com.chinaitop.depot.agent.quality.model.BusinessAgentQuality;
 import com.chinaitop.depot.agent.quality.model.BusinessAgentQualityExample;
@@ -63,13 +64,18 @@ public class AgentQualityController {
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "checktype", value = "检查的类型", paramType = "query"),
             @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query"),
+            @ApiImplicitParam(name = "quality", value = "储粮性质", paramType = "query"),
+            @ApiImplicitParam(name = "subType", value = "粮食品种", paramType = "query"),
+            @ApiImplicitParam(name = "searchStartDate", value = "开始日期", paramType = "query"),
+            @ApiImplicitParam(name = "searchEndDate", value = "结束日期", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "粮库id", paramType = "query"),
             @ApiImplicitParam(name = "agentId", value = "代储点名称", paramType = "query"),
             @ApiImplicitParam(name = "agentDepotId", value = "粮库名称", paramType = "query"),
             @ApiImplicitParam(name = "storehouseId", value = "仓房名称", paramType = "query"),
             @ApiImplicitParam(name = "warehouseId", value = "货位名称", paramType = "query"),
     })
-    public PageInfo<BusinessAgentQuality> listPage(Integer pageNum, Integer pageSize,String checktype, String checkResult, Integer orgId,
+    public PageInfo<BusinessAgentQuality> listPage(Integer pageNum, Integer pageSize,String checktype, String checkResult,
+                                                   String quality, Integer subType, String searchStartDate, String searchEndDate, Integer orgId,
     Integer agentId,Integer agentDepotId,Integer storehouseId,Integer warehouseId) {
     	BusinessAgentQuality qualityCheck = new BusinessAgentQuality();
         //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
@@ -103,6 +109,20 @@ public class AgentQualityController {
         if (StringUtils.isNotBlank(checkResult)) {
             qualityCheck.setCheckResult(checkResult);
         }
+        if (StringUtils.isNotBlank(quality)){
+            HashMap hashMap = JSON.parseObject(quality, HashMap.class);
+            String ax = String.valueOf(hashMap.get("id"));
+            qualityCheck.setQuality(ax);
+        }
+        if (subType!= null){
+            qualityCheck.setSubType(subType);
+        }
+
+        if(ParameterUtil.isnotnull(searchStartDate) && ParameterUtil.isnotnull(searchEndDate)){
+            qualityCheck.setSearchStartDate(searchStartDate);
+            qualityCheck.setSearchEndDate(searchEndDate);
+        }
+
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
         //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
         //qualityCheck.setSealStatus("0");

src/main/java/com/chinaitop/depot/agent/quality/mapper/BusinessAgentQualityMapper.xml

@@ -1856,7 +1856,8 @@
         LEFT JOIN business_agent agent ON agent.id = sqk.agent_id
         LEFT JOIN business_agent_depot depot ON depot.id = sqk.agent_depot_id
       <where>
-          ware.library_type = 1 AND store.library_type = 1
+        (ware.library_type = 1
+        OR store.library_type = 1 )
           <if test="agentId !=null">
               and sqk.agent_id = #{agentId}
           </if>
@@ -1887,6 +1888,18 @@
           <if test="checkResult !=null">
               and sqk.check_result = #{checkResult}
           </if>
+          <if test="quality !=null">
+            and sqk.quality = #{quality}
+          </if>
+          <if test="subType !=null">
+            and sqk.sub_type = #{subType}
+          </if>
+          <if test="searchStartDate !=null">
+            and STR_TO_DATE(sqk.check_time, '%Y-%m-%d')  <![CDATA[ >= ]]> #{searchStartDate}
+          </if>
+          <if test="searchEndDate !=null">
+            and STR_TO_DATE(sqk.check_time, '%Y-%m-%d')  &lt;= #{searchEndDate}
+          </if>
           AND sqk.org_id = #{orgId}
       </where>
       GROUP BY sqk.id

src/main/java/com/chinaitop/depot/agent/quality/model/BusinessAgentQuality.java

@@ -4,6 +4,26 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class BusinessAgentQuality {
+    //开始日期和结束日期
+    private String searchStartDate;
+
+    public String getSearchStartDate() {
+        return searchStartDate;
+    }
+
+    public void setSearchStartDate(String searchStartDate) {
+        this.searchStartDate = searchStartDate;
+    }
+
+    public String getSearchEndDate() {
+        return searchEndDate;
+    }
+
+    public void setSearchEndDate(String searchEndDate) {
+        this.searchEndDate = searchEndDate;
+    }
+
+    private String searchEndDate;
     private Integer id;
 
     private Integer agentId;

src/main/java/com/chinaitop/depot/agent/temperature/controller/AgentTemperatureController.java

@@ -59,10 +59,11 @@ public class AgentTemperatureController {
             @ApiImplicitParam(name = "startTime", value = "检测开始时间", paramType = "query"),
             @ApiImplicitParam(name = "endTime", value = "检测结束时间", paramType = "query"),
             @ApiImplicitParam(name = "temperId", value = "粮情id", paramType = "query"),
-            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
+            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query"),
+            @ApiImplicitParam(name = "lspz", value = "粮油品种", paramType = "query")
     })
     public PageInfo<Map<String, Object>> getAgentTemperatureList(Integer pageNum, Integer pageSize, Integer agentId, Integer agentDepotId,
-                                                                 Integer storehouseId, String startTime, String endTime, String temperId, String orgid) {
+                                                                 Integer storehouseId, String startTime, String endTime, String temperId, String orgid, Integer lspz) {
         Map<String, Object> map = new HashMap<>();
         map.put("orgId", orgid);
         if (ParameterUtil.isnotnull(agentId)) {
@@ -81,6 +82,9 @@ public class AgentTemperatureController {
             map.put("startTime", startTime + " 00:00:00");
             map.put("endTime", endTime + " 23:59:59");
         }
+        if (null != lspz && !"".equals(lspz)) {
+            map.put("lspz", lspz);
+        }
         PageHelper.clearPage();
 
         List<Map<String, Object>> dataList = this.getDataByMap(map);

src/main/java/com/chinaitop/depot/agent/temperature/mapper/BusinessAgentTemperatureMapper.xml

@@ -588,40 +588,117 @@
   </update>
 
   <select id="getDataByExample" parameterType="java.util.Map" resultType="java.util.HashMap">
+    SELECT
+    temperAll.*
+    FROM
+    (
     SELECT DISTINCT
+    temper.id id,
+    temper.org_id orgId,
     depot.depot_id agentOrgId,
     depot.depot_id agentStoreOrgId,
-    agent.agent_name agentName,
+    '1' sign,
     depot.agent_depot_name agentDepotName,
-    depot.updatetime,
     store.storehouse_name storehouseName,
+    ba.agent_name agentName,
+    temper.lspz lspz,
+    temper.detection_time detectionTime,
+    temper.house_temperature houseTemperature,
+    temper.house_humidity houseHumidity,
+    temper.max max,
+    temper.min min,
+    temper.avg avg,
     store.storehouse_type storehouseType,
     store.design_capacity designCapacity,
-    store.storehouse_code storehouseCode,
-    store.storehouse_id storehouseId,
-    keeper.name keeper
+    temper.enter_time enterTime,
+    temper.nature nature,
+    temper.level level,
+    temper.actual_amount actualAmount,
+    temper.harvest_year harvestYear,
+    temper.gas_temperature gasTemperature,
+    temper.gas_humidity gasHumidity,
+    temper.keeper keeper,
+    temper.updatetime updatetime
+    FROM
+    business_agent_temperature temper
+    LEFT JOIN business_agent_depot depot ON depot.id = temper.agent_depot_id
+    AND depot.org_id = #{orgId,jdbcType=INTEGER}
+    LEFT JOIN basic_storehouse store ON store.storehouse_id = temper.storehouse_id
+    LEFT JOIN business_agent ba ON depot.org_id = ba.org_id
+    WHERE temper.org_id = #{orgId,jdbcType=INTEGER}
+    <if test="agentDepotId != null">
+      AND temper.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
+    </if>
+    <if test="storehouseId != null">
+      AND temper.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+    </if>
+    <if test="startTime != null and endTime != null">
+      AND temper.detection_time BETWEEN #{startTime} AND #{endTime}
+    </if>
+    <if test="temperId != null">
+      AND temper.id = #{temperId,jdbcType=INTEGER}
+    </if>
+    <if test="lspz != null">
+      AND temper.lspz = #{lspz,jdbcType=INTEGER}
+    </if>
+    UNION ALL
+    SELECT DISTINCT
+    tt.id id,
+    tt.org_id orgId,
+    depot.depot_id agentOrgId,
+    depot.depot_id agentStoreOrgId,
+    '0' sign,
+    depot.agent_depot_name agentDepotName,
+    store.storehouse_name storehouseName,
+    ba.agent_name agentName,
+    tt.storehouse lspz,
+    tt.time detectionTime,
+    tt.inTemp houseTemperature,
+    tt.inH houseHumidity,
+    tt.max max,
+    tt.min min,
+    tt.avg avg,
+    store.storehouse_type storehouseType,
+    store.design_capacity designCapacity,
+    tt.storehouse enterTime,
+    tt.storehouse nature,
+    tt.storehouse level,
+    tt.storehouse actualAmount,
+    tt.storehouse harvestYear,
+    tt.outTemp gasTemperature,
+    tt.outH gasHumidity,
+    '' keeper,
+    tt.updatetime updatetime
     FROM
     business_agent_depot depot
-    LEFT JOIN business_agent agent ON depot.agent_id = agent.id
-    AND agent.org_id = #{orgId,jdbcType=INTEGER}
     INNER JOIN business_agent_storehouse agentStore ON depot.id = agentStore.agent_depot_id
+    INNER JOIN business_agent ba ON depot.org_id = ba.org_id
     INNER JOIN basic_storehouse store ON store.storehouse_id = agentStore.storehouse_id
     AND store.del_flag = 1
-    LEFT JOIN basic_keeper_house keepHouse ON keepHouse.house_Id = agentStore.storehouse_id
-    AND depot.depot_id = keepHouse.org_id
-    LEFT JOIN basic_keeper keeper ON keeper.id = keepHouse.keeper_Id
-    WHERE depot.org_id = #{orgId,jdbcType=INTEGER}
+    LEFT JOIN t_testdata tt ON depot.depot_id = tt.org_id
+    AND tt.storehouse = store.storehouse_code
+    AND tt.org_id != #{orgId,jdbcType=INTEGER}
+    AND tt.updatetime >= depot.updatetime
+    WHERE
+    tt.iLq_yq = '0'
+    AND depot.org_id = #{orgId,jdbcType=INTEGER}
     AND depot.del_flag = 1
-    <if test="agentId != null">
-      AND agent.id = #{agentId,jdbcType=INTEGER}
-    </if>
     <if test="agentDepotId != null">
       AND depot.id = #{agentDepotId,jdbcType=INTEGER}
     </if>
     <if test="storehouseId != null">
       AND store.storehouse_id = #{storehouseId,jdbcType=INTEGER}
     </if>
-    order by depot.depot_id
+    <if test="startTime != null and endTime != null">
+      AND tt.time BETWEEN #{startTime} AND #{endTime}
+    </if>
+    <if test="lspz != null and endTime != null">
+      AND tt.storehouse = #{lspz,jdbcType=INTEGER}
+    </if>
+    ) temperAll
+    WHERE temperAll.orgId IS NOT NULL AND temperAll.id IS NOT NULL
+    ORDER BY
+    temperAll.updatetime DESC
   </select>
 
   <select id="getTestDataList" parameterType="java.util.Map" resultType="java.util.HashMap">
@@ -655,6 +732,9 @@
     <if test="startTime != null and endTime != null">
       AND tt.time BETWEEN #{startTime} AND #{endTime}
     </if>
+    <if test="lspz != null">
+      AND tt.lspz = #{lspz,jdbcType=INTEGER}
+    </if>
     order by tt.updatetime desc
     LIMIT 100
   </select>

src/main/java/com/chinaitop/depot/agent/temperature/service/impl/AgentTemperatureServiceImpl.java

@@ -38,93 +38,94 @@ public class AgentTemperatureServiceImpl implements agentTemperatureService {
      */
     @Override
     public List<Map<String, Object>> getAgentTemperatureList(List<Map<String, Object>> dataList,Map<String, Object> map) {
-        List<String> houseCode = new ArrayList<>();
-        String depotId = "";
-        String updatetime = "";
-        Integer idNum = 0;
-        List<Map<String, Object>> AllList = new ArrayList<Map<String, Object>>();
-        String houseIds = "";
-        for (int i = 0; i <= dataList.size(); i++) {
-            //如果是最后一次循环则直接查询数据，不往下走
-            if(i == dataList.size()){
-                map.put("depotId",depotId);
-                map.put("updatetime",updatetime);
-                map.put("houseCode",houseCode);
-                List<Map<String, Object>> testList = businessAgentTemperatureMapper.getTestDataList(map);
-                Map<String, Object> modelMap = new HashMap<String, Object>();
-                if(ParameterUtil.isnotnull(testList) && testList.size() != 0){
-                    for (Map<String, Object> testData:testList) {
-                        modelMap = testData;
-                        modelMap.put("agentOrgId",dataList.get(i-1).get("agentOrgId"));
-                        modelMap.put("agentStoreOrgId",dataList.get(i-1).get("agentStoreOrgId"));
-                        modelMap.put("agentName",dataList.get(i-1).get("agentName"));
-                        modelMap.put("agentDepotName",dataList.get(i-1).get("agentDepotName"));
-                        modelMap.put("designCapacity",dataList.get(i-1).get("designCapacity"));
-                        modelMap.put("storehouseName",dataList.get(i-1).get("storehouseName"));
-                        modelMap.put("storehouseId",dataList.get(i-1).get("storehouseId"));
-                        modelMap.put("keeper",dataList.get(i-1).get("keeper"));
-                        AllList.add(modelMap);
-                        if(AllList.size() == 100){
-                            break;
-                        }
-                    }
-                }
-                break;
-            }
-            houseIds += dataList.get(i).get("storehouseId") + ",";
-            if(idNum == 0){//判断算是否是一个库的仓房编号
-                depotId = dataList.get(i).get("agentOrgId").toString();
-                updatetime = dataList.get(i).get("updatetime").toString();
-                houseCode.add(dataList.get(i).get("storehouseCode").toString());
-                idNum++;
-            }else if(ParameterUtil.isequal(depotId,dataList.get(i).get("agentOrgId").toString())){//如果是一个库的则组成字符串
-                houseCode.add(dataList.get(i).get("storehouseCode").toString());
-            }else{//不是一个库的还原idNum值，以便下回循环，然后把这个库的100条温度数据查出来加入list集合，继续循环查下一个库
-                idNum = 0;
-                map.put("depotId",depotId);
-                map.put("updatetime",updatetime);
-                map.put("houseCode",houseCode);
-                List<Map<String, Object>> testList = businessAgentTemperatureMapper.getTestDataList(map);
-                Map<String, Object> modelMap = new HashMap<String, Object>();
-                if(ParameterUtil.isnotnull(testList) && testList.size() != 0){
-                    for (Map<String, Object> testData:testList) {
-                        modelMap = testData;
-                        modelMap.put("agentOrgId",dataList.get(i-1).get("agentOrgId"));
-                        modelMap.put("agentStoreOrgId",dataList.get(i-1).get("agentStoreOrgId"));
-                        modelMap.put("agentName",dataList.get(i-1).get("agentName"));
-                        modelMap.put("agentDepotName",dataList.get(i-1).get("agentDepotName"));
-                        modelMap.put("designCapacity",dataList.get(i-1).get("designCapacity"));
-                        modelMap.put("storehouseName",dataList.get(i-1).get("storehouseName"));
-                        modelMap.put("storehouseId",dataList.get(i-1).get("storehouseId"));
-                        modelMap.put("keeper",dataList.get(i-1).get("keeper"));
-                        AllList.add(modelMap);
-                        if(AllList.size() == 100){
-                            break;
-                        }
-                    }
-                }
-            }
-            if(AllList.size() == 100){
-                break;
-            }
-        }
-
-        String url = "http://localhost:9026/agile/kcsw/getDateByHouseIds";
-        Map<String, Object> dataMap = new HashMap<String, Object>();
-        dataMap.put("houseIds",houseIds.substring(0,houseIds.length()-1));
-        String strResult = HTTPUtils.doPost(url,dataMap);
-        JSONArray json = JSONArray.parseArray(strResult);
-        if(ParameterUtil.isnotnull(json) && json.size() != 0){
-            for (int i = 0; i < AllList.size(); i++) {
-                for (int j = 0; j < json.size(); j++) {
-                    JSONObject job = json.getJSONObject(j);
-                    if(ParameterUtil.isequal(AllList.get(i).get("storehouseId").toString(),job.get("ch").toString())){
-                        AllList.get(i).put("lspz",Integer.parseInt(job.get("pz").toString()));
-                    }
-                }
-            }
-        }
-        return AllList;
+//        List<String> houseCode = new ArrayList<>();
+//        String depotId = "";
+//        String updatetime = "";
+//        Integer idNum = 0;
+//        List<Map<String, Object>> AllList = new ArrayList<Map<String, Object>>();
+//        String houseIds = "";
+//        for (int i = 0; i <= dataList.size(); i++) {
+//            //如果是最后一次循环则直接查询数据，不往下走
+//            if(i == dataList.size()){
+//                map.put("depotId",depotId);
+//                map.put("updatetime",updatetime);
+//                map.put("houseCode",houseCode);
+//                List<Map<String, Object>> testList = businessAgentTemperatureMapper.getTestDataList(map);
+//                Map<String, Object> modelMap = new HashMap<String, Object>();
+//                if(ParameterUtil.isnotnull(testList) && testList.size() != 0){
+//                    for (Map<String, Object> testData:testList) {
+//                        modelMap = testData;
+//                        modelMap.put("agentOrgId",dataList.get(i-1).get("agentOrgId"));
+//                        modelMap.put("agentStoreOrgId",dataList.get(i-1).get("agentStoreOrgId"));
+//                        modelMap.put("agentName",dataList.get(i-1).get("agentName"));
+//                        modelMap.put("agentDepotName",dataList.get(i-1).get("agentDepotName"));
+//                        modelMap.put("designCapacity",dataList.get(i-1).get("designCapacity"));
+//                        modelMap.put("storehouseName",dataList.get(i-1).get("storehouseName"));
+//                        modelMap.put("storehouseId",dataList.get(i-1).get("storehouseId"));
+//                        modelMap.put("keeper",dataList.get(i-1).get("keeper"));
+//                        AllList.add(modelMap);
+//                        if(AllList.size() == 100){
+//                            break;
+//                        }
+//                    }
+//                }
+//                break;
+//            }
+//            houseIds += dataList.get(i).get("storehouseId") + ",";
+//            if(idNum == 0){//判断算是否是一个库的仓房编号
+//                depotId = dataList.get(i).get("agentOrgId").toString();
+//                updatetime = dataList.get(i).get("updatetime").toString();
+//                houseCode.add(dataList.get(i).get("storehouseCode").toString());
+//                idNum++;
+//            }else if(ParameterUtil.isequal(depotId,dataList.get(i).get("agentOrgId").toString())){//如果是一个库的则组成字符串
+//                houseCode.add(dataList.get(i).get("storehouseCode").toString());
+//            }else{//不是一个库的还原idNum值，以便下回循环，然后把这个库的100条温度数据查出来加入list集合，继续循环查下一个库
+//                idNum = 0;
+//                map.put("depotId",depotId);
+//                map.put("updatetime",updatetime);
+//                map.put("houseCode",houseCode);
+//                List<Map<String, Object>> testList = businessAgentTemperatureMapper.getTestDataList(map);
+//                Map<String, Object> modelMap = new HashMap<String, Object>();
+//                if(ParameterUtil.isnotnull(testList) && testList.size() != 0){
+//                    for (Map<String, Object> testData:testList) {
+//                        modelMap = testData;
+//                        modelMap.put("agentOrgId",dataList.get(i-1).get("agentOrgId"));
+//                        modelMap.put("agentStoreOrgId",dataList.get(i-1).get("agentStoreOrgId"));
+//                        modelMap.put("agentName",dataList.get(i-1).get("agentName"));
+//                        modelMap.put("agentDepotName",dataList.get(i-1).get("agentDepotName"));
+//                        modelMap.put("designCapacity",dataList.get(i-1).get("designCapacity"));
+//                        modelMap.put("storehouseName",dataList.get(i-1).get("storehouseName"));
+//                        modelMap.put("storehouseId",dataList.get(i-1).get("storehouseId"));
+//                        modelMap.put("keeper",dataList.get(i-1).get("keeper"));
+//                        AllList.add(modelMap);
+//                        if(AllList.size() == 100){
+//                            break;
+//                        }
+//                    }
+//                }
+//            }
+//            if(AllList.size() == 100){
+//                break;
+//            }
+//        }
+//
+//        String url = "http://localhost:9026/agile/kcsw/getDateByHouseIds";
+//        Map<String, Object> dataMap = new HashMap<String, Object>();
+//        dataMap.put("houseIds",houseIds.substring(0,houseIds.length()-1));
+//        String strResult = HTTPUtils.doPost(url,dataMap);
+//        JSONArray json = JSONArray.parseArray(strResult);
+//        if(ParameterUtil.isnotnull(json) && json.size() != 0){
+//            for (int i = 0; i < AllList.size(); i++) {
+//                for (int j = 0; j < json.size(); j++) {
+//                    JSONObject job = json.getJSONObject(j);
+//                    if(ParameterUtil.isequal(AllList.get(i).get("storehouseId").toString(),job.get("ch").toString())){
+//                        AllList.get(i).put("lspz",Integer.parseInt(job.get("pz").toString()));
+//                    }
+//                }
+//            }
+//        }
+//        return AllList;
+        return businessAgentTemperatureMapper.getDataByExample(map);
     }
 
     @Override