异常待办事项

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){
+//        for (UserGroup userGroup : userGroupList){
-            if("ADMINISTRATORS".equals(userGroup.getUserGroup())){
+//            if("ADMINISTRATORS".equals(userGroup.getUserGroup())){
-                userGroupList = null;
+//                userGroupList = null;
-                break;
+//                break;
-            }
+//            }
-        }
+//        }
         String language = LocaleContextHolder.getLocale().getLanguage();
         return abnormalBillMapper.backLog(abnormalBillDto, language,userGroupList);
     }

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,
+        GROUP BY zab.ABNORMAL_NO,it.DESCRIPTION,zab.CREATED_DATE_TIME,zab.RESPONSE_DATE_TIME,
-        ZNU.FULL_NAME,zab.NC_CODE,zab.PB_DESCRIPTION
+        ZNU.FULL_NAME,zab.NC_CODE,zab.PB_DESCRIPTION,ZAB.CORRECTION,ZAB.PROGRAM,ZAB.STATUS
         ORDER BY zab.CREATED_DATE_TIME DESC
     </select>