Sfoglia il codice sorgente

更新应极端代码和解决设置代储库功能

lvzhikai 5 anni fa
parent
commit
81745fe5d5

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

@@ -210,7 +210,7 @@ public class AgentDepotController {
210
     public List<List<Map<String, Object>>> getDepotList(String orgId,String storehouseId,String orgName) {
210
     public List<List<Map<String, Object>>> getDepotList(String orgId,String storehouseId,String orgName) {
211
         //查询所有粮库
211
         //查询所有粮库
212
         Map<String,Object> map = new HashMap<>();
212
         Map<String,Object> map = new HashMap<>();
213
-        map.put("agentDepotId",orgId);
213
+        map.put("orgId",orgId);
214
         map.put("storehouseId",storehouseId);
214
         map.put("storehouseId",storehouseId);
215
 
215
 
216
         if(ParameterUtil.isnotnull(orgName)){
216
         if(ParameterUtil.isnotnull(orgName)){

+ 3 - 2
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentDepotMapper.xml

@@ -376,17 +376,18 @@
376
         store.agent_depot_id depot_id,
376
         store.agent_depot_id depot_id,
377
         org.org_id,
377
         org.org_id,
378
         org.org_name,
378
         org.org_name,
379
-        NVL2(store.id,'true','false') state_value,
379
+        NVL2(store.id,'1','0') state_value,
380
         NVL2(store.id,org.org_code,null) org_code,
380
         NVL2(store.id,org.org_code,null) org_code,
381
         NVL2(store.id,org.area_name,null) area_name
381
         NVL2(store.id,org.area_name,null) area_name
382
     FROM
382
     FROM
383
         org_info org
383
         org_info org
384
     LEFT JOIN business_agent_storehouse store ON store.org_id = org.org_id
384
     LEFT JOIN business_agent_storehouse store ON store.org_id = org.org_id
385
         AND store.del_flag = 1 AND store.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
385
         AND store.del_flag = 1 AND store.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
386
-    WHERE org.org_class_id = 5318
386
+    WHERE org.org_class_id = 5318 AND org.org_id != #{orgId,jdbcType=VARCHAR}
387
     <if test="orgName != null">
387
     <if test="orgName != null">
388
       AND org.org_name LIKE #{orgName,jdbcType=VARCHAR}
388
       AND org.org_name LIKE #{orgName,jdbcType=VARCHAR}
389
     </if>
389
     </if>
390
+    order by store.id desc
390
   </select>
391
   </select>
391
   <select id="getByExample" resultMap="BaseResultMap" parameterType="java.util.Map">
392
   <select id="getByExample" resultMap="BaseResultMap" parameterType="java.util.Map">
392
     SELECT
393
     SELECT