流程优化

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

@@ -270,6 +270,13 @@ public class RepairApplicationFormController {
         return new R<>();
     }
 
+    @SysLog("关闭工单")
+    @PutMapping("/close/repair")
+    public R closeRepair(@RequestBody RepairApplicationFormDTO applicationFormDTO) {
+        RepairStrategyFactory.getStrategy(applicationFormDTO.getCategory()).closeRepair(applicationFormDTO);
+        return new R<>();
+    }
+
     @SysLog("接单维修单")
     @PutMapping("/report/repair")
     public R reportRepairForm(@RequestBody RepairApplicationFormDTO applicationFormDTO) {

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

@@ -292,7 +292,7 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
         }else{
             data = JsonUtils.jsonToModel(info.getData(),RepairTicketTemplateData.class);
             RepairApplicationForm form = repairApplicationFormMapper.selectByPrimaryKey(objId);
-            if(StringUtils.isNotBlank(data.getRepairMan())){
+            if(StringUtils.isBlank(data.getRepairMan())){
                 data.setRepairMan(sysUserMapper.selectByPrimaryKey(form.getRepairUserId()).getRealName());
             }
             if(StringUtils.isBlank(data.getRepairStartTime()) && form.getRepairStartTime() != null){