Parcourir la source

代储bug修改

lvzhikai il y a 5 ans
Parent
commit
0117f50017

+ 6 - 3
src/main/java/com/chinaitop/depot/agent/basic/controller/AgentDepotController.java

@@ -81,13 +81,16 @@ public class AgentDepotController {
81
     @ApiImplicitParams({
81
     @ApiImplicitParams({
82
             @ApiImplicitParam(name = "agentDepotName", value = "代储库名称", paramType = "query"),
82
             @ApiImplicitParam(name = "agentDepotName", value = "代储库名称", paramType = "query"),
83
             @ApiImplicitParam(name = "agentId", value = "代储点id", paramType = "query"),
83
             @ApiImplicitParam(name = "agentId", value = "代储点id", paramType = "query"),
84
-            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
84
+            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query"),
85
+            @ApiImplicitParam(name = "addState", value = "添加状态", paramType = "query")
85
     })
86
     })
86
-    public List<BusinessAgentDepot> getAgentDepotHouse(String agentDepotName,String orgid, String agentId){
87
+    public List<BusinessAgentDepot> getAgentDepotHouse(String agentDepotName,String orgid, String agentId, String addState){
87
         BusinessAgentDepotExample example = new BusinessAgentDepotExample();
88
         BusinessAgentDepotExample example = new BusinessAgentDepotExample();
88
         BusinessAgentDepotExample.Criteria criteria = example.createCriteria();
89
         BusinessAgentDepotExample.Criteria criteria = example.createCriteria();
89
         criteria.andOrgIdEqualTo(Integer.parseInt(orgid));
90
         criteria.andOrgIdEqualTo(Integer.parseInt(orgid));
90
-        criteria.andDepotIdEqualTo(0);
91
+        if(ParameterUtil.isnull(addState) || ParameterUtil.isequal(addState,"0")){
92
+            criteria.andDepotIdEqualTo(0);
93
+        }
91
         criteria.andDelFlagEqualTo(1);
94
         criteria.andDelFlagEqualTo(1);
92
         if(ParameterUtil.isnotnull(agentDepotName)){
95
         if(ParameterUtil.isnotnull(agentDepotName)){
93
             criteria.andAgentDepotNameLike("%" + agentDepotName + "%");
96
             criteria.andAgentDepotNameLike("%" + agentDepotName + "%");

+ 3 - 3
src/main/java/com/chinaitop/depot/agent/number/mapper/BusinessAgentNumberMapper.xml

@@ -360,8 +360,8 @@
360
     depot.agent_depot_name agentDepotName
360
     depot.agent_depot_name agentDepotName
361
     FROM
361
     FROM
362
     business_agent_number num
362
     business_agent_number num
363
-    LEFT JOIN business_agent agent ON agent.id = num.agent_id AND agent.org_id = #{orgId,jdbcType=INTEGER}
364
-    LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id AND depot.org_id = #{orgId,jdbcType=INTEGER}
363
+    LEFT JOIN business_agent agent ON agent.id = num.agent_id AND agent.del_flag = 1 AND agent.org_id = #{orgId,jdbcType=INTEGER}
364
+    LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id AND depot.del_flag = 1 AND depot.org_id = #{orgId,jdbcType=INTEGER}
365
     LEFT JOIN basic_storehouse store ON store.storehouse_id = num.storehouse_id
365
     LEFT JOIN basic_storehouse store ON store.storehouse_id = num.storehouse_id
366
     LEFT JOIN basic_warehouse ware ON ware.warehouse_id = num.warehouse_id
366
     LEFT JOIN basic_warehouse ware ON ware.warehouse_id = num.warehouse_id
367
     WHERE num.org_id = #{orgId,jdbcType=INTEGER}
367
     WHERE num.org_id = #{orgId,jdbcType=INTEGER}
@@ -377,6 +377,6 @@
377
     <if test="warehouseId != null">
377
     <if test="warehouseId != null">
378
       AND num.warehouse_id = #{warehouseId,jdbcType=INTEGER}
378
       AND num.warehouse_id = #{warehouseId,jdbcType=INTEGER}
379
     </if>
379
     </if>
380
-    order by num.updatetime desc
380
+    order by num.create_time desc
381
   </select>
381
   </select>
382
 </mapper>
382
 </mapper>