功能修改

src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java

@@ -366,9 +366,9 @@ public class MaintenanceController extends BladeController {
                     }
 
                 }
-            } else {
-                taskDetailService.saveOrUpdate(maintenanceTaskDetail);
             }
+            taskDetailService.saveOrUpdate(maintenanceTaskDetail);
+
         }
         return R.success();
     }
@@ -393,6 +393,9 @@ public class MaintenanceController extends BladeController {
     public R repairSupervisorConfirm(@RequestBody MaintenanceTask task) {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SUPERVISOR_CONFIRM.getValue());
+        taskOld.setApproveRemarkManager(task.getApproveRemarkManager());
+        taskOld.setApproveResultManager(CommonConstant.TRUE_INT);
+        taskOld.setActualAmount(task.getActualAmount());
         taskService.updateById(taskOld);
         List<User> userList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, task.getDeptId()));
         for (User user : userList) {
@@ -407,9 +410,9 @@ public class MaintenanceController extends BladeController {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setApprovePoint("主管审核维修方案");
         taskOld.setApprovePerson(task.getApprovePerson());
-        taskOld.setApproveResult(CommonConstant.FALSE_INT);
+        taskOld.setApproveResultManager(CommonConstant.FALSE_INT);
         taskOld.setApproveTime(DateUtil.now());
-        taskOld.setApproveRemark(task.getApproveRemark());
+        taskOld.setApproveRemarkManager(task.getApproveRemarkManager());
         taskOld.setRepairStatus(MaintenanceStatusEnum.SUPERVISOR_CONFIRM_REFUSE.getValue());
         taskService.updateById(taskOld);
         messageService.saveMessage(task.getTaskCode(), "维修方案已被驳回，请重新提交维修方案", task.getServicemanId(), 1);
@@ -463,9 +466,11 @@ public class MaintenanceController extends BladeController {
     public R repairServicemanFinish(@RequestBody MaintenanceTask task) {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_REPAIR_FINISH.getValue());
-        taskOld.setCompleteImgList(task.getCompleteImgList());
         taskService.updateById(taskOld);
-
+        List<MaintenanceTaskDetail> details = task.getDetails();
+        if (details != null && !details.isEmpty()) {
+            taskDetailService.updateBatchById(details);
+        }
         return R.success();
     }
 
@@ -481,6 +486,7 @@ public class MaintenanceController extends BladeController {
         taskOld.setIsOkQuality(task.getIsOkQuality());
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_EVALUATE_FINISH.getValue());
         taskOld.setApproveResult(task.getApproveResult());
+        taskOld.setEvaluationRemarks(task.getEvaluationRemarks());
         taskService.updateById(taskOld);
 
         return R.success();

src/main/java/org/springblade/modules/business/pojo/dto/MaintenanceTaskDto.java

@@ -1,5 +1,7 @@
 package org.springblade.modules.business.pojo.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTask.java

@@ -114,11 +114,17 @@ public class MaintenanceTask extends BaseEntity {
     private Integer repairStatus;
 
     /**
-     * 审批结果（0不通过 1通过）
+     * 客户审批结果（0不通过 1通过）
      */
     @JsonSerialize(nullsUsing = NullSerializer.class)
     private Integer approveResult;
 
+    /**
+     * 主管审批结果（0不通过 1通过）
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer approveResultManager;
+
     /**
      * 审核节点
      */
@@ -136,10 +142,15 @@ public class MaintenanceTask extends BaseEntity {
     private Date approveTime;
 
     /**
-     * 审批备注
+     * 客户审批备注
      */
     private String approveRemark;
 
+    /**
+     * 主管审批备注
+     */
+    private String approveRemarkManager;
+
     /**
      * 附件详情
      */
@@ -161,6 +172,11 @@ public class MaintenanceTask extends BaseEntity {
      */
     private Integer isOkValidity;
 
+    /**
+     * 评价意见
+     */
+    private String evaluationRemarks;
+
     /**
      * 签名图片地址
      */
@@ -228,4 +244,10 @@ public class MaintenanceTask extends BaseEntity {
      * 维修完成图片url
      */
     private String completeImgList;
+
+    /**
+     * 实际金额
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Double actualAmount;
 }

src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTaskDetail.java

@@ -138,4 +138,14 @@ public class MaintenanceTaskDetail extends BaseEntity {
     @TableField(exist = false)
     private String servicemanName;
 
+    /**
+     * 维修完成图片url
+     */
+    private String completeImgList;
+
+    /**
+     * 维修方案
+     */
+    private String repairOption;
+
 }