维修完善

platform-dao/src/main/java/com/platform/dao/dto/customize/CustomFieldTemplateDataDTO.java

@@ -97,4 +97,6 @@ public class CustomFieldTemplateDataDTO extends BaseDTO implements Serializable
     private List<Integer> statusList;
 
     private List<SysFile> imageList;
+
+    private String opinion;
 }

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -365,4 +365,9 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
      * 审核图片
      */
     private List<SysFile> verifyImages;
+
+    /**
+     * 二次派工原因
+     */
+    private String remarkTwo;
 }

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairRecordTemplateData.java

@@ -16,4 +16,9 @@ public class RepairRecordTemplateData implements Serializable {
     private String file;
 
     private String imageList;
+
+    /**
+     * 主管建议
+     */
+    private String opinion;
 }

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

@@ -288,5 +288,9 @@ public class RepairApplicationForm implements Serializable {
      * 维修部门ID
      */
     private String repairDeptId;
+    /**
+     * 二次派工原因
+     */
+    private String remarkTwo;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/query/customize/CustomFieldTemplateDataVO.java

@@ -135,4 +135,6 @@ public class CustomFieldTemplateDataVO extends BaseVO implements Serializable {
     private List<SysFile> imageList;
 
     private String file;
+
+    private String opinion;
 }

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -372,4 +372,9 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
      * 维修部门ID
      */
     private String repairDeptId;
+
+    /**
+     * 二次派工原因
+     */
+    private String remarkTwo;
 }

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -298,6 +298,9 @@
             <if test="remark != null">
                 remark = #{remark},
             </if>
+            <if test="remarkTwo != null">
+                remark_two = #{remarkTwo},
+            </if>
             <if test="status != null">
                 status = #{status},
             </if>

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

@@ -207,11 +207,9 @@ public class RepairApplicationFormController {
     @SysLog("提交审核维修单")
     @PutMapping("/examine/{id}")
     @PreAuthorize("@pms.hasPermission('repair-application-forms-finish')")
-    public R examineApply(@PathVariable("id") String id) {
-        RepairApplicationFormDTO repairFormDTO = new RepairApplicationFormDTO();
+    public R examineApply(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody RepairApplicationFormDTO repairFormDTO) {
         repairFormDTO.setId(id);
         RepairStrategyFactory.getStrategy().submitRepair(repairFormDTO);
-        //repairApplicationFormService.examine(id);
         return new R<>();
     }
 

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

@@ -190,6 +190,7 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
                 RepairRecordTemplateData data2 = JsonUtils.jsonToModel(vo.getData(),RepairRecordTemplateData.class);
                 vo.setDataRemark(data2.getRemark());
                 vo.setRepairHours(data2.getRepairMinutes());
+                vo.setOpinion(data2.getOpinion());
                 sysFiles.forEach(item -> {
                     if (item.getType().equals(SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue())) {
                         imageList.add(item);
@@ -211,6 +212,9 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
         if(StringUtils.isNotBlank(record.getRemark())){
             dataInfo.setRemark(record.getRemark().trim());
         }
+        if(StringUtils.isNotBlank(record.getOpinion())){
+            dataInfo.setOpinion(record.getOpinion().trim());
+        }
         // 保存维修记录图片
         sysFileService.saveFile(record.getId(), SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue(), record.getImageList());
         queryData.setData(JsonUtils.objectToJson(dataInfo));
@@ -222,6 +226,7 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
             RepairRecordTemplateData data = JsonUtils.jsonToModel(vo.getData(),RepairRecordTemplateData.class);
             vo.setDataRemark(data.getRemark());
             vo.setRepairHours(data.getRepairMinutes());
+            vo.setOpinion(data.getOpinion());
         }
     }
 

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

@@ -211,7 +211,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
     public RepairApplicationFormDTO verifyRefused(RepairApplicationFormDTO model) {
         // 1.修改验收单状态
         RepairApplicationForm applicationForm = repairApplicationFormMapper.selectById(model.getId());
-        applicationForm.setCheckContent(model.getCheckContent());
+        applicationForm.setRemarkTwo(model.getRemark());
         applicationForm.setStatus(RepairApplicationFormStatusEnum.REBACK.getValue());
         applicationForm.setUpdateTime(LocalDateTime.now());
         repairApplicationFormMapper.updateByPrimaryKeySelective(applicationForm);

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -214,7 +214,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         // 2、回写并修改维修表
         RepairApplicationForm updRepair = new RepairApplicationForm();
         updRepair.setId(model.getId());
-        updRepair.setRemark(model.getRemark());
+        updRepair.setRemarkTwo(model.getRemark());
         updRepair.setStatus(RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue());
         double repairMinutes = form.getRepairMinutes() == null ? 0.0 : form.getRepairMinutes();
         updRepair.setRepairMinutes(repairMinutes + hours);
@@ -354,6 +354,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         data.setCreatedUserName(form.getRepairUserName());
         data.setRemark(CommonConstants.REPAIR_RECORD);
         RepairRecordTemplateData dataInfo = new RepairRecordTemplateData();
+        dataInfo.setOpinion(form.getRemark());
         dataInfo.setRemark("");
         dataInfo.setRepairMinutes(0.0);
         dataInfo.setFile("");