自报异常待办事项查询中返回参数中添加发送用户组

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

@@ -843,8 +843,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         }
         abnormalBill.setCancelUser(CommonMethods.getUser());
         abnormalBill.setCancelDateTime(now);
-        this.anomalyCreatedAndSendMessage(abnormalBill,null);
         this.saveOrUpdate(abnormalBill);
+        this.anomalyCreatedAndSendMessage(abnormalBill,null);
         return  true;
     }
 

quality/src/main/resources/mapper/SelfReportMapper.xml

@@ -562,7 +562,11 @@
 
     <!--自定义sql-->
     <select id="selectListByCondition" resultMap="BaseResultMap">
-        SELECT ZSR.HANDLE, ZSR.SITE, ZSR.TASK_NO, ZSR.WORK_CENTER,ZSR.NC_CODE_DESC, ZSR.SHOP_ORDER, ZSR.ITEM, ZSR.OP_STEP, ZSR.RESRCE, ZSR.SFC, ZSR.NC_CODE, ZSR.NC_QTY, ZSR.LOCATION, ZSR.STATE, ZSR.REMARK, B.FULL_NAME CREATE_USER,ZSR. CREATED_DATE_TIME,IT.DESCRIPTION,ZSR.CREATE_USER PB_USER,CF.VALUE CHECK_USR FROM Z_SELF_REPORT ZSR
+        SELECT ZSR.HANDLE, ZSR.SITE, ZSR.TASK_NO, ZSR.WORK_CENTER,ZSR.NC_CODE_DESC, ZSR.SHOP_ORDER, ZSR.ITEM,
+               ZSR.OP_STEP, ZSR.RESRCE, ZSR.SFC, ZSR.NC_CODE, ZSR.NC_QTY, ZSR.LOCATION, ZSR.STATE, ZSR.REMARK,
+               B.FULL_NAME CREATE_USER,ZSR. CREATED_DATE_TIME,IT.DESCRIPTION,ZSR.CREATE_USER PB_USER,CF.VALUE CHECK_USR,
+               ZSR.REPORT_USER_GROUP REPORT_USER_GROUP
+        FROM Z_SELF_REPORT ZSR
         JOIN ITEM I ON I.ITEM = ZSR.ITEM AND I.CURRENT_REVISION='true'
         LEFT JOIN ITEM_T IT ON I.HANDLE = IT.ITEM_BO AND IT.LOCALE = #{locale}
         LEFT JOIN Z_NWA_USER B ON ZSR.SITE = B.SITE AND ZSR.CREATE_USER = B.USER_NAME