待办事项

anomaly/src/main/resources/mapper/AbnormalBillMapper.xml

@@ -942,9 +942,18 @@
                 <if test="abnormalBill.abnormalNo != null and abnormalBill.abnormalNo != ''">
                     AND zab.ABNORMAL_NO = #{abnormalBill.abnormalNo}
                 </if>
-                <if test="abnormalBill.status != null and abnormalBill.status != ''">
+                <if test="abnormalBill.status != null and abnormalBill.status != '' and abnormalBill.status != 'COMP'.toString()">
                     AND zab.STATUS = #{abnormalBill.status}
                 </if>
+                <if test="abnormalBill.status == 'J'.toString()">
+                    AND zab.PROGRAM IS NULL
+                </if>
+                <if test="abnormalBill.status == 'F'.toString()">
+                    AND zab.CORRECTION IS NULL
+                </if>
+                <if test="abnormalBill.status == 'COMP'.toString()">
+                    AND zab.PROGRAM = 'true' AND zab.CORRECTION = 'true' AND zab.status != 'G'
+                </if>
                 <if test="abnormalBill.startDateTime != null ">
                     AND zab.CREATED_DATE_TIME &gt;= #{abnormalBill.startDateTime}
                 </if>

common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java

@@ -2,6 +2,7 @@ package com.foreverwin.mesnac.common.util;
 
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jms.core.JmsMessagingTemplate;
 import org.springframework.stereotype.Component;
 
@@ -15,6 +16,7 @@ public class ActiveMQUtil {
 
 
     @Autowired
+    @Qualifier("mesJmsTemplate")
     private JmsMessagingTemplate mesJmsTemplate;
 
     public void wechatSendMessage(String user, String text) {