Merge remote-tracking branch 'origin/master'

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

@@ -282,7 +282,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 
         //判断是否是用户自报,如果是自报的话，调用孙豪的方法
         if(!StringUtil.isBlank(abnormalBill.getInspector()) && Constants.NEW.equals(abnormalBill.getStatus()) &&"B".equals(abnormalBill.getReportFrom())){
-            abnormalBill.setObjectBo(HandleEnum.SELF_REPORT.getHandle(abnormalBill.getSite(),abnormalBill.getObjectBo()));
+            //abnormalBill.setObjectBo(HandleEnum.SELF_REPORT.getHandle(abnormalBill.getSite(),abnormalBill.getObjectBo()));
             selfReportService.updateState(abnormalBill.getObjectBo(), Constants.STATE_CONFIRM);
         }
 
@@ -427,12 +427,12 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         String site = CommonMethods.getSite();
         List<UserGroup> userGroupList = userGroupMapper.findUserGroupListByUser(site, user);
         //判断该用户组中有没有administrator,如果有的话就等于null
-        for (UserGroup userGroup : userGroupList){
-            if("ADMINISTRATORS".equals(userGroup.getUserGroup())){
-                userGroupList = null;
-                break;
-            }
-        }
+//        for (UserGroup userGroup : userGroupList){
+//            if("ADMINISTRATORS".equals(userGroup.getUserGroup())){
+//                userGroupList = null;
+//                break;
+//            }
+//        }
         String language = LocaleContextHolder.getLocale().getLanguage();
         return abnormalBillMapper.backLog(abnormalBillDto, language,userGroupList);
     }
@@ -491,7 +491,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         LocalDateTime now = LocalDateTime.now();
         abnormalBillDispose.setHandle(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()));
 
-
         if(!StringUtil.isBlank(abnormalBillDispose.getRouterBo())){
             //分割该工艺路线
             String[] routerSplit = abnormalBillDispose.getRouterBo().split(",");
@@ -507,7 +506,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             }
         }
 
-
         //判断返修工单是否正确
         if(!StringUtil.isBlank(abnormalBillDispose.getResolveShopOrder())){
             ShopOrder shopOrder = shopOrderMapper.selectById(HandleEnum.SHOP_ORDER.getHandle(site, abnormalBillDispose.getResolveShopOrder()));
@@ -527,8 +525,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBill.setStatus(Constants.PROGRAM_CONFIRM);
         abnormalBill.setProgram("true");
 
-
-
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
         this.saveOrUpdate(abnormalBill);
 
@@ -1018,6 +1014,11 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalMessage.setMessageType(messageType.getMessageType());
         //格式化消息
         String message = this.formatMessage(abnormalBill, abnormalMessage.getMessageType(), site);
+        //得到消息触发的时间
+        abnormalMessage.setResponseDateTime(now);
+        //得到要发送的消息
+        abnormalMessage.setContent(message);
+
         //设置发送的用户组和异常节点
         switch (abnormalBill.getStatus()){
             //新建
@@ -1080,12 +1081,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 
 
 
-        //得到消息触发的时间
-        abnormalMessage.setResponseDateTime(now);
-
-        //得到要发送的消息
-        abnormalMessage.setContent(message);
-
         //设置状态，新建是N，响应为N，纠防确认是N，方案确认是Y，取消是Y,N为可以升级，Y为不可以升级
         if(Constants.ABNORMAL_MESSAGE_RESPONSE.equals(abnormalMessage.getNode()) ||
            Constants.ABNORMAL_MESSAGE_REPORT.equals(abnormalMessage.getNode())){

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

@@ -70,8 +70,6 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
         abnormalMessageQueryWrapper.lt("UP_DATE_TIME",now);
 //        AbnormalBill abnormalBill = new AbnormalBill();
         List<Message> abnormalMessages = messageMapper.selectList(abnormalMessageQueryWrapper);
-
-
         for(Message _abnormalMessage : abnormalMessages){
             String uuid = UUID.randomUUID().toString();
             Message abnormalMessage = new Message();
@@ -119,7 +117,8 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
             if(Constants.ABNORMAL_MESSAGE_REPORT.equals(abnormalMessage.getNode())){
                 abnormalMessage.setContent(message+",现已超时未响应");
             }else if(Constants.ABNORMAL_MESSAGE_RESPONSE.equals(abnormalMessage.getNode())){
-                abnormalMessage.setContent(message+",现已响应超时");
+                //走判责提交和方案确认
+                abnormalMessage.setContent(message+",现已响应超时未方案确认");
             };
 
             //设置时间

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

@@ -973,7 +973,10 @@
 
     <select id="backLog" resultMap="abnormalBillDto">
         SELECT ROW_NUMBER() OVER(ORDER BY ZAB.ABNORMAL_NO ASC) SEQ,ZAB.ABNORMAL_NO ABNORMAL_NO,
-        ZAB.STATUS STATUS, IT.DESCRIPTION ITEM_DESCRIPTION, ZAB.CREATED_DATE_TIME CREATED_DATE_TIME,
+        CASE WHEN ZAB.CORRECTION = 'true' AND ZAB.PROGRAM = 'true' THEN '纠防确认,方案确认'
+            ELSE ZAB.STATUS
+            END STATUS ,
+        IT.DESCRIPTION ITEM_DESCRIPTION, ZAB.CREATED_DATE_TIME CREATED_DATE_TIME,
         ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME,
         ZNU.FULL_NAME CREATED_USER,
         ZAB.NC_CODE NC_CODE,ZAB.PB_DESCRIPTION PB_DESCRIPTION,
@@ -1090,8 +1093,8 @@
                 <!--                </choose>-->
             </if>
         </where>
-        GROUP BY zab.ABNORMAL_NO,zab.STATUS,it.DESCRIPTION,zab.CREATED_DATE_TIME,zab.RESPONSE_DATE_TIME,
-        ZNU.FULL_NAME,zab.NC_CODE,zab.PB_DESCRIPTION
+        GROUP BY zab.ABNORMAL_NO,it.DESCRIPTION,zab.CREATED_DATE_TIME,zab.RESPONSE_DATE_TIME,
+        ZNU.FULL_NAME,zab.NC_CODE,zab.PB_DESCRIPTION,ZAB.CORRECTION,ZAB.PROGRAM,ZAB.STATUS
         ORDER BY zab.CREATED_DATE_TIME DESC
     </select>