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

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

@@ -56,12 +56,15 @@ public class AgentDepotController {
             @ApiImplicitParam(name = "agentId", value = "代储点id", paramType = "query"),
             @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
     })
-    public PageInfo<BusinessAgentDepot> getAgentDepotList(Integer pageNum, Integer pageSize,String agentDepotName,String orgid, String agentId){
+    public PageInfo<BusinessAgentDepot> getAgentDepotList(Integer pageNum, Integer pageSize,String agentDepotName,String agentName,String orgid, String agentId){
         Map<String,Object> map = new HashMap<>();
         map.put("orgId",orgid);
         if(ParameterUtil.isnotnull(agentDepotName)){
             map.put("agentDepotName","%" + agentDepotName + "%");
         }
+        if(ParameterUtil.isnotnull(agentName)){
+            map.put("agentName","%" + agentName + "%");
+        }
         if(ParameterUtil.isnotnull(agentId)){
             map.put("agentId",agentId);
         }

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentDepotMapper.xml

@@ -402,13 +402,14 @@
     depot.updatetime
     FROM
     business_agent_depot depot
+    LEFT JOIN business_agent agent ON agent.id = depot.agent_id
     WHERE
     depot.depot_id = 0 AND depot.del_flag = 1 AND depot.org_id = #{orgId,jdbcType=INTEGER}
     <if test="agentDepotName != null">
       AND depot.agent_depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
     </if>
-    <if test="agentId != null">
-      AND depot.agent_id LIKE #{agentId,jdbcType=VARCHAR}
+    <if test="agentName != null">
+      AND agent.agent_name LIKE #{agentName,jdbcType=VARCHAR}
     </if>
     UNION ALL
     SELECT
@@ -423,6 +424,7 @@
     depot.updatetime
     FROM
     business_agent_depot depot
+    LEFT JOIN business_agent agent ON agent.id = depot.agent_id
     LEFT JOIN org_info org ON org.org_id = depot.depot_id
     LEFT JOIN basic_enum depotType ON depotType.enumId = org.company_nature
     WHERE depot.org_id = #{orgId,jdbcType=INTEGER} AND depot.del_flag = 1
@@ -430,8 +432,8 @@
     <if test="agentDepotName != null">
       AND depot.agent_depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
     </if>
-    <if test="agentId != null">
-      AND depot.agent_id = #{agentId,jdbcType=VARCHAR}
+    <if test="agentName != null">
+      AND agent.agent_name LIKE #{agentName,jdbcType=VARCHAR}
     </if>
     ) t
     ORDER BY

src/main/java/com/chinaitop/depot/agent/crk/controller/AgentQcController.java

@@ -73,7 +73,7 @@ public class AgentQcController {
             @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
     })
     public PageInfo<Map<String, Object>> getAgentQcList(Integer pageNum, Integer pageSize, Integer agentId, Integer agentDepotId,
-                                                                Integer storehouseId, Integer warehouseId, String businessType, Integer lspz, String orgid){
+      Integer storehouseId, Integer warehouseId, String businessType, Integer lspz, String orgid, String cph){
         Map<String,Object> map = new HashMap<>();
         map.put("orgId",orgid);
         if(ParameterUtil.isnotnull(agentId)){
@@ -98,6 +98,9 @@ public class AgentQcController {
         if(ParameterUtil.isnotnull(lspz)){
             map.put("lspz",lspz);
         }
+        if(ParameterUtil.isnotnull(cph)){
+            map.put("cph",cph);
+        }
 
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> list = agentQcService.getAgentQcList(map);

src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentQcMapper.xml

@@ -419,6 +419,9 @@
     <if test="lspz != null">
       AND qc.lspz = #{lspz,jdbcType=INTEGER}
     </if>
+    <if test="cph != null">
+      AND qc.car_brand = #{cph,jdbcType=VARCHAR}
+    </if>
     UNION ALL
     SELECT
         qc.id,qc.agent_id agentId,qc.agent_depot_id agentDepotId,depot.depot_id agentOrgId,qc.notice,qc.business_number businessNumber,qc.car_brand carBrand,
@@ -453,6 +456,9 @@
     <if test="lspz != null">
       AND qc.lspz = #{lspz,jdbcType=INTEGER}
     </if>
+    <if test="cph != null">
+      AND qc.car_brand = #{cph,jdbcType=VARCHAR}
+    </if>
     GROUP BY qc.business_number
     ) a
     ORDER BY a.crkTime DESC

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

@@ -1976,10 +1976,10 @@
       LEFT JOIN storage_foodbasicinfo sfo ON sfo.house_id = sqk.house_id AND sfo.warehouse_id = sqk.warehouse_id
     <where>
       <if test="agentId !=null">
-        and agent.agent_id = #{agentId}
+        and agent.id = #{agentId}
       </if>
       <if test="agentDepotId !=null">
-        and depot.agent_depot_id = #{agentDepotId}
+        and depot.id = #{agentDepotId}
       </if>
       <if test="storehouseId !=null">
         and sqk.house_id = #{storehouseId}

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

@@ -588,60 +588,7 @@
   </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,
-    '1' sign,
-    depot.agent_depot_name agentDepotName,
-    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,
-    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,
@@ -649,7 +596,7 @@
     depot.depot_id agentStoreOrgId,
     '0' sign,
     depot.agent_depot_name agentDepotName,
-    store.storehouse_name storehouseName,
+    agentStore.storehouse_id storehouseName,
     ba.agent_name agentName,
     tt.storehouse lspz,
     tt.time detectionTime,
@@ -658,8 +605,6 @@
     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,
@@ -673,21 +618,19 @@
     business_agent_depot depot
     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 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 tt.org_id = #{orgId,jdbcType=INTEGER}
     AND depot.org_id = #{orgId,jdbcType=INTEGER}
     AND depot.del_flag = 1
     <if test="agentDepotId != null">
       AND depot.id = #{agentDepotId,jdbcType=INTEGER}
     </if>
     <if test="storehouseId != null">
-      AND store.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+      AND agentStore.storehouse_id = #{storehouseId,jdbcType=INTEGER}
     </if>
     <if test="startTime != null and endTime != null">
       AND tt.time BETWEEN #{startTime} AND #{endTime}
@@ -695,10 +638,9 @@
     <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
+    AND tt.org_id IS NOT NULL AND tt.id IS NOT NULL
     ORDER BY
-    temperAll.updatetime DESC
+    tt.updatetime DESC
   </select>
 
   <select id="getTestDataList" parameterType="java.util.Map" resultType="java.util.HashMap">