Tenlion/bt-yjj-system-examination-signup
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
cuibaocheng 2021-05-04 13:15:29 +08:00
commit d9d45b69f9
3 changed files with 125 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanDTO.java
View File

@ -1,5 +1,7 @@
package cn.com.tenlion.pojo.dtos.classplan;
import ink.wgink.annotation.CheckEmptyAnnotation;
import ink.wgink.annotation.CheckNumberAnnotation;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -14,6 +16,10 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel
public class ClassPlanDTO {
@ApiModelProperty(name = "classPlanId", value = "计划ID")
private String classPlanId;
@ApiModelProperty(name = "orgId", value = "机构ID")
private String orgId;
@ApiModelProperty(name = "planNumber", value = "培训计划编号")
private String planNumber;
@ApiModelProperty(name = "planName", value = "培训计划名称")
@ -25,14 +31,19 @@ public class ClassPlanDTO {
@ApiModelProperty(name = "workerCatalog", value = "培训工种")
private String workerCatalog;
@ApiModelProperty(name = "planPersonNum", value = "计划人数")
@CheckNumberAnnotation(name = "计划人数")
private Integer planPersonNum;
@ApiModelProperty(name = "planStartTime", value = "培训开始时间")
@CheckEmptyAnnotation(name = "培训开始时间", verifyType = "datetime")
private String planStartTime;
@ApiModelProperty(name = "planEndTime", value = "培训结束时间")
@CheckEmptyAnnotation(name = "培训结束时间", verifyType = "datetime")
private String planEndTime;
@ApiModelProperty(name = "signUpStartTime", value = "报名时间开始")
@CheckEmptyAnnotation(name = "报名时间开始", verifyType = "datetime")
private String signUpStartTime;
@ApiModelProperty(name = "signUpEndTime", value = "报名时间截止")
@CheckEmptyAnnotation(name = "报名时间截止", verifyType = "datetime")
private String signUpEndTime;
@ApiModelProperty(name = "planAddress", value = "培训地点")
private String planAddress;
@ -40,6 +51,10 @@ public class ClassPlanDTO {
private String chargePerson;
@ApiModelProperty(name = "chargePersonTel", value = "联系方式")
private String chargePersonTel;
@ApiModelProperty(name = "reportType", value = "报备状态")
private String reportType;
@ApiModelProperty(name = "reportReason", value = "报备审核原因")
private String reportReason;
public String getPlanNumber() {
return planNumber == null ? "" : planNumber.trim();
@ -145,5 +160,35 @@ public class ClassPlanDTO {
this.chargePersonTel = chargePersonTel;
}
public String getClassPlanId() {
return classPlanId == null ? "" : classPlanId;
}
public void setClassPlanId(String classPlanId) {
this.classPlanId = classPlanId;
}
public String getOrgId() {
return orgId == null ? "" : orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getReportType() {
return reportType == null ? "" : reportType;
}
public void setReportType(String reportType) {
this.reportType = reportType;
}
public String getReportReason() {
return reportReason == null ? "" : reportReason;
}
public void setReportReason(String reportReason) {
this.reportReason = reportReason;
}
}

38
src/main/java/cn/com/tenlion/pojo/vos/classplan/ClassPlanVO.java
View File

@ -16,6 +16,10 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel
public class ClassPlanVO {
@ApiModelProperty(name = "classPlanId", value = "计划ID")
private String classPlanId;
@ApiModelProperty(name = "orgId", value = "机构ID")
private String orgId;
@ApiModelProperty(name = "planNumber", value = "培训计划编号")
private String planNumber;
@ApiModelProperty(name = "planName", value = "培训计划名称")
@ -47,6 +51,10 @@ public class ClassPlanVO {
private String chargePerson;
@ApiModelProperty(name = "chargePersonTel", value = "联系方式")
private String chargePersonTel;
@ApiModelProperty(name = "reportType", value = "报备状态")
private String reportType;
@ApiModelProperty(name = "reportReason", value = "报备审核原因")
private String reportReason;
public String getPlanNumber() {
return planNumber == null ? "" : planNumber.trim();
@ -152,5 +160,35 @@ public class ClassPlanVO {
this.chargePersonTel = chargePersonTel;
}
public String getClassPlanId() {
return classPlanId == null ? "" : classPlanId;
}
public void setClassPlanId(String classPlanId) {
this.classPlanId = classPlanId;
}
public String getOrgId() {
return orgId == null ? "" : orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getReportType() {
return reportType == null ? "" : reportType;
}
public void setReportType(String reportType) {
this.reportType = reportType;
}
public String getReportReason() {
return reportReason == null ? "" : reportReason;
}
public void setReportReason(String reportReason) {
this.reportReason = reportReason;
}
}

50
src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml
View File

@ -3,6 +3,8 @@
<mapper namespace="cn.com.tenlion.dao.classplan.IClassPlanDao">
<resultMap id="classPlanDTO" type="cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO">
<id column="class_plan_id" property="classPlanId"/>
<id column="org_id" property="orgId"/>
<result column="plan_number" property="planNumber"/>
<result column="plan_name" property="planName"/>
<result column="plan_type" property="planType"/>
@ -16,6 +18,8 @@
<result column="plan_address" property="planAddress"/>
<result column="charge_person" property="chargePerson"/>
<result column="charge_person_tel" property="chargePersonTel"/>
<result column="report_type" property="reportType"/>
<result column="report_reason" property="reportReason"/>
</resultMap>
<resultMap id="classPlanBO" type="cn.com.tenlion.pojo.bos.classplan.ClassPlanBO">
@ -56,6 +60,7 @@
<insert id="save" parameterType="map">
INSERT INTO e_class_plan(
class_plan_id,
org_id,
plan_number,
plan_name,
plan_type,
@ -68,9 +73,12 @@
sign_up_end_time,
plan_address,
charge_person,
charge_person_tel
charge_person_tel,
report_type,
report_reason
) VALUES(
#{classPlanId},
#{orgId},
#{planNumber},
#{planName},
#{planType},
@ -83,7 +91,9 @@
#{signUpEndTime},
#{planAddress},
#{chargePerson},
#{chargePersonTel}
#{chargePersonTel},
#{reportType},
#{reportReason}
)
</insert>
@ -99,6 +109,17 @@
</foreach>
</update>
<!-- 删除（逻辑） -->
<update id="remove" parameterType="map">
UPDATE e_class_plan SET
is_delete = '1'
WHERE
class_plan_id IN
<foreach collection="classPlanIds" index="index" open="(" separator="," close=")">
#{classPlanIds[${index}]}
</foreach>
</update>
<!-- 修改 -->
<update id="update" parameterType="map">
UPDATE
@ -107,6 +128,9 @@
<if test="planNumber != null and planNumber != ''">
plan_number = #{planNumber},
</if>
<if test="orgId != null and orgId != ''">
org_id = #{orgId},
</if>
<if test="planName != null and planName != ''">
plan_name = #{planName},
</if>
@ -142,6 +166,12 @@
</if>
<if test="chargePersonTel != null and chargePersonTel != ''">
charge_person_tel = #{chargePersonTel},
</if>
<if test="reportType != null and reportType != ''">
report_type = #{reportType},
</if>
<if test="reportReason != null and reportReason != ''">
report_reason = #{reportReason},
</if>
class_plan_id = class_plan_id
WHERE
@ -152,6 +182,7 @@
<select id="get" parameterType="map" resultMap="classPlanDTO">
SELECT
t1.plan_number,
t1.org_id,
t1.plan_name,
t1.plan_type,
t1.project_catalog_id,
@ -164,7 +195,9 @@
t1.plan_address,
t1.charge_person,
t1.charge_person_tel,
t1.class_plan_id
t1.class_plan_id,
t1.report_type,
t1.report_reason
FROM
e_class_plan t1
WHERE
@ -233,6 +266,7 @@
<select id="list" parameterType="map" resultMap="classPlanDTO">
SELECT
t1.plan_number,
t1.org_id,
t1.plan_name,
t1.plan_type,
t1.project_catalog_id,
@ -245,16 +279,16 @@
t1.plan_address,
t1.charge_person,
t1.charge_person_tel,
1
t1.report_type,
t1.report_reason
FROM
e_class_plan t1
WHERE
1 = 1
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
)
AND (
t1.id LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="classPlanIds != null and classPlanIds.size > 0">
AND