luobang 1 anno fa
parent
commit
c8c79fa67a

+ 2 - 2
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -2216,7 +2216,7 @@
                     </if>
                     <if test="saleAreaRemark != null">
                         and <foreach collection="saleAreaRemark" item="item" open="(" separator="or" close=")">
-                        ASO.sale_remark like '%${item}%'
+                        (CASE WHEN ASM.TRANSFER_IN_OF_WAREHOUSE IS NOT NULL THEN ASM.TRANSFER_IN_OF_WAREHOUSE ELSE ASO.SALE_REMARK END) like '%${item}%'
                     </foreach>
                     </if>
                     <if test="consigneeNames != null">
@@ -2350,7 +2350,7 @@
                     </if>
                     <if test="saleRemarkList != null and saleRemarkList.size > 0">
                         and <foreach collection="saleRemarkList" item="item" open="(" separator="or" close=")">
-                        ASO.sale_remark like '%${item}%'
+                        (CASE WHEN ASM.TRANSFER_IN_OF_WAREHOUSE IS NOT NULL THEN ASM.TRANSFER_IN_OF_WAREHOUSE ELSE ASO.SALE_REMARK END) like '%${item}%'
                     </foreach>
                     </if>
                     <if test="truckRemarkList != null and truckRemarkList.size > 0">

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

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,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