Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -605,8 +605,8 @@ public class RMScontroller extends BaseRESTfulController {
             ){
                 throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
             }
-            set.add(item.get("NC主键").toString()+item.get("类型").toString());
-            map.put(item.get("NC主键").toString()+item.get("类型").toString(),item);
+            set.add(item.get("NC主键").toString()+"-"+item.get("类型").toString());
+            map.put(item.get("NC主键").toString()+"-"+item.get("类型").toString(),item);
         }
         //去重
         String[] setList = set.toArray(new String[0]);

src/main/java/com/steerinfo/dil/feign/ColumnDataFeign.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import com.steerinfo.dil.config.MyFeignRequestInterceptor;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -12,8 +13,11 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "ANTAI-COLUMN-DATA",url = "${openfeign.ColumnDataFeign.url}")
+@FeignClient(value = "ANTAI-COLUMN-DATA",url = "${openfeign.ColumnDataFeign.url}",configuration = MyFeignRequestInterceptor.class)
 public interface ColumnDataFeign {
     @RequestMapping("getColumnData")
     List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);
+
+    @RequestMapping("getColumnData")
+    List<Map<String,Object>> getColumnDataByUserId(@RequestParam("apiId") Integer apiId,@RequestParam(required = false,value = "userId") String userId);
 }

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.feign;
 
 import com.steerinfo.dil.annotaion.LogAround;
+import com.steerinfo.dil.config.MyFeignRequestInterceptor;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -15,7 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(value = "ANTAI-RMS-API", url = "${openfeign.RmsFeign.url}")
+@FeignClient(value = "ANTAI-RMS-API", url = "${openfeign.RmsFeign.url}",configuration = MyFeignRequestInterceptor.class)
 public interface RmsFeign {
 
 

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import com.steerinfo.dil.config.MyFeignRequestInterceptor;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -20,7 +21,7 @@ import java.util.Map;
  * @ time      :2021/9/28 9:30
  */
 
-@FeignClient(name = "ANTAI-TMS-API", url = "${openfeign.TmsFeign.url}")
+@FeignClient(name = "ANTAI-TMS-API", url = "${openfeign.TmsFeign.url}",configuration = MyFeignRequestInterceptor.class)
 public interface TmsFeign {
 
     //======================>车辆综合实绩

src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import com.steerinfo.dil.config.MyFeignRequestInterceptor;
 import com.steerinfo.dil.model.WmsSlmDlivDir;
 import com.steerinfo.framework.controller.RESTfulResult;
 import oracle.jdbc.proxy.annotation.Post;
@@ -17,7 +18,7 @@ import java.util.Map;
  * @author luobang
  * @create 2021-09-17 14:13
  */
-@FeignClient(value = "ANTAI-WMS-API",url = "${openfeign.WMSFeign.url}")
+@FeignClient(value = "ANTAI-WMS-API",url = "${openfeign.WMSFeign.url}",configuration = MyFeignRequestInterceptor.class)
 public interface WMSFeign {
 
     @PostMapping("api/v1/wms/wmsslmdlivdirs/selectSaleOrderPage")

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -35,4 +35,15 @@ public class ColumnDataUtil {
         pageList.setColumnData(columnDataList);
         return pageList;
     }
+
+    public PageListAdd tableColumnDataByUserId(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data, String userId) {
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnDataByUserId(apiId,userId);
+//        for (Map<String, Object> columnData : columnDataList) {
+//            //每个表头字段的过滤条
+//            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
+//        }
+        PageListAdd pageList = new PageListAdd(data);
+        pageList.setColumnData(columnDataList);
+        return pageList;
+    }
 }

src/main/resources/com/steerinfo/dil/mapper/BackgroundProcessingMapper.xml

@@ -20,18 +20,21 @@
         AND RC.COMPANY_TYPE = #{roleName}
     </select>
     <select id="getCompanyList" resultType="java.util.Map">
-        SELECT distinct rc.company_id "companyId",
-               rc.COMPANY_TYPE "companyType",
-               rc.DELETED "deleted",
-               level "level" FROM RMS_COMPANY RC
-        START WITH RC.COMPANY_ID IN (
-        SELECT RPC.COMPANY_ID FROM RMS_PERSONNEL RP
-        LEFT JOIN RMS_PERSONNEL_COMPANY RPC on RP.PERSONNEL_ID = RPC.PERSONNEL_ID
-        WHERE
-        RPC.DELETED = 0
-        AND
-        RP.PERSONNEL_JOB_NUMBER = #{userName}
-        ) connect BY PRIOR RC.COMPANY_ID = rc.PARENT_COMPANY_ID
+        select "companyId" from (
+        SELECT DISTINCT
+        rc.company_id "companyId",
+        level	"level"
+        FROM
+        RMS_COMPANY RC START WITH RC.COMPANY_ID IN (
+            SELECT RPC.COMPANY_ID
+            FROM RMS_PERSONNEL RP
+                     LEFT JOIN RMS_PERSONNEL_COMPANY RPC ON RP.PERSONNEL_ID = RPC.PERSONNEL_ID
+            WHERE RPC.DELETED = 0
+              AND RP.PERSONNEL_JOB_NUMBER = #{userName}
+        )
+        CONNECT BY PRIOR RC.COMPANY_ID = rc.PARENT_COMPANY_ID
+        )
+        order by "level"
     </select>
     <select id="getCurrentCompanyList" resultType="java.util.Map">
         SELECT distinct rc.company_id "companyId",

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -463,7 +463,7 @@
         LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
         left join oms_trans_order oto
         on RCA.capacity_id = oto.capacity_id
-        and oto.deleted != 2
+        and oto.deleted between 4 and 5
         <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
             LEFT JOIN (
                 SELECT CAPACITY_ID "capacityId",