[清退] 添加阅知信息 以及修改标题

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepel.java

@@ -5,7 +5,9 @@ import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.misc.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
@@ -24,13 +26,14 @@ import java.util.List;
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 @ApiModel("清退账单")
+@NoArgsConstructor
+@AllArgsConstructor
 public class DeviceRepel extends BaseEntity {
     /**
      * 数据id
      */
     @Id
-    @GeneratedValue
-    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     private Integer id;
 
     /**

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepelDetail.java

@@ -8,7 +8,9 @@ import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
 import com.tykj.dev.misc.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
@@ -27,14 +29,15 @@ import java.util.List;
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 @ApiModel("清退详情")
+@NoArgsConstructor
+@AllArgsConstructor
 public class DeviceRepelDetail extends BaseEntity {
     /**
      * 主键id
      */
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
-    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     /**

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelBusinessService.java

@@ -137,6 +137,11 @@ public interface RepelBusinessService {
      */
     void AllRepelNotDeviceSubmit(SecurityUser securityUser,Integer taskId);
 
-
+    /**
+     * 撤回任务
+     * 根据任务id找到对应的任务 因为只有回执单时才有 回执单任务为只任务，主要配发任务为当前任务的主任务
+     * 子任务 封存 主任务根据单位进行回退到不同的状态  市 -1206 区 -1205 装备统一变程在库状态
+     */
+    void withdraw(Integer taskId);
 
 }

dev-train/src/main/java/com/tykj/dev/device/train/controller/HandoverController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/WorkHandoverServiceImpl.java

@@ -35,6 +35,7 @@ import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collector;
@@ -75,6 +76,7 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
     WorkHandoverDevDao workHandoverDevDao;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public WorkHandover createWorkHandover(WorkHandoverAddVo workHandoverAddVo, SecurityUser securityUser) {
         log.info("[workHandover] 新建工作交接");
 //        WorkHandover
@@ -105,6 +107,7 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public WorkHandover endWorkHandover(WorkHandoverEndAddVo workHandoverEndAddVo) {
         //更新workHamdoverDb状态
         WorkHandover workHandover;