完善

platform-rest/src/main/java/com/platform/rest/controller/check/CheckStandardController.java

@@ -88,6 +88,30 @@ public class CheckStandardController {
       return new R<>();
   }
 
+    /**
+     * 初始化编码
+     *
+     * @return R
+     */
+    @SysLog("修改保养标准")
+    @PutMapping("/no")
+    @PreAuthorize("@pms.hasPermission('check-spot-standards-edit')")
+    public R updateNo() {
+        List<CheckStandardVO> checkStandardVOList = checkStandardService.selectList(new CheckStandardDTO());
+        if(CollectionUtil.isNotEmpty(checkStandardVOList)){
+            List<CheckStandard> checkStandardList = new ArrayList<CheckStandard>();
+            int i = 1;
+            for(CheckStandardVO vo: checkStandardVOList){
+                CheckStandard checkStandard = new CheckStandard();
+                checkStandard.setId(vo.getId());
+                checkStandard.setNo(String.format("%05d", i++));
+                checkStandardList.add(checkStandard);
+            }
+            checkStandardService.updateBatch(checkStandardList);
+        }
+        return new R<>("编码更新成功");
+    }
+
     /**
      * 复制某个设备的bom记录
      *

platform-service/src/main/java/com/platform/service/check/CheckStandardService.java

@@ -60,7 +60,7 @@ public interface CheckStandardService extends IBaseService<CheckStandard, CheckS
     String importListByAddOldVersion(MultipartFile file);
 
     void genSpareWarnTask(int month, int type);
-
+    void updateBatch(List<CheckStandard> updateStandardList);
     /**
      * 分页查询
      * @param month      :

platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -150,7 +150,8 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         Weekend<CheckStandard> weekend = new Weekend<>(CheckStandard.class);
         weekend.weekendCriteria().andIsNotNull(CheckStandard::getId);
         Integer count = mapper.selectCountByExample(weekend);
-        model.setNo(IdGeneratorUtils.getCheckStandardNo(++count));
+        String str1 = String.format("%05d", count);
+        model.setNo(str1);
 
         // 设置等级
         setLevel(model);
@@ -173,6 +174,14 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         return checkStandard;
     }
 
+    public static void main(String[] args) {
+        String str1 = String.format("%05d", 1);
+        System.out.println(str1);
+    }
+
+    public String setNo(int no){
+       return String.format("%05d", no);
+    }
     private void setLevel(CheckStandardDTO model) {
         if(model.getCheckUserType().equals(CheckPlanUserTypeEnum.USE_USER.getValue())){
             model.setLevel(CheckStandardLevelEnum.A.getValue());
@@ -603,6 +612,11 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         }
     }
 
+    @Override
+    public void updateBatch(List<CheckStandard> updateStandardList) {
+        mapper.updateBatch(updateStandardList);
+    }
+
     @Override
     public AbstractPageResultBean<CheckStandardSpareVO> selectSpareWarnVOPage(int month, int type, int pageNum, int pageSize) {
         CheckStandardDTO checkStandardDTO = new CheckStandardDTO();

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -258,14 +258,12 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         List<String> receiverList = new ArrayList<String>();
         if(StringUtils.isNotBlank(sbInfo.getRepairUser())){
             SysUserVO user = sysUserService.selectUserVO(sbInfo.getRepairUser());
-            receiverList.add(user.getPhone());
             userIds.add(sbInfo.getRepairUser());
             openIds.add(user.getWxOpenid());
             mails.add(user.getEmail());
         }
         if(StringUtils.isNotBlank(sbInfo.getRepairUserSecond())){
             SysUserVO user = sysUserService.selectUserVO(sbInfo.getRepairUserSecond());
-            receiverList.add(user.getPhone());
             userIds.add(sbInfo.getRepairUserSecond());
             openIds.add(user.getWxOpenid());
             mails.add(user.getEmail());
@@ -295,11 +293,20 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 MessageTemplateUtil.getFreemarkerHtmlContent(repairUrl,model,sb),
                 model.getId(), userIds, mails));
 
-        // 发送微信通知给第一维修人，第二维修人
+        // 发送微信通知给所有维修人角色
       /*  for(String openId : openIds){
             WeChatMessageUtil.repairMessage( openId, repairUrl,model,sb);
         }*/
         // 发送短信通知给第一维修人,和第二维修人，其他人不发短信，且必须是正式环境
+        SysUserDTO sysUserDTO = new SysUserDTO();
+        sysUserDTO.setRoleCode(SysRoleCodeEnum.Maintenance.name());
+        List<SysUserVO> sysUserVOList = sysUserService.getDeptChildrenRoleUser(sysUserDTO);
+        if(CollectionUtil.isNotEmpty(sysUserVOList)){
+            for(SysUserVO sysUserVO:sysUserVOList){
+                System.out.println(sysUserVO.getPhone());
+                receiverList.add(sysUserVO.getPhone());
+            }
+        }
         if(CollectionUtil.isNotEmpty(receiverList) && BeanUtils.isProd()){
             // String templateParas_repair = "[\"C-001\",\"1号车间\",\"熊超\"]";
             String no = sb.getNo();