Skip to content

D
dd_school
Commit b779ba64 by heneng
Options

教师电子档案-工作量信息:增、改、查、导入、导出修改 

(1)"周课时量"改名"周课时总量"
(2)增加：早读、正课、晚自习、周末课时、是否满工作量
parent 6aa634ca
Showing with 49 additions and 11 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkload.java
......@@ -70,6 +70,12 @@ public class SchoolAworkload extends BaseEntity
/** 周课时量 */
private BigDecimal weeklyClassHours;
/** 周课时量 */
private BigDecimal weekendClassHours;
/** 是否满工作量 */
private String workloadFullFlag;
/** 证明人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadDc.java
......@@ -62,25 +62,32 @@ public class SchoolAworkloadDc extends BaseEntity {
private String classType;
/** 早读 */
// @Excel(name = "早读")
@Excel(name = "早读")
private BigDecimal earlyReading;
/** 正课 */
// @Excel(name = "正课")
@Excel(name = "正课")
private BigDecimal requiredCourses;
/** 晚自习 */
// @Excel(name = "晚自习")
@Excel(name = "晚自习")
private BigDecimal eveningSelfStudy;
/**合计*/
// @Excel(name = "合计")
private BigDecimal amountTo;
/** 周课时量 */
@Excel(name = "周课时量")
/** 周末课时 */
@Excel(name = "周末课时")
private BigDecimal weekendClassHours;
@Excel(name = "总课时量")
private BigDecimal weeklyClassHours;
/** 是否满工作量 */
@Excel(name = "是否满工作量",combo = {"是","否"},readConverterExp = "Y=是,N=否")
private String workloadFullFlag;
/** 证明人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadExport.java
......@@ -69,25 +69,33 @@ public class SchoolAworkloadExport extends BaseEntity
private String classType;
/** 早读 */
// @Excel(name = "早读")
@Excel(name = "早读")
private BigDecimal earlyReading;
/** 正课 */
// @Excel(name = "正课")
@Excel(name = "正课")
private BigDecimal requiredCourses;
/** 晚自习 */
// @Excel(name = "晚自习")
@Excel(name = "晚自习")
private BigDecimal eveningSelfStudy;
/**合计*/
// @Excel(name = "合计")
private BigDecimal amountTo;
/** 周末课时 */
@Excel(name = "周末课时")
private BigDecimal weekendClassHours;
/** 周课时量 */
@Excel(name = "周课时量")
@Excel(name = "总课时量")
private BigDecimal weeklyClassHours;
/** 是否满工作量 */
@Excel(name = "是否满工作量")
private String workloadFullFlag;
/** 证明人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadVo.java
......@@ -75,9 +75,16 @@ public class SchoolAworkloadVo extends BaseEntity
/**合计*/
private BigDecimal amountTo;
/** 周课时量 */
/** 周末课时 */
private BigDecimal weekendClassHours;
/** 周课时总量 */
private BigDecimal weeklyClassHours;
/** 是否满工作量 */
private String workloadFullFlag;
/** 证明人id */
private Long userId;
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAworkloadMapper.xml
......@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="requiredCourses" column="required_courses" />
<result property="eveningSelfStudy" column="evening_self_study" />
<result property="weeklyClassHours" column="weekly_class_hours" />
<result property="weekendClassHours" column="weekend_class_hours" />
<result property="workloadFullFlag" column="workload_full_flag" />
<result property="userId" column="user_id" />
<result property="userName" column="user_name" />
<result property="remark" column="remark" />
......@@ -33,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSchoolAworkloadVo">
select id, school_year, semester, year, grade, name, sub, id_card, appointment_post, appointment_position, appointment_situation, class_name, class_type, early_reading, required_courses, evening_self_study, weekly_class_hours, user_id, user_name, remark, create_by, create_time, update_by, update_time, del_flag from school_aworkload
select id, school_year, semester, year, grade, name, sub, id_card, appointment_post, appointment_position, appointment_situation, class_name, class_type, early_reading, required_courses, evening_self_study, weekly_class_hours,weekend_class_hours,workload_full_flag, user_id, user_name, remark, create_by, create_time, update_by, update_time, del_flag from school_aworkload
</sql>
<select id="selectSchoolAworkloadList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo">
......@@ -132,6 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="requiredCourses != null">required_courses,</if>
<if test="eveningSelfStudy != null">evening_self_study,</if>
<if test="weeklyClassHours != null">weekly_class_hours,</if>
<if test="weekendClassHours != null">weekend_class_hours,</if>
<if test="workloadFullFlag != null">workload_full_flag,</if>
<if test="userId != null">user_id,</if>
<if test="userName != null">user_name,</if>
<if test="remark != null">remark,</if>
......@@ -158,6 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="requiredCourses != null">#{requiredCourses},</if>
<if test="eveningSelfStudy != null">#{eveningSelfStudy},</if>
<if test="weeklyClassHours != null">#{weeklyClassHours},</if>
<if test="weekendClassHours != null">#{weekendClassHours},</if>
<if test="workloadFullFlag != null">#{workloadFullFlag},</if>
<if test="userId != null">#{userId},</if>
<if test="userName != null">#{userName},</if>
<if test="remark != null">#{remark},</if>
......@@ -188,6 +194,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="requiredCourses != null">required_courses = #{requiredCourses},</if>
<if test="eveningSelfStudy != null">evening_self_study = #{eveningSelfStudy},</if>
<if test="weeklyClassHours != null">weekly_class_hours = #{weeklyClassHours},</if>
<if test="weekendClassHours != null">weekend_class_hours = #{weekendClassHours},</if>
<if test="workloadFullFlag != null">workload_full_flag = #{workloadFullFlag},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="userName != null">user_name = #{userName},</if>
<if test="remark != null">remark = #{remark},</if>
......@@ -210,4 +218,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment