Redeem 1 рік тому
батько
коміт
f330b3f7a2

+ 2 - 1
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}

+ 5 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1739,6 +1739,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 != ''">
@@ -1753,6 +1755,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
         )

+ 1 - 1
src/main/resources/log4j.properties

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