Skip to content

D
dd_school
Commit 0f88a905 by xuwenhao
Options

1.26修改工作量与违纪

parent f6433c06
Showing with 77 additions and 54 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkload.java
......@@ -67,6 +67,9 @@ public class SchoolAworkload extends BaseEntity
/** 晚自习 */
private BigDecimal eveningSelfStudy;
/** 周课时量 */
private BigDecimal weeklyClassHours;
/** 证明人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadDc.java
......@@ -62,21 +62,25 @@ 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 = "合计")
// @Excel(name = "合计")
private BigDecimal amountTo;
/** 周课时量 */
@Excel(name = "周课时量")
private BigDecimal weeklyClassHours;
/** 证明人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadExport.java
......@@ -69,21 +69,25 @@ 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 = "合计")
// @Excel(name = "合计")
private BigDecimal amountTo;
/** 周课时量 */
@Excel(name = "周课时量")
private BigDecimal weeklyClassHours;
/** 证明人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadVo.java
......@@ -75,6 +75,9 @@ public class SchoolAworkloadVo extends BaseEntity
/**合计*/
private BigDecimal amountTo;
/** 周课时量 */
private BigDecimal weeklyClassHours;
/** 证明人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolRewardsPunishments/SchoolScDiscipline.java
......@@ -74,8 +74,8 @@ public class SchoolScDiscipline extends OurBaseEntity
@Excel(name = "级部主任")
private String gradeDirector;
/** 违纪类别（字典） */
@Excel(name = "违纪类别", readConverterExp = "字=典")
/** 违纪行为 */
@Excel(name = "违纪行为")
private String violateType;
/** 违纪次数（字典） */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAworkloadServiceImpl.java
......@@ -124,19 +124,25 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
sb.append(index+ "、班级类型不能为空");
sb.append("<br/>");
}
//早读
if (date.getEarlyReading() == null) {
sb.append(index+ "、早读不能为空");
sb.append("<br/>");
}
//正课
if (date.getRequiredCourses() == null) {
sb.append(index+ "、正课不能为空");
sb.append("<br/>");
}
//晚自习
if (date.getEveningSelfStudy() == null) {
sb.append(index+ "、晚自习不能为空");
// //早读
// if (date.getEarlyReading() == null) {
// sb.append(index+ "、早读不能为空");
// sb.append("<br/>");
// }
// //正课
// if (date.getRequiredCourses() == null) {
// sb.append(index+ "、正课不能为空");
// sb.append("<br/>");
// }
// //晚自习
// if (date.getEveningSelfStudy() == null) {
// sb.append(index+ "、晚自习不能为空");
// sb.append("<br/>");
// }
//周课时量
if (date.getWeeklyClassHours() == null) {
sb.append(index+ "、周课时量不能为空");
sb.append("<br/>");
}
......@@ -303,10 +309,10 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkloadVo schoolAworkloadVo)
{
List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadMapper.selectSchoolAworkloadList(schoolAworkloadVo);
//计算合计
for (SchoolAworkloadVo date : schoolAworkloadVos){
date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
}
// //计算合计
// for (SchoolAworkloadVo date : schoolAworkloadVos){
// date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
// }
return schoolAworkloadVos;
}
......@@ -315,10 +321,10 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkloadVo schoolAworkloadVo)
{
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadMapper.selectAworkloadList(schoolAworkloadVo);
//计算合计
for (SchoolAworkloadExport date : schoolAworkloadVos){
date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
}
// //计算合计
// for (SchoolAworkloadExport date : schoolAworkloadVos){
// date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
// }
return schoolAworkloadVos;
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteachingAchievementsServiceImpl.java
......@@ -352,6 +352,8 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学科输入错误,请您重新输入! ");
}else {
schoolXteachingAchievements.setGrade(grade1);
schoolXteachingAchievements.setSub(sub1);
//判断班级是否正确
String className = schoolXteachingAchievements.getClassName();
//将所有中文逗号替换成英文逗号
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolRewardsPunishments/SchoolScDisciplineServiceImpl.java
......@@ -284,7 +284,7 @@ public class SchoolScDisciplineServiceImpl extends ServiceImpl<SchoolScDisciplin
failureMsg.append("<br/>" + failureNum + "、身份证号为空,请您重新输入! ");
}else if (StringUtils.isEmpty(schoolScDisciplineVo.getViolateType())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、违纪类别为空,请您重新输入! ");
failureMsg.append("<br/>" + failureNum + "、违纪行为为空,请您重新输入! ");
}else if (StringUtils.isEmpty(schoolScDisciplineVo.getViolateNum())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、违纪次数为空,请您重新输入! ");
......@@ -369,13 +369,13 @@ public class SchoolScDisciplineServiceImpl extends ServiceImpl<SchoolScDisciplin
}
}
if (StringUtils.isEmpty(idCard)){
//判断违纪类别输入是否正确
String wjlb1 = "";
for (SysDictData sysDictData : wjlb) {
if (schoolScDisciplineVo.getViolateType().equals(sysDictData.getDictLabel())){
wjlb1 = sysDictData.getDictValue();
}
}
// //判断违纪类别输入是否正确
// String wjlb1 = "";
// for (SysDictData sysDictData : wjlb) {
// if (schoolScDisciplineVo.getViolateType().equals(sysDictData.getDictLabel())){
// wjlb1 = sysDictData.getDictValue();
// }
// }
//判断违纪次数输入是否正确
String wjcs1 = "";
......@@ -393,15 +393,15 @@ public class SchoolScDisciplineServiceImpl extends ServiceImpl<SchoolScDisciplin
}
}
if (StringUtils.isEmpty(wjlb1)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、违纪类别输入错误,请您重新输入! ");
}else if (StringUtils.isEmpty(wjcs1)){
if (StringUtils.isEmpty(wjcs1)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、违纪次数输入错误,请您重新输入! ");
}else if (StringUtils.isEmpty(cfjg1)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、处分结果输入错误,请您重新输入! ");
}else {
schoolScDisciplineVo.setViolateNum(wjcs1);
schoolScDisciplineVo.setPunishResult(cfjg1);
}
}
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolRewardsPunishments/SchoolScDisciplineExport.java
......@@ -80,19 +80,14 @@ public class SchoolScDisciplineExport {
private String gradeDirector;
/** 违纪类别（字典） */
// @Excel(name = "违纪类别", combo = {"旷课","擅离学校","夜不归宿","扰乱秩序","骂人打架","携带管制刀具","破坏公物","偷盗","抽烟","喝酒","带手机","考试作弊","谈恋爱","其他"},
// readConverterExp = "1=旷课,2=擅离学校,3=夜不归宿,4=扰乱秩序,5=骂人打架,6=携带管制刀具,7=破坏公物,8=偷盗,9=抽烟,10=喝酒,11=带手机,12=考试作弊,13=谈恋爱,14=其他")
@Excel(name = "违纪类别",dictType = "violate_type")
@Excel(name = "违纪行为")
private String violateType;
/** 违纪次数（字典） */
// @Excel(name = "违纪次数", combo = {"首次违纪","第2次违纪","第3次违纪"}, readConverterExp = "1=首次违纪,2=第2次违纪,3=第3次违纪")
@Excel(name = "违纪次数", dictType = "violate_num")
private String violateNum;
/** 处分结果（字典） */
// @Excel(name = "处分结果", combo = {"警告","严重警告","记过","留校察看","勒令退学","开除学籍","其他"},
// readConverterExp = "1=警告,2=严重警告,3=记过,4=留校察看,5=勒令退学,6=开除学籍,7=其他")
@Excel(name = "处分结果",dictType = "punish_result")
private String punishResult;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolRewardsPunishments/SchoolScDisciplineVo.java
......@@ -80,8 +80,8 @@ public class SchoolScDisciplineVo {
@Excel(name = "级部主任")
private String gradeDirector;
/** 违纪类别（字典） */
@Excel(name = "违纪类别")
/** 违纪行为 */
@Excel(name = "违纪行为")
private String violateType;
/** 违纪次数（字典） */
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAworkloadMapper.xml
......@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="earlyReading" column="early_reading" />
<result property="requiredCourses" column="required_courses" />
<result property="eveningSelfStudy" column="evening_self_study" />
<result property="weeklyClassHours" column="weekly_class_hours" />
<result property="userId" column="user_id" />
<result property="userName" column="user_name" />
<result property="remark" column="remark" />
......@@ -32,7 +33,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, 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, 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">
......@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="earlyReading != null "> and early_reading = #{earlyReading}</if>
<if test="requiredCourses != null "> and required_courses = #{requiredCourses}</if>
<if test="eveningSelfStudy != null "> and evening_self_study = #{eveningSelfStudy}</if>
<if test="weeklyClassHours != null "> and weekly_class_hours = #{weeklyClassHours}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
<if test="idCards != null">
......@@ -93,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="earlyReading != null "> and early_reading = #{earlyReading}</if>
<if test="requiredCourses != null "> and required_courses = #{requiredCourses}</if>
<if test="eveningSelfStudy != null "> and evening_self_study = #{eveningSelfStudy}</if>
<if test="weeklyClassHours != null "> and weekly_class_hours = #{weeklyClassHours}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
<if test="idCards != null">
......@@ -128,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="earlyReading != null">early_reading,</if>
<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="userId != null">user_id,</if>
<if test="userName != null">user_name,</if>
<if test="remark != null">remark,</if>
......@@ -153,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="earlyReading != null">#{earlyReading},</if>
<if test="requiredCourses != null">#{requiredCourses},</if>
<if test="eveningSelfStudy != null">#{eveningSelfStudy},</if>
<if test="weeklyClassHours != null">#{weeklyClassHours},</if>
<if test="userId != null">#{userId},</if>
<if test="userName != null">#{userName},</if>
<if test="remark != null">#{remark},</if>
......@@ -182,6 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="earlyReading != null">early_reading = #{earlyReading},</if>
<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="userId != null">user_id = #{userId},</if>
<if test="userName != null">user_name = #{userName},</if>
<if test="remark != null">remark = #{remark},</if>
......@@ -195,11 +201,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteSchoolAworkloadById" parameterType="Long">
delete from school_aworkload where id = #{id}
update school_aworkload set del_flag = '1' where id = #{id}
</delete>
<delete id="deleteSchoolAworkloadByIds" parameterType="String">
delete from school_aworkload where id in
update school_aworkload set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
......
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