Quellcode durchsuchen

修改计时查询

liyg vor 2 Jahren
Ursprung
Commit
e1b4bac8d8

+ 4 - 1
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -731,7 +731,10 @@
                 LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
         WHERE
                 TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3 and TTTR.INSERT_USERNAME =#{userId}
-        <if test="orderType!=null">
+        <if test="orderType!=null and orderType==21">
+            AND OO.ORDER_TYPE IN (21,11)
+        </if>
+        <if test="orderType!=null and orderType!=21">
             AND OO.ORDER_TYPE=#{orderType}
         </if>
         <include refid="orderBy">

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

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