From cec49f06df75b3f4aa05e5a78f61a3344b75e885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Fri, 23 Jul 2021 15:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=A5=E5=BF=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=8A=A0=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AbnormalBillController.java    |  3 +
 .../controller/AbnormalBillLogController.java |  6 +-
 .../anomaly/mapper/AbnormalBillLogMapper.java |  3 +-
 .../mesnac/anomaly/model/AbnormalBillLog.java | 34 ++++++++-
 .../service/AbnormalBillLogService.java       |  3 +-
 .../impl/AbnormalBillLogServiceImpl.java      | 74 ++++++++++---------
 .../service/impl/AbnormalBillServiceImpl.java |  9 ++-
 .../mapper/AbnormalBillLogMapper.xml          | 69 +++++++++++++----
 .../resources/mapper/AbnormalBillMapper.xml   |  6 +-
 9 files changed, 145 insertions(+), 62 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index 8064d0a8..e90edfc3 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -9,6 +9,7 @@ import com.foreverwin.mesnac.anomaly.service.AbnormalBillService;
 import com.foreverwin.mesnac.anomaly.service.FileUploadedService;
 import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
+import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,6 +76,8 @@ public class AbnormalBillController {
     public R page(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill){
         IPage result;
         QueryWrapper<AbnormalBill> queryWrapper = new QueryWrapper<>();
+        String site = CommonMethods.getSite();
+        abnormalBill.setSite(site);
         queryWrapper.setEntity(abnormalBill);
         if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
             //TODO modify global query
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java
index 95a440dc..368d81ad 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java
@@ -16,7 +16,7 @@ import java.util.List;
 /**
  *
  * @author 赵嘉伟
- * @since 2021-07-16
+ * @since 2021-07-23
  */
 @RestController
 @RequestMapping("/Z-ABNORMAL-BILL-LOG")
@@ -113,6 +113,8 @@ public class AbnormalBillLogController {
                 .or().like(AbnormalBillLog::getClosedUser, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getAbnormalReason, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getBeforeMeasure, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillLog::getReportSendUserGroup, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillLog::getCancelSendUserGroup, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getCreatedUser, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getModifiedUser, frontPage.getGlobalQuery())
     );
@@ -163,6 +165,7 @@ public class AbnormalBillLogController {
         return R.ok(abnormalBillLogService.removeByIds(ids));
     }
 
+
     @GetMapping("saveAndUpdate")
     public R saveAndUpdate(AbnormalBill abnormalBill,
                            AbnormalBillDispose abnormalBillDispose,
@@ -172,4 +175,5 @@ public class AbnormalBillLogController {
         abnormalBillLogService.saveAndUpdate(abnormalBill,abnormalBillDispose,ncGroupAndNcCodes,dutyCauseType,dutyType);
         return R.ok();
     }
+
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java
index 71b2dcc7..4d898f53 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java
@@ -12,11 +12,10 @@ import org.springframework.stereotype.Repository;
  * </p>
  *
  * @author 赵嘉伟
- * @since 2021-07-16
+ * @since 2021-07-23
  */
 @Repository
 public interface AbnormalBillLogMapper extends BaseMapper<AbnormalBillLog> {
 
     AbnormalBillLog findAllByAbnormalNo(@Param("abnormalBill") AbnormalBill abnormalBill);
-
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java
index e413b17f..8e503406 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java
@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author 赵嘉伟
- * @since 2021-07-16
+ * @since 2021-07-23
  */
 
 @TableName("Z_ABNORMAL_BILL_LOG")
@@ -284,6 +284,16 @@ public class AbnormalBillLog extends Model<AbnormalBillLog> {
      */
    @TableField("BEFORE_MEASURE")
    private String beforeMeasure;
+    /**
+     * 提报发送用户组
+     */
+   @TableField("REPORT_SEND_USER_GROUP")
+   private String reportSendUserGroup;
+    /**
+     * 取消发送用户组
+     */
+   @TableField("CANCEL_SEND_USER_GROUP")
+   private String cancelSendUserGroup;
     /**
      * 创建人
      */
@@ -722,6 +732,22 @@ public class AbnormalBillLog extends Model<AbnormalBillLog> {
       this.beforeMeasure = beforeMeasure;
    }
 
+   public String getReportSendUserGroup() {
+      return reportSendUserGroup;
+   }
+
+   public void setReportSendUserGroup(String reportSendUserGroup) {
+      this.reportSendUserGroup = reportSendUserGroup;
+   }
+
+   public String getCancelSendUserGroup() {
+      return cancelSendUserGroup;
+   }
+
+   public void setCancelSendUserGroup(String cancelSendUserGroup) {
+      this.cancelSendUserGroup = cancelSendUserGroup;
+   }
+
    public String getCreatedUser() {
       return createdUser;
    }
@@ -858,6 +884,10 @@ public static final String ABNORMAL_REASON = "ABNORMAL_REASON";
 
 public static final String BEFORE_MEASURE = "BEFORE_MEASURE";
 
+public static final String REPORT_SEND_USER_GROUP = "REPORT_SEND_USER_GROUP";
+
+public static final String CANCEL_SEND_USER_GROUP = "CANCEL_SEND_USER_GROUP";
+
 public static final String CREATED_USER = "CREATED_USER";
 
 public static final String CREATED_DATA_TIME = "CREATED_DATA_TIME";
@@ -927,6 +957,8 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
          ", closedDateTime = " + closedDateTime +
          ", abnormalReason = " + abnormalReason +
          ", beforeMeasure = " + beforeMeasure +
+         ", reportSendUserGroup = " + reportSendUserGroup +
+         ", cancelSendUserGroup = " + cancelSendUserGroup +
          ", createdUser = " + createdUser +
          ", createdDataTime = " + createdDataTime +
          ", modifiedUser = " + modifiedUser +
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java
index 50878b58..9bdf6cdf 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java
@@ -16,7 +16,7 @@ import java.util.List;
  * </p>
  *
  * @author 赵嘉伟
- * @since 2021-07-16
+ * @since 2021-07-23
  */
 public interface AbnormalBillLogService extends IService<AbnormalBillLog> {
 
@@ -35,5 +35,4 @@ public interface AbnormalBillLogService extends IService<AbnormalBillLog> {
                        @RequestParam List<String> dutyCauseType,
                        @RequestParam List<String> dutyType);
 
-
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java
index c778dd40..aa3b9edb 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java
@@ -38,7 +38,7 @@ import java.util.List;
  * </p>
  *
  * @author 赵嘉伟
- * @since 2021-07-16
+ * @since 2021-07-23
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -90,6 +90,36 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
         String site = CommonMethods.getSite();
         AbnormalBillLog abnormalBillLog = abnormalBillLogMapper.findAllByAbnormalNo(abnormalBill);
 
+        if(!StringUtil.isBlank(abnormalBillDispose.getRouterBo())){
+            //分割该工艺路线
+            String[] routerSplit = abnormalBillDispose.getRouterBo().split(",");
+            //判断该返修工艺是否正确
+            Router router = new Router();
+            router.setSite(site);
+            router.setRouter(routerSplit[1]);
+            router.setRouterType(routerSplit[2]);
+            router.setCurrentRevision("true");
+            List<Router> routers = routerService.selectList(router);
+            if(routers == null || routers.size() == 0){
+                throw BusinessException.build("该返修工艺不存在");
+            }
+        }
+        //判断返修工单是否正确
+        if(!StringUtil.isBlank(abnormalBillDispose.getResolveShopOrder())){
+            ShopOrder shopOrder = shopOrderMapper.selectById(HandleEnum.SHOP_ORDER.getHandle(site, abnormalBillDispose.getResolveShopOrder()));
+            if(shopOrder == null){
+                throw BusinessException.build("该返修工单不存在");
+            }
+        }
+        //发送用户
+        String[] split = abnormalBillDispose.getResolveSendUser().split(",");
+        List<String> strings = Arrays.asList(split);
+        int length = nwaUserMapper.checkUser(site, strings);
+        if(length != strings.size()){
+            throw BusinessException.build("发送用户填报错误");
+        }
+
+
         if(abnormalBillLogMapper.selectById(abnormalBillLog.getHandle()) == null){
             //根据abnormalNo找到不合格代码组
             StringBuilder ncGroup = new StringBuilder();
@@ -107,14 +137,14 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
             List<String> ncGroups =new ArrayList<>();
             if(!StringUtil.isBlank(ncGroup.toString().toString())){
                 ncGroup = new StringBuilder(ncGroup.substring(0, ncGroup.length() - 1));
-                List<String> strings = Arrays.asList(ncGroup.toString().split(","));
-                ncGroups.add(strings.get(0));
-                for (int i = 1; i < strings.size(); i++) {
+                List<String> ncGroupList = Arrays.asList(ncGroup.toString().split(","));
+                ncGroups.add(ncGroupList.get(0));
+                for (int i = 1; i < ncGroupList.size(); i++) {
                     for(int j = 0; j < ncGroups.size(); j++){
-                        if(j == (ncGroups.size() - 1) && !ncGroups.get(j).equals(strings.get(i))){
-                            ncGroups.add(strings.get(i));
+                        if(j == (ncGroups.size() - 1) && !ncGroups.get(j).equals(ncGroupList.get(i))){
+                            ncGroups.add(ncGroupList.get(i));
                         }
-                        if(ncGroups.get(j).equals(strings.get(i))){
+                        if(ncGroups.get(j).equals(ncGroupList.get(i))){
                             break;
                         }
                     }
@@ -135,34 +165,7 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
             abnormalBillLog.setModifiedDateTime(now);
             this.save(abnormalBillLog);;
         }
-        if(!StringUtil.isBlank(abnormalBillDispose.getRouterBo())){
-            //分割该工艺路线
-            String[] routerSplit = abnormalBillDispose.getRouterBo().split(",");
-            //判断该返修工艺是否正确
-            Router router = new Router();
-            router.setSite(site);
-            router.setRouter(routerSplit[1]);
-            router.setRouterType(routerSplit[2]);
-            router.setCurrentRevision("true");
-            List<Router> routers = routerService.selectList(router);
-            if(routers == null || routers.size() == 0){
-                throw BusinessException.build("该返修工艺不存在");
-            }
-        }
-        //判断返修工单是否正确
-        if(!StringUtil.isBlank(abnormalBillDispose.getResolveShopOrder())){
-            ShopOrder shopOrder = shopOrderMapper.selectById(HandleEnum.SHOP_ORDER.getHandle(site, abnormalBillDispose.getResolveShopOrder()));
-            if(shopOrder == null){
-                throw BusinessException.build("该返修工单不存在");
-            }
-        }
-        //发送用户
-        String[] split = abnormalBillDispose.getResolveSendUser().split(",");
-        List<String> strings = Arrays.asList(split);
-        int length = nwaUserMapper.checkUser(site, strings);
-        if(length != strings.size()){
-            throw BusinessException.build("发送用户填报错误");
-        }
+
 
 
 
@@ -172,4 +175,5 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
             abnormalBillService.anomalyReportOther(abnormalBill,abnormalBillDispose,dutyCauseType,dutyType);
         }
     }
+
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 6ad17c35..c6ac68db 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -157,7 +157,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         this.saveOrUpdate(abnormalBill);
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
         //发送消息
-        this.anomalyCreatedAndSendMessage(abnormalBill,null);
+        if(Constants.NEW.equals(abnormalBill.getStatus())){
+            this.anomalyCreatedAndSendMessage(abnormalBill,null);
+        }
         return message;
     }
 
@@ -213,7 +215,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         this.saveOrUpdate(abnormalBill);
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
         //发送消息
-        this.anomalyCreatedAndSendMessage(abnormalBill,null);
+        if(Constants.NEW.equals(abnormalBill.getStatus())){
+            this.anomalyCreatedAndSendMessage(abnormalBill,null);
+        }
+
         return message;
     }
 
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml
index d619299b..e0fe68f7 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml
@@ -56,6 +56,8 @@
         <result column="CLOSED_DATE_TIME" property="closedDateTime" />
         <result column="ABNORMAL_REASON" property="abnormalReason" />
         <result column="BEFORE_MEASURE" property="beforeMeasure" />
+        <result column="REPORT_SEND_USER_GROUP" property="reportSendUserGroup" />
+        <result column="CANCEL_SEND_USER_GROUP" property="cancelSendUserGroup" />
         <result column="CREATED_USER" property="createdUser" />
         <result column="CREATED_DATA_TIME" property="createdDataTime" />
         <result column="MODIFIED_USER" property="modifiedUser" />
@@ -64,7 +66,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, NC_CODE_GROUP, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
+        HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, NC_CODE_GROUP, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
     </sql>
 
     <!-- BaseMapper标准查询/修改/删除 -->
@@ -150,6 +152,8 @@
             <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
             <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
             <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+            <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+            <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
             <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
             <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
             <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -216,6 +220,8 @@
                 <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                 <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
                 <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                 <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                 <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
                 <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -290,6 +296,8 @@
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
                     <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -364,6 +372,8 @@
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
                     <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -438,6 +448,8 @@
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
                     <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -512,6 +524,8 @@
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
                     <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -586,6 +600,8 @@
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
                     <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -656,6 +672,8 @@
             <if test="closedDateTime!=null">CLOSED_DATE_TIME,</if>
             <if test="abnormalReason!=null">ABNORMAL_REASON,</if>
             <if test="beforeMeasure!=null">BEFORE_MEASURE,</if>
+            <if test="reportSendUserGroup!=null">REPORT_SEND_USER_GROUP,</if>
+            <if test="cancelSendUserGroup!=null">CANCEL_SEND_USER_GROUP,</if>
             <if test="createdUser!=null">CREATED_USER,</if>
             <if test="createdDataTime!=null">CREATED_DATA_TIME,</if>
             <if test="modifiedUser!=null">MODIFIED_USER,</if>
@@ -714,6 +732,8 @@
             <if test="closedDateTime!=null">#{closedDateTime},</if>
             <if test="abnormalReason!=null">#{abnormalReason},</if>
             <if test="beforeMeasure!=null">#{beforeMeasure},</if>
+            <if test="reportSendUserGroup!=null">#{reportSendUserGroup},</if>
+            <if test="cancelSendUserGroup!=null">#{cancelSendUserGroup},</if>
             <if test="createdUser!=null">#{createdUser},</if>
             <if test="createdDataTime!=null">#{createdDataTime},</if>
             <if test="modifiedUser!=null">#{modifiedUser},</if>
@@ -779,6 +799,8 @@
             #{closedDateTime},
             #{abnormalReason},
             #{beforeMeasure},
+            #{reportSendUserGroup},
+            #{cancelSendUserGroup},
             #{createdUser},
             #{createdDataTime},
             #{modifiedUser},
@@ -840,6 +862,8 @@
         <if test="et.closedDateTime!=null">CLOSED_DATE_TIME=#{et.closedDateTime},</if>
         <if test="et.abnormalReason!=null">ABNORMAL_REASON=#{et.abnormalReason},</if>
         <if test="et.beforeMeasure!=null">BEFORE_MEASURE=#{et.beforeMeasure},</if>
+        <if test="et.reportSendUserGroup!=null">REPORT_SEND_USER_GROUP=#{et.reportSendUserGroup},</if>
+        <if test="et.cancelSendUserGroup!=null">CANCEL_SEND_USER_GROUP=#{et.cancelSendUserGroup},</if>
         <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
         <if test="et.createdDataTime!=null">CREATED_DATA_TIME=#{et.createdDataTime},</if>
         <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
@@ -901,6 +925,8 @@
         CLOSED_DATE_TIME=#{et.closedDateTime},
         ABNORMAL_REASON=#{et.abnormalReason},
         BEFORE_MEASURE=#{et.beforeMeasure},
+        REPORT_SEND_USER_GROUP=#{et.reportSendUserGroup},
+        CANCEL_SEND_USER_GROUP=#{et.cancelSendUserGroup},
         CREATED_USER=#{et.createdUser},
         CREATED_DATA_TIME=#{et.createdDataTime},
         MODIFIED_USER=#{et.modifiedUser},
@@ -962,6 +988,8 @@
         <if test="et.closedDateTime!=null">CLOSED_DATE_TIME=#{et.closedDateTime},</if>
         <if test="et.abnormalReason!=null">ABNORMAL_REASON=#{et.abnormalReason},</if>
         <if test="et.beforeMeasure!=null">BEFORE_MEASURE=#{et.beforeMeasure},</if>
+        <if test="et.reportSendUserGroup!=null">REPORT_SEND_USER_GROUP=#{et.reportSendUserGroup},</if>
+        <if test="et.cancelSendUserGroup!=null">CANCEL_SEND_USER_GROUP=#{et.cancelSendUserGroup},</if>
         <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
         <if test="et.createdDataTime!=null">CREATED_DATA_TIME=#{et.createdDataTime},</if>
         <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
@@ -1022,6 +1050,8 @@
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
                     <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -1113,6 +1143,8 @@
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
                     <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -1134,22 +1166,25 @@
         </foreach>)
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
+
+
     <select id="findAllByAbnormalNo" resultMap="BaseResultMap">
         SELECT zab.HANDLE HANDLE ,zab.SITE SITE ,zab.ABNORMAL_NO ABNORMAL_NO ,zab.STATUS STATUS ,
-               zab."TYPE" "TYPE" ,zab.ITEM_BO ITEM_BO ,zab.SFC SFC ,zab.OPERATION OPERATION ,
-               zab.WORK_CENTER ,WORK_CENTER ,zab.SHOP_ORDER SHOP_ORDER ,zab.MESSAGE_TYPE MESSAGE_TYPE ,
-               zab.RESRCE RESRCE ,zab.NC_CODE NC_CODE,zab.SHUT_DOWN SHUT_DOWN ,zab.RESPONSE_USER RESPONSE_USER ,
-               zab.RESPONSE_DATE_TIME RESPONSE_DATE_TIME ,zab.PB_DESCRIPTION PB_DESCRIPTION ,zab.NC_QTY NC_QTY ,
-               zab.PB_GRADE PB_GRADE ,zab.PB_USER PB_USER ,zab.PB_QTY PB_QTY ,zab.REPAIR_DATE_TIME REPAIR_DATE_TIME ,
-               zab.DISCOVER DISCOVER ,zab.INSPECTOR INSPECTOR ,zab.ENTITY_LOCATION ENTITY_LOCATION ,zab.REPORT_FROM REPORT_FROM ,
-               zab.OBJECT_BO OBJECT_BO ,zab.PB_PHOTOSHOP PB_PHOTOSHOP ,zab.CANCEL_CODE CANCEL_CODE ,zab.CANCEL_REASON CANCEL_REASON ,
-               zab.CANCEL_DATE_TIME CANCEL_DATE_TIME ,zab.CANCEL_USER CANCEL_USER ,zabd.DUTY_USER DUTY_USER,zabd.DUTY_DATE_TIME DUTY_DATE_TIME,
-               zabd.DUTY_DEPART DUTY_DEPART,zabd.PRINCIPAL_USER PRINCIPAL_USER,zabd.DUTY_CAUSE_DESCRIPTION DUTY_CAUSE_DESCRIPTION,
-               zabd.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,zabd.DUTY_TYPE DUTY_TYPE,zabd.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,
-               zabd.RESOLVE_USER  RESOLVE_USER,zabd.RESOLVE_DATE_TIME RESOLVE_DATE_TIME,zabd.ABNORMAL_METHOD ABNORMAL_METHOD,
-               zabd.ROUTER_BO ROUTER_BO,zabd.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,zabd.RESOLVE_REMARK RESOLVE_REMARK,
-               zabd.RESOLVE_SEND_USER RESOLVE_SEND_USER,zabd.CLOSED_USER CLOSED_USER,zabd.CLOSED_DATE_TIME CLOSED_DATE_TIME,
-               zabd.ABNORMAL_REASON ABNORMAL_REASON,zabd.BEFORE_MEASURE BEFORE_MEASURE
+        zab."TYPE" "TYPE" ,zab.ITEM_BO ITEM_BO ,zab.SFC SFC ,zab.OPERATION OPERATION ,
+        zab.WORK_CENTER ,WORK_CENTER ,zab.SHOP_ORDER SHOP_ORDER ,zab.MESSAGE_TYPE MESSAGE_TYPE ,
+        zab.RESRCE RESRCE ,zab.NC_CODE NC_CODE,zab.SHUT_DOWN SHUT_DOWN ,zab.RESPONSE_USER RESPONSE_USER ,
+        zab.RESPONSE_DATE_TIME RESPONSE_DATE_TIME ,zab.PB_DESCRIPTION PB_DESCRIPTION ,zab.NC_QTY NC_QTY ,
+        zab.PB_GRADE PB_GRADE ,zab.PB_USER PB_USER ,zab.PB_QTY PB_QTY ,zab.REPAIR_DATE_TIME REPAIR_DATE_TIME ,
+        zab.DISCOVER DISCOVER ,zab.INSPECTOR INSPECTOR ,zab.ENTITY_LOCATION ENTITY_LOCATION ,zab.REPORT_FROM REPORT_FROM ,
+        zab.OBJECT_BO OBJECT_BO ,zab.PB_PHOTOSHOP PB_PHOTOSHOP ,zab.CANCEL_CODE CANCEL_CODE ,zab.CANCEL_REASON CANCEL_REASON ,
+        zab.CANCEL_DATE_TIME CANCEL_DATE_TIME ,zab.CANCEL_USER CANCEL_USER ,zabd.DUTY_USER DUTY_USER,zabd.DUTY_DATE_TIME DUTY_DATE_TIME,
+        zabd.DUTY_DEPART DUTY_DEPART,zabd.PRINCIPAL_USER PRINCIPAL_USER,zabd.DUTY_CAUSE_DESCRIPTION DUTY_CAUSE_DESCRIPTION,
+        zabd.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,zabd.DUTY_TYPE DUTY_TYPE,zabd.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,
+        zabd.RESOLVE_USER  RESOLVE_USER,zabd.RESOLVE_DATE_TIME RESOLVE_DATE_TIME,zabd.ABNORMAL_METHOD ABNORMAL_METHOD,
+        zabd.ROUTER_BO ROUTER_BO,zabd.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,zabd.RESOLVE_REMARK RESOLVE_REMARK,
+        zabd.RESOLVE_SEND_USER RESOLVE_SEND_USER,zabd.CLOSED_USER CLOSED_USER,zabd.CLOSED_DATE_TIME CLOSED_DATE_TIME,
+        zabd.ABNORMAL_REASON ABNORMAL_REASON,zabd.BEFORE_MEASURE BEFORE_MEASURE,zab.REPORT_SEND_USER_GROUP REPORT_SEND_USER_GROUP,
+               zab.CANCEL_SEND_USER_GROUP CANCEL_SEND_USER_GROUP
         FROM Z_ABNORMAL_BILL zab
         INNER JOIN Z_ABNORMAL_BILL_DISPOSE zabd ON zab.HANDLE = zabd.ABNORMAL_BILL_BO
         <where>
@@ -1158,9 +1193,11 @@
                     ZAB.SITE = #{abnormalBill.site}
                 </if>
                 <if test="abnormalBill.abnormalNo != null and abnormalBill.abnormalNo != ''">
-                   AND ZAB.ABNORMAL_NO = #{abnormalBill.abnormalNo}
+                    AND ZAB.ABNORMAL_NO = #{abnormalBill.abnormalNo}
                 </if>
             </if>
         </where>
     </select>
+
+
 </mapper>
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 44a68d0e..57024160 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -238,7 +238,7 @@
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
-                    ${ew.sqlSegment}
+                     ${ew.sqlSegment}
                 </if>
             </if>
         </where>
@@ -406,12 +406,12 @@
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
-                    ${ew.sqlSegment}
+                  AND  ${ew.sqlSegment}
                 </if>
             </if>
         </where>
         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
-            ${ew.sqlSegment}
+            AND ${ew.sqlSegment}
         </if>
     </select>