diff --git a/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java b/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java index f6cb812..ffffd8d 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java +++ b/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java @@ -1,5 +1,7 @@ package cn.com.tenlion.pojo.bos.examapply; +import io.swagger.annotations.ApiModelProperty; + /** * * @ClassName: ExamApplyBO @@ -22,6 +24,10 @@ public class ExamApplyBO { private String paymentVoucher; private String paymentVoucherNum; private String examApplyNum; + private String plan; + private String planName; + private Integer planCount; + private String examMechanism; public String getExamApplyId() { return examApplyId; @@ -118,4 +124,36 @@ public class ExamApplyBO { public void setExamApplyNum(String examApplyNum) { this.examApplyNum = examApplyNum; } + + public String getPlan() { + return plan; + } + + public void setPlan(String plan) { + this.plan = plan; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + public Integer getPlanCount() { + return planCount; + } + + public void setPlanCount(Integer planCount) { + this.planCount = planCount; + } + + public String getExamMechanism() { + return examMechanism; + } + + public void setExamMechanism(String examMechanism) { + this.examMechanism = examMechanism; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java index ddd5d9e..2b1f18e 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java @@ -38,6 +38,14 @@ public class ExamApplyDTO { private String paymentVoucherNum; @ApiModelProperty(name = "examApplyNum", value = "考试申请编号") private String examApplyNum; + @ApiModelProperty(name = "plan", value = "培训计划") + private String plan; + @ApiModelProperty(name = "planName", value = "计划名称") + private String planName; + @ApiModelProperty(name = "planCount", value = "计划人数") + private Integer planCount; + @ApiModelProperty(name = "examMechanism", value = "考试机构") + private String examMechanism; public String getExamApplyId() { return examApplyId; @@ -134,4 +142,36 @@ public class ExamApplyDTO { public void setExamApplyNum(String examApplyNum) { this.examApplyNum = examApplyNum; } + + public String getPlan() { + return plan; + } + + public void setPlan(String plan) { + this.plan = plan; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + public Integer getPlanCount() { + return planCount; + } + + public void setPlanCount(Integer planCount) { + this.planCount = planCount; + } + + public String getExamMechanism() { + return examMechanism; + } + + public void setExamMechanism(String examMechanism) { + this.examMechanism = examMechanism; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java b/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java index 0590d92..af0550c 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java +++ b/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java @@ -22,6 +22,10 @@ public class ExamApplyPO { private String paymentVoucher; private String paymentVoucherNum; private String examApplyNum; + private String plan; + private String planName; + private Integer planCount; + private String examMechanism; public String getExamApplyId() { return examApplyId; @@ -118,4 +122,36 @@ public class ExamApplyPO { public void setExamApplyNum(String examApplyNum) { this.examApplyNum = examApplyNum; } + + public String getPlan() { + return plan; + } + + public void setPlan(String plan) { + this.plan = plan; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + public Integer getPlanCount() { + return planCount; + } + + public void setPlanCount(Integer planCount) { + this.planCount = planCount; + } + + public String getExamMechanism() { + return examMechanism; + } + + public void setExamMechanism(String examMechanism) { + this.examMechanism = examMechanism; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java b/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java index 230a77a..9195090 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java @@ -40,6 +40,14 @@ public class ExamApplyVO { private String paymentVoucherNum; @ApiModelProperty(name = "examApplyNum", value = "考试申请编号") private String examApplyNum; + @ApiModelProperty(name = "plan", value = "培训计划") + private String plan; + @ApiModelProperty(name = "planName", value = "计划名称") + private String planName; + @ApiModelProperty(name = "planCount", value = "计划人数") + private Integer planCount; + @ApiModelProperty(name = "examMechanism", value = "考试机构") + private String examMechanism; public String getExamApplyId() { return examApplyId; @@ -136,4 +144,36 @@ public class ExamApplyVO { public void setExamApplyNum(String examApplyNum) { this.examApplyNum = examApplyNum; } + + public String getPlan() { + return plan; + } + + public void setPlan(String plan) { + this.plan = plan; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + public Integer getPlanCount() { + return planCount; + } + + public void setPlanCount(Integer planCount) { + this.planCount = planCount; + } + + public String getExamMechanism() { + return examMechanism; + } + + public void setExamMechanism(String examMechanism) { + this.examMechanism = examMechanism; + } } diff --git a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml index 2da5b38..3fbe081 100644 --- a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml +++ b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml @@ -15,6 +15,10 @@ + + + + @@ -58,6 +62,10 @@ theory_exam_end_time, payment_voucher, payment_voucher_num, + plan, + plan_name, + plan_count, + exam_mechanism, gmt_create, creator, gmt_modified, @@ -72,6 +80,10 @@ #{theoryExamEndTime}, #{paymentVoucher}, #{paymentVoucherNum}, + #{plan}, + #{planName}, + #{planCount}, + #{examMechanism}, #{gmtCreate}, #{creator}, #{gmtModified}, @@ -143,6 +155,18 @@ exam_apply_num = #{examApplyNum}, + + + plan = #{plan}, + + + plan_name = #{planName}, + + + plan_count = #{planCount}, + + + exam_mechanism = #{examMechanism}, gmt_modified = #{gmtModified}, modifier = #{modifier}, @@ -162,7 +186,11 @@ t1.payment_voucher, t1.payment_voucher_num, t1.exam_apply_num, - t1.exam_apply_id + t1.exam_apply_id, + t1.plan, + t1.plan_name, + t1.plan_count, + t1.exam_mechanism FROM management_exam_apply t1 WHERE @@ -187,7 +215,11 @@ t1.practice_exam_end_time, t1.payment_voucher, t1.payment_voucher_num, - t1.exam_apply_num + t1.exam_apply_num, + t1.plan, + t1.plan_name, + t1.plan_count, + t1.exam_mechanism FROM management_exam_apply t1 WHERE @@ -212,7 +244,11 @@ t1.practice_exam_end_time, t1.payment_voucher, t1.payment_voucher_num, - t1.exam_apply_num + t1.exam_apply_num, + t1.plan, + t1.plan_name, + t1.plan_count, + t1.exam_mechanism FROM management_exam_apply t1 WHERE @@ -237,7 +273,11 @@ t1.practice_exam_end_time, t1.payment_voucher, t1.payment_voucher_num, - t1.exam_apply_num, + t1.exam_apply_num,, + t1.plan, + t1.plan_name, + t1.plan_count, + t1.exam_mechanism, 1 FROM management_exam_apply t1 @@ -280,7 +320,11 @@ t1.practice_exam_end_time, t1.payment_voucher, t1.payment_voucher_num, - t1.exam_apply_num + t1.exam_apply_num, + t1.plan, + t1.plan_name, + t1.plan_count, + t1.exam_mechanism FROM management_exam_apply t1 WHERE @@ -322,7 +366,11 @@ t1.practice_exam_end_time, t1.payment_voucher, t1.payment_voucher_num, - t1.exam_apply_num + t1.exam_apply_num, + t1.plan, + t1.plan_name, + t1.plan_count, + t1.exam_mechanism FROM management_exam_apply t1 WHERE diff --git a/src/main/resources/static/route/examapply/save.html b/src/main/resources/static/route/examapply/save.html index 56816e1..b8e62f3 100644 --- a/src/main/resources/static/route/examapply/save.html +++ b/src/main/resources/static/route/examapply/save.html @@ -28,7 +28,7 @@
- +
@@ -40,13 +40,13 @@
- +
- +