云南最新bug修改

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

@@ -39,18 +39,14 @@ public class AgentStoreWareController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-            @ApiImplicitParam(name = "warehouseName", value = "货位名称", paramType = "query"),
-            @ApiImplicitParam(name = "storehouseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "agentDepotName", value = "粮库名称", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
     })
-    public PageInfo<Map<String,Object>> getWareList(Integer pageNum, Integer pageSize, String warehouseName, String storehouseId, String orgId){
+    public PageInfo<Map<String,Object>> getWareList(Integer pageNum, Integer pageSize, String agentDepotName, String orgId){
         Map<String,Object> map = new HashMap<>();
         map.put("orgId",orgId);
-        if(ParameterUtil.isnotnull(warehouseName)){
-            map.put("warehouseName","%" + warehouseName + "%");
-        }
-        if(ParameterUtil.isnotnull(storehouseId)){
-            map.put("storehouseId",storehouseId);
+        if(ParameterUtil.isnotnull(agentDepotName)){
+            map.put("agentDepotName","%" + agentDepotName + "%");
         }
 
         PageHelper.startPage(pageNum, pageSize);

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

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

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankMapper.java

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

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

@@ -320,4 +320,17 @@
       updatetime = #{updatetime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="getAgentList" resultMap="BaseResultMap" parameterType="java.util.Map" >
+    select
+        tank.*
+    from business_agent_tank tank
+    LEFT JOIN business_agent_depot depot ON depot.id = tank.depot_id
+    WHERE
+    depot.depot_id = 0
+    <if test="agentDepotName != null" >
+      AND depot.agent_depot_name like #{agentDepotName,jdbcType=INTEGER}
+    </if>
+    order by tank.updatetime desc
+  </select>
 </mapper>

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

@@ -313,6 +313,7 @@
     bware.warehouse_id id,
     bware.storehouse_id storehouseId,
     bstore.storehouse_name storehouseName,
+    bware.depot_name agentDepotName,
     bware.warehouse_id warehouseId,
     bware.warehouse_name warehouseName,
     bware.warehouse_status warehouseStatus,
@@ -326,17 +327,15 @@
     bware.library_type = 1 AND bware.del_flag = 1
     AND bware.depot_id != bware.org_id
     AND bware.org_id = #{orgId,jdbcType=VARCHAR}
-    <if test="warehouseName != null">
-      AND bware.warehouse_name LIKE #{warehouseName,jdbcType=VARCHAR}
-    </if>
     <if test="agentDepotName != null">
-      AND bware.storehouse_id = #{agentDepotName,jdbcType=VARCHAR}
+      AND bware.depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
     </if>
     UNION ALL
     SELECT
     ware.id,
     bware.storehouse_id storehouseId,
     bstore.storehouse_name storehouseName,
+    bware.depot_name agentDepotName,
     bware.warehouse_id warehouseId,
     bware.warehouse_name warehouseName,
     bware.warehouse_status warehouseStatus,
@@ -350,11 +349,8 @@
     WHERE
     bware.del_flag = 1 AND ware.del_flag = 1
     AND ware.org_id = #{orgId,jdbcType=VARCHAR}
-    <if test="warehouseName != null">
-      AND bware.warehouse_name LIKE #{warehouseName,jdbcType=VARCHAR}
-    </if>
-    <if test="storehouseId != null">
-      AND bware.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
+    <if test="agentDepotName != null">
+      AND bware.depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
     </if>
   </select>
   <select id="getWare" parameterType="java.util.Map" resultType="java.util.Map">

src/main/java/com/chinaitop/depot/agent/basic/service/agentTankService.java

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

src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentTankServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class AgentTankServiceImpl implements agentTankService {
@@ -28,8 +29,8 @@ public class AgentTankServiceImpl implements agentTankService {
      * @return
      */
     @Override
-    public List<BusinessAgentTank> getAgentList(BusinessAgentTankExample map) {
-        return BusinessAgentTankMapper.selectByExample(map);
+    public List<BusinessAgentTank> getAgentList(Map<String, Object> map) {
+        return BusinessAgentTankMapper.getAgentList(map);
     }
 
     @Override

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

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

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

@@ -684,7 +684,7 @@
     LEFT JOIN basic_keeper keeper ON keeper.id = keepHouse.keeper_Id
     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 (
     SELECT storehouse,MAX(updatetime) updatetime,inTemp, inH, max, min, avg ,outTemp,outH
-    FROM t_testdata WHERE org_id = 160 GROUP BY storehouse,DATE_FORMAT(updatetime, '%Y-%m-%d')
+    FROM t_testdata GROUP BY storehouse,DATE_FORMAT(updatetime, '%Y-%m-%d')
     ) B ON A.storehouse = B.storehouse AND A.updatetime = B.updatetime) tt ON depot.depot_id = tt.org_id
     AND tt.storehouse = store.storehouse_code
     AND tt.org_id != #{orgId,jdbcType=INTEGER}