model

ses-model/src/main/java/cn/hmsoft/ses/data/model/by/ByApply.java

@@ -115,6 +115,15 @@ public class ByApply implements Serializable {
 	protected String year_code;
 
 	protected String idcard_photo_path;
+	protected String by_date;
+
+	public String getBy_date() {
+		return by_date;
+	}
+
+	public void setBy_date(String by_date) {
+		this.by_date = by_date;
+	}
 
 	public String getScore_file_two() {
 		return score_file_two;

ses-model/src/main/java/cn/hmsoft/ses/data/model/by/ByCourseReplDetailPre.java

@@ -0,0 +1,214 @@
+package cn.hmsoft.ses.data.model.by;
+
+import java.io.Serializable;
+import cn.hmsoft.jdbc.entity.Table;
+
+/**
+ * 课程顶替详情表 模型.
+ * 
+ * @author: haoguanghui
+ * @date: 2019-01-07 16:16:11
+ * @version: 1.0
+ * @email: hgh@qmth.com.cn
+ * @Company: www.hmsoft.cn
+ */
+@Table(tableName = "by_course_repl_detail_pre", keyColumn = "id", sequenceName = "SEQ_by_course_repl_detail")
+public class ByCourseReplDetailPre implements Serializable {
+	private static final long serialVersionUID = -6014136766012600887L;
+  	//主键ID
+  	private Integer id;
+  	//是否适用所有专业 0：不适用；1:适用
+  	private Integer is_all;
+  	//专业代码 冗余字段,老库中有7位的代码
+  	private String major_code;
+  	//专业ID 和专业信息表关联
+  	private Integer major_id;
+  	//原课程ID 指以前的课程，多个课程ID用英文逗号分隔
+  	private String old_course_ids;
+  	//原课程名称 带有课程代码，多个用|分隔
+  	private String old_course_names;
+  	//备注
+  	private String remark;
+  	//顶替课程ID 课程ID，多个课程ID用英文逗号分隔
+  	private String repl_course_ids;
+  	//顶替课程名称 带有课程代码，多个用|分隔
+  	private String repl_course_names;
+  	//顶替规则ID 和课程顶替规则表关联
+  	private Integer rule_id;
+  	//状态 0：禁用；1：启用
+  	private Integer status;
+  
+	/**
+	 * 主键ID
+	 */	
+  	public void setId(Integer id) {
+		this.id = id;
+  	}
+ 	/**
+	 * 主键ID
+	 */	 	
+  	public Integer getId() {
+		return id;
+  	}
+	/**
+	 * 是否适用所有专业 0：不适用；1:适用
+	 */	
+  	public void setIs_all(Integer is_all) {
+		this.is_all = is_all;
+  	}
+ 	/**
+	 * 是否适用所有专业 0：不适用；1:适用
+	 */	 	
+  	public Integer getIs_all() {
+		return is_all;
+  	}
+	/**
+	 * 专业代码 冗余字段,老库中有7位的代码
+	 */	
+  	public void setMajor_code(String major_code) {
+		this.major_code = major_code;
+  	}
+ 	/**
+	 * 专业代码 冗余字段,老库中有7位的代码
+	 */	 	
+  	public String getMajor_code() {
+		return major_code;
+  	}
+	/**
+	 * 专业ID 和专业信息表关联
+	 */	
+  	public void setMajor_id(Integer major_id) {
+		this.major_id = major_id;
+  	}
+ 	/**
+	 * 专业ID 和专业信息表关联
+	 */	 	
+  	public Integer getMajor_id() {
+		return major_id;
+  	}
+	/**
+	 * 原课程ID 指以前的课程，多个课程ID用英文逗号分隔
+	 */	
+  	public void setOld_course_ids(String old_course_ids) {
+		this.old_course_ids = old_course_ids;
+  	}
+ 	/**
+	 * 原课程ID 指以前的课程，多个课程ID用英文逗号分隔
+	 */	 	
+  	public String getOld_course_ids() {
+		return old_course_ids;
+  	}
+	/**
+	 * 原课程名称 带有课程代码，多个用|分隔
+	 */	
+  	public void setOld_course_names(String old_course_names) {
+		this.old_course_names = old_course_names;
+  	}
+ 	/**
+	 * 原课程名称 带有课程代码，多个用|分隔
+	 */	 	
+  	public String getOld_course_names() {
+		return old_course_names;
+  	}
+	/**
+	 * 备注
+	 */	
+  	public void setRemark(String remark) {
+		this.remark = remark;
+  	}
+ 	/**
+	 * 备注
+	 */	 	
+  	public String getRemark() {
+		return remark;
+  	}
+	/**
+	 * 顶替课程ID 课程ID，多个课程ID用英文逗号分隔
+	 */	
+  	public void setRepl_course_ids(String repl_course_ids) {
+		this.repl_course_ids = repl_course_ids;
+  	}
+ 	/**
+	 * 顶替课程ID 课程ID，多个课程ID用英文逗号分隔
+	 */	 	
+  	public String getRepl_course_ids() {
+		return repl_course_ids;
+  	}
+	/**
+	 * 顶替课程名称 带有课程代码，多个用|分隔
+	 */	
+  	public void setRepl_course_names(String repl_course_names) {
+		this.repl_course_names = repl_course_names;
+  	}
+ 	/**
+	 * 顶替课程名称 带有课程代码，多个用|分隔
+	 */	 	
+  	public String getRepl_course_names() {
+		return repl_course_names;
+  	}
+	/**
+	 * 顶替规则ID 和课程顶替规则表关联
+	 */	
+  	public void setRule_id(Integer rule_id) {
+		this.rule_id = rule_id;
+  	}
+ 	/**
+	 * 顶替规则ID 和课程顶替规则表关联
+	 */	 	
+  	public Integer getRule_id() {
+		return rule_id;
+  	}
+	/**
+	 * 状态 0：禁用；1：启用
+	 */	
+  	public void setStatus(Integer status) {
+		this.status = status;
+  	}
+ 	/**
+	 * 状态 0：禁用；1：启用
+	 */	 	
+  	public Integer getStatus() {
+		return status;
+  	}
+  	
+  	protected Integer[] major_ids; //专业ID集合
+  	protected Integer year; 
+  	protected String major_name;
+  	protected String major_level;
+  	protected String total_credits;
+
+	public Integer[] getMajor_ids() {
+		return major_ids;
+	}
+
+	public void setMajor_ids(Integer[] major_ids) {
+		this.major_ids = major_ids;
+	}
+	public Integer getYear() {
+		return year;
+	}
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+	public String getMajor_name() {
+		return major_name;
+	}
+	public void setMajor_name(String major_name) {
+		this.major_name = major_name;
+	}
+	public String getMajor_level() {
+		return major_level;
+	}
+	public void setMajor_level(String major_level) {
+		this.major_level = major_level;
+	}
+	public String getTotal_credits() {
+		return total_credits;
+	}
+	public void setTotal_credits(String total_credits) {
+		this.total_credits = total_credits;
+	}
+	
+	
+  	
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlCoursePre.java

@@ -0,0 +1,291 @@
+package cn.hmsoft.ses.data.model.pl;
+
+import java.io.Serializable;
+import cn.hmsoft.jdbc.entity.Table;
+
+/**
+ * 课程表 模型.
+ * 
+ * @author: haoguanghui
+ * @date: 2018-10-16 21:08:14
+ * @version: 1.0
+ * @email: hgh@qmth.com.cn
+ * @Company: www.hmsoft.cn
+ */
+@Table(tableName = "pl_course_pre", keyColumn = "id", sequenceName = "seq_pl_course")
+public class PlCoursePre implements Serializable {
+	private static final long serialVersionUID = 8199805101057304070L;
+  	//课程代号
+  	private String course_code;
+  	//考试课程类型 1：理论课；2：实践课；3：未知
+  	private Integer course_exam_type;
+  	//课程名称
+  	private String course_name;
+  	//学分，可以有一位小数
+  	private String course_score;
+  	//国标代码
+  	private String course_standard_code;
+  	//课程ID
+  	private Integer id;
+  	//是否国考 null或1：非统考；2：统考
+  	private Integer is_nation_exam;
+  	//父ID 针对湖北的联合课，没有的话，为null
+  	private Integer pid;
+  	//课程说明
+  	private String remark;
+  	//特殊标志 1：普通课程；2：特殊课程
+  	private Integer special_flag;
+  	//状态 开考、停考
+  	private Integer status;
+    //是否网评卷
+  	private Integer is_net_mark;
+  	//课程收费代码
+  	private String fee_code;
+  	//社会考生是否可以报考
+  	private Integer is_social_enrol;
+  	//课程类型：0：实践课，1：沟通课，默认为空
+  	private Integer course_type;
+  	
+  	protected Integer course_nature;
+	protected String final_score;
+	
+	public String getFinal_score() {
+		return final_score;
+	}
+	public void setFinal_score(String final_score) {
+		this.final_score = final_score;
+	}
+	public Integer getCourse_nature() {
+		return course_nature;
+	}
+	public void setCourse_nature(Integer course_nature) {
+		this.course_nature = course_nature;
+	}
+	/**
+	 * 课程代号
+	 */	
+  	public void setCourse_code(String course_code) {
+		this.course_code = course_code;
+  	}
+ 	/**
+	 * 课程代号
+	 */	 	
+  	public String getCourse_code() {
+		return course_code;
+  	}
+	/**
+	 * 考试课程类型 1：理论课；2：实践课；3：未知
+	 */	
+  	public void setCourse_exam_type(Integer course_exam_type) {
+		this.course_exam_type = course_exam_type;
+  	}
+ 	/**
+	 * 考试课程类型 1：理论课；2：实践课；3：未知
+	 */	 	
+  	public Integer getCourse_exam_type() {
+		return course_exam_type;
+  	}
+	/**
+	 * 课程名称
+	 */	
+  	public void setCourse_name(String course_name) {
+		this.course_name = course_name;
+  	}
+ 	/**
+	 * 课程名称
+	 */	 	
+  	public String getCourse_name() {
+		return course_name;
+  	}
+	/**
+	 * 学分，可以有一位小数
+	 */	
+  	public void setCourse_score(String course_score) {
+		this.course_score = course_score;
+  	}
+ 	/**
+	 * 学分，可以有一位小数
+	 */	 	
+  	public String getCourse_score() {
+		return course_score;
+  	}
+	/**
+	 * 国标代码
+	 */	
+  	public void setCourse_standard_code(String course_standard_code) {
+		this.course_standard_code = course_standard_code;
+  	}
+ 	/**
+	 * 国标代码
+	 */	 	
+  	public String getCourse_standard_code() {
+		return course_standard_code;
+  	}
+	/**
+	 * 课程ID
+	 */	
+  	public void setId(Integer id) {
+		this.id = id;
+  	}
+ 	/**
+	 * 课程ID
+	 */	 	
+  	public Integer getId() {
+		return id;
+  	}
+	/**
+	 * 是否国考 null或1：非统考；2：统考
+	 */	
+  	public void setIs_nation_exam(Integer is_nation_exam) {
+		this.is_nation_exam = is_nation_exam;
+  	}
+ 	/**
+	 * 是否国考 null或1：非统考；2：统考
+	 */	 	
+  	public Integer getIs_nation_exam() {
+		return is_nation_exam;
+  	}
+	/**
+	 * 父ID 针对湖北的联合课，没有的话，为null
+	 */	
+  	public void setPid(Integer pid) {
+		this.pid = pid;
+  	}
+ 	/**
+	 * 父ID 针对湖北的联合课，没有的话，为null
+	 */	 	
+  	public Integer getPid() {
+		return pid;
+  	}
+	/**
+	 * 课程说明
+	 */	
+  	public void setRemark(String remark) {
+		this.remark = remark;
+  	}
+ 	/**
+	 * 课程说明
+	 */	 	
+  	public String getRemark() {
+		return remark;
+  	}
+	/**
+	 * 特殊标志 1：普通课程；2：特殊课程
+	 */	
+  	public void setSpecial_flag(Integer special_flag) {
+		this.special_flag = special_flag;
+  	}
+ 	/**
+	 * 特殊标志 1：普通课程；2：特殊课程
+	 */	 	
+  	public Integer getSpecial_flag() {
+		return special_flag;
+  	}
+	/**
+	 * 状态 开考、停考
+	 */	
+  	public void setStatus(Integer status) {
+		this.status = status;
+  	}
+ 	/**
+	 * 状态 开考、停考
+	 */	 	
+  	public Integer getStatus() {
+		return status;
+  	}
+	/**
+	 * 课程收费代码
+	 */	  	
+	public String getFee_code() {
+		return fee_code;
+	}
+	/**
+	 * 课程收费代码
+	 */	
+	public void setFee_code(String fee_code) {
+		this.fee_code = fee_code;
+	}
+	/**
+	 * 是否网评卷
+	 */	
+	public Integer getIs_net_mark() {
+		return is_net_mark;
+	}
+	/**
+	 * 是否网评卷
+	 */	
+	public void setIs_net_mark(Integer is_net_mark) {
+		this.is_net_mark = is_net_mark;
+	}
+	/**
+	 * 社会考生是否可以报考
+	 */	
+	public Integer getIs_social_enrol() {
+		return is_social_enrol;
+	}
+	/**
+	 * 社会考生是否可以报考
+	 */	
+	public void setIs_social_enrol(Integer is_social_enrol) {
+		this.is_social_enrol = is_social_enrol;
+	}
+
+
+	public Integer getCourse_type() {
+		return course_type;
+	}
+	public void setCourse_type(Integer course_type) {
+		this.course_type = course_type;
+	}
+
+
+	protected String code_course_name;// （课程代码+课程名称）
+	protected String textbook_name; //关联教材名称
+	protected String textbook_writer; //关联教材名称
+	protected String textbook_publisher; //关联教材名称
+	protected String textbook_revision; //关联教材名称
+	protected String textbook_outline; //关联教材名称
+
+	public String getCode_course_name() {
+		return code_course_name;
+	}
+
+	public void setCode_course_name(String code_course_name) {
+		this.code_course_name = code_course_name;
+	}
+
+	public String getTextbook_name() {
+		return textbook_name;
+	}
+
+	public void setTextbook_name(String textbook_name) {
+		this.textbook_name = textbook_name;
+	}
+	public String getTextbook_writer() {
+		return textbook_writer;
+	}
+	public void setTextbook_writer(String textbook_writer) {
+		this.textbook_writer = textbook_writer;
+	}
+	public String getTextbook_publisher() {
+		return textbook_publisher;
+	}
+	public void setTextbook_publisher(String textbook_publisher) {
+		this.textbook_publisher = textbook_publisher;
+	}
+	public String getTextbook_revision() {
+		return textbook_revision;
+	}
+	public void setTextbook_revision(String textbook_revision) {
+		this.textbook_revision = textbook_revision;
+	}
+	public String getTextbook_outline() {
+		return textbook_outline;
+	}
+	public void setTextbook_outline(String textbook_outline) {
+		this.textbook_outline = textbook_outline;
+	}
+	
+  	
+	
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlCourseTextbookLogPre.java

@@ -0,0 +1,142 @@
+package cn.hmsoft.ses.data.model.pl;
+
+import java.io.Serializable;
+import cn.hmsoft.jdbc.entity.Table;
+import java.time.LocalDateTime;
+
+/**
+ * 课程教材关联历史表 模型.
+ * 
+ * @author: haoguanghui
+ * @date: 2019-01-25 11:06:51
+ * @version: 1.0
+ * @email: hgh@qmth.com.cn
+ * @Company: www.hmsoft.cn
+ */
+@Table(tableName = "pl_course_textbook_log_pre", keyColumn = "id", sequenceName = "SEQ_pl_course_textbook_log")
+public class PlCourseTextbookLogPre implements Serializable {
+	private static final long serialVersionUID = -8711676310152577028L;
+  	//课程ID
+  	private Integer course_id;
+  	//主键ID
+  	private Integer id;
+  	//操作人 登录名+用户姓名
+  	private String operator;
+  	//操作时间
+  	private LocalDateTime oper_time;
+  	//教材ID
+  	private Integer textbook_id;
+  	//类型 0：新增；1：修改；2：删除
+  	private Integer type;
+  	//批次ID
+  	private Integer exam_time_id;
+  
+	/**
+	 * 课程ID
+	 */	
+  	public void setCourse_id(Integer course_id) {
+		this.course_id = course_id;
+  	}
+ 	/**
+	 * 课程ID
+	 */	 	
+  	public Integer getCourse_id() {
+		return course_id;
+  	}
+	/**
+	 * 主键ID
+	 */	
+  	public void setId(Integer id) {
+		this.id = id;
+  	}
+ 	/**
+	 * 主键ID
+	 */	 	
+  	public Integer getId() {
+		return id;
+  	}
+	/**
+	 * 操作人 登录名+用户姓名
+	 */	
+  	public void setOperator(String operator) {
+		this.operator = operator;
+  	}
+ 	/**
+	 * 操作人 登录名+用户姓名
+	 */	 	
+  	public String getOperator() {
+		return operator;
+  	}
+	/**
+	 * 操作时间
+	 */	
+  	public void setOper_time(LocalDateTime oper_time) {
+		this.oper_time = oper_time;
+  	}
+ 	/**
+	 * 操作时间
+	 */	 	
+  	public LocalDateTime getOper_time() {
+		return oper_time;
+  	}
+	/**
+	 * 教材ID
+	 */	
+  	public void setTextbook_id(Integer textbook_id) {
+		this.textbook_id = textbook_id;
+  	}
+ 	/**
+	 * 教材ID
+	 */	 	
+  	public Integer getTextbook_id() {
+		return textbook_id;
+  	}
+	/**
+	 * 类型 0：新增；1：修改；2：删除
+	 */	
+  	public void setType(Integer type) {
+		this.type = type;
+  	}
+ 	/**
+	 * 类型 0：新增；1：修改；2：删除
+	 */	 	
+  	public Integer getType() {
+		return type;
+  	}
+  	/**
+	 * 批次ID
+	 */	
+	public Integer getExam_time_id() {
+		return exam_time_id;
+	}
+	/**
+	 * 批次ID
+	 */	
+	public void setExam_time_id(Integer exam_time_id) {
+		this.exam_time_id = exam_time_id;
+	}
+	protected String course_name; //课程名称
+	protected String textbook_name; //教材名称
+	protected Integer year_code; //批次码
+
+	public String getTextbook_name() {
+		return textbook_name;
+	}
+	public void setTextbook_name(String textbook_name) {
+		this.textbook_name = textbook_name;
+	}
+	public Integer getYear_code() {
+		return year_code;
+	}
+	public void setYear_code(Integer year_code) {
+		this.year_code = year_code;
+	}
+	public String getCourse_name() {
+		return course_name;
+	}
+	public void setCourse_name(String course_name) {
+		this.course_name = course_name;
+	}
+	
+	
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlCourseTextbookPre.java

@@ -0,0 +1,93 @@
+package cn.hmsoft.ses.data.model.pl;
+
+import java.io.Serializable;
+import cn.hmsoft.jdbc.entity.Table;
+
+/**
+ * 课程教材关联表 课程对应的教材，一门课程可以对应多个教材 模型.
+ * 
+ * @author: haoguanghui
+ * @date: 2018-10-17 15:55:47
+ * @version: 1.0
+ * @email: hgh@qmth.com.cn
+ * @Company: www.hmsoft.cn
+ */
+@Table(tableName = "pl_course_textbook_pre", keyColumn = "id", sequenceName = "seq_pl_course_textbook")
+public class PlCourseTextbookPre implements Serializable {
+	private static final long serialVersionUID = -4452361002745814634L;
+	
+	//主键ID
+	private Integer id;
+  	//课程ID
+  	private Integer course_id;
+  	//考试时间ID 和考试时间设置表关联
+  	private Integer exam_time_id;
+  	//教材ID
+  	private Integer textbook_id;
+  	private Integer year_code;
+  	
+  	public Integer getYear_code() {
+		return year_code;
+	}
+	public void setYear_code(Integer year_code) {
+		this.year_code = year_code;
+	}
+	/**
+	 * 主键ID
+	 */	
+	public Integer getId() {
+		return id;
+	}
+	/**
+	 * 主键ID
+	 */	
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	/**
+	 * 课程ID
+	 */	
+  	public void setCourse_id(Integer course_id) {
+		this.course_id = course_id;
+  	}
+ 	/**
+	 * 课程ID
+	 */	 	
+  	public Integer getCourse_id() {
+		return course_id;
+  	}
+	/**
+	 * 考试时间ID 和考试时间设置表关联
+	 */	
+  	public void setExam_time_id(Integer exam_time_id) {
+		this.exam_time_id = exam_time_id;
+  	}
+ 	/**
+	 * 考试时间ID 和考试时间设置表关联
+	 */	 	
+  	public Integer getExam_time_id() {
+		return exam_time_id;
+  	}
+	/**
+	 * 教材ID
+	 */	
+  	public void setTextbook_id(Integer textbook_id) {
+		this.textbook_id = textbook_id;
+  	}
+ 	/**
+	 * 教材ID
+	 */	 	
+  	public Integer getTextbook_id() {
+		return textbook_id;
+  	}
+  	
+  	protected String textbook_name; //教材名称
+
+	public String getTextbook_name() {
+		return textbook_name;
+	}
+	public void setTextbook_name(String textbook_name) {
+		this.textbook_name = textbook_name;
+	}
+  	
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlExamAreaCourse.java

@@ -27,7 +27,16 @@ public class PlExamAreaCourse implements Serializable {
   	private Integer org_id;
   	//考试时间ID 和考试时间配置表关联
   	private Integer exam_time_id;
+  	
+  	protected String calculator;
+  	
   
+	public String getCalculator() {
+		return calculator;
+	}
+	public void setCalculator(String calculator) {
+		this.calculator = calculator;
+	}
 	/**
 	 * 课程code 冗余字段，适应老库的数据
 	 */	

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlMajor.java

@@ -337,6 +337,8 @@ public class PlMajor implements Serializable {
   	protected String course_code;//课程代码
   	protected String course_score;//课程学分
   	protected String textbook_name;//教材名称
+  	protected String textbook_outline;//教材大纲
+  	
   	protected String textbook_publisher;//出版社
   	protected String textbook_revision;//版次
   	protected Integer subject_pid;
@@ -348,6 +350,12 @@ public class PlMajor implements Serializable {
   	protected String full_name;//专业组合名称
   	protected String exam_year_month;
   	
+	public String getTextbook_outline() {
+		return textbook_outline;
+	}
+	public void setTextbook_outline(String textbook_outline) {
+		this.textbook_outline = textbook_outline;
+	}
 	public String getExam_year_month() {
 		return exam_year_month;
 	}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlMajorApplyPro.java

@@ -0,0 +1,156 @@
+package cn.hmsoft.ses.data.model.pl;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+import cn.hmsoft.jdbc.entity.Table;
+
+/**
+ * 专业申报主表 模型.
+ * 
+ * @author: zq
+ * @date: 2018-11-30 16:55:32
+ * @version: 1.0
+ * @email: zhanqiang@qmth.com.cn
+ * @Company: www.hmsoft.cn
+ */
+@Table(tableName = "PL_MAJOR_APPLY_PRO", keyColumn = "id", sequenceName = "SEQ_PL_MAJOR_APPLY_PRO")
+public class PlMajorApplyPro implements Serializable {
+	private static final long serialVersionUID = -2761618208250588120L;
+	// 申报日期
+	private LocalDate apply_date;
+
+	// 申报说明
+	private String apply_remark;
+
+	// 申报形式
+	private Integer apply_form;
+	// 主键
+	private Integer id;
+
+	// 主考学校ID
+	private Integer school_id;
+	// 年度码
+	private Integer year;
+	// 衔接学校ID
+	private Integer join_school_id;
+
+
+	protected String major_code;
+	protected String major_name;
+	
+	protected Integer detail_id;
+
+	// 衔接学校
+	protected String join_school;
+	// 主考学校
+	protected String master_school;
+	// 申报选择的专业
+	protected Integer[] major_id_arr;
+
+	public LocalDate getApply_date() {
+		return apply_date;
+	}
+
+	public void setApply_date(LocalDate apply_date) {
+		this.apply_date = apply_date;
+	}
+
+	public String getApply_remark() {
+		return apply_remark;
+	}
+
+	public void setApply_remark(String apply_remark) {
+		this.apply_remark = apply_remark;
+	}
+
+	public Integer getApply_form() {
+		return apply_form;
+	}
+
+	public void setApply_form(Integer apply_form) {
+		this.apply_form = apply_form;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getSchool_id() {
+		return school_id;
+	}
+
+	public void setSchool_id(Integer school_id) {
+		this.school_id = school_id;
+	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public Integer getJoin_school_id() {
+		return join_school_id;
+	}
+
+	public void setJoin_school_id(Integer join_school_id) {
+		this.join_school_id = join_school_id;
+	}
+
+
+	public String getMajor_code() {
+		return major_code;
+	}
+
+	public void setMajor_code(String major_code) {
+		this.major_code = major_code;
+	}
+
+	public String getMajor_name() {
+		return major_name;
+	}
+
+	public void setMajor_name(String major_name) {
+		this.major_name = major_name;
+	}
+
+	public String getJoin_school() {
+		return join_school;
+	}
+
+	public void setJoin_school(String join_school) {
+		this.join_school = join_school;
+	}
+
+	public String getMaster_school() {
+		return master_school;
+	}
+
+	public void setMaster_school(String master_school) {
+		this.master_school = master_school;
+	}
+
+	public Integer[] getMajor_id_arr() {
+		return major_id_arr;
+	}
+
+	public void setMajor_id_arr(Integer[] major_id_arr) {
+		this.major_id_arr = major_id_arr;
+	}
+
+	public Integer getDetail_id() {
+		return detail_id;
+	}
+
+	public void setDetail_id(Integer detail_id) {
+		this.detail_id = detail_id;
+	}
+
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlMajorApplyProDetail.java

@@ -0,0 +1,51 @@
+package cn.hmsoft.ses.data.model.pl;
+
+import java.io.Serializable;
+import cn.hmsoft.jdbc.entity.Table;
+
+/**
+ *  模型.
+ * 
+ * @author: zhanqiang
+ * @date: 2019-04-21 20:44:55
+ * @version: 1.0
+ * @email: zhanqiang@qmth.com.cn
+ * @Company: www.hmsoft.cn
+ */
+@Table(tableName = "pl_major_apply_pro_detail", keyColumn = "id", sequenceName = "SEQ_pl_major_apply_pro_detail")
+public class PlMajorApplyProDetail implements Serializable {
+	private static final long serialVersionUID = 6221253721314127638L;
+    
+	private Integer id;
+	private Integer apply_id;
+	private Integer major_id;
+	
+	public Integer getId() {
+		return id;
+	}
+	public Integer getApply_id() {
+		return apply_id;
+	}
+	public Integer getMajor_id() {
+		return major_id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public void setApply_id(Integer apply_id) {
+		this.apply_id = apply_id;
+	}
+	public void setMajor_id(Integer major_id) {
+		this.major_id = major_id;
+	}
+	
+	protected String major_code; //专业代码
+
+	public String getMajor_code() {
+		return major_code;
+	}
+	public void setMajor_code(String major_code) {
+		this.major_code = major_code;
+	}
+	
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlMajorCoursePre.java

@@ -0,0 +1,191 @@
+package cn.hmsoft.ses.data.model.pl;
+
+import java.io.Serializable;
+import cn.hmsoft.jdbc.entity.Table;
+
+/**
+ * 专业课程对应表 模型.
+ * 
+ * @author: haoguanghui
+ * @date: 2018-10-17 10:03:45
+ * @version: 1.0
+ * @email: hgh@qmth.com.cn
+ * @Company: www.hmsoft.cn
+ */
+@Table(tableName = "pl_major_course_pre", keyColumn = "id", sequenceName = "seq_pl_major_course")
+public class PlMajorCoursePre implements Serializable {
+	private static final long serialVersionUID = 224021187172599345L;
+  	//课程ID 和课程表关联
+  	private Integer course_id;
+  	//课程性质 公共课、核心课、选考科、毕业论文
+  	private Integer course_nature;
+  	//主键ID
+  	private Integer id;
+  	//是否沟通课
+  	private Integer is_communicate_course;
+  	//是否必考
+  	private Integer is_must;
+  	//专业ID 和专业信息表关联
+  	private Integer major_id;
+  	//选修方向
+  	private String direct_remark;
+  	// 是否百分百合成
+  	private Integer iscompose;
+  	
+  	protected String full_name;
+  	
+	public String getFull_name() {
+		return full_name;
+	}
+	public void setFull_name(String full_name) {
+		this.full_name = full_name;
+	}
+	public Integer getIscompose() {
+		return iscompose;
+	}
+	public void setIscompose(Integer iscompose) {
+		this.iscompose = iscompose;
+	}
+	/**
+	 * 课程ID 和课程表关联
+	 */	
+  	public void setCourse_id(Integer course_id) {
+		this.course_id = course_id;
+  	}
+ 	/**
+	 * 课程ID 和课程表关联
+	 */	 	
+  	public Integer getCourse_id() {
+		return course_id;
+  	}
+	/**
+	 * 课程性质 公共课、核心课、选考科、毕业论文
+	 */	
+  	public void setCourse_nature(Integer course_nature) {
+		this.course_nature = course_nature;
+  	}
+ 	/**
+	 * 课程性质 公共课、核心课、选考科、毕业论文
+	 */	 	
+  	public Integer getCourse_nature() {
+		return course_nature;
+  	}
+	/**
+	 * 主键ID
+	 */	
+  	public void setId(Integer id) {
+		this.id = id;
+  	}
+ 	/**
+	 * 主键ID
+	 */	 	
+  	public Integer getId() {
+		return id;
+  	}
+	/**
+	 * 是否沟通课
+	 */	
+  	public void setIs_communicate_course(Integer is_communicate_course) {
+		this.is_communicate_course = is_communicate_course;
+  	}
+ 	/**
+	 * 是否沟通课
+	 */	 	
+  	public Integer getIs_communicate_course() {
+		return is_communicate_course;
+  	}
+	/**
+	 * 是否必考
+	 */	
+  	public void setIs_must(Integer is_must) {
+		this.is_must = is_must;
+  	}
+ 	/**
+	 * 是否必考
+	 */	 	
+  	public Integer getIs_must() {
+		return is_must;
+  	}
+	/**
+	 * 专业ID 和专业信息表关联
+	 */	
+  	public void setMajor_id(Integer major_id) {
+		this.major_id = major_id;
+  	}
+ 	/**
+	 * 专业ID 和专业信息表关联
+	 */	 	
+  	public Integer getMajor_id() {
+		return major_id;
+  	}
+	/**
+	 * 选修方向
+	 */	
+  	public String getDirect_remark() {
+		return direct_remark;
+	}
+	/**
+	 * 选修方向
+	 */	
+	public void setDirect_remark(String direct_remark) {
+		this.direct_remark = direct_remark;
+	}
+
+
+
+	protected Integer couse_id;
+	protected String course_code;// 课程代码
+	protected String course_name;// 课程名称
+	protected String course_score;// 学分
+	protected Integer course_exam_type;// 考试课程类型
+	protected Integer status;// 课程状态(开考、停考)
+  	
+	
+	public Integer getCouse_id() {
+		return couse_id;
+	}
+	public void setCouse_id(Integer couse_id) {
+		this.couse_id = couse_id;
+	}
+	public String getCourse_code() {
+		return course_code;
+	}
+
+	public void setCourse_code(String course_code) {
+		this.course_code = course_code;
+	}
+
+	public String getCourse_name() {
+		return course_name;
+	}
+
+	public void setCourse_name(String course_name) {
+		this.course_name = course_name;
+	}
+
+	public String getCourse_score() {
+		return course_score;
+	}
+
+	public void setCourse_score(String course_score) {
+		this.course_score = course_score;
+	}
+
+	public Integer getCourse_exam_type() {
+		return course_exam_type;
+	}
+
+	public void setCourse_exam_type(Integer course_exam_type) {
+		this.course_exam_type = course_exam_type;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+  	
+  	
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlMajorPre.java

@@ -0,0 +1,468 @@
+package cn.hmsoft.ses.data.model.pl;
+
+import java.io.Serializable;
+import cn.hmsoft.jdbc.entity.Table;
+import java.time.LocalDateTime;
+
+/**
+ * 专业信息表
+ * 
+ * @author: haoguanghui
+ * @date: 2018-10-16 15:40:22
+ * @version: 1.0
+ * @email: hgh@qmth.com.cn
+ * @Company: www.hmsoft.cn
+ */
+@Table(tableName = "PL_MAJOR_PRE", keyColumn = "id", sequenceName = "SEQ_PL_MAJOR")
+public class PlMajorPre implements Serializable {
+	private static final long serialVersionUID = -971381455685941978L;
+  	
+  	//专业ID
+  	private Integer id;
+  	//是否允许毕业 1：允许毕业；2：不允许毕业
+  	private Integer is_allow_graduate;
+  	//是否国考 1：统考专业；2：非统考专业
+  	private Integer is_nation_exam;
+  	//专业代号
+  	private String major_code;
+  	//层次属性 专科、本科
+  	private Integer major_level;
+  	//专业名称
+  	private String major_name;
+  	//国标专业代码
+  	private String major_standard_code;
+  	//国标专业名称
+  	private String major_standard_name;
+  	//备注
+  	private String remark;
+  	//停办证时间
+  	private LocalDateTime stop_certificate_time;
+  	//所属学科 和学科表关联
+  	private Integer subject_id;
+  	//课程总学分
+  	private String total_credits;
+  	//毕业总学分 毕业需要达到多少学分，才能毕业
+  	private String graduate_total_credits;
+  	//年度码
+  	private Integer year;
+  	//创建时间
+  	private LocalDateTime create_time;
+  	//停考时间
+  	private String stop_exam_time;
+  	//开停考标志
+  	private Integer status;
+  	//开考类型
+  	private Integer start_exam_type;
+  	//是否新专业，0：否 1：是
+  	private Integer is_new_major;
+  	//是否网考0：否1：是
+  	private Integer is_net_exam;
+  	//是否现场报考0：否1：是
+  	private Integer is_live_enrol;
+  	
+  	//是否允许社会考生毕业 1：允许毕业；0：不允许毕业
+  	private Integer is_allow_social;
+  	
+  	protected Integer major_id;
+
+	public Integer getMajor_id() {
+		return major_id;
+	}
+	public void setMajor_id(Integer major_id) {
+		this.major_id = major_id;
+	}
+	public Integer getIs_allow_social() {
+		return is_allow_social;
+	}
+	public void setIs_allow_social(Integer is_allow_social) {
+		this.is_allow_social = is_allow_social;
+	}
+	/**
+	 * 毕业总学分 毕业需要达到多少学分，才能毕业
+	 */	
+  	public void setGraduate_total_credits(String graduate_total_credits) {
+		this.graduate_total_credits = graduate_total_credits;
+  	}
+ 	/**
+	 * 毕业总学分 毕业需要达到多少学分，才能毕业
+	 */	 	
+  	public String getGraduate_total_credits() {
+		return graduate_total_credits;
+  	}
+	/**
+	 * 专业ID
+	 */	
+  	public void setId(Integer id) {
+		this.id = id;
+  	}
+ 	/**
+	 * 专业ID
+	 */	 	
+  	public Integer getId() {
+		return id;
+  	}
+	/**
+	 * 是否允许毕业 1：允许毕业；2：不允许毕业
+	 */	
+  	public void setIs_allow_graduate(Integer is_allow_graduate) {
+		this.is_allow_graduate = is_allow_graduate;
+  	}
+ 	/**
+	 * 是否允许毕业 1：允许毕业；2：不允许毕业
+	 */	 	
+  	public Integer getIs_allow_graduate() {
+		return is_allow_graduate;
+  	}
+	/**
+	 * 是否国考 1：统考专业；2：非统考专业
+	 */	
+  	public void setIs_nation_exam(Integer is_nation_exam) {
+		this.is_nation_exam = is_nation_exam;
+  	}
+ 	/**
+	 * 是否国考 1：统考专业；2：非统考专业
+	 */	 	
+  	public Integer getIs_nation_exam() {
+		return is_nation_exam;
+  	}
+	/**
+	 * 专业代号
+	 */	
+  	public void setMajor_code(String major_code) {
+		this.major_code = major_code;
+  	}
+ 	/**
+	 * 专业代号
+	 */	 	
+  	public String getMajor_code() {
+		return major_code;
+  	}
+	/**
+	 * 层次属性 专科、本科
+	 */	
+  	public void setMajor_level(Integer major_level) {
+		this.major_level = major_level;
+  	}
+ 	/**
+	 * 层次属性 专科、本科
+	 */	 	
+  	public Integer getMajor_level() {
+		return major_level;
+  	}
+	/**
+	 * 专业名称
+	 */	
+  	public void setMajor_name(String major_name) {
+		this.major_name = major_name;
+  	}
+ 	/**
+	 * 专业名称
+	 */	 	
+  	public String getMajor_name() {
+		return major_name;
+  	}
+	/**
+	 * 国标专业代码
+	 */	
+  	public void setMajor_standard_code(String major_standard_code) {
+		this.major_standard_code = major_standard_code;
+  	}
+ 	/**
+	 * 国标专业代码
+	 */	 	
+  	public String getMajor_standard_code() {
+		return major_standard_code;
+  	}
+	/**
+	 * 国标专业名称
+	 */	
+  	public void setMajor_standard_name(String major_standard_name) {
+		this.major_standard_name = major_standard_name;
+  	}
+ 	/**
+	 * 国标专业名称
+	 */	 	
+  	public String getMajor_standard_name() {
+		return major_standard_name;
+  	}
+	/**
+	 * 备注
+	 */	
+  	public void setRemark(String remark) {
+		this.remark = remark;
+  	}
+ 	/**
+	 * 备注
+	 */	 	
+  	public String getRemark() {
+		return remark;
+  	}
+	/**
+	 * 停办证时间
+	 */	
+  	public void setStop_certificate_time(LocalDateTime stop_certificate_time) {
+		this.stop_certificate_time = stop_certificate_time;
+  	}
+ 	/**
+	 * 停办证时间
+	 */	 	
+  	public LocalDateTime getStop_certificate_time() {
+		return stop_certificate_time;
+  	}
+	/**
+	 * 所属学科 和学科表关联
+	 */	
+  	public void setSubject_id(Integer subject_id) {
+		this.subject_id = subject_id;
+  	}
+ 	/**
+	 * 所属学科 和学科表关联
+	 */	 	
+  	public Integer getSubject_id() {
+		return subject_id;
+  	}
+	/**
+	 * 课程总学分
+	 */	
+  	public void setTotal_credits(String total_credits) {
+		this.total_credits = total_credits;
+  	}
+ 	/**
+	 * 课程总学分
+	 */	 	
+  	public String getTotal_credits() {
+		return total_credits;
+  	}
+	/**
+	 * 年度码
+	 */	
+  	public void setYear(Integer year) {
+		this.year = year;
+  	}
+ 	/**
+	 * 年度码
+	 */	 	
+  	public Integer getYear() {
+		return year;
+  	}
+	/**
+	 * 创建时间
+	 */
+	public LocalDateTime getCreate_time() {
+		return create_time;
+	}
+	/**
+	 * 创建时间
+	 */
+	public void setCreate_time(LocalDateTime create_time) {
+		this.create_time = create_time;
+	}
+	/**
+	 * 停考时间
+	 */
+	public String getStop_exam_time() {
+		return stop_exam_time;
+	}
+	/**
+	 * 停考时间
+	 */
+	public void setStop_exam_time(String stop_exam_time) {
+		this.stop_exam_time = stop_exam_time;
+	}
+	/**
+	 * 开停考标志
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+	/**
+	 * 开停考标志
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	/**
+	 * 开考类型
+	 */
+  	public Integer getStart_exam_type() {
+		return start_exam_type;
+	}
+  	/**
+	 * 开考类型
+	 */
+	public void setStart_exam_type(Integer start_exam_type) {
+		this.start_exam_type = start_exam_type;
+	}
+	/**
+	 * 是否新专业，0：否 1：是
+	 */
+	public Integer getIs_new_major() {
+		return is_new_major;
+	}
+	/**
+	 * 是否新专业，0：否 1：是
+	 */
+	public void setIs_new_major(Integer is_new_major) {
+		this.is_new_major = is_new_major;
+	}
+	/**
+	 * 是否网考0：否1：是
+	 */
+	public Integer getIs_net_exam() {
+		return is_net_exam;
+	}
+	/**
+	 * 是否网考0：否1：是
+	 */
+	public void setIs_net_exam(Integer is_net_exam) {
+		this.is_net_exam = is_net_exam;
+	}
+	/**
+	 * 是否现场报考0：否1：是
+	 */
+	public Integer getIs_live_enrol() {
+		return is_live_enrol;
+	}
+	/**
+	 * 是否现场报考0：否1：是
+	 */
+	public void setIs_live_enrol(Integer is_live_enrol) {
+		this.is_live_enrol = is_live_enrol;
+	}
+
+
+
+	protected String subject_name;//学科名称
+  	protected String course_name;//课程名称
+  	protected String course_code;//课程代码
+  	protected String course_score;//课程学分
+  	protected String textbook_name;//教材名称
+  	protected String textbook_publisher;//出版社
+  	protected String textbook_revision;//版次
+  	protected Integer subject_pid;
+  	protected String major_full_name;//专业组合名称
+  	protected String org_name; //专业所在学校
+	protected String org_code;
+  	protected Integer org_id;
+  	protected Integer year_code;
+  	protected String full_name;//专业组合名称
+  	protected String exam_year_month;
+  	
+	public String getExam_year_month() {
+		return exam_year_month;
+	}
+	public void setExam_year_month(String exam_year_month) {
+		this.exam_year_month = exam_year_month;
+	}
+	public String getFull_name() {
+		return full_name;
+	}
+	public void setFull_name(String full_name) {
+		this.full_name = full_name;
+	}
+	public Integer getYear_code() {
+		return year_code;
+	}
+	public void setYear_code(Integer year_code) {
+		this.year_code = year_code;
+	}
+	public Integer getOrg_id() {
+		return org_id;
+	}
+	public void setOrg_id(Integer org_id) {
+		this.org_id = org_id;
+	}
+  	
+  	public String getOrg_code() {
+		return org_code;
+	}
+	public void setOrg_code(String org_code) {
+		this.org_code = org_code;
+	}
+
+
+
+	protected Integer old_major_status;
+	
+	public String getSubject_name() {
+		return subject_name;
+	}
+
+	public void setSubject_name(String subject_name) {
+		this.subject_name = subject_name;
+	}
+
+	public String getCourse_name() {
+		return course_name;
+	}
+
+	public void setCourse_name(String course_name) {
+		this.course_name = course_name;
+	}
+
+	public String getCourse_code() {
+		return course_code;
+	}
+
+	public void setCourse_code(String course_code) {
+		this.course_code = course_code;
+	}
+
+	public String getCourse_score() {
+		return course_score;
+	}
+
+	public void setCourse_score(String course_score) {
+		this.course_score = course_score;
+	}
+
+	public String getTextbook_name() {
+		return textbook_name;
+	}
+
+	public void setTextbook_name(String textbook_name) {
+		this.textbook_name = textbook_name;
+	}
+
+	public String getTextbook_publisher() {
+		return textbook_publisher;
+	}
+
+	public void setTextbook_publisher(String textbook_publisher) {
+		this.textbook_publisher = textbook_publisher;
+	}
+
+	public String getTextbook_revision() {
+		return textbook_revision;
+	}
+
+	public void setTextbook_revision(String textbook_revision) {
+		this.textbook_revision = textbook_revision;
+	}
+	public Integer getSubject_pid() {
+		return subject_pid;
+	}
+	public void setSubject_pid(Integer subject_pid) {
+		this.subject_pid = subject_pid;
+	}
+	public String getMajor_full_name() {
+		return major_full_name;
+	}
+	public void setMajor_full_name(String major_full_name) {
+		this.major_full_name = major_full_name;
+	}
+	public String getOrg_name() {
+		return org_name;
+	}
+	public void setOrg_name(String org_name) {
+		this.org_name = org_name;
+	}
+	public Integer getOld_major_status() {
+		return old_major_status;
+	}
+	public void setOld_major_status(Integer old_major_status) {
+		this.old_major_status = old_major_status;
+	}
+
+  	
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlSchoolMajorPre.java

@@ -0,0 +1,99 @@
+package cn.hmsoft.ses.data.model.pl;
+
+import java.io.Serializable;
+import cn.hmsoft.jdbc.entity.Table;
+
+/**
+ * 专业对应的主考学校 主考学校开考了哪些专业 模型.
+ * 
+ * @author: haoguanghui
+ * @date: 2019-06-04 15:53:34
+ * @version: 1.0
+ * @email: hgh@qmth.com.cn
+ * @Company: www.hmsoft.cn
+ */
+@Table(tableName = "pl_school_major_pre", keyColumn = "id", sequenceName = "SEQ_pl_school_major")
+public class PlSchoolMajorPre implements Serializable {
+	private static final long serialVersionUID = 7521221241505281339L;
+  	//ID
+  	private Integer id;
+  	//专业code 专业表中的major_code
+  	private String major_code;
+  	//主考学校代码
+  	private String school_code;
+  	//主考学校ID 和机构表中的ID关联
+  	private Integer school_id;
+  	//状态 0：禁用；1：启用
+  	private Integer status;
+  
+	/**
+	 * ID
+	 */	
+  	public void setId(Integer id) {
+		this.id = id;
+  	}
+ 	/**
+	 * ID
+	 */	 	
+  	public Integer getId() {
+		return id;
+  	}
+	/**
+	 * 专业code 专业表中的major_code
+	 */	
+  	public void setMajor_code(String major_code) {
+		this.major_code = major_code;
+  	}
+ 	/**
+	 * 专业code 专业表中的major_code
+	 */	 	
+  	public String getMajor_code() {
+		return major_code;
+  	}
+	/**
+	 * 主考学校代码
+	 */	
+  	public void setSchool_code(String school_code) {
+		this.school_code = school_code;
+  	}
+ 	/**
+	 * 主考学校代码
+	 */	 	
+  	public String getSchool_code() {
+		return school_code;
+  	}
+	/**
+	 * 主考学校ID 和机构表中的ID关联
+	 */	
+  	public void setSchool_id(Integer school_id) {
+		this.school_id = school_id;
+  	}
+ 	/**
+	 * 主考学校ID 和机构表中的ID关联
+	 */	 	
+  	public Integer getSchool_id() {
+		return school_id;
+  	}
+	/**
+	 * 状态 0：禁用；1：启用
+	 */	
+  	public void setStatus(Integer status) {
+		this.status = status;
+  	}
+ 	/**
+	 * 状态 0：禁用；1：启用
+	 */	 	
+  	public Integer getStatus() {
+		return status;
+  	}
+  	
+  	protected String org_name; //机构名称
+
+	public String getOrg_name() {
+		return org_name;
+	}
+	public void setOrg_name(String org_name) {
+		this.org_name = org_name;
+	}
+  	
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlTextbook.java

@@ -40,10 +40,31 @@ public class PlTextbook implements Serializable {
   	//编著
   	private String textbook_writer;
   	
-  	protected Integer course_id;
+  	private Integer course_id;
   	protected String year_code;
+  	
+  	private Integer exam_time_id;
+  	private String file_path;
+  	private String file_name;
 
-  
+	public String getFile_name() {
+		return file_name;
+	}
+	public void setFile_name(String file_name) {
+		this.file_name = file_name;
+	}
+	public Integer getExam_time_id() {
+		return exam_time_id;
+	}
+	public void setExam_time_id(Integer exam_time_id) {
+		this.exam_time_id = exam_time_id;
+	}
+	public String getFile_path() {
+		return file_path;
+	}
+	public void setFile_path(String file_path) {
+		this.file_path = file_path;
+	}
 	public Integer getCourse_id() {
 		return course_id;
 	}

ses-model/src/main/java/cn/hmsoft/ses/data/model/pl/PlTextbookPre.java

@@ -0,0 +1,203 @@
+package cn.hmsoft.ses.data.model.pl;
+
+import java.io.Serializable;
+import cn.hmsoft.jdbc.entity.Table;
+
+/**
+ * 教材表 旧表-jc_jiaocai 模型.
+ * 
+ * @author: haoguanghui
+ * @date: 2018-10-17 14:49:52
+ * @version: 1.0
+ * @email: hgh@qmth.com.cn
+ * @Company: www.hmsoft.cn
+ */
+@Table(tableName = "pl_textbook_pre", keyColumn = "id", sequenceName = "seq_pl_textbook")
+public class PlTextbookPre implements Serializable {
+	private static final long serialVersionUID = -536281787214929661L;
+  	//主键ID
+  	private Integer id;
+  	//费用
+  	private String price;
+  	//出版时间
+  	private String publish_time;
+  	//说明
+  	private String remark;
+  	//状态 启用、停用
+  	private Integer status;
+  	//教材代号
+  	private String textbook_code;
+  	//教材名称
+  	private String textbook_name;
+  	//大纲 教材大纲
+  	private String textbook_outline;
+  	//出版社
+  	private String textbook_publisher;
+  	//版次 如：2008
+  	private String textbook_revision;
+  	//国标代码
+  	private String textbook_standard_code;
+  	//编著
+  	private String textbook_writer;
+  	
+  	protected Integer course_id;
+  	protected String year_code;
+
+  
+	public Integer getCourse_id() {
+		return course_id;
+	}
+	public void setCourse_id(Integer course_id) {
+		this.course_id = course_id;
+	}
+	public String getYear_code() {
+		return year_code;
+	}
+	public void setYear_code(String year_code) {
+		this.year_code = year_code;
+	}
+	/**
+	 * 主键ID
+	 */	
+  	public void setId(Integer id) {
+		this.id = id;
+  	}
+ 	/**
+	 * 主键ID
+	 */	 	
+  	public Integer getId() {
+		return id;
+  	}
+	/**
+	 * 费用
+	 */	
+  	public void setPrice(String price) {
+		this.price = price;
+  	}
+ 	/**
+	 * 费用
+	 */	 	
+  	public String getPrice() {
+		return price;
+  	}
+	/**
+	 * 出版时间
+	 */	
+  	public void setPublish_time(String publish_time) {
+		this.publish_time = publish_time;
+  	}
+ 	/**
+	 * 出版时间
+	 */	 	
+  	public String getPublish_time() {
+		return publish_time;
+  	}
+	/**
+	 * 说明
+	 */	
+  	public void setRemark(String remark) {
+		this.remark = remark;
+  	}
+ 	/**
+	 * 说明
+	 */	 	
+  	public String getRemark() {
+		return remark;
+  	}
+	/**
+	 * 状态 启用、停用
+	 */	
+  	public void setStatus(Integer status) {
+		this.status = status;
+  	}
+ 	/**
+	 * 状态 启用、停用
+	 */	 	
+  	public Integer getStatus() {
+		return status;
+  	}
+	/**
+	 * 教材代号
+	 */	
+  	public void setTextbook_code(String textbook_code) {
+		this.textbook_code = textbook_code;
+  	}
+ 	/**
+	 * 教材代号
+	 */	 	
+  	public String getTextbook_code() {
+		return textbook_code;
+  	}
+	/**
+	 * 教材名称
+	 */	
+  	public void setTextbook_name(String textbook_name) {
+		this.textbook_name = textbook_name;
+  	}
+ 	/**
+	 * 教材名称
+	 */	 	
+  	public String getTextbook_name() {
+		return textbook_name;
+  	}
+	/**
+	 * 大纲 教材大纲
+	 */	
+  	public void setTextbook_outline(String textbook_outline) {
+		this.textbook_outline = textbook_outline;
+  	}
+ 	/**
+	 * 大纲 教材大纲
+	 */	 	
+  	public String getTextbook_outline() {
+		return textbook_outline;
+  	}
+	/**
+	 * 出版社
+	 */	
+  	public void setTextbook_publisher(String textbook_publisher) {
+		this.textbook_publisher = textbook_publisher;
+  	}
+ 	/**
+	 * 出版社
+	 */	 	
+  	public String getTextbook_publisher() {
+		return textbook_publisher;
+  	}
+	/**
+	 * 版次 如：2008
+	 */	
+  	public void setTextbook_revision(String textbook_revision) {
+		this.textbook_revision = textbook_revision;
+  	}
+ 	/**
+	 * 版次 如：2008
+	 */	 	
+  	public String getTextbook_revision() {
+		return textbook_revision;
+  	}
+	/**
+	 * 国标代码
+	 */	
+  	public void setTextbook_standard_code(String textbook_standard_code) {
+		this.textbook_standard_code = textbook_standard_code;
+  	}
+ 	/**
+	 * 国标代码
+	 */	 	
+  	public String getTextbook_standard_code() {
+		return textbook_standard_code;
+  	}
+	/**
+	 * 编著
+	 */	
+  	public void setTextbook_writer(String textbook_writer) {
+		this.textbook_writer = textbook_writer;
+  	}
+ 	/**
+	 * 编著
+	 */	 	
+  	public String getTextbook_writer() {
+		return textbook_writer;
+  	}
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/std/StdBreakDiscipline.java

@@ -61,6 +61,11 @@ public class StdBreakDiscipline implements Serializable {
 	// 录入人
   	private Integer optr_id;
   	
+ 
+  	private String file_path;
+  	
+  	private String file_name;
+  	
   	public Integer getOptr_id() {
 		return optr_id;
 	}
@@ -372,6 +377,18 @@ public class StdBreakDiscipline implements Serializable {
 	public void setYear_code(Integer year_code) {
 		this.year_code = year_code;
 	}
+	public String getFile_path() {
+		return file_path;
+	}
+	public void setFile_path(String file_path) {
+		this.file_path = file_path;
+	}
+	public String getFile_name() {
+		return file_name;
+	}
+	public void setFile_name(String file_name) {
+		this.file_name = file_name;
+	}
 	
   	
   	

ses-model/src/main/java/cn/hmsoft/ses/data/model/std/StdBreakDisciplineFile.java

@@ -0,0 +1,91 @@
+package cn.hmsoft.ses.data.model.std;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import cn.hmsoft.jdbc.entity.Table;
+
+/**
+ * @author huangzibo
+ *
+ */
+@Table(tableName = "std_break_discipline_file")
+public class StdBreakDisciplineFile implements Serializable {
+	private static final long serialVersionUID = 429012448173574812L;
+
+	private Integer exam_time_id;
+	private String ticket_no;
+	private String std_name;
+	private String cert_no;
+	private String file_type;
+	private String file_url;
+	private LocalDateTime create_time;
+
+	protected String exam_year_month;
+
+	public Integer getExam_time_id() {
+		return exam_time_id;
+	}
+
+	public void setExam_time_id(Integer exam_time_id) {
+		this.exam_time_id = exam_time_id;
+	}
+
+	public String getTicket_no() {
+		return ticket_no;
+	}
+
+	public void setTicket_no(String ticket_no) {
+		this.ticket_no = ticket_no;
+	}
+
+	public String getStd_name() {
+		return std_name;
+	}
+
+	public void setStd_name(String std_name) {
+		this.std_name = std_name;
+	}
+
+	public String getCert_no() {
+		return cert_no;
+	}
+
+	public void setCert_no(String cert_no) {
+		this.cert_no = cert_no;
+	}
+
+	public String getFile_type() {
+		return file_type;
+	}
+
+	public void setFile_type(String file_type) {
+		this.file_type = file_type;
+	}
+
+	public String getFile_url() {
+		return file_url;
+	}
+
+	public void setFile_url(String file_url) {
+		this.file_url = file_url;
+	}
+
+	public LocalDateTime getCreate_time() {
+		return create_time;
+	}
+
+	public void setCreate_time(LocalDateTime create_time) {
+		this.create_time = create_time;
+	}
+
+	public String getExam_year_month() {
+		return exam_year_month;
+	}
+
+	public void setExam_year_month(String exam_year_month) {
+		this.exam_year_month = exam_year_month;
+	}
+
+}

ses-model/src/main/java/cn/hmsoft/ses/data/model/std/StdRegInfo.java

@@ -3,6 +3,7 @@ package cn.hmsoft.ses.data.model.std;
 import cn.hmsoft.jdbc.entity.Table;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * 
@@ -163,6 +164,16 @@ public class StdRegInfo implements Serializable {
 	
 	protected String ks_address;
 	
+	protected LocalDateTime create_time;
+	
+	public LocalDateTime getCreate_time() {
+		return create_time;
+	}
+
+	public void setCreate_time(LocalDateTime create_time) {
+		this.create_time = create_time;
+	}
+
 	public String getKs_address() {
 		return ks_address;
 	}

ses-model/src/main/java/cn/hmsoft/ses/data/model/sys/SysAppNews.java

@@ -32,8 +32,16 @@ public class SysAppNews implements Serializable {
   	
   	private String more_url;
   	
+  	private String topup;
+  	
   	protected Integer is_new;
   	
+	public String getTopup() {
+		return topup;
+	}
+	public void setTopup(String topup) {
+		this.topup = topup;
+	}
 	public Integer getIs_new() {
 		return is_new;
 	}