维修优化

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -310,6 +310,6 @@ public class RepairApplicationForm implements Serializable {
 
     private Integer repairProfessor; // 检维修单位
 
-    private Integer repairType; // 工作类型
+    private String repairType; // 工作类型
 
 }

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

@@ -315,6 +315,19 @@ public class RepairApplicationFormController {
         return new R<>();
     }
 
+    /**
+     * 验收驳回
+     *
+     * @param repairCheckDTO 验收单DTO
+     * @return R
+     */
+    @SysLog("编辑故障异常")
+    @PutMapping("/edit/error/info")
+    public R editErrorInfo(@Validated({UpdateGroup.class}) @RequestBody RepairApplicationFormDTO repairCheckDTO) {
+
+        return new R<>();
+    }
+
     /**
      * 保修单导出
      *

platform-service/src/main/java/com/platform/service/customize/impl/CustomFieldTemplateDataServiceImpl.java

@@ -267,7 +267,7 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
                 data.setDispatcher(sysUserMapper.selectByPrimaryKey(repairApplicationForm.getDispatchUserId()).getRealName());
             }
             data.setRepairProfessor(repairApplicationForm.getRepairProfessor());
-            data.setRepairType(repairApplicationForm.getRepairType());
+            //data.setRepairType(repairApplicationForm.getRepairType());
             data.setRequireHours(repairApplicationForm.getLimitHours());
             data.setRepairMan(sysUserMapper.selectByPrimaryKey(repairApplicationForm.getRepairUserId()).getRealName());
             data.setRepairNo(repairApplicationForm.getNo());

platform-service/src/main/java/com/platform/service/repair/RepairApplicationFormService.java

@@ -152,4 +152,6 @@ public interface RepairApplicationFormService extends IBaseService<RepairApplica
      * @return :
      */
     MyVOPage<RepairApplicationFormVO> selectPageInfoVOByModelThree(RepairApplicationFormDTO record, int pageNum, int pageSize);
+
+    void editErrorInfo(RepairApplicationFormDTO record);
 }

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

@@ -521,6 +521,14 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         return new MyVOPage<>(mapper.selectPageList(record));
     }
 
+    @Override
+    public void editErrorInfo(RepairApplicationFormDTO record) {
+        RepairApplicationForm form = new RepairApplicationForm();
+        form.setId(record.getId());
+        form.setContent(record.getContent());
+        mapper.updateByPrimaryKeySelective(form);
+    }
+
     @Override
     public R getStoreForm(UserInfo userInfo) {
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();

platform-service/src/main/java/com/platform/service/repair/strategy/AbstractRepairBaseStrategy.java

@@ -118,6 +118,10 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
     public RepairApplicationFormDTO sendRepair(RepairApplicationFormDTO model) {
         String id = model.getId();
         RepairApplicationForm applicationForm = repairApplicationFormMapper.selectById(id);
+        String userId = SecurityUtils.getUserInfo().getUserId();
+        if(!userId.equals(applicationForm.getDispatchUserId())){
+            throw new DeniedException("您非该维修单工程师，不可以进行派单");
+        }
         if (!RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue().equals(applicationForm.getStatus()) &&
                 !RepairApplicationFormStatusEnum.REBACK.getValue().equals(applicationForm.getStatus()) &&
                 !RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue().equals(applicationForm.getStatus()) &&
@@ -135,7 +139,6 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
         model.setNo(applicationForm.getNo());
         model.setUserId(applicationForm.getUserId());
         model.setDispatchUserId(applicationForm.getDispatchUserId());
-        //model.setRepairDispatchList(applicationForm.getRepairDispatchList());
         model.setSbId(sbInfo.getId());
         return model;
     }