lvzhikai пре 5 година
родитељ
комит
c128629a27

+ 4 - 8
src/main/java/com/chinaitop/depot/agent/basic/controller/AgentStoreWareController.java

@@ -39,18 +39,14 @@ public class AgentStoreWareController {
39
     @ApiImplicitParams({
39
     @ApiImplicitParams({
40
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
40
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
41
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
41
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
42
-            @ApiImplicitParam(name = "warehouseName", value = "货位名称", paramType = "query"),
43
-            @ApiImplicitParam(name = "storehouseId", value = "仓房id", paramType = "query"),
42
+            @ApiImplicitParam(name = "agentDepotName", value = "粮库名称", paramType = "query"),
44
             @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
43
             @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
45
     })
44
     })
46
-    public PageInfo<Map<String,Object>> getWareList(Integer pageNum, Integer pageSize, String warehouseName, String storehouseId, String orgId){
45
+    public PageInfo<Map<String,Object>> getWareList(Integer pageNum, Integer pageSize, String agentDepotName, String orgId){
47
         Map<String,Object> map = new HashMap<>();
46
         Map<String,Object> map = new HashMap<>();
48
         map.put("orgId",orgId);
47
         map.put("orgId",orgId);
49
-        if(ParameterUtil.isnotnull(warehouseName)){
50
-            map.put("warehouseName","%" + warehouseName + "%");
51
-        }
52
-        if(ParameterUtil.isnotnull(storehouseId)){
53
-            map.put("storehouseId",storehouseId);
48
+        if(ParameterUtil.isnotnull(agentDepotName)){
49
+            map.put("agentDepotName","%" + agentDepotName + "%");
54
         }
50
         }
55
 
51
 
56
         PageHelper.startPage(pageNum, pageSize);
52
         PageHelper.startPage(pageNum, pageSize);

+ 7 - 9
src/main/java/com/chinaitop/depot/agent/basic/controller/AgentTankController.java

@@ -48,20 +48,18 @@ public class AgentTankController {
48
     @ApiImplicitParams({
48
     @ApiImplicitParams({
49
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
49
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
50
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
50
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
51
-            @ApiImplicitParam(name = "tankNumber", value = "油罐编号", paramType = "query"),
51
+            @ApiImplicitParam(name = "agentDepotName", value = "粮库名称", paramType = "query"),
52
             @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
52
             @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
53
     })
53
     })
54
-    public PageInfo<BusinessAgentTank> getAgentList(Integer pageNum, Integer pageSize,String tankNumber,String orgId){
54
+    public PageInfo<BusinessAgentTank> getAgentList(Integer pageNum, Integer pageSize,String agentDepotName,String orgId){
55
 
55
 
56
-        BusinessAgentTankExample example = new BusinessAgentTankExample();
57
-        BusinessAgentTankExample.Criteria criteria = example.createCriteria();
58
-        criteria.andOrgIdEqualTo(Integer.valueOf(orgId));
59
-        if(ParameterUtil.isnotnull(tankNumber)){
60
-            criteria.andTankNumberLike("%" + tankNumber +"%");
56
+        Map<String, Object> modelMap = new HashMap<String, Object>();
57
+        modelMap.put("orgId",orgId);
58
+        if(ParameterUtil.isnotnull(agentDepotName)){
59
+            modelMap.put("agentDepotName","%" + agentDepotName +"%");
61
         }
60
         }
62
-        example.setOrderByClause("updatetime desc");
63
         PageHelper.startPage(pageNum, pageSize);
61
         PageHelper.startPage(pageNum, pageSize);
64
-        List<BusinessAgentTank> list = agentTankService.getAgentList(example);
62
+        List<BusinessAgentTank> list = agentTankService.getAgentList(modelMap);
65
         PageInfo<BusinessAgentTank> pageInfo = new PageInfo<BusinessAgentTank>(list);
63
         PageInfo<BusinessAgentTank> pageInfo = new PageInfo<BusinessAgentTank>(list);
66
         return pageInfo;
64
         return pageInfo;
67
     }
65
     }

+ 4 - 0
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankMapper.java

@@ -3,6 +3,8 @@ package com.chinaitop.depot.agent.basic.mapper;
3
 import com.chinaitop.depot.agent.basic.model.BusinessAgentTank;
3
 import com.chinaitop.depot.agent.basic.model.BusinessAgentTank;
4
 import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample;
4
 import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample;
5
 import java.util.List;
5
 import java.util.List;
6
+import java.util.Map;
7
+
6
 import org.apache.ibatis.annotations.Param;
8
 import org.apache.ibatis.annotations.Param;
7
 
9
 
8
 public interface BusinessAgentTankMapper {
10
 public interface BusinessAgentTankMapper {
@@ -27,4 +29,6 @@ public interface BusinessAgentTankMapper {
27
     int updateByPrimaryKeySelective(BusinessAgentTank record);
29
     int updateByPrimaryKeySelective(BusinessAgentTank record);
28
 
30
 
29
     int updateByPrimaryKey(BusinessAgentTank record);
31
     int updateByPrimaryKey(BusinessAgentTank record);
32
+
33
+    List<BusinessAgentTank> getAgentList(Map<String, Object> map);
30
 }
34
 }

+ 13 - 0
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankMapper.xml

@@ -320,4 +320,17 @@
320
       updatetime = #{updatetime,jdbcType=TIMESTAMP}
320
       updatetime = #{updatetime,jdbcType=TIMESTAMP}
321
     where id = #{id,jdbcType=INTEGER}
321
     where id = #{id,jdbcType=INTEGER}
322
   </update>
322
   </update>
323
+
324
+  <select id="getAgentList" resultMap="BaseResultMap" parameterType="java.util.Map" >
325
+    select
326
+        tank.*
327
+    from business_agent_tank tank
328
+    LEFT JOIN business_agent_depot depot ON depot.id = tank.depot_id
329
+    WHERE
330
+    depot.depot_id = 0
331
+    <if test="agentDepotName != null" >
332
+      AND depot.agent_depot_name like #{agentDepotName,jdbcType=INTEGER}
333
+    </if>
334
+    order by tank.updatetime desc
335
+  </select>
323
 </mapper>
336
 </mapper>

+ 5 - 9
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentWarehouseMapper.xml

@@ -313,6 +313,7 @@
313
     bware.warehouse_id id,
313
     bware.warehouse_id id,
314
     bware.storehouse_id storehouseId,
314
     bware.storehouse_id storehouseId,
315
     bstore.storehouse_name storehouseName,
315
     bstore.storehouse_name storehouseName,
316
+    bware.depot_name agentDepotName,
316
     bware.warehouse_id warehouseId,
317
     bware.warehouse_id warehouseId,
317
     bware.warehouse_name warehouseName,
318
     bware.warehouse_name warehouseName,
318
     bware.warehouse_status warehouseStatus,
319
     bware.warehouse_status warehouseStatus,
@@ -326,17 +327,15 @@
326
     bware.library_type = 1 AND bware.del_flag = 1
327
     bware.library_type = 1 AND bware.del_flag = 1
327
     AND bware.depot_id != bware.org_id
328
     AND bware.depot_id != bware.org_id
328
     AND bware.org_id = #{orgId,jdbcType=VARCHAR}
329
     AND bware.org_id = #{orgId,jdbcType=VARCHAR}
329
-    <if test="warehouseName != null">
330
-      AND bware.warehouse_name LIKE #{warehouseName,jdbcType=VARCHAR}
331
-    </if>
332
     <if test="agentDepotName != null">
330
     <if test="agentDepotName != null">
333
-      AND bware.storehouse_id = #{agentDepotName,jdbcType=VARCHAR}
331
+      AND bware.depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
334
     </if>
332
     </if>
335
     UNION ALL
333
     UNION ALL
336
     SELECT
334
     SELECT
337
     ware.id,
335
     ware.id,
338
     bware.storehouse_id storehouseId,
336
     bware.storehouse_id storehouseId,
339
     bstore.storehouse_name storehouseName,
337
     bstore.storehouse_name storehouseName,
338
+    bware.depot_name agentDepotName,
340
     bware.warehouse_id warehouseId,
339
     bware.warehouse_id warehouseId,
341
     bware.warehouse_name warehouseName,
340
     bware.warehouse_name warehouseName,
342
     bware.warehouse_status warehouseStatus,
341
     bware.warehouse_status warehouseStatus,
@@ -350,11 +349,8 @@
350
     WHERE
349
     WHERE
351
     bware.del_flag = 1 AND ware.del_flag = 1
350
     bware.del_flag = 1 AND ware.del_flag = 1
352
     AND ware.org_id = #{orgId,jdbcType=VARCHAR}
351
     AND ware.org_id = #{orgId,jdbcType=VARCHAR}
353
-    <if test="warehouseName != null">
354
-      AND bware.warehouse_name LIKE #{warehouseName,jdbcType=VARCHAR}
355
-    </if>
356
-    <if test="storehouseId != null">
357
-      AND bware.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
352
+    <if test="agentDepotName != null">
353
+      AND bware.depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
358
     </if>
354
     </if>
359
   </select>
355
   </select>
360
   <select id="getWare" parameterType="java.util.Map" resultType="java.util.Map">
356
   <select id="getWare" parameterType="java.util.Map" resultType="java.util.Map">

+ 2 - 1
src/main/java/com/chinaitop/depot/agent/basic/service/agentTankService.java

@@ -4,6 +4,7 @@ import com.chinaitop.depot.agent.basic.model.BusinessAgentTank;
4
 import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample;
4
 import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample;
5
 
5
 
6
 import java.util.List;
6
 import java.util.List;
7
+import java.util.Map;
7
 
8
 
8
 public interface agentTankService {
9
 public interface agentTankService {
9
 
10
 
@@ -12,7 +13,7 @@ public interface agentTankService {
12
      * @param map
13
      * @param map
13
      * @return
14
      * @return
14
      */
15
      */
15
-    List<BusinessAgentTank> getAgentList(BusinessAgentTankExample map);
16
+    List<BusinessAgentTank> getAgentList(Map<String, Object> map);
16
 
17
 
17
     void add(BusinessAgentTank user);
18
     void add(BusinessAgentTank user);
18
 
19
 

+ 3 - 2
src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentTankServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
12
 import javax.annotation.Resource;
12
 import javax.annotation.Resource;
13
 import java.util.Date;
13
 import java.util.Date;
14
 import java.util.List;
14
 import java.util.List;
15
+import java.util.Map;
15
 
16
 
16
 @Service
17
 @Service
17
 public class AgentTankServiceImpl implements agentTankService {
18
 public class AgentTankServiceImpl implements agentTankService {
@@ -28,8 +29,8 @@ public class AgentTankServiceImpl implements agentTankService {
28
      * @return
29
      * @return
29
      */
30
      */
30
     @Override
31
     @Override
31
-    public List<BusinessAgentTank> getAgentList(BusinessAgentTankExample map) {
32
-        return BusinessAgentTankMapper.selectByExample(map);
32
+    public List<BusinessAgentTank> getAgentList(Map<String, Object> map) {
33
+        return BusinessAgentTankMapper.getAgentList(map);
33
     }
34
     }
34
 
35
 
35
     @Override
36
     @Override

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

@@ -455,7 +455,7 @@
455
     </if>
455
     </if>
456
     GROUP BY qc.business_number
456
     GROUP BY qc.business_number
457
     ) a
457
     ) a
458
-    ORDER BY a.updatetime DESC
458
+    ORDER BY a.crkTime DESC
459
   </select>
459
   </select>
460
   
460
   
461
   <!-- 查询代储库仓房货位信息 -->
461
   <!-- 查询代储库仓房货位信息 -->

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

@@ -684,7 +684,7 @@
684
     LEFT JOIN basic_keeper keeper ON keeper.id = keepHouse.keeper_Id
684
     LEFT JOIN basic_keeper keeper ON keeper.id = keepHouse.keeper_Id
685
     LEFT JOIN (SELECT A.id,A.storehouse,A.org_id,A.time,A.updatetime,A.iLq_yq,A.inTemp, A.inH,A.max, A.min, A.avg,A.t_points ,A.outTemp,A.outH FROM t_testdata A INNER JOIN (
685
     LEFT JOIN (SELECT A.id,A.storehouse,A.org_id,A.time,A.updatetime,A.iLq_yq,A.inTemp, A.inH,A.max, A.min, A.avg,A.t_points ,A.outTemp,A.outH FROM t_testdata A INNER JOIN (
686
     SELECT storehouse,MAX(updatetime) updatetime,inTemp, inH, max, min, avg ,outTemp,outH
686
     SELECT storehouse,MAX(updatetime) updatetime,inTemp, inH, max, min, avg ,outTemp,outH
687
-    FROM t_testdata WHERE org_id = 160 GROUP BY storehouse,DATE_FORMAT(updatetime, '%Y-%m-%d')
687
+    FROM t_testdata GROUP BY storehouse,DATE_FORMAT(updatetime, '%Y-%m-%d')
688
     ) B ON A.storehouse = B.storehouse AND A.updatetime = B.updatetime) tt ON depot.depot_id = tt.org_id
688
     ) B ON A.storehouse = B.storehouse AND A.updatetime = B.updatetime) tt ON depot.depot_id = tt.org_id
689
     AND tt.storehouse = store.storehouse_code
689
     AND tt.storehouse = store.storehouse_code
690
     AND tt.org_id != #{orgId,jdbcType=INTEGER}
690
     AND tt.org_id != #{orgId,jdbcType=INTEGER}