代码提交

src/main/java/com/example/removetolocal/config/LocationConfig.java

@@ -41,7 +41,11 @@ import java.util.Map;
                 "com.example.removetolocal.newselfcheck.dao",
                 "com.example.removetolocal.newallot.dao",
                 "com.example.removetolocal.newback.dao",
-                "com.example.removetolocal.newrepair.dao"}
+                "com.example.removetolocal.newrepair.dao",
+                "com.example.removetolocal.newrepel.dao",
+                "com.example.removetolocal.oldrepel.dao",
+                "com.example.removetolocal.oldtrain.dao",
+                "com.example.removetolocal.newtrain.dao"}
 )
 @EnableConfigurationProperties(JpaProperties.class)
 public class LocationConfig {
@@ -75,7 +79,11 @@ public class LocationConfig {
                         "com.example.removetolocal.newselfcheck.entity",
                         "com.example.removetolocal.newallot.entity",
                         "com.example.removetolocal.newback.entity",
-                        "com.example.removetolocal.newrepair.entity")
+                        "com.example.removetolocal.newrepair.entity",
+                        "com.example.removetolocal.newrepel.entity",
+                        "com.example.removetolocal.oldrepel.entity",
+                        "com.example.removetolocal.newtrain.entity",
+                        "com.example.removetolocal.oldtrain")
                 .persistenceUnit("locationPersistenceUnit")
                 .build();
     }

src/main/java/com/example/removetolocal/newentity/entity/AllotBackBill.java

@@ -45,7 +45,7 @@ public class AllotBackBill {
 	/**
 	* backCheckDetail
 	*/
-	@Column(name = "back_check_detail")
+	@Column(name = "back_check_detail",columnDefinition = "TEXT")
 	private String backCheckDetail;
 	/**
 	* backCheckResult
@@ -70,12 +70,12 @@ public class AllotBackBill {
 	/**
 	* billFileName
 	*/
-	@Column(name = "bill_file_name")
+	@Column(name = "bill_file_name",columnDefinition = "TEXT")
 	private String billFileName;
 	/**
 	* billFileUrl
 	*/
-	@Column(name = "bill_file_url")
+	@Column(name = "bill_file_url",columnDefinition = "TEXT")
 	private String billFileUrl;
 	/**
 	* createTime
@@ -97,12 +97,12 @@ public class AllotBackBill {
 	/**
 	* fileName
 	*/
-	@Column(name = "file_name")
+	@Column(name = "file_name",columnDefinition = "TEXT")
 	private String fileName;
 	/**
 	* fileUrl
 	*/
-	@Column(name = "file_url")
+	@Column(name = "file_url",columnDefinition = "TEXT")
 	private String fileUrl;
 	/**
 	* leftSignatureId
@@ -117,7 +117,7 @@ public class AllotBackBill {
 	/**
 	* receiveCheckDetail
 	*/
-	@Column(name = "receive_check_detail")
+	@Column(name = "receive_check_detail",columnDefinition = "TEXT")
 	private String receiveCheckDetail;
 	/**
 	* receiveCheckResult
@@ -132,12 +132,12 @@ public class AllotBackBill {
 	/**
 	* receiveFileName
 	*/
-	@Column(name = "receive_file_name")
+	@Column(name = "receive_file_name",columnDefinition = "TEXT")
 	private String receiveFileName;
 	/**
 	* receiveFileUrl
 	*/
-	@Column(name = "receive_file_url")
+	@Column(name = "receive_file_url",columnDefinition = "TEXT")
 	private String receiveFileUrl;
 	/**
 	* receiveUnit
@@ -199,7 +199,7 @@ public class AllotBackBill {
 	/**
 	* replyFiles
 	*/
-	@Column(name = "reply_files")
+	@Column(name = "reply_files",columnDefinition = "TEXT")
 	private String replyFiles;
 	/**
 	* sendTime
@@ -214,7 +214,7 @@ public class AllotBackBill {
 	/**
 	* sendFiles
 	*/
-	@Column(name = "send_files")
+	@Column(name = "send_files",columnDefinition = "TEXT")
 	private String sendFiles;
 
 }

src/main/java/com/example/removetolocal/newentity/entity/DeviceRepel.java

+package com.example.removetolocal.newentity.entity;
+
+import lombok.Data;
+import javax.persistence.*;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+import java.util.Date;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+
+/**
+ * entity class for device_repel
+*/
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@Table(name = "device_repel")
+public class DeviceRepel {
+
+	/**
+	* id
+	*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+	/**
+	* describes
+	*/
+	@Column(name = "describes",columnDefinition = "TEXT")
+	private String describes;
+	/**
+	* fielding
+	*/
+	@Column(name = "fielding",columnDefinition = "TEXT")
+	private String fielding;
+	/**
+	* fineName
+	*/
+	@Column(name = "fine_name")
+	private String fineName;
+	/**
+	* taskScope
+	*/
+	@Column(name = "task_scope",columnDefinition = "TEXT")
+	private String taskScope;
+	/**
+	* time
+	*/
+	@Column(name = "time")
+	private java.util.Date time;
+	/**
+	* url
+	*/
+	@Column(name = "url")
+	private String url;
+	/**
+	* createTime
+	*/
+	@Column(name = "create_time")
+	@CreatedDate
+	private java.util.Date createTime;
+	/**
+	* createUserId
+	*/
+	@Column(name = "create_user_id")
+	@CreatedBy
+	private Integer createUserId;
+	/**
+	* deleteTag
+	*/
+	@Column(name = "delete_tag")
+	private Integer deleteTag;
+	/**
+	* updateTime
+	*/
+	@Column(name = "update_time")
+	@LastModifiedDate
+	private java.util.Date updateTime;
+	/**
+	* updateUserId
+	*/
+	@Column(name = "update_user_id")
+	@LastModifiedBy
+	private Integer updateUserId;
+	/**
+	* repelStatus
+	*/
+	@Column(name = "repel_status")
+	private Integer repelStatus;
+	/**
+	* title
+	*/
+	@Column(name = "title")
+	private String title;
+	/**
+	* files
+	*/
+	@Column(name = "files",columnDefinition = "TEXT")
+	private String files;
+	/**
+	* initiateName
+	*/
+	@Column(name = "initiate_name")
+	private String initiateName;
+	/**
+	* unitId
+	*/
+	@Column(name = "unit_id")
+	private Integer unitId;
+	/**
+	* unitName
+	*/
+	@Column(name = "unit_name")
+	private String unitName;
+
+}

src/main/java/com/example/removetolocal/newentity/entity/DeviceRepelDetail.java

+package com.example.removetolocal.newentity.entity;
+
+import lombok.Data;
+import javax.persistence.*;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+import java.util.Date;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+
+/**
+ * entity class for device_repel_detail
+*/
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@Table(name = "device_repel_detail")
+public class DeviceRepelDetail {
+
+	/**
+	* id
+	*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+	/**
+	* agent
+	*/
+	@Column(name = "agent")
+	private String agent;
+	/**
+	* applyNumber
+	*/
+	@Column(name = "apply_number")
+	private String applyNumber;
+	/**
+	* auditingFeedback
+	*/
+	@Column(name = "auditing_feedback",columnDefinition = "TEXT")
+	private String auditingFeedback;
+	/**
+	* billFileName
+	*/
+	@Column(name = "bill_file_name")
+	private String billFileName;
+	/**
+	* billFileUrl
+	*/
+	@Column(name = "bill_file_url")
+	private String billFileUrl;
+	/**
+	* createTime
+	*/
+	@Column(name = "create_time")
+	@CreatedDate
+	private java.util.Date createTime;
+	/**
+	* createUserId
+	*/
+	@Column(name = "create_user_id")
+	@CreatedBy
+	private Integer createUserId;
+	/**
+	* deleteTag
+	*/
+	@Column(name = "delete_tag")
+	private Integer deleteTag;
+	/**
+	* deviceIds
+	*/
+	@Column(name = "device_ids",columnDefinition = "TEXT")
+	private String deviceIds;
+	/**
+	* fileName
+	*/
+	@Column(name = "file_name")
+	private String fileName;
+	/**
+	* fileUrl
+	*/
+	@Column(name = "file_url")
+	private String fileUrl;
+	/**
+	* leftSignatureId
+	*/
+	@Column(name = "left_signature_id")
+	private String leftSignatureId;
+	/**
+	* num
+	*/
+	@Column(name = "num")
+	private String num;
+	/**
+	* receiveCheckDetail
+	*/
+	@Column(name = "receive_check_detail",columnDefinition = "TEXT")
+	private String receiveCheckDetail;
+	/**
+	* receiveCheckResult
+	*/
+	@Column(name = "receive_check_result")
+	private String receiveCheckResult;
+	/**
+	* receiveCount
+	*/
+	@Column(name = "receive_count")
+	private Integer receiveCount;
+	/**
+	* receiveTime
+	*/
+	@Column(name = "receive_time")
+	private java.util.Date receiveTime;
+	/**
+	* receiveUnit
+	*/
+	@Column(name = "receive_unit")
+	private String receiveUnit;
+	/**
+	* receiveUseraid
+	*/
+	@Column(name = "receive_useraid")
+	private Integer receiveUseraid;
+	/**
+	* receiveUseraname
+	*/
+	@Column(name = "receive_useraname")
+	private String receiveUseraname;
+	/**
+	* receiveUserbid
+	*/
+	@Column(name = "receive_userbid")
+	private Integer receiveUserbid;
+	/**
+	* receiveUserbname
+	*/
+	@Column(name = "receive_userbname")
+	private String receiveUserbname;
+	/**
+	* recordId
+	*/
+	@Column(name = "record_id")
+	private String recordId;
+	/**
+	* repairDeviceDetail
+	*/
+	@Column(name = "repair_device_detail",columnDefinition = "TEXT")
+	private String repairDeviceDetail;
+	/**
+	* repelId
+	*/
+	@Column(name = "repel_id")
+	private Integer repelId;
+	/**
+	* replayNumber
+	*/
+	@Column(name = "replay_number")
+	private String replayNumber;
+	/**
+	* rightSignatureId
+	*/
+	@Column(name = "right_signature_id")
+	private String rightSignatureId;
+	/**
+	* sendBackCount
+	*/
+	@Column(name = "send_back_count")
+	private Integer sendBackCount;
+	/**
+	* sendBackStatus
+	*/
+	@Column(name = "send_back_status")
+	private Integer sendBackStatus;
+	/**
+	* sendCheckDetail
+	*/
+	@Column(name = "send_check_detail",columnDefinition = "TEXT")
+	private String sendCheckDetail;
+	/**
+	* sendCheckResult
+	*/
+	@Column(name = "send_check_result")
+	private String sendCheckResult;
+	/**
+	* sendTime
+	*/
+	@Column(name = "send_time")
+	private java.util.Date sendTime;
+	/**
+	* sendUnit
+	*/
+	@Column(name = "send_unit")
+	private String sendUnit;
+	/**
+	* sendUseraid
+	*/
+	@Column(name = "send_useraid")
+	private Integer sendUseraid;
+	/**
+	* sendUseraname
+	*/
+	@Column(name = "send_useraname")
+	private String sendUseraname;
+	/**
+	* sendUserbid
+	*/
+	@Column(name = "send_userbid")
+	private Integer sendUserbid;
+	/**
+	* sendUserbname
+	*/
+	@Column(name = "send_userbname")
+	private String sendUserbname;
+	/**
+	* sendedCount
+	*/
+	@Column(name = "sended_count")
+	private Integer sendedCount;
+	/**
+	* submitDescription
+	*/
+	@Column(name = "submit_description",columnDefinition = "TEXT")
+	private String submitDescription;
+	/**
+	* updateTime
+	*/
+	@Column(name = "update_time")
+	@LastModifiedDate
+	private java.util.Date updateTime;
+	/**
+	* updateUserId
+	*/
+	@Column(name = "update_user_id")
+	@LastModifiedBy
+	private Integer updateUserId;
+	/**
+	* billFile
+	*/
+	@Column(name = "bill_file",columnDefinition = "TEXT")
+	private String billFile;
+	/**
+	* outboundFile
+	*/
+	@Column(name = "outbound_file",columnDefinition = "TEXT")
+	private String outboundFile;
+	/**
+	* receiveUnitId
+	*/
+	@Column(name = "receive_unit_id")
+	private Integer receiveUnitId;
+	/**
+	* sendUnitId
+	*/
+	@Column(name = "send_unit_id")
+	private Integer sendUnitId;
+	/**
+	* inFile
+	*/
+	@Column(name = "in_file",columnDefinition = "TEXT")
+	private String inFile;
+	/**
+	* repelStatus
+	*/
+	@Column(name = "repel_status")
+	private Integer repelStatus;
+
+	@Column(name = "reply_files",columnDefinition = "TEXT")
+	private String replyFiles;
+
+	@Column(name = "send_files",columnDefinition = "TEXT")
+	private String sendFiles;
+}

src/main/java/com/example/removetolocal/newentity/entity/RepairBackBill.java

@@ -40,7 +40,7 @@ public class RepairBackBill {
 	/**
 	* backCheckDetail
 	*/
-	@Column(name = "back_check_detail")
+	@Column(name = "back_check_detail",columnDefinition = "TEXT")
 	private String backCheckDetail;
 	/**
 	* backCheckResult
@@ -50,7 +50,7 @@ public class RepairBackBill {
 	/**
 	* backReciveCheckDetail
 	*/
-	@Column(name = "back_recive_check_detail")
+	@Column(name = "back_recive_check_detail",columnDefinition = "TEXT")
 	private String backReciveCheckDetail;
 	/**
 	* backReciveCheckResult
@@ -65,12 +65,12 @@ public class RepairBackBill {
 	/**
 	* billFileName
 	*/
-	@Column(name = "bill_file_name")
+	@Column(name = "bill_file_name",columnDefinition = "TEXT")
 	private String billFileName;
 	/**
 	* billFileUrl
 	*/
-	@Column(name = "bill_file_url")
+	@Column(name = "bill_file_url",columnDefinition = "TEXT")
 	private String billFileUrl;
 	/**
 	* createTime
@@ -102,12 +102,12 @@ public class RepairBackBill {
 	/**
 	* fileName
 	*/
-	@Column(name = "file_name")
+	@Column(name = "file_name",columnDefinition = "TEXT")
 	private String fileName;
 	/**
 	* fileUrl
 	*/
-	@Column(name = "file_url")
+	@Column(name = "file_url",columnDefinition = "TEXT")
 	private String fileUrl;
 	/**
 	* leftSignatureId
@@ -122,12 +122,12 @@ public class RepairBackBill {
 	/**
 	* receiveFileName
 	*/
-	@Column(name = "receive_file_name")
+	@Column(name = "receive_file_name",columnDefinition = "TEXT")
 	private String receiveFileName;
 	/**
 	* receiveFileUrl
 	*/
-	@Column(name = "receive_file_url")
+	@Column(name = "receive_file_url",columnDefinition = "TEXT")
 	private String receiveFileUrl;
 	/**
 	* receiveTime

src/main/java/com/example/removetolocal/newentity/entity/RepairSendBill.java

@@ -40,12 +40,12 @@ public class RepairSendBill {
 	/**
 	* billFileName
 	*/
-	@Column(name = "bill_file_name")
+	@Column(name = "bill_file_name",columnDefinition = "TEXT")
 	private String billFileName;
 	/**
 	* billFileUrl
 	*/
-	@Column(name = "bill_file_url")
+	@Column(name = "bill_file_url",columnDefinition = "TEXT")
 	private String billFileUrl;
 	/**
 	* createTime
@@ -72,12 +72,12 @@ public class RepairSendBill {
 	/**
 	* fileName
 	*/
-	@Column(name = "file_name")
+	@Column(name = "file_name",columnDefinition = "TEXT")
 	private String fileName;
 	/**
 	* fileUrl
 	*/
-	@Column(name = "file_url")
+	@Column(name = "file_url",columnDefinition = "TEXT")
 	private String fileUrl;
 	/**
 	* receiveCount
@@ -87,12 +87,12 @@ public class RepairSendBill {
 	/**
 	* receiveFileName
 	*/
-	@Column(name = "receive_file_name")
+	@Column(name = "receive_file_name",columnDefinition = "TEXT")
 	private String receiveFileName;
 	/**
 	* receiveFileUrl
 	*/
-	@Column(name = "receive_file_url")
+	@Column(name = "receive_file_url",columnDefinition = "TEXT")
 	private String receiveFileUrl;
 	/**
 	* receiveTime
@@ -112,7 +112,7 @@ public class RepairSendBill {
 	/**
 	* repairDeviceCheckDetail
 	*/
-	@Column(name = "repair_device_check_detail")
+	@Column(name = "repair_device_check_detail",columnDefinition = "TEXT")
 	private String repairDeviceCheckDetail;
 	/**
 	* repairDeviceCheckResult
@@ -122,12 +122,12 @@ public class RepairSendBill {
 	/**
 	* repairDeviceDetail
 	*/
-	@Column(name = "repair_device_detail")
+	@Column(name = "repair_device_detail",columnDefinition = "TEXT")
 	private String repairDeviceDetail;
 	/**
 	* repairReciveCheckDetail
 	*/
-	@Column(name = "repair_recive_check_detail")
+	@Column(name = "repair_recive_check_detail",columnDefinition = "TEXT")
 	private String repairReciveCheckDetail;
 	/**
 	* repairReciveCheckResult

src/main/java/com/example/removetolocal/newentity/entity/RepelDeviceUnit.java

+package com.example.removetolocal.newentity.entity;
+
+import lombok.Data;
+import javax.persistence.*;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+import java.util.Date;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+
+/**
+ * entity class for repel_device_unit
+*/
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@Table(name = "repel_device_unit")
+public class RepelDeviceUnit {
+
+	/**
+	* id
+	*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+	/**
+	* deviceId
+	*/
+	@Column(name = "device_id")
+	private Integer deviceId;
+	/**
+	* unitsId
+	*/
+	@Column(name = "units_id")
+	private Integer unitsId;
+
+}

src/main/java/com/example/removetolocal/newentity/entity/RepelTaskStatistical.java

+package com.example.removetolocal.newentity.entity;
+
+import lombok.Data;
+import javax.persistence.*;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+import java.util.Date;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+
+/**
+ * entity class for repel_task_statistical
+*/
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@Table(name = "repel_task_statistical")
+public class RepelTaskStatistical {
+
+	/**
+	* id
+	*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+	/**
+	* areaName
+	*/
+	@Column(name = "area_name")
+	private String areaName;
+	/**
+	* fatherTaskId
+	*/
+	@Column(name = "father_task_id")
+	private Integer fatherTaskId;
+	/**
+	* modelCount
+	*/
+	@Column(name = "model_count",columnDefinition = "TEXT")
+	private String modelCount;
+	/**
+	* repelId
+	*/
+	@Column(name = "repel_id")
+	private Integer repelId;
+	/**
+	* taskId
+	*/
+	@Column(name = "task_id")
+	private Integer taskId;
+	/**
+	* taskStatus
+	*/
+	@Column(name = "task_status")
+	private Integer taskStatus;
+	/**
+	* createTime
+	*/
+	@Column(name = "create_time")
+	@CreatedDate
+	private java.util.Date createTime;
+	/**
+	* createUserId
+	*/
+	@Column(name = "create_user_id")
+	@CreatedBy
+	private Integer createUserId;
+	/**
+	* deleteTag
+	*/
+	@Column(name = "delete_tag")
+	private Integer deleteTag;
+	/**
+	* updateTime
+	*/
+	@Column(name = "update_time")
+	@LastModifiedDate
+	private java.util.Date updateTime;
+	/**
+	* updateUserId
+	*/
+	@Column(name = "update_user_id")
+	@LastModifiedBy
+	private Integer updateUserId;
+	/**
+	* des
+	*/
+	@Column(name = "des",columnDefinition = "TEXT")
+	private String des;
+
+}

src/main/java/com/example/removetolocal/newrepair/dao/RepairBackBillDao.java

@@ -13,5 +13,6 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  */
 public interface RepairBackBillDao extends JpaRepository<RepairBackBill, Integer>, JpaSpecificationExecutor<RepairBackBill> {
     RepairBackBill findByDeviceRepairBillId(Integer repairBillId);
+    RepairBackBill findByOldId(Integer oldId);
 }
 

src/main/java/com/example/removetolocal/newrepair/entity/RepairBackBill.java

@@ -91,7 +91,7 @@ public class RepairBackBill {
 	* deleteTag
 	*/
 	@Column(name = "delete_tag")
-	private Integer deleteTag;
+	private Integer deleteTag = 0;
 	/**
 	* deviceRepairBillId
 	*/

src/main/java/com/example/removetolocal/newrepair/entity/RepairDetail.java

@@ -46,7 +46,7 @@ public class RepairDetail {
 	* deleteTag
 	*/
 	@Column(name = "delete_tag")
-	private Integer deleteTag;
+	private Integer deleteTag = 0;
 	/**
 	* deviceId
 	*/

src/main/java/com/example/removetolocal/newrepel/entity/BaseEntity.java

@@ -33,6 +33,7 @@ public class BaseEntity {
      */
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @Column(name = "id")
 //    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
@@ -40,28 +41,33 @@ public class BaseEntity {
      * 创建用户id
      */
     @CreatedBy
+    @Column(name = "create_user_id")
     private Integer createUserId;
 
     /**
      * 更新用户id
      */
     @LastModifiedBy
+    @Column(name = "update_user_id")
     private Integer updateUserId;
 
     /**
      * 创建时间
      */
     @CreatedDate
+    @Column(name = "create_time")
     private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
     @LastModifiedDate
+    @Column(name = "update_time")
     private LocalDateTime updateTime;
 
     /**
      * 删除标记(0:未删除，1:已删除)
      */
+    @Column(name = "delete_tag")
     private Integer deleteTag = 0;
 }

src/main/java/com/example/removetolocal/newrepel/entity/DeviceRepel.java

 package com.example.removetolocal.newrepel.entity;
 
+import com.example.removetolocal.config.BeanHelper;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.annotations.SQLDelete;
+import org.modelmapper.ModelMapper;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
@@ -20,18 +22,20 @@ import java.util.List;
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 @SQLDelete(sql = "update device_check_bill set delete_tag = 1 where id = ?")
+@Table(name = "device_repel")
 public class DeviceRepel extends BaseEntity {
     /**
      * 数据id
      */
     @Id
     @GeneratedValue
-    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    @Column(name = "id")
     private Integer id;
 
     /**
      * 清退标题
      */
+    @Column(name = "title")
     private String title;
     /**
      * 类型集合多个列装id
@@ -62,27 +66,32 @@ public class DeviceRepel extends BaseEntity {
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Column(name = "time")
     private Date time;
 
     /**
      * 清退状态
      * 1。全量清退 2。部分清退
      */
+    @Column(name = "repel_status")
     private Integer repelStatus;
 
     /**
      * 发起人名称
      */
+    @Column(name = "initiate_name")
     private String initiateName;
 
     /**
      * 发起单位
      */
+    @Column(name = "unit_name")
     private String unitName;
 
     /**
      * 发起单位id
      */
+    @Column(name = "unit_id")
     private Integer unitId;
 
     public DeviceRepel(String title, String fielding, String describes, String taskScope, String files, Date time, Integer repelStatus, String initiateName, String unitName, Integer unitId) {
@@ -97,4 +106,9 @@ public class DeviceRepel extends BaseEntity {
         this.unitName = unitName;
         this.unitId = unitId;
     }
+
+    public com.example.removetolocal.newentity.entity.DeviceRepel toST() {
+        ModelMapper mapper = BeanHelper.getUserMapper();
+        return mapper.map(this, com.example.removetolocal.newentity.entity.DeviceRepel.class);
+    }
 }

src/main/java/com/example/removetolocal/newrepel/entity/DeviceRepelDetail.java

 package com.example.removetolocal.newrepel.entity;
 
+import com.example.removetolocal.config.BeanHelper;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import lombok.Data;
+import org.modelmapper.ModelMapper;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
@@ -18,98 +20,117 @@ import java.util.Date;
 @Data
 @Entity
 @EntityListeners(AuditingEntityListener.class)
+@Table(name = "device_repel_detail")
 public class DeviceRepelDetail extends BaseEntity {
     /**
      * 主键id
      */
     @Id
     @GeneratedValue
-    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    @Column(name = "id")
     private Integer id;
 
     /**
      * 账单id
      */
+    @Column(name = "repel_id")
     private Integer repelId;
 
     /**
      * 编号
      */
+    @Column(name = "num")
     private String num;
 
     /**
      * 申请文号
      */
+    @Column(name = "apply_number")
     private String applyNumber;
     /**
      * 批复文号
      */
+    @Column(name = "replay_number")
     private String replayNumber;
     /**
      * 发件单位
      */
+    @Column(name = "send_unit")
     private String sendUnit;
 
     /**
      * 发件单位id
      */
+    @Column(name = "send_unit_id")
     private Integer sendUnitId;
 
     /**
      * 收件单位id
      */
+    @Column(name = "receive_unit_id")
     private Integer receiveUnitId;
     /**
      * 收件单位
      */
+    @Column(name = "receive_unit")
     private String receiveUnit;
     /**
      * 配发时间
      */
+    @Column(name = "send_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date sendTime;
     /**
      * 接收时间
      */
+    @Column(name = "receive_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date receiveTime;
     /**
      * 经办人
      */
+    @Column(name = "send_useraid")
     private Integer sendUserAId;
 
     /**
      * 经办人 名称
      */
+    @Column(name = "send_useraname")
     private String sendUserAName;
 
     /**
      * 签发人
      */
+    @Column(name = "send_userbname")
     private String sendUserBName;
 
     /**
      * 签发人 id
      */
+    @Column(name = "send_userbid")
     private Integer sendUserBId;
 
     /**
      * 收件方 经办人
      */
+    @Column(name = "receive_useraid")
     private Integer receiveUserAId;
 
     /**
      * 收件方 经办人名称
      */
+    @Column(name = "receive_useraname")
     private String receiveUserAName;
 
     /**
      * 收件方id(B岗位)
      */
+    @Column(name = "receive_userbname")
     private String receiveUserBName;
     /**
      * 收件方id(B岗位)
      */
+    @Column(name = "receive_userbid")
     private Integer receiveUserBId;
 
     /**
@@ -133,18 +154,22 @@ public class DeviceRepelDetail extends BaseEntity {
     /**
      * 退回状态(1:退回待审核,2:退回审核失败,3:退回中,4:退回接收待审核,5:退回接收审核失败,6:退回成功)
      */
+    @Column(name = "send_back_status")
     private Integer sendBackStatus;
     /**
      * 退回装备数量
      */
+    @Column(name = "send_back_count")
     private Integer sendBackCount;
     /**
      * 已出库装备数量
      */
+    @Column(name = "sended_count")
     private Integer sendedCount;
     /**
      * 已接收装备数量
      */
+    @Column(name = "receive_count")
     private Integer receiveCount;
     /**
      * 出库检查详情(装备主键id+核对结果(0缺失1无误3新增,字符x作为分隔符)),例如x10x21x32x,意为主键id为1的装备缺失,为2的无误,为3的不匹配
@@ -189,6 +214,7 @@ public class DeviceRepelDetail extends BaseEntity {
     @Column(name = "auditing_feedback",columnDefinition = "TEXT")
     private String auditingFeedback;
 
+    @Column(name = "repel_status")
     private Integer repelStatus;
 
 
@@ -229,4 +255,9 @@ public class DeviceRepelDetail extends BaseEntity {
         this.auditingFeedback = auditingFeedback;
         this.repelStatus = repelStatus;
     }
+
+    public com.example.removetolocal.newentity.entity.DeviceRepelDetail toST() {
+        ModelMapper mapper = BeanHelper.getUserMapper();
+        return mapper.map(this, com.example.removetolocal.newentity.entity.DeviceRepelDetail.class);
+    }
 }

src/main/java/com/example/removetolocal/newrepel/entity/RepelDeviceUnit.java

 package com.example.removetolocal.newrepel.entity;
 
+import com.example.removetolocal.config.BeanHelper;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.modelmapper.ModelMapper;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
@@ -19,14 +21,17 @@ import javax.persistence.*;
 @NoArgsConstructor
 @AllArgsConstructor
 @EntityListeners(AuditingEntityListener.class)
+@Table(name = "repel_device_unit")
 public class RepelDeviceUnit {
     @Id
     @GeneratedValue
-    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    @Column(name = "id")
     private Integer id;
 
+    @Column(name = "device_id")
     private Integer deviceId;
 
+    @Column(name = "units_id")
     private Integer unitsId;
 
     public RepelDeviceUnit(Integer deviceId, Integer unitsId) {
@@ -57,4 +62,9 @@ public class RepelDeviceUnit {
     public void setUnitsId(Integer unitsId) {
         this.unitsId = unitsId;
     }
+
+    public com.example.removetolocal.newentity.entity.RepelDeviceUnit toST() {
+        ModelMapper mapper = BeanHelper.getUserMapper();
+        return mapper.map(this, com.example.removetolocal.newentity.entity.RepelDeviceUnit.class);
+    }
 }

src/main/java/com/example/removetolocal/newrepel/entity/RepelTaskStatistical.java

 package com.example.removetolocal.newrepel.entity;
 
+import com.example.removetolocal.config.BeanHelper;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.modelmapper.ModelMapper;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
@@ -20,36 +22,42 @@ import java.util.List;
 @EntityListeners(AuditingEntityListener.class)
 @NoArgsConstructor
 @AllArgsConstructor
+@Table(name = "repel_task_statistical")
 public class RepelTaskStatistical extends BaseEntity {
     /**
      * 数据id
      */
     @Id
-    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    @Column(name = "id")
     private  Integer id;
 
     /**
      * repelId
      */
+    @Column(name = "repel_id")
     private Integer repelId;
     /**
      * 父类taskId
      */
+    @Column(name = "father_task_id")
     private Integer fatherTaskId;
 
     /**
      * taskId
      */
+    @Column(name = "task_id")
     private Integer taskId;
 
     /**
      * 任务状态 1.正常提交 2.延期 3.等待审核
      */
+    @Column(name = "task_status")
     private Integer taskStatus;
 
     /**
      * 区域名称
      */
+    @Column(name = "area_name")
     private String  areaName;
 
     /**
@@ -82,4 +90,9 @@ public class RepelTaskStatistical extends BaseEntity {
         this.modelCount = modelCount;
         this.des = des;
     }
+
+    public com.example.removetolocal.newentity.entity.RepelTaskStatistical toST() {
+        ModelMapper mapper = BeanHelper.getUserMapper();
+        return mapper.map(this, com.example.removetolocal.newentity.entity.RepelTaskStatistical.class);
+    }
 }

src/main/java/com/example/removetolocal/newtrain/entity/TrainTheme.java

@@ -175,5 +175,4 @@ public class TrainTheme {
 		ModelMapper mapper = BeanHelper.getUserMapper();
 		return mapper.map(this, com.example.removetolocal.newentity.entity.TrainTheme.class);
 	}
-
 }

src/main/java/com/example/removetolocal/newtrain/entity/TrainUser.java

@@ -129,4 +129,8 @@ public class TrainUser {
 		this.isNotJoinUserId = isNotJoinUserId;
 	}
 
+	public com.example.removetolocal.newentity.entity.TrainUser toST() {
+		ModelMapper mapper = BeanHelper.getUserMapper();
+		return mapper.map(this, com.example.removetolocal.newentity.entity.TrainUser.class);
+	}
 }

src/main/java/com/example/removetolocal/oldentity/DevTaskmain.java

@@ -120,7 +120,7 @@ public class DevTaskmain {
 				taskBto.setBusinessType(14);
 				break;
 			case 7:
-				taskBto.setBusinessType(16);
+				taskBto.setBusinessType(22);
 				break;
 			case 9:
 				taskBto.setBusinessType(4);
@@ -139,6 +139,10 @@ public class DevTaskmain {
 				break;
 			case 26:
 				taskBto.setBusinessType(16);
+				break;
+			case 25:
+				taskBto.setBusinessType(18);
+				break;
 			default:break;
 		}
 		taskBto.setTitle(this.title);

src/main/java/com/example/removetolocal/oldentity/dao/DevRepairReceivedetailDao.java

@@ -3,5 +3,8 @@ package com.example.removetolocal.oldentity.dao;
 import com.example.removetolocal.oldentity.DevRepairReceivedetail;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface DevRepairReceivedetailDao extends JpaRepository<DevRepairReceivedetail,Integer> {
+    List<DevRepairReceivedetail> findAllByRepairReceiveId(Integer id);
 }

src/main/java/com/example/removetolocal/oldentity/dao/DevTaskmainDao.java

@@ -3,6 +3,9 @@ package com.example.removetolocal.oldentity.dao;
 import com.example.removetolocal.oldentity.DevTaskmain;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface DevTaskmainDao extends JpaRepository<DevTaskmain,Integer> {
     DevTaskmain findByTypeAndResourceId(Integer type,Integer resourceId);
+    List<DevTaskmain> findAllByTypeAndResourceId(Integer type, Integer resourceId);
 }

src/main/java/com/example/removetolocal/oldrepel/dao/DevScrapDao.java

@@ -4,6 +4,8 @@ import com.example.removetolocal.oldrepel.entity.DevScrap;
 import com.example.removetolocal.oldrepel.entity.DevScrapnoticeUnit;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface DevScrapDao  extends JpaRepository<DevScrap,Integer> {
-    DevScrap findByNoticeIdAndStatus(Integer noticeId,Integer status);
+    List<DevScrap> findAllByNoticeIdAndStatus(Integer noticeId, Integer status);
 }

src/main/java/com/example/removetolocal/oldrepel/entity/DevScrap.java

@@ -16,7 +16,6 @@ import org.hibernate.annotations.Where;
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 @SQLDelete(sql = "update dev_scrap set delete_tag = 1 where id = ?")
-@Where(clause = "delete_tag = 0")
 @Table(name = "dev_scrap")
 public class DevScrap {
 

src/main/java/com/example/removetolocal/oldrepel/entity/DevScrapDetail.java

@@ -19,7 +19,6 @@ import org.springframework.data.annotation.LastModifiedDate;
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 @SQLDelete(sql = "update dev_scrap_detail set delete_tag = 1 where id = ?")
-@Where(clause = "delete_tag = 0")
 @Table(name = "dev_scrap_detail")
 public class DevScrapDetail {
 

src/main/java/com/example/removetolocal/oldrepel/entity/DevScrapnotice.java

@@ -20,7 +20,6 @@ import org.springframework.data.annotation.LastModifiedDate;
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 @SQLDelete(sql = "update dev_scrapnotice set delete_tag = 1 where id = ?")
-@Where(clause = "delete_tag = 0")
 @Table(name = "dev_scrapnotice")
 public class DevScrapnotice {
 

src/main/java/com/example/removetolocal/oldrepel/entity/DevScrapnoticeUnit.java

@@ -19,7 +19,6 @@ import org.springframework.data.annotation.LastModifiedDate;
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 @SQLDelete(sql = "update dev_scrapnotice_unit set delete_tag = 1 where id = ?")
-@Where(clause = "delete_tag = 0")
 @Table(name = "dev_scrapnotice_unit")
 public class DevScrapnoticeUnit {
 

src/main/java/com/example/removetolocal/oldtrain/DevTrain.java

@@ -67,7 +67,7 @@ public class DevTrain {
 	* 培训状态：1.报名中 2.截止报名 3.结束 4.撤销
 	*/
 	@Column(name = "status")
-	private Boolean status;
+	private Integer status;
 	/**
 	* 创建用户
 	*/
@@ -122,7 +122,7 @@ public class DevTrain {
 				null,
 				null,
 				null,
-				Integer.valueOf(String.valueOf(passScore)),
+				passScore.intValue(),
 				null,
 				null,
 				null,

src/main/java/com/example/removetolocal/service/impl/AllotServiceImpl.java

@@ -68,6 +68,7 @@ public class AllotServiceImpl implements AllotService {
                 }
                 if (devAllot.getSendConfirmUser()!=null) {
                     allotBill.setSendUserbId(userService.getUserByOldId(devAllot.getSendConfirmUser()).getUserId());
+                    allotBill.setAgent(userService.getUserByOldId(devAllot.getSendConfirmUser()).getName());
                 }
                 if (devAllot.getHandleUser()!=null) {
                     if (userService.getUserByOldId(devAllot.getHandleUser())!=null) {
@@ -149,9 +150,9 @@ public class AllotServiceImpl implements AllotService {
                 if (devBack.getSendUser()!=null) {
                     allotBill.setSendUseraId(userService.getUserByOldId(devBack.getSendUser()).getUserId());
                 }
-//                if (devBack.getSendConfirmUser()!=null) {
-//                    allotBill.setSendUserbId(userService.getUserByOldId(devBack.getSendConfirmUser()).getUserId());
-//                }
+                if (devBack.getSendConfirmUser()!=null) {
+                    allotBill.setAgent(userService.getUserByOldId(devBack.getSendConfirmUser()).getName());
+                }
                 if (devBack.getHandleUser()!=null) {
                     if (userService.getUserByOldId(devBack.getHandleUser())!=null) {
                         allotBill.setReceiveUseraId(userService.getUserByOldId(devBack.getHandleUser()).getUserId());
@@ -189,7 +190,7 @@ public class AllotServiceImpl implements AllotService {
 //                allotBill.setAllotType(2);
                 allotBill.setBackStatus(3);
                 List<Integer> deviceIds = new ArrayList<>();
-                devAllotDetailDao.findAllByAllotId(devBack.getId()).forEach(devAllotDetail -> deviceIds.add(deviceLibraryDao.findByOldId(devAllotDetail.getDevId()).getId()));
+                devBackDetailDao.findAllByBackId(devBack.getId()).forEach(devBackdetail -> deviceIds.add(deviceLibraryDao.findByOldId(devBackdetail.getDevId()).getId()));
                 allotBill.setBackCheckDetail(StringSplitUtil.idListToCheckString(deviceIds));
                 allotBill.setReceiveCheckDetail(allotBill.getBackCheckDetail());
                 AllotBackBill allotBill1 = allotBackBillDao.save(allotBill);

src/main/java/com/example/removetolocal/service/impl/MysqlToSTServiceImpl.java

@@ -10,6 +10,14 @@ import com.example.removetolocal.newdevice.domin.DeviceLibrary;
 import com.example.removetolocal.newdevice.domin.DeviceLog;
 import com.example.removetolocal.newdevice.domin.PackingLibrary;
 import com.example.removetolocal.newentity.dao.*;
+import com.example.removetolocal.newrepair.dao.RepairBackBillDao;
+import com.example.removetolocal.newrepair.dao.RepairBillDao;
+import com.example.removetolocal.newrepair.dao.RepairDetailDao;
+import com.example.removetolocal.newrepair.dao.RepairSendBillDao;
+import com.example.removetolocal.newrepair.entity.RepairBackBill;
+import com.example.removetolocal.newrepair.entity.RepairBill;
+import com.example.removetolocal.newrepair.entity.RepairDetail;
+import com.example.removetolocal.newrepair.entity.RepairSendBill;
 import com.example.removetolocal.newselfcheck.dao.SelfCheckBillDao;
 import com.example.removetolocal.newselfcheck.entity.SelfCheckBill;
 import com.example.removetolocal.newstorage.dao.StorageBillDao;
@@ -67,6 +75,14 @@ public class MysqlToSTServiceImpl implements MysqlToSTService {
     @Autowired
     UserRoleDao userRoleDao;
     @Autowired
+    RepairBillDao repairBillDao;
+    @Autowired
+    RepairSendBillDao repairSendBillDao;
+    @Autowired
+    RepairBackBillDao repairBackBillDao;
+    @Autowired
+    RepairDetailDao repairDetailDao;
+    @Autowired
     com.example.removetolocal.newdevice.dao.DeviceLibraryDao deviceLibraryDao;
     @Autowired
     com.example.removetolocal.newdevice.dao.PackingLibraryDao packingLibraryDao;
@@ -105,6 +121,14 @@ public class MysqlToSTServiceImpl implements MysqlToSTService {
     NewUserRoleDao newUserRoleDao;
     @Autowired
     NewAllotBackBillDao newAllotBackBillDao;
+    @Autowired
+    NewRepairBillDao newRepairBillDao;
+    @Autowired
+    NewRepairSendBillDao newRepairSendBillDao;
+    @Autowired
+    NewRepairDetailDao newRepairDetailDao;
+    @Autowired
+    NewRepairBackBillDao newRepairBackBillDao;
 
     @Override
     public void dbToDb() {
@@ -136,6 +160,14 @@ public class MysqlToSTServiceImpl implements MysqlToSTService {
         log.info("task_log表迁移成功");
         userRoleToSt();
         log.info("user_role表迁移成功");
+        repairBillToSt();
+        log.info("repair_bill表迁移成功");
+        repairSendBillToSt();
+        log.info("repair_send_bill表迁移成功");
+        repairBackBillToSt();
+        log.info("repair_back_bill表迁移成功");
+        repairDetailToSt();
+        log.info("repair_detail表迁移成功");
     }
 
     private void userRoleToSt(){
@@ -193,4 +225,20 @@ public class MysqlToSTServiceImpl implements MysqlToSTService {
     private void allotBackBillToSt(){
         newAllotBackBillDao.saveAll(allotBackBillDao.findAll().stream().map(AllotBackBill::toST).collect(Collectors.toList()));
     }
+
+    private void repairBillToSt(){
+        newRepairBillDao.saveAll(repairBillDao.findAll().stream().map(RepairBill::toST).collect(Collectors.toList()));
+    }
+
+    private void repairSendBillToSt(){
+        newRepairSendBillDao.saveAll(repairSendBillDao.findAll().stream().map(RepairSendBill::toST).collect(Collectors.toList()));
+    }
+
+    private void repairBackBillToSt(){
+        newRepairBackBillDao.saveAll(repairBackBillDao.findAll().stream().map(RepairBackBill::toST).collect(Collectors.toList()));
+    }
+
+    private void repairDetailToSt(){
+        newRepairDetailDao.saveAll(repairDetailDao.findAll().stream().map(RepairDetail::toST).collect(Collectors.toList()));
+    }
 }

src/main/java/com/example/removetolocal/service/impl/RepelServiceImpl.java

@@ -106,7 +106,7 @@ public class RepelServiceImpl implements RepelService {
         devScrapnoticeDao.findAll().stream().filter(devScrapnotice -> devScrapnotice.getStatus()==3).forEach(
                 devScrapnotice -> {
                 DeviceRepel deviceRepel1= devScrapnotice.toDeviceRepel();
-                deviceRepel1.setUnitName(userService.getUnitNameByOldId(devScrapnotice.getApplyUser()));
+                deviceRepel1.setUnitName(userService.getUnitNameByOldId(devScrapnotice.getApplyUnit()));
                 List<Integer> integers = StringUtils.stringToList(devScrapnotice.getCatalogIds());
                 List<PackingLibrary> packingLibraries= packingLibraryDao.findAllByOldIdIn(integers);
                 deviceRepel1.setFielding(StringUtils.ListToString(packingLibraries.stream().map(PackingLibrary::getId).collect(Collectors.toList())));
@@ -122,7 +122,11 @@ public class RepelServiceImpl implements RepelService {
                 List<RepelTaskStatistical> list=new ArrayList<>();
                 devScrapnoticeUnitList.stream().filter(devScrapnoticeUnit -> devScrapnoticeUnit.getStatus()==4).forEach(
                         devScrapnoticeUnit -> {
-                            DevScrap devScrap= devScrapDao.findByNoticeIdAndStatus(devScrapnoticeUnit.getId(),4);
+                            List<DevScrap> devScraps= devScrapDao.findAllByNoticeIdAndStatus(devScrapnoticeUnit.getId(),4);
+                            if (devScraps.size()==0){
+                                return;
+                            }
+                            DevScrap devScrap = devScraps.get(0);
                            //发起单位
                             if (devScrap.getApplyUnit()== null){
                                 log.info("{},ApplyUnit数据为空",devScrap.getId());
@@ -229,7 +233,7 @@ public class RepelServiceImpl implements RepelService {
 
     private Task toTask27(Integer id1,Integer id2){
         //task转换
-        DevTaskmain devTaskmain = devTaskmainDao.findByTypeAndResourceId(27,id1);
+        DevTaskmain devTaskmain = devTaskmainDao.findByTypeAndResourceId(25,id1);
         if (devTaskmain.getIsComplete()==1||devTaskmain.getIsSeal()==1) {
             TaskBto taskBto = devTaskmain.parseToTaskBto();
             taskBto.setBillId(id2);

src/main/java/com/example/removetolocal/service/impl/StorageServiceImpl.java

 package com.example.removetolocal.service.impl;
 
-import com.example.removetolocal.newentity.entity.StorageBill;
+import com.example.removetolocal.newstorage.entity.StorageBill;
 import com.example.removetolocal.newstorage.dao.StorageBillDao;
 import com.example.removetolocal.newstorage.dao.TaskDao;
 import com.example.removetolocal.newstorage.dao.TaskLogDao;

src/main/java/com/example/removetolocal/service/impl/TrainServiceImpl.java

@@ -22,6 +22,7 @@ import com.example.removetolocal.oldtrain.dao.DevTrainEnrollDao;
 import com.example.removetolocal.service.TrainService;
 import com.example.removetolocal.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,6 +33,7 @@ import java.util.List;
  * @Date 2020/12/25 下午3:39
  * @Version 1.0
  */
+@Service
 public class TrainServiceImpl implements TrainService {
     @Autowired
     TrainThemeDao trainThemeDao;
@@ -63,12 +65,18 @@ public class TrainServiceImpl implements TrainService {
         devTrainDao.findAllByStatus(3).forEach(
                 devTrain -> {
                   TrainTheme trainTheme=devTrain.toTrainTheme();
-                  User user= userService.getUserByOldId(devTrain.getCreateuser());
+                  User user;
+                  if (devTrain.getCreateuser()==null){
+                      user= userService.getUserByOldId(devTrain.getUpdateuser());
+                  }
+                  else {
+                      user = userService.getUserByOldId(devTrain.getCreateuser());
+                  }
                   trainTheme.setOriginatorId(user.getUserId());
                   trainTheme.setOriginatorName(user.getName());
-                  Units units= userService.getUnitByOldId(devTrain.getHost());
+                  Units units= userService.getUnitByOldId(devTrain.getCreateOrg());
                   trainTheme.setUnitsId(units.getUnitId());
-                  trainTheme.setUnitsName(units.getName());
+                  trainTheme.setUnitsName(devTrain.getHost());
                   trainTheme.setTrainStatus(9999);
                   TrainTheme trainTheme1= trainThemeDao.save(trainTheme);
                   trainUserDaoDcToNew(devTrain.getId(),trainTheme1.getTrainId());
@@ -79,7 +87,8 @@ public class TrainServiceImpl implements TrainService {
 
     private void toTask18(Integer id1, Integer id2){
         //task转换
-        DevTaskmain devTaskmain = devTaskmainDao.findByTypeAndResourceId(18,id1);
+        List<DevTaskmain> devTaskmains = devTaskmainDao.findAllByTypeAndResourceId(18,id1);
+        DevTaskmain devTaskmain = devTaskmains.get(devTaskmains.size()-1);
         if (devTaskmain.getIsComplete()==1||devTaskmain.getIsSeal()==1) {
             TaskBto taskBto = devTaskmain.parseToTaskBto();
             taskBto.setBillId(id2);

src/main/java/com/example/removetolocal/task/changeRun.java

@@ -30,6 +30,15 @@ public class changeRun implements CommandLineRunner {
     @Autowired
     AllotService allotService;
 
+    @Autowired
+    RepelService repelService;
+
+    @Autowired
+    TrainService trainService;
+
+    @Autowired
+    RepairService repairService;
+
     /**
      * Callback used to run the bean.
      *
@@ -53,6 +62,14 @@ public class changeRun implements CommandLineRunner {
         log.info("配发业务数据迁移完成");
         allotService.moveBack();
         log.info("退回业务数据迁移完成");
+        repelService.repelDataConversion();
+        log.info("清退业务数据迁移完成");
+        trainService.trainDcToNew();
+        log.info("培训业务数据迁移完成");
+        repairService.moveRepair();
+        log.info("送修业务数据迁移完成");
+        repairService.moveRepairBack();
+        log.info("维修领取业务数据迁移完成");
         mysqlToSTService.dbToDb();
         log.info("数据全部迁移成功！");
     }