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

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

@@ -67,16 +67,8 @@ public class TMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
     @PostMapping("/addcomprehensiveresults")
-    public Map<String, Object> insertcomprehensiveresults(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
-        if (!map.isEmpty()) {
-            if (!map.get("resultTime").toString().isEmpty()) {
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                Date resultTime = simpleDateFormat.parse(map.get("resultTime").toString());
-                map.put("resultTime", resultTime);
-            }
-        }
-        map.put("insertUsername", map.get("userName").toString());
-        return tmsFeign.insertAmsSalaryContrac(map);
+    public Map<String, Object> insertcomprehensiveresults(@RequestBody(required = false) Map<String, Object> map)  {
+        return tmsFeign.addComprehensiveResult(map);
     }
 
     @ApiOperation(value = "车辆实绩删除")

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

@@ -31,7 +31,7 @@ public interface TmsFeign {
                                                 @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmscomprehensiveresults/add")
-    Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> addComprehensiveResult(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/tmscomprehensiveresults/tmscomprehensiveresultsupdate")
     Map<String, Object> updateAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);

src/main/resources/application-prod.yml

@@ -26,11 +26,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.90.202:8000}
-    url: ${RMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.90.202:8000}
+#    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${RMSFEIGN_URL:localhost:8086}
+#    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+    url: ${RMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign:

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

@@ -23,25 +23,35 @@
             <foreach collection="roleCodes" index="index" item="item" separator="or" close=")" open="(">
                 <choose>
                     <when test="item == 'chengYunShang'">
+                        (
                         "carrierId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
-                            #{item.companyId}
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                            SELECT
+                            COMPANY_ID
+                            FROM
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID =
+                            #{item.companyId})
                         </foreach>
-                    </when>
-                    <when test="item == 'shippingCompany'">
+                        OR
                         "shippingCompanyId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
-                            #{item.companyId}
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                            SELECT
+                            COMPANY_ID
+                            FROM
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID = #{item.companyId})
                         </foreach>
-                    </when>
-                    <when test="item == 'receivingCompany'">
+                        OR
                         "receivingCompanyId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
-                            #{item.companyId}
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                            SELECT
+                            COMPANY_ID
+                            FROM
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID = #{item.companyId})
                         </foreach>
+                        )
                     </when>
                     <when test="item == 'businessCompany'">
                         "businessCompanyId"

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

@@ -1628,7 +1628,6 @@
             ) T ON T."driverId" = RP .PERSONNEL_ID
         </if>
         WHERE RP.DELETED = 0
-        AND RC.COMPANY_TYPE = '承运商'
         <if test="isNC!=null">
             AND RP.SOURCE_ID IS NOT NULL
         </if>