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

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

@@ -769,7 +769,14 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation("同步生产实绩")
     @PostMapping("/syncProductionResult")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"调拨实绩"})
     RESTfulResult syncProductionResult(@RequestBody Map<String,Object> map) {
         return tmsFeign.syncProductionResult(map);
     }
+
+    @ApiOperation("获取司机日工作量")
+    @PostMapping("/getDriverDayJobForApp")
+    RESTfulResult getDriverDayJobForApp(@RequestBody Map<String,Object> map,Integer apiId) {
+        return tmsFeign.getDriverDayJobForApp(map,apiId);
+    }
 }

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

@@ -278,6 +278,9 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/omstransorders/syncProductionResult")
     RESTfulResult syncProductionResult(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/getDriverDayJobForApp")
+    RESTfulResult getDriverDayJobForApp(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId);
 }
 
 

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

@@ -90,7 +90,8 @@
         SELECT DISTINCT
             RP.PERSONNEL_ID "personnelId",
             RP.PERSONNEL_NAME "personnelName",
-            RP.PERSONNEL_POST "personnelPost"
+            RP.PERSONNEL_POST "personnelPost",
+            RP.PERSONNEL_TEAM "personnelTeam"
         FROM RMS_PERSONNEL  RP
         WHERE RP.DELETED = 0
           AND RP.PERSONNEL_JOB_NUMBER = #{loginName}

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

@@ -1065,6 +1065,8 @@
         RC.MATERIAL_NAME "text",
         'materialName' "prop"
         from RMS_MATERIAL RC
+        left join rms_material_map t
+        on t.prod_code_l = RC.MATERIAL_CODE
         <where>
             DELETED = 0
             <if test="index!=null and index!=''">
@@ -1080,6 +1082,10 @@
             <if test="materialId!=null and materialId!=''">
                 AND RC.MATERIAL_ID = #{materialId}
             </if>
+            <if test="prodCode!=null and prodCode!=''">
+                AND ( REGEXP_LIKE(t.prod_code, #{prodCode})
+                OR REGEXP_LIKE(RC.MATERIAL_CODE, #{prodCode}) )
+            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
         )
@@ -1755,6 +1761,8 @@
         ON ARC.TRANS_REQUIREMENT_ID = ATR.TRANS_REQUIREMENT_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = ARC.MATERIAL_ID
+        LEFT JOIN RMS_COMPANY RC
+        ON RC.COMPANY_ID = ATR.RECEIVING_COMPANY_ID
         <where>
             ATR.DELETED NOT IN (2,5,6)
             <if test="index != null and index != ''">
@@ -1769,6 +1777,9 @@
             <if test="materialId !=null and materialId != ''">
                 AND REGEXP_LIKE(ARC.MATERIAL_ID, #{materialId})
             </if>
+            <if test="receiveCompanyName !=null and receiveCompanyName != ''">
+                AND REGEXP_LIKE(RC.COMPANY_NAME, #{receiveCompanyName})
+            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
         )

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,stdout, RUNNING,errorfile
+log4j.rootCategory=INFO,file,RUNNING,errorfile,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout