[核查模块] 增加了退回功能，优化了核查情况与核查结果的说明

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckDetail.java

@@ -2,13 +2,16 @@ package com.tykj.dev.device.confirmcheck.entity.domain;
 
 import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.misc.base.BaseEntity;
+import com.tykj.dev.misc.base.BeanHelper;
 import com.tykj.dev.misc.utils.TimestampUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
+import org.modelmapper.ModelMapper;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -16,6 +19,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -261,4 +265,15 @@ public class DeviceCheckDetail extends BaseEntity {
                 remark
         );
     }
+
+    public DeviceCheckDetail copyWithoutId(){
+        ModelMapper mapper = BeanHelper.getUserMapper();
+        DeviceCheckDetail detail = mapper.map(this, DeviceCheckDetail.class);
+        this.setCreateTime(LocalDateTime.now());
+        this.setUpdateTime(LocalDateTime.now());
+        this.userAId = 0;
+        this.userBId = 0;
+        return detail;
+    }
+
 }

dev-task/src/main/java/com/tykj/dev/device/task/subject/domin/Task.java

@@ -138,4 +138,13 @@ public class Task {
         taskBto.setUserReadDetailList(StringSplitUtil.userIdSplit(this.userReadDetail));
         return taskBto;
     }
+
+    public Task copy(){
+        //modelMap复制
+        ModelMapper mapper = BeanHelper.getUserMapper();
+        Task task = mapper.map(this, Task.class);
+        this.createTime = new Date();
+        this.updateTime = new Date();
+        return task;
+    }
 }