[添加了所有实体以及dao]

src/main/java/com/example/removetolocal/newdevice/dao/DeviceLibraryDao.java

@@ -16,6 +16,8 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
 
     DeviceLibrary findByOldId(Integer oldId);
 
+    List<DeviceLibrary> findAllByOldIdIn(List<Integer> oldIn);
+
     List<DeviceLibrary> getAllByModel(String model);
 
     List<DeviceLibrary> getAllByOwnUnit(String unit);

src/main/java/com/example/removetolocal/newdevice/dao/PackingLibraryDao.java

@@ -15,5 +15,7 @@ public interface PackingLibraryDao extends JpaRepository<PackingLibrary, Integer
 
     PackingLibrary findByOldId(Integer oldId);
 
+    List<PackingLibrary> findAllByOldIdIn(List<Integer> olds);
+
     List<PackingLibrary> findAllByIsRoot(Integer isRoot);
 }

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

@@ -109,4 +109,23 @@ public class TrainUser {
 	@Column(name = "user_id")
 	private Integer userId;
 
+
+	public TrainUser(Integer trainId, Integer userId, String name, String mobile, String idCard, Integer sex, Integer position, String unitsName, Integer unitsId, String attendance, String score, String evaluation, Integer isSignUp, String note, Integer certificate, Integer isNotJoinUserId) {
+		this.trainId = trainId;
+		this.userId = userId;
+		this.name = name;
+		this.mobile = mobile;
+		this.idCard = idCard;
+		this.sex = sex;
+		this.position = position;
+		this.unitsName = unitsName;
+		this.unitsId = unitsId;
+		this.attendance = attendance;
+		this.score = score;
+		this.evaluation = evaluation;
+		this.isSignUp = isSignUp;
+		this.note = note;
+		this.certificate = certificate;
+		this.isNotJoinUserId = isNotJoinUserId;
+	}
 }

src/main/java/com/example/removetolocal/newrepel/dao/DeviceRepelDao.java

+package com.example.removetolocal.newrepel.dao;
+
+import com.example.removetolocal.newrepel.entity.DeviceRepel;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface DeviceRepelDao extends JpaRepository<DeviceRepel, Integer>, JpaSpecificationExecutor<DeviceRepel> {
+}

src/main/java/com/example/removetolocal/newrepel/dao/DeviceRepelDetailDao.java

+package com.example.removetolocal.newrepel.dao;
+
+import com.example.removetolocal.newrepel.entity.DeviceRepelDetail;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.Date;
+import java.util.List;
+
+public interface DeviceRepelDetailDao extends JpaRepository<DeviceRepelDetail, Integer>, JpaSpecificationExecutor<DeviceRepelDetail> {
+ List<DeviceRepelDetail> findAllBySendTimeBetweenAndSendUnitIdAndRepelStatus(Date time,Date endTime, Integer unitId, Integer repelStatus);
+}

src/main/java/com/example/removetolocal/newrepel/dao/RepelDeviceUnitDao.java

+package com.example.removetolocal.newrepel.dao;
+
+import com.example.removetolocal.newrepel.entity.RepelDeviceUnit;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName RepelDeviceUnitDao.java
+ * @Description TODO
+ * @createTime 2021年01月10日 10:40:00
+ */
+public interface RepelDeviceUnitDao  extends JpaRepository<RepelDeviceUnit, Integer>, JpaSpecificationExecutor<RepelDeviceUnit> {
+
+    List<RepelDeviceUnit> findAllByUnitsId(Integer unitId);
+}

src/main/java/com/example/removetolocal/newrepel/dao/RepelTaskStatisticalDao.java

+package com.example.removetolocal.newrepel.dao;
+
+import com.example.removetolocal.newrepel.entity.RepelTaskStatistical;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface RepelTaskStatisticalDao extends JpaRepository<RepelTaskStatistical, Integer>, JpaSpecificationExecutor<RepelTaskStatistical> {
+    List<RepelTaskStatistical>  findAllByFatherTaskIdAndAndRepelId(Integer fatherId,Integer repelId);
+
+    RepelTaskStatistical findByTaskIdAndAndRepelId(Integer taskId,Integer repelId);
+}

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

+package com.example.removetolocal.newrepel.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+/**
+ * BaseEntity.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2020/9/27 at 1:25 上午
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+@Where(clause = "delete_tag = 0")
+public class BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
+//    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    private Integer id;
+
+    /**
+     * 创建用户id
+     */
+    @CreatedBy
+    private Integer createUserId;
+
+    /**
+     * 更新用户id
+     */
+    @LastModifiedBy
+    private Integer updateUserId;
+
+    /**
+     * 创建时间
+     */
+    @CreatedDate
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @LastModifiedDate
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标记(0:未删除，1:已删除)
+     */
+    private Integer deleteTag = 0;
+}

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

+package com.example.removetolocal.newrepel.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.hibernate.annotations.SQLDelete;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName DeviceRepel.java
+ * @Description DeviceRepel 清退业务id
+ * @createTime 2021年01月06日 20:02:00
+ */
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@SQLDelete(sql = "update device_check_bill set delete_tag = 1 where id = ?")
+public class DeviceRepel extends BaseEntity {
+    /**
+     * 数据id
+     */
+    @Id
+    @GeneratedValue
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    private Integer id;
+
+    /**
+     * 清退标题
+     */
+    private String title;
+    /**
+     * 类型集合多个列装id
+     * 页面类型
+     */
+    @Column(name = "fielding",columnDefinition = "TEXT")
+    private String fielding;
+
+    /**
+     * 描述
+     */
+    @Column(name = "describes",columnDefinition = "TEXT")
+    private String describes;
+
+    /**
+     * 任务范围
+     *
+     */
+    @Column(name = "task_scope",columnDefinition = "TEXT")
+    private String taskScope;
+
+    /**
+     *征文
+     *
+     */
+    @Column(name = "files",columnDefinition = "TEXT")
+    private String files;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date time;
+
+    /**
+     * 清退状态
+     * 1。全量清退 2。部分清退
+     */
+    private Integer repelStatus;
+
+    /**
+     * 发起人名称
+     */
+    private String initiateName;
+
+    /**
+     * 发起单位
+     */
+    private String unitName;
+
+    /**
+     * 发起单位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) {
+        this.title = title;
+        this.fielding = fielding;
+        this.describes = describes;
+        this.taskScope = taskScope;
+        this.files = files;
+        this.time = time;
+        this.repelStatus = repelStatus;
+        this.initiateName = initiateName;
+        this.unitName = unitName;
+        this.unitId = unitId;
+    }
+}

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

+package com.example.removetolocal.newrepel.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName DeviceRepel.java
+ * @Description DeviceRepel 清退业务id
+ * @createTime 2021年01月06日 20:02:00
+ */
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+public class DeviceRepelDetail extends BaseEntity {
+    /**
+     * 主键id
+     */
+    @Id
+    @GeneratedValue
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    private Integer id;
+
+    /**
+     * 账单id
+     */
+    private Integer repelId;
+
+    /**
+     * 编号
+     */
+    private String num;
+
+    /**
+     * 申请文号
+     */
+    private String applyNumber;
+    /**
+     * 批复文号
+     */
+    private String replayNumber;
+    /**
+     * 发件单位
+     */
+    private String sendUnit;
+
+    /**
+     * 发件单位id
+     */
+    private Integer sendUnitId;
+
+    /**
+     * 收件单位id
+     */
+    private Integer receiveUnitId;
+    /**
+     * 收件单位
+     */
+    private String receiveUnit;
+    /**
+     * 配发时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date sendTime;
+    /**
+     * 接收时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date receiveTime;
+    /**
+     * 经办人
+     */
+    private Integer sendUserAId;
+
+    /**
+     * 经办人 名称
+     */
+    private String sendUserAName;
+
+    /**
+     * 签发人
+     */
+    private String sendUserBName;
+
+    /**
+     * 签发人 id
+     */
+    private Integer sendUserBId;
+
+    /**
+     * 收件方 经办人
+     */
+    private Integer receiveUserAId;
+
+    /**
+     * 收件方 经办人名称
+     */
+    private String receiveUserAName;
+
+    /**
+     * 收件方id(B岗位)
+     */
+    private String receiveUserBName;
+    /**
+     * 收件方id(B岗位)
+     */
+    private Integer receiveUserBId;
+
+    /**
+     * 出库附件文件
+     */
+    @Column(name = "outbound_file",columnDefinition = "TEXT")
+    private String outboundFile;
+
+    /**
+     * 清退单文件
+     */
+    @Column(name = "bill_file",columnDefinition = "TEXT")
+    private String billFile;
+
+    /**
+     * 入库确认单
+     */
+    @Column(name = "in_file",columnDefinition = "TEXT")
+    private String inFile;
+
+    /**
+     * 退回状态(1:退回待审核,2:退回审核失败,3:退回中,4:退回接收待审核,5:退回接收审核失败,6:退回成功)
+     */
+    private Integer sendBackStatus;
+    /**
+     * 退回装备数量
+     */
+    private Integer sendBackCount;
+    /**
+     * 已出库装备数量
+     */
+    private Integer sendedCount;
+    /**
+     * 已接收装备数量
+     */
+    private Integer receiveCount;
+    /**
+     * 出库检查详情(装备主键id+核对结果(0缺失1无误3新增,字符x作为分隔符)),例如x10x21x32x,意为主键id为1的装备缺失,为2的无误,为3的不匹配
+     */
+    @Column(name = "send_check_detail",columnDefinition = "TEXT")
+    private String sendCheckDetail;
+    /**
+     * 出库检查结果(缺失数量x新增数量),例如1x1,意为缺失1台,新增一条
+     */
+    @Column(name = "send_check_result",columnDefinition = "TEXT")
+    private String sendCheckResult;
+
+    /**
+     * 接收方入库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如x10x21x32x,意为主键id为1的装备缺失,为2的无误,为3的不匹配
+     */
+    @Column(name = "receive_check_detail",columnDefinition = "TEXT")
+    private String receiveCheckDetail;
+
+    /**
+     * 接收方检查结果(缺失数量x新增数量),例如1x1,意为缺失1台,新增一条
+     */
+    @Column(name = "receive_check_result",columnDefinition = "TEXT")
+    private String receiveCheckResult;
+
+    @Column(name = "device_ids",columnDefinition = "TEXT")
+    private String deviceIds;
+
+    private String leftSignatureId;
+
+    private String rightSignatureId;
+
+    private String recordId;
+
+    /**
+     * 提交描述
+     */
+    @Column(name = "submit_description",columnDefinition = "TEXT")
+    private String submitDescription;
+    /**
+     * 审核反馈
+     */
+    @Column(name = "auditing_feedback",columnDefinition = "TEXT")
+    private String auditingFeedback;
+
+    private Integer repelStatus;
+
+
+    public DeviceRepelDetail(Integer repelId, String num, String applyNumber, String replayNumber, String sendUnit, Integer sendUnitId, Integer receiveUnitId, String receiveUnit, Date sendTime, Date receiveTime, Integer sendUserAId, String sendUserAName, String sendUserBName, Integer receiveUserAId, String receiveUserAName, String receiveUserBName, Integer receiveUserBId, String outboundFile, String billFile, String inFile, Integer sendBackStatus, Integer sendBackCount, Integer sendedCount, Integer receiveCount, String sendCheckDetail, String sendCheckResult, String receiveCheckDetail, String receiveCheckResult, String deviceIds, String leftSignatureId, String rightSignatureId, String recordId, String submitDescription, String auditingFeedback, Integer repelStatus) {
+        this.repelId = repelId;
+        this.num = num;
+        this.applyNumber = applyNumber;
+        this.replayNumber = replayNumber;
+        this.sendUnit = sendUnit;
+        this.sendUnitId = sendUnitId;
+        this.receiveUnitId = receiveUnitId;
+        this.receiveUnit = receiveUnit;
+        this.sendTime = sendTime;
+        this.receiveTime = receiveTime;
+        this.sendUserAId = sendUserAId;
+        this.sendUserAName = sendUserAName;
+        this.sendUserBName = sendUserBName;
+        this.receiveUserAId = receiveUserAId;
+        this.receiveUserAName = receiveUserAName;
+        this.receiveUserBName = receiveUserBName;
+        this.receiveUserBId = receiveUserBId;
+        this.outboundFile = outboundFile;
+        this.billFile = billFile;
+        this.inFile = inFile;
+        this.sendBackStatus = sendBackStatus;
+        this.sendBackCount = sendBackCount;
+        this.sendedCount = sendedCount;
+        this.receiveCount = receiveCount;
+        this.sendCheckDetail = sendCheckDetail;
+        this.sendCheckResult = sendCheckResult;
+        this.receiveCheckDetail = receiveCheckDetail;
+        this.receiveCheckResult = receiveCheckResult;
+        this.deviceIds = deviceIds;
+        this.leftSignatureId = leftSignatureId;
+        this.rightSignatureId = rightSignatureId;
+        this.recordId = recordId;
+        this.submitDescription = submitDescription;
+        this.auditingFeedback = auditingFeedback;
+        this.repelStatus = repelStatus;
+    }
+}

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

+package com.example.removetolocal.newrepel.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName DeviceRepel.java
+ * @Description
+ * @createTime 2021年01月10日 10:34:00
+ */
+@Data
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@EntityListeners(AuditingEntityListener.class)
+public class RepelDeviceUnit {
+    @Id
+    @GeneratedValue
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    private Integer id;
+
+    private Integer deviceId;
+
+    private Integer unitsId;
+
+    public RepelDeviceUnit(Integer deviceId, Integer unitsId) {
+        this.deviceId = deviceId;
+        this.unitsId = unitsId;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public  Integer getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(Integer deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Integer getUnitsId() {
+        return unitsId;
+    }
+
+    public void setUnitsId(Integer unitsId) {
+        this.unitsId = unitsId;
+    }
+}

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

+package com.example.removetolocal.newrepel.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName RepelTaskStatistical.java
+ * @Description TODO
+ * @createTime 2021年01月07日 09:35:00
+ */
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@NoArgsConstructor
+@AllArgsConstructor
+public class RepelTaskStatistical extends BaseEntity {
+    /**
+     * 数据id
+     */
+    @Id
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    private  Integer id;
+
+    /**
+     * repelId
+     */
+    private Integer repelId;
+    /**
+     * 父类taskId
+     */
+    private Integer fatherTaskId;
+
+    /**
+     * taskId
+     */
+    private Integer taskId;
+
+    /**
+     * 任务状态 1.正常提交 2.延期 3.等待审核
+     */
+    private Integer taskStatus;
+
+    /**
+     * 区域名称
+     */
+    private String  areaName;
+
+    /**
+     * 提交的型号和数量 json存储modelCount对象
+     */
+    @Column(name = "model_count",columnDefinition = "TEXT")
+    private String  modelCount;
+
+    /**
+     * 描述
+     */
+    @Column(name = "des",columnDefinition = "TEXT")
+    private String des;
+
+
+    public RepelTaskStatistical(Integer repelId, Integer fatherTaskId, Integer taskId, Integer taskStatus, String areaName) {
+        this.repelId = repelId;
+        this.fatherTaskId = fatherTaskId;
+        this.taskId = taskId;
+        this.taskStatus = taskStatus;
+        this.areaName = areaName;
+    }
+
+    public RepelTaskStatistical(Integer repelId, Integer fatherTaskId, Integer taskId, Integer taskStatus, String areaName, String modelCount, String des) {
+        this.repelId = repelId;
+        this.fatherTaskId = fatherTaskId;
+        this.taskId = taskId;
+        this.taskStatus = taskStatus;
+        this.areaName = areaName;
+        this.modelCount = modelCount;
+        this.des = des;
+    }
+}

src/main/java/com/example/removetolocal/newrepel/package-info.java

+package com.example.removetolocal.newrepel;
\ No newline at end of file

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

@@ -26,94 +26,107 @@ public class TrainUser {
 	@Column(name = "id")
 	private Integer id;
 	/**
-	* attendance
+	* 考勤
 	*/
 	@Column(name = "attendance")
 	private String attendance;
 	/**
-	* certificate
+	* 是否发证
 	*/
 	@Column(name = "certificate")
 	private Integer certificate;
 	/**
-	* evaluation
+	* 评价
 	*/
 	@Column(name = "evaluation")
 	private String evaluation;
 	/**
-	* idCard
+	* 身份证
 	*/
 	@Column(name = "id_card")
 	private String idCard;
 	/**
-	* isNotJoinUserId
+	* 是否必须报名
 	*/
 	@Column(name = "is_not_join_user_id")
 	private Integer isNotJoinUserId;
 	/**
-	* isSignUp
+	* 是否报名
 	*/
 	@Column(name = "is_sign_up")
 	private Integer isSignUp;
 	/**
-	* mobile
+	* 手机
 	*/
 	@Column(name = "mobile")
 	private String mobile;
 	/**
-	* name
+	* 姓名
 	*/
 	@Column(name = "name")
 	private String name;
 	/**
-	* note
+	* 备注
 	*/
 	@Column(name = "note")
 	private String note;
 	/**
-	* position
+	* 职务
 	*/
 	@Column(name = "position")
 	private Integer position;
 	/**
-	* recordId
+	* 区块链id
 	*/
 	@Column(name = "record_id")
 	private String recordId;
 	/**
-	* score
+	* 分数
 	*/
 	@Column(name = "score")
 	private String score;
 	/**
-	* sex
+	* 性别
 	*/
 	@Column(name = "sex")
 	private Integer sex;
 	/**
-	* trainId
+	* 培训id
 	*/
 	@Column(name = "train_id")
 	private Integer trainId;
 	/**
-	* unitsId
+	* 单位id
 	*/
 	@Column(name = "units_id")
 	private Integer unitsId;
 	/**
-	* unitsName
+	* 单位名称
 	*/
 	@Column(name = "units_name")
 	private String unitsName;
 	/**
-	* userId
+	* 用户id
 	*/
 	@Column(name = "user_id")
 	private Integer userId;
-
-	public com.example.removetolocal.newentity.entity.TrainUser toST() {
-		ModelMapper mapper = BeanHelper.getUserMapper();
-		return mapper.map(this, com.example.removetolocal.newentity.entity.TrainUser.class);
+	public TrainUser(Integer trainId, Integer userId, String name, String mobile, String idCard, Integer sex, Integer position, String unitsName, Integer unitsId, String attendance, String score, String evaluation, Integer isSignUp, String note, Integer certificate, Integer isNotJoinUserId) {
+		this.trainId = trainId;
+		this.userId = userId;
+		this.name = name;
+		this.mobile = mobile;
+		this.idCard = idCard;
+		this.sex = sex;
+		this.position = position;
+		this.unitsName = unitsName;
+		this.unitsId = unitsId;
+		this.attendance = attendance;
+		this.score = score;
+		this.evaluation = evaluation;
+		this.isSignUp = isSignUp;
+		this.note = note;
+		this.certificate = certificate;
+		this.isNotJoinUserId = isNotJoinUserId;
 	}
 
 }

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

@@ -137,6 +137,8 @@ public class DevTaskmain {
 			case 28:
 				taskBto.setBusinessType(21);
 				break;
+			case 26:
+				taskBto.setBusinessType(16);
 			default:break;
 		}
 		taskBto.setTitle(this.title);

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

+package com.example.removetolocal.oldrepel.dao;
+
+import com.example.removetolocal.oldrepel.entity.DevScrap;
+import com.example.removetolocal.oldrepel.entity.DevScrapnoticeUnit;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface DevScrapDao  extends JpaRepository<DevScrap,Integer> {
+    DevScrap findByNoticeIdAndStatus(Integer noticeId,Integer status);
+}

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

+package com.example.removetolocal.oldrepel.dao;
+
+import com.example.removetolocal.oldrepel.entity.DevScrapDetail;
+import com.example.removetolocal.oldrepel.entity.DevScrapnoticeUnit;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface DevScrapDetailDao  extends JpaRepository<DevScrapDetail,Integer> {
+}

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

+package com.example.removetolocal.oldrepel.dao;
+
+import com.example.removetolocal.oldrepel.entity.DevScrapnotice;
+import com.example.removetolocal.oldrepel.entity.DevScrapnoticeUnit;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface DevScrapnoticeDao  extends JpaRepository<DevScrapnotice,Integer> {
+}

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

+package com.example.removetolocal.oldrepel.dao;
+
+import com.example.removetolocal.oldentity.DevInstorage;
+import com.example.removetolocal.oldrepel.entity.DevScrapnoticeUnit;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface DevScrapnoticeUnitDao extends JpaRepository<DevScrapnoticeUnit,Integer> {
+    List<DevScrapnoticeUnit> findAllByNoticeId(Integer noticeId);
+}

src/main/java/com/example/removetolocal/oldrepel/entity/vo/ModelCount.java

+package com.example.removetolocal.oldrepel.entity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName Model.java
+ * @Description TODO
+ * @createTime 2021年01月07日 09:41:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ModelCount {
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 数量
+     */
+    private Integer count;
+}

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

 package com.example.removetolocal.oldtrain;
 
+import com.example.removetolocal.newtrain.entity.TrainUser;
 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 dev_train_enroll
@@ -66,7 +59,7 @@ public class DevTrainEnroll {
 	* 状态:1.任务未读 2.已报名 3.忽略报名 4.参加考试 5.缺席考试
 	*/
 	@Column(name = "status")
-	private Boolean status;
+	private Integer status;
 	/**
 	* 报名时间
 	*/
@@ -78,4 +71,5 @@ public class DevTrainEnroll {
 	@Column(name = "score")
 	private Double score;
 
+
 }

src/main/java/com/example/removetolocal/oldtrain/dao/DevTrainDao.java

@@ -4,8 +4,11 @@ import com.example.removetolocal.oldtrain.DevTrain;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 /**
  * @author dengdiyi
  */
 public interface DevTrainDao extends JpaRepository<DevTrain, Integer>, JpaSpecificationExecutor<DevTrain> {
+    List<DevTrain> findAllByStatus(Integer status);
 }

src/main/java/com/example/removetolocal/oldtrain/dao/DevTrainEnrollDao.java

@@ -4,8 +4,11 @@ import com.example.removetolocal.oldtrain.DevTrainEnroll;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 /**
  * @author dengdiyi
  */
 public interface DevTrainEnrollDao extends JpaRepository<DevTrainEnroll, Integer>, JpaSpecificationExecutor<DevTrainEnroll> {
+List<DevTrainEnroll> findAllByTrainId(Integer trainId);
 }

src/main/java/com/example/removetolocal/service/RepelService.java

+package com.example.removetolocal.service;
+
+public interface RepelService {
+    /**
+     * 清退数据迁
+     */
+    void repelDataConversion();
+}

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.dao.StorageBillDao;
 import com.example.removetolocal.newstorage.dao.TaskDao;
 import com.example.removetolocal.newstorage.dao.TaskLogDao;
-import com.example.removetolocal.newstorage.entity.StorageBill;
 import com.example.removetolocal.newdevice.dao.DeviceLibraryDao;
 import com.example.removetolocal.newstorage.bto.TaskBto;
 import com.example.removetolocal.newstorage.entity.Task;

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

 package com.example.removetolocal.service.impl;
 
+import com.example.removetolocal.newstorage.bto.TaskBto;
+import com.example.removetolocal.newstorage.dao.TaskDao;
+import com.example.removetolocal.newstorage.dao.TaskLogDao;
+import com.example.removetolocal.newstorage.entity.Task;
+import com.example.removetolocal.newstorage.entity.TaskLog;
 import com.example.removetolocal.newtrain.dao.TrainThemeDao;
 import com.example.removetolocal.newtrain.dao.TrainUserDao;
 import com.example.removetolocal.newtrain.entity.TrainTheme;
+import com.example.removetolocal.newtrain.entity.TrainUser;
 import com.example.removetolocal.newuser.domin.Units;
 import com.example.removetolocal.newuser.domin.User;
+import com.example.removetolocal.oldentity.DevTasklog;
+import com.example.removetolocal.oldentity.DevTaskmain;
+import com.example.removetolocal.oldentity.dao.DevTasklogDao;
+import com.example.removetolocal.oldentity.dao.DevTaskmainDao;
+import com.example.removetolocal.oldentity.dao.DevTaskoperaterDao;
+import com.example.removetolocal.oldtrain.DevTrainEnroll;
 import com.example.removetolocal.oldtrain.dao.DevTrainDao;
 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 java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author zjm
  * @Description TODO
@@ -28,9 +43,24 @@ public class TrainServiceImpl implements TrainService {
     DevTrainEnrollDao devTrainEnrollDao;
     @Autowired
     UserService userService;
+
+    @Autowired
+    DevTaskmainDao devTaskmainDao;
+    @Autowired
+    DevTaskoperaterDao devTaskoperaterDao;
+    @Autowired
+    TaskDao taskDao;
+    @Autowired
+    DevTasklogDao devTasklogDao;
+    @Autowired
+    TaskLogDao taskLogDao;
+
+    /**
+     * 只迁移已完成的状态 1.报名中 2.截止报名 3.结束 4.撤销',
+     */
     @Override
     public void trainDcToNew() {
-        devTrainDao.findAll().forEach(
+        devTrainDao.findAllByStatus(3).forEach(
                 devTrain -> {
                   TrainTheme trainTheme=devTrain.toTrainTheme();
                   User user= userService.getUserByOldId(devTrain.getCreateuser());
@@ -39,12 +69,77 @@ public class TrainServiceImpl implements TrainService {
                   Units units= userService.getUnitByOldId(devTrain.getHost());
                   trainTheme.setUnitsId(units.getUnitId());
                   trainTheme.setUnitsName(units.getName());
-
+                  trainTheme.setTrainStatus(9999);
                   TrainTheme trainTheme1= trainThemeDao.save(trainTheme);
+                  trainUserDaoDcToNew(devTrain.getId(),trainTheme1.getTrainId());
+                    toTask18(devTrain.getId(),trainTheme1.getTrainId());
+                }
+        );
+    }
 
+    private void toTask18(Integer id1, Integer id2){
+        //task转换
+        DevTaskmain devTaskmain = devTaskmainDao.findByTypeAndResourceId(18,id1);
+        if (devTaskmain.getIsComplete()==1||devTaskmain.getIsSeal()==1) {
+            TaskBto taskBto = devTaskmain.parseToTaskBto();
+            taskBto.setBillId(id2);
+            taskBto.setOldId(devTaskmain.getId());
+            Task task = taskDao.save(taskBto.toDo());
+            //添加业务日志
+            List<DevTasklog> devTasklogs = devTasklogDao.findAllByTaskId(devTaskmain.getId());
+            devTasklogs.forEach(devTasklog -> {
+                TaskLog taskLog = new TaskLog();
+                taskLog.setCreateTime(devTasklog.getOperateTime());
+                taskLog.setCreateUserId(userService.getUserByOldId(devTasklog.getOperater()).getUserId());
+                taskLog.setUpdateTime(taskLog.getCreateTime());
+                taskLog.setUpdateUserId(taskLog.getCreateUserId());
+                taskLog.setFileDetail("Ǵ");
+                taskLog.setRemark(devTasklog.getNote());
+                taskLog.setTaskId(task.getId());
+                taskLog.setOldId(devTasklog.getId());
+                taskLogDao.save(taskLog);
+            });
+        }
+    }
+
+    private void trainUserDaoDcToNew(Integer trainOldId,Integer newTrainId){
+        List<DevTrainEnroll> allByTrainId = devTrainEnrollDao.findAllByTrainId(trainOldId);
+        List<TrainUser> trainUsers=new ArrayList<>();
+        allByTrainId.forEach(
+//                状态:1.任务未读 2.已报名 3.忽略报名 4.参加考试 5.缺席考试
+                devTrainEnroll -> {
+                    TrainUser trainUser=new TrainUser();
+                    trainUser.setTrainId(newTrainId);
+                    User user=  userService.getUserByOldId(devTrainEnroll.getVmanagerId());
+                    trainUser.setUserId(user.getUserId());
+                    trainUser.setName(user.getName());
+                    if (devTrainEnroll.getStatus()==1 ||devTrainEnroll.getStatus()==3){
+                        trainUser.setAttendance("不参加培训");
+                        trainUser.setIsSignUp(2);
+                        trainUser.setCertificate(0);
+                    }else if (devTrainEnroll.getStatus()==5){
+                        trainUser.setAttendance("缺考");
+                        trainUser.setIsSignUp(1);
+                        trainUser.setCertificate(0);
+                    }else {
+                        trainUser.setAttendance("正常参加");
+                        trainUser.setIsSignUp(1);
+                        trainUser.setCertificate(1);
+                        trainUser.setScore(String.valueOf(devTrainEnroll.getScore()));
 
                     }
+                    trainUser.setIdCard(user.getIdCard());
+                    trainUser.setMobile(user.getMobile());
+                    trainUser.setPosition(user.getPosition());
+                    trainUser.setSex(user.getSex());
+                    Units units=userService.getUnitByOldId(devTrainEnroll.getOwnsup());
+                    trainUser.setUnitsName(units.getName());
+                    trainUser.setUnitsId(units.getUnitId());
+                    trainUser.setIsNotJoinUserId(2);
+                    trainUser.setEvaluation("");
+                    trainUsers.add(trainUser);
+                }
         );
-
+        trainUserDao.saveAll(trainUsers);
     }
 }

src/main/java/com/example/removetolocal/utils/JacksonUtil.java

+package com.example.removetolocal.utils;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * JacksonUtil.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2020/8/15 at 7:30 下午
+ */
+public final class JacksonUtil {
+    private static ObjectMapper objectMapper = new ObjectMapper();
+
+    static {
+        objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+    }
+
+    /**
+     * 使用泛型方法，把json字符串转换为相应的JavaBean对象。
+     * (1)转换为普通JavaBean：readValue(json,Student.class)
+     * (2)转换为List,如List<Student>,将第二个参数传递为Student
+     * [].class.然后使用Arrays.asList();方法把得到的数组转换为特定类型的List
+     */
+    public static <T> T readValue(String jsonStr, Class<T> valueType) {
+        if (objectMapper == null) {
+            objectMapper = new ObjectMapper();
+        }
+        try {
+            return objectMapper.readValue(jsonStr, valueType);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 转换为指定类型的集合
+     *
+     * @param jsonStr   待转换的json字符串
+     * @param valueType 指定类型的Class对象
+     * @return 指定类型的集合
+     */
+    public static <T> List<T> readValueToList(String jsonStr, Class<T> valueType) {
+        T[] arrays = readValue(jsonStr, new TypeReference<T[]>() {
+        });
+        List<T> list = Collections.emptyList();
+        if (arrays != null) {
+            list = Arrays.asList(arrays);
+        }
+        return list;
+    }
+
+    /**
+     * json数组转List
+     *
+     * @param jsonStr      待转换的json字符串
+     * @param valueTypeRef 指定类型的Class对象
+     * @return 指定类型的集合
+     */
+    public static <T> T readValue(String jsonStr, TypeReference<T> valueTypeRef) {
+        if (objectMapper == null) {
+            objectMapper = new ObjectMapper();
+        }
+        try {
+            return objectMapper.readValue(jsonStr, valueTypeRef);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 把JavaBean转换为json字符串
+     */
+    public static String toJSon(Object object) {
+        if (objectMapper == null) {
+            objectMapper = new ObjectMapper();
+        }
+
+        try {
+            return objectMapper.writeValueAsString(object);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+}

src/main/java/com/example/removetolocal/utils/StringUtils.java

+package com.example.removetolocal.utils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName StringUtils.java
+ * @Description TODO
+ * @createTime 2021年01月10日 16:20:00
+ */
+public class StringUtils {
+    public static String ListToString(List<Integer> idList){
+        StringBuffer stringBuffer=new StringBuffer();
+        idList.forEach(
+                i->stringBuffer.append(",").append(i)
+        );
+        return stringBuffer.toString();
+    }
+
+    public static List<Integer> stringToList(String idStirng){
+        if (idStirng!=null) {
+            List<String> idStringList = Arrays.asList(idStirng.split(","));
+            return idStringList.stream().filter(list2 -> !list2.equals("")).map(Integer::parseInt).collect(Collectors.toList());
+        }else {
+            return new ArrayList<>();
+        }
+        }
+}