检定完善

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -71,9 +71,8 @@ public class RepairApplicationFormController {
      */
     @SysLog("新增保修单")
     @PostMapping
-    @PreAuthorize("@pms.hasPermission('repair-application-forms-add')")
+    // @PreAuthorize("@pms.hasPermission('repair-application-forms-add')")
     public R save(@Validated({AddGroup.class}) @RequestBody RepairApplicationFormDTO repairApplicationFormDTO) {
-
         return new R<>(repairApplicationFormService.saveModelByDTO(repairApplicationFormDTO));
     }
 

platform-rest/src/main/resources/application-dev.yml

@@ -76,7 +76,8 @@ ignore:
     - /test/test/**
     - /static/**
     - /service/**
-
+    - /repair/**
+    - /sb/infos/**
 upload:
   root-dir: D://data//xian
 

platform-rest/src/main/resources/application-prod.yml

@@ -61,7 +61,8 @@ ignore:
     - /verify/captcha/**
     - /static/**
     - /service/**
-
+    - /repair/application-forms/**
+    - /sb/infos/**
 upload:
   root-dir: /home/data/sb-base/FileData
 

platform-rest/src/main/resources/application-test.yml

@@ -56,7 +56,8 @@ ignore:
     - /verify/captcha/**
     - /static/**
     - /service/**
-
+    - /repair/application-forms/**
+    - /sb/infos/**
 upload:
   root-dir: /home/data/XiAnConstructionAsset/FileData
 

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

@@ -190,9 +190,21 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         Weekend<RepairApplicationForm> weekend = new Weekend<>(RepairApplicationForm.class);
         weekend.weekendCriteria().andIsNotNull(RepairApplicationForm::getId).andEqualTo(RepairApplicationForm::getType, model.getType());
         int count = mapper.selectCountByExample(weekend);
-        UserInfo userInfo = SecurityUtils.getUserInfo();
-        model.setUserId(userInfo.getUserId());
-
+       /* UserInfo userInfo = SecurityUtils.getUserInfo();
+        if(userInfo != null){
+            model.setUserId(userInfo.getUserId());
+            if(StringUtils.isBlank(model.getActualUser())){
+                model.setActualUser(userInfo.getRealName());
+            }
+        }*/
+        if(StringUtils.isBlank(model.getActualUser())){
+            UserInfo userInfo = SecurityUtils.getUserInfo();
+            model.setUserId(userInfo.getUserId());
+            model.setActualUser(userInfo.getRealName());
+        }
+        if(model.getSource() == null){
+            model.setSource(1);
+        }
         // 设置维修审批人为验收人，进行最终验收
         SysUserDTO query = new SysUserDTO();
         query.setRoleCode(SysRoleCodeEnum.REPAIR_EXAMINE.name());
@@ -224,12 +236,12 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         boolean updateSb = false;
         SbInfo info = new SbInfo();
         info.setId(sb.getId());
-        if(!StringUtils.isBlank(sb.getCph()) || !model.getSbCph().equalsIgnoreCase((sb.getCph()))){
+        if(StringUtils.isNotBlank(model.getSbCph()) && !model.getSbCph().equalsIgnoreCase((sb.getCph()))){
             info.setCph(model.getSbCph());
             updateSb = true;
         }
         // 如果选择了设备停机，则要修改设备状态
-        if (model.getNeedStop().intValue() == RepairApplicationFormStopEnum.STOP.getValue()) {
+        if (model.getNeedStop()!=null && model.getNeedStop().intValue() == RepairApplicationFormStopEnum.STOP.getValue()) {
             info.setStatus(SbInfoStatusEnum.IN_MAINTAIN.getValue());
             updateSb = true;
         }
@@ -249,7 +261,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         model.setUpdateTime(model.getApplyTime());
         model.setId(IdGeneratorUtils.getObjectId());
         this.saveFile(model);
-        RepairApplicationForm form = super.saveModelHaveCreateInfo(model);
+        RepairApplicationForm form = BeanConverterUtil.copyObjectProperties(model, RepairApplicationForm.class);
+        int result = mapper.insert(form);
         List<String> userIds = new ArrayList<>();
         List<String> mails = new ArrayList<>();
 
@@ -313,8 +326,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             map.put("no", model.getNo());
             map.put("sbName", vo.getName());
             map.put("sbNo", vo.getNo());
-            map.put("sbCph", model.getSbCph());
-            map.put("actualUser", model.getActualUser());
+            map.put("sbCph", model.getSbCph()==null?"无":model.getSbCph());
+            map.put("actualUser", model.getActualUser()==null?"无":model.getActualUser());
             if(StringUtils.isBlank(model.getContent())){
                 map.put("repairDesc", "无法断定，请维修人员现场检查");
             }else{