异常逻辑修改提交

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java

@@ -164,6 +164,11 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose {
      */
     private String operation;
 
+    /**
+     * 提报用户组
+     */
+    private String reportSendUserGroup;
+
     /**
      *
      * @return
@@ -425,4 +430,12 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose {
     public void setItemBo(String itemBo) {
         this.itemBo = itemBo;
     }
+
+    public String getReportSendUserGroup() {
+        return reportSendUserGroup;
+    }
+
+    public void setReportSendUserGroup(String reportSendUserGroup) {
+        this.reportSendUserGroup = reportSendUserGroup;
+    }
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java

@@ -1,6 +1,7 @@
 package com.foreverwin.mesnac.anomaly.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto;
@@ -422,7 +423,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBill.setStatus(Constants.SHUT_DOWN);
         abnormalBillDispose.setClosedUser(user);
         abnormalBillDispose.setClosedDateTime(now);
-        this.anomalyCreatedAndSendMessage(abnormalBill,abnormalBillDispose);
+       // this.anomalyCreatedAndSendMessage(abnormalBill,abnormalBillDispose);
         this.saveOrUpdate(abnormalBill);
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
 
@@ -847,6 +848,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             case Constants.CANCEL://取消
                 abnormalMessage.setSendUserGroup(abnormalBill.getCancelSendUserGroup());
                 abnormalMessage.setAbnormalNode(Constants.ABNORMAL_MESSAGE_CANCEL);
+
+
+                //异常取消的时候要关闭当前异常单下所有的异常信息
+                UpdateWrapper<AbnormalMessage> messageTypeUpdateWrapper = new UpdateWrapper<>();
+//              messageTypeUpdateWrapper.eq("SITE",site);
+//              messageTypeUpdateWrapper.eq("ABNORMAL_BILL_BO",abnormalMessage.getAbnormalBillBo());
+                AbnormalMessage abnormalMessage2 = new AbnormalMessage();
+              //  abnormalMessage2.setAbnormalBillBo(abnormalMessage.getAbnormalBillBo());
+                abnormalMessage2.setStatus("Y");
+                messageTypeUpdateWrapper.eq("STATUS","N");
+                messageTypeUpdateWrapper.eq("ABNORMAL_BILL_BO",abnormalMessage.getAbnormalBillBo());
+                abnormalMessageService.update(abnormalMessage2,messageTypeUpdateWrapper);
                 break;
             case Constants.SHUT_DOWN:
                 break;
@@ -899,7 +912,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalMessage.setModifiedDateTime(now);
 
 
-        //判断，如果是方案确认，则发送用户，否则，除了节点是响应之外，则发送用户
+        //判断，如果是方案确认，则发送用户，否则，除了节点是响应之外，则发送用户组
         if(Constants.ABNORMAL_MESSAGE_PROGRAM_CONFIRM.equals(abnormalMessage.getAbnormalNode())){
             String sendUsers = abnormalMessage.getSendUser().replace(',', '|');
             activeMQUtil.wechatSendMessage(sendUsers,abnormalMessage.getContent());

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

@@ -66,6 +66,7 @@
         <result column="RESRCE_DESCRIPTION" property="resrceDescription"/>
         <result column="FULL_NAME" property="fullName"/>
         <result column="OPERATION" property="operation"/>
+        <result column="REPORT_SEND_USER_GROUP" property="reportSendUserGroup"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -628,7 +629,7 @@
 	   ZABD.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,ZABD.DUTY_TYPE DUTY_TYPE,ZABD.PRINCIPAL_USER PRINCIPAL_USER,ZABD.ABNORMAL_METHOD ABNORMAL_METHOD,
 	   R.ROUTER ROUTER,ZABD.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,ZABD.RESOLVE_REMARK RESOLVE_REMARK,ZABD.RESOLVE_SEND_USER RESOLVE_SEND_USER,
 	   ZABD.ABNORMAL_REASON ABNORMAL_REASON,ZABD.BEFORE_MEASURE BEFORE_MEASURE,"MAP".VALUE "MAP",listagg(ZANC.NC_CODE_GROUP || '/'||ZANC.NC_CODE || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE,
-        ZABD.ROUTER_BO ROUTER_BO,ZAB.OPERATION OPERATION,I.HANDLE ITEM_BO
+        ZABD.ROUTER_BO ROUTER_BO,ZAB.OPERATION OPERATION,I.HANDLE ITEM_BO,ZAB.REPORT_SEND_USER_GROUP REPORT_SEND_USER_GROUP
         FROM Z_ABNORMAL_BILL ZAB
             LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE = ZABD.ABNORMAL_BILL_BO
             INNER JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO
@@ -663,7 +664,8 @@
             ZAB.PB_PHOTOSHOP ,ZABD.DUTY_CAUSE_DESCRIPTION ,ZABD.DUTY_CAUSE_TYPE ,ZABD.DUTY_DEPART ,
             ZABD.DUTY_SEND_USER_GROUP ,ZABD.DUTY_TYPE ,ZABD.PRINCIPAL_USER ,ZABD.ABNORMAL_METHOD ,
             R.ROUTER ,ZABD.RESOLVE_SHOP_ORDER ,ZABD.RESOLVE_REMARK ,ZABD.RESOLVE_SEND_USER ,
-            ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION,I.HANDLE
+            ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION,I.HANDLE,
+            ZAB.REPORT_SEND_USER_GROUP
     </select>
 
 

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

@@ -55,6 +55,7 @@
         <result column="ABNORMAL_METHOD" property="abnormalMethod"/>
         <result column="CONFIRM_USER" property="confirmUser"/>
         <result column="RESOLVE_REMARK" property="resolveRemark"/>
+        <result column="REPORT_SEND_USER_GROUP" property="reportSendUserGroup"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -910,7 +911,8 @@
         ZAB.RESRCE RESRCE ,R.DESCRIPTION RESRCE_DESCRIPTION,ZNU.FULL_NAME REPORT_USER,ZAB.MESSAGE_TYPE MESSAGE_TYPE ,
         ZAB.NC_CODE  NC_CODE ,ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.SHUT_DOWN SHUT_DOWN ,ZAB.RESPONSE_USER RESPONSE_USER,ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME,
         ZABD.ABNORMAL_METHOD ABNORMAL_METHOD,ZNU3.FULL_NAME CONFIRM_USER,ZABD.RESOLVE_REMARK RESOLVE_REMARK,
-        ZAB.CANCEL_CODE CANCEL_CODE,ZAB.CANCEL_DATE_TIME CANCEL_DATE_TIME,ZNU4.FULL_NAME CANCEL_USER,ZAB.CANCEL_REASON CANCEL_REASON
+        ZAB.CANCEL_CODE CANCEL_CODE,ZAB.CANCEL_DATE_TIME CANCEL_DATE_TIME,ZNU4.FULL_NAME CANCEL_USER,ZAB.CANCEL_REASON CANCEL_REASON,
+        ZAB.REPORT_SEND_USER_GROUP REPORT_SEND_USER_GROUP
         FROM
         Z_ABNORMAL_BILL ZAB
         INNER JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO  = ZAB.HANDLE