Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/dto/preparation/PreparationDTO.java

@@ -236,4 +236,6 @@ public class PreparationDTO extends BaseDTO implements Serializable {
 
     private String delUserId; // 删除人ID集合
 
+    private String finishContent; // 完成情况
+
 }

platform-dao/src/main/java/com/platform/dao/entity/preparation/Preparation.java

@@ -172,5 +172,7 @@ public class Preparation implements Serializable{
 
     private String delUserId; // 删除人ID集合
 
+    private String finishContent; // 完成情况
+
 
 }

platform-dao/src/main/java/com/platform/dao/vo/query/preparation/PreparationVO.java

@@ -200,4 +200,6 @@ public class PreparationVO extends BaseVO implements Serializable {
 
     private String delUserId; // 删除人ID集合
 
+    private String finishContent; // 完成情况
+
 }

platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -407,7 +407,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         Preparation preparation = mapper.selectByPrimaryKey(model.getId());
         Preparation updPre = new Preparation();
         updPre.setId(model.getId());
-        updPre.setRepairContent(model.getRepairContent());
+        updPre.setFinishContent(model.getFinishContent());
         updPre.setRepairEndTime(LocalDateTime.now());
         updPre.setRepairMinutes(DateUtils.getDurationHours(preparation.getRepairStartTime(), updPre.getRepairEndTime()));
         updPre.setStatus(PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue());
@@ -821,6 +821,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         updPre.setStatus(PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue());
         updPre.setFee(model.getFee());
         updPre.setFeeContent(model.getFeeContent());
+        updPre.setRepairContent(model.getRepairContent());
         // 保存文件图片
         if(model.getImageList() != null && model.getImageList().size() > 0){
             sysFileService.saveFile(model.getId(), SysFileTypeEnum.PREPARATION_APPLICATION_IMGS.getValue(), model.getImageList());