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

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

+package com.example.removetolocal.oldrepel.entity;
+
+import com.example.removetolocal.newrepel.entity.DeviceRepelDetail;
+import lombok.Data;
+import javax.persistence.*;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
+
+/**
+ * entity class for dev_scrap
+ * 报废主表
+*/
+@Data
+@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 {
+
+	/**
+	* 主键
+	*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+	/**
+	* 通知id
+	*/
+	@Column(name = "noticeId")
+	private Integer noticeId;
+	/**
+	* applyDocNo
+	*/
+	@Column(name = "applyDocNo")
+	private String applyDocNo;
+	/**
+	* replyDocNo
+	*/
+	@Column(name = "replyDocNo")
+	private String replyDocNo;
+	/**
+	* 标题
+	*/
+	@Column(name = "title")
+	private String title;
+	/**
+	* 发起单位
+	*/
+	@Column(name = "applyUnit")
+	private String applyUnit;
+	/**
+	* 发起人
+	*/
+	@Column(name = "applyUser")
+	private String applyUser;
+	/**
+	* 发起确认人
+	*/
+	@Column(name = "applyConfirmUser")
+	private String applyConfirmUser;
+	/**
+	* 发起时间
+	*/
+	@Column(name = "applyTime")
+	private java.util.Date applyTime;
+	/**
+	* 收件单位
+	*/
+	@Column(name = "handleUnit")
+	private String handleUnit;
+	/**
+	* 收件人
+	*/
+	@Column(name = "handleUser")
+	private String handleUser;
+	/**
+	* 收件确认人
+	*/
+	@Column(name = "handleConfirmUser")
+	private String handleConfirmUser;
+	/**
+	* 收件时间
+	*/
+	@Column(name = "handleTime")
+	private java.util.Date handleTime;
+	/**
+	* 发送方附件
+	*/
+	@Column(name = "annex")
+	private String annex;
+	/**
+	* 接收方附件
+	*/
+	@Column(name = "HANDLEANNEX")
+	private String handleannex;
+	/**
+	* 状态 -1.退回 0.删除失效 1.待确认 4.完成
+	*/
+	@Column(name = "status")
+	private Integer status;
+	/**
+	* 应报废总量
+	*/
+	@Column(name = "total")
+	private Integer total;
+	/**
+	* 实报废总量
+	*/
+	@Column(name = "realTotal")
+	private Integer realTotal;
+	/**
+	* 报废单pdf文件id
+	*/
+	@Column(name = "billFileid")
+	private Integer billFileid;
+	/**
+	* 是否已确认
+	*/
+	@Column(name = "isConfirm")
+	private Integer isConfirm;
+	/**
+	* 是否已下发通知
+	*/
+	@Column(name = "isNotice")
+	private Integer isNotice;
+
+	public DeviceRepelDetail toDeviceRepelDetail(){
+		//为null的需要set进来 具体看字段
+		return new DeviceRepelDetail(null,applyDocNo,null,replyDocNo,null,null,null,null,applyTime,handleTime,null,null,null,null,null,null,null,null,null,null,6,total,total,total,null,null,null,null,null,null,null,null,null,null,1);
+	}
+
+}

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

+package com.example.removetolocal.oldrepel.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 dev_scrap_detail
+ * 报废详情表
+*/
+@Data
+@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 {
+
+	/**
+	* 主键
+	*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+	/**
+	* 报废id
+	*/
+	@Column(name = "scrapId")
+	private Integer scrapId;
+	/**
+	* 装备id
+	*/
+	@Column(name = "devId")
+	private Integer devId;
+	/**
+	* serNum
+	*/
+	@Column(name = "serNum")
+	private String serNum;
+	/**
+	* proNum
+	*/
+	@Column(name = "proNum")
+	private String proNum;
+	/**
+	* ownUnit
+	*/
+	@Column(name = "ownUnit")
+	private String ownUnit;
+	/**
+	* 是否退回。 通知单如果无需退回直接以退回
+	*/
+	@Column(name = "isBack")
+	private Integer isBack;
+	/**
+	* 备注
+	*/
+	@Column(name = "memo")
+	private String memo;
+
+}

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

+package com.example.removetolocal.oldrepel.entity;
+
+import com.example.removetolocal.newrepel.entity.DeviceRepel;
+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_scrapnotice
+ * 报废通知
+*/
+@Data
+@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 {
+
+	/**
+	* 主键
+	*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+	/**
+	* 关联上级通知
+	*/
+	@Column(name = "pid")
+	private Integer pid;
+	/**
+	* 标题
+	*/
+	@Column(name = "title")
+	private String title;
+	/**
+	* 文号
+	*/
+	@Column(name = "docNo")
+	private String docNo;
+	/**
+	* 发起人
+	*/
+	@Column(name = "applyUser")
+	private String applyUser;
+	/**
+	* 核发人
+	*/
+	@Column(name = "applyConfirmUser")
+	private String applyConfirmUser;
+	/**
+	* 发起单位
+	*/
+	@Column(name = "applyUnit")
+	private String applyUnit;
+	/**
+	* 创建时间
+	*/
+	@Column(name = "createTime")
+	private java.util.Date createTime;
+	/**
+	* 发起时间
+	*/
+	@Column(name = "applyTime")
+	private java.util.Date applyTime;
+	/**
+	* 通知范围：1.全省 2.全市 3.指定单位
+	*/
+	@Column(name = "noticeRange")
+	private Boolean noticeRange;
+	/**
+	* 接收单位集合，多个之间用'，隔开'
+	*/
+	@Column(name = "acceptUnits")
+	private String acceptUnits;
+	/**
+	* 截至时间
+	*/
+	@Column(name = "entTime")
+	private java.util.Date entTime;
+	/**
+	* 列装id列表。多个之间用,隔开
+	*/
+	@Column(name = "catalogIds")
+	private String catalogIds;
+	/**
+	* 入库方式
+	*/
+	@Column(name = "instorageType")
+	private String instorageType;
+	/**
+	* 状态 0.已删除 1.草稿 3.已发布  4.已撤销
+	*/
+	@Column(name = "status")
+	private Integer status;
+	/**
+	* 备注
+	*/
+	@Column(name = "memo")
+	private String memo;
+	/**
+	* 是否退回装备。 1退回 0保留
+	*/
+	@Column(name = "isBackDev")
+	private Integer isBackDev;
+	/**
+	* 附件
+	*/
+	@Column(name = "annex")
+	private String annex;
+
+	public DeviceRepel toDeviceRepel(){
+		return new DeviceRepel(title,catalogIds,memo,acceptUnits,"",entTime,1,applyUser,"",Integer.valueOf(applyUnit));
+	}
+
+}

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

+package com.example.removetolocal.oldrepel.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 dev_scrapnotice_unit
+ * 报废通知
+*/
+@Data
+@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 {
+
+	/**
+	* 主键
+	*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+	/**
+	* 关联通知id
+	*/
+	@Column(name = "noticeId")
+	private Integer noticeId;
+	/**
+	* unit
+	*/
+	@Column(name = "unit")
+	private String unit;
+	/**
+	* total
+	*/
+	@Column(name = "total")
+	private Integer total;
+	/**
+	* 选择报废的装备Id
+	*/
+	@Column(name = "devIds")
+	private String devIds;
+	/**
+	* 状态 1.待确认 2.报废中  3.忽略  4.完成
+	*/
+	@Column(name = "status")
+	private Integer status;
+	/**
+	* optUser
+	*/
+	@Column(name = "optUser")
+	private String optUser;
+	/**
+	* optTime
+	*/
+	@Column(name = "optTime")
+	private java.util.Date optTime;
+	/**
+	* 退回意见
+	*/
+	@Column(name = "opinion")
+	private String opinion;
+
+}