3254194295 2 ヶ月 前
コミット
da2333fcbb

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

@@ -197,6 +197,7 @@ public class RepairApplicationFormController {
     @PutMapping("/finish/{id}")
     @PreAuthorize("@pms.hasPermission('repair-application-forms-finish')")
     public R finish(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody RepairApplicationFormDTO repairFormDTO) {
+        repairFormDTO.setRepairContent(repairFormDTO.getRemark());
         repairApplicationFormService.finish(repairFormDTO);
         return new R<>();
     }

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

@@ -673,6 +673,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         // 1. 将维修单的状态修改已完成
         RepairApplicationForm applicationForm = mapper.selectById(dto.getId());
         applicationForm.setStatus(RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue());
+        applicationForm.setRepairContent(dto.getRepairContent());
 
         // 驳回重新完成的,不用更新这个时间,驳回应该状态是完成待审核,不需要重新维修
         if (applicationForm.getRepairEndTime() == null) {