Skip to content

D
dd_school
Commit 5438e8ec by xuwenhao
Options

2.23修改嘉奖与违纪、班主任考核

parent 5725ff0c
Showing with 56 additions and 11 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolRewardsPunishments/SchoolScDisciplineController.java
...@@ -254,7 +254,7 @@ public class SchoolScDisciplineController extends BaseController ...@@ -254,7 +254,7 @@ public class SchoolScDisciplineController extends BaseController
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public AjaxResult importDataGr(MultipartFile file) throws Exception { public AjaxResult importDataGr(MultipartFile file) throws Exception {
ExcelUtil<SchoolScDisciplineVo> util = new ExcelUtil<SchoolScDisciplineVo>(SchoolScDisciplineVo.class); ExcelUtil<SchoolScDisciplineVo> util = new ExcelUtil<SchoolScDisciplineVo>(SchoolScDisciplineVo.class);
List<SchoolScDisciplineVo> list = util.importExcel(file.getInputStream()); List<SchoolScDisciplineVo> list = util.importExcelNdkh(file.getInputStream());
//先校验 //先校验
schoolScDisciplineService.checkImport(list); schoolScDisciplineService.checkImport(list);
//数据导入 //数据导入
...@@ -277,7 +277,7 @@ public class SchoolScDisciplineController extends BaseController ...@@ -277,7 +277,7 @@ public class SchoolScDisciplineController extends BaseController
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public AjaxResult importData(MultipartFile file) throws Exception { public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<SchoolScDisciplineVo> util = new ExcelUtil<SchoolScDisciplineVo>(SchoolScDisciplineVo.class); ExcelUtil<SchoolScDisciplineVo> util = new ExcelUtil<SchoolScDisciplineVo>(SchoolScDisciplineVo.class);
List<SchoolScDisciplineVo> list = util.importExcel(file.getInputStream()); List<SchoolScDisciplineVo> list = util.importExcelNdkh(file.getInputStream());
//先校验 //先校验
schoolScDisciplineService.checkImport(list); schoolScDisciplineService.checkImport(list);
//数据导入 //数据导入
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessment.java
...@@ -73,6 +73,10 @@ public class SchoolAclassTeacherAssessment extends BaseEntity ...@@ -73,6 +73,10 @@ public class SchoolAclassTeacherAssessment extends BaseEntity
@Excel(name = "学科") @Excel(name = "学科")
private String sub; private String sub;
/** 考核结果 */
@Excel(name = "考核结果")
private String assessmentResults;
/** 备注*/ /** 备注*/
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentExport.java
...@@ -64,6 +64,10 @@ public class SchoolAclassTeacherAssessmentExport extends BaseEntity ...@@ -64,6 +64,10 @@ public class SchoolAclassTeacherAssessmentExport extends BaseEntity
@Excel(name = "学科",dictType = "sub_dzdn") @Excel(name = "学科",dictType = "sub_dzdn")
private String sub; private String sub;
/** 考核结果 */
@Excel(name = "考核结果",dictType = "assessment_results")
private String assessmentResults;
/** 备注*/ /** 备注*/
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentReq.java
...@@ -81,7 +81,8 @@ public class SchoolAclassTeacherAssessmentReq extends BaseEntity ...@@ -81,7 +81,8 @@ public class SchoolAclassTeacherAssessmentReq extends BaseEntity
private BigDecimal intellEduCheckAchievementltd; private BigDecimal intellEduCheckAchievementltd;
/** 考核结果 */
private String assessmentResults;
/** 删除状态 */ /** 删除状态 */
private String delFlag; private String delFlag;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentVo.java
...@@ -10,7 +10,7 @@ import java.math.BigDecimal; ...@@ -10,7 +10,7 @@ import java.math.BigDecimal;
/** /**
* 班主任考核对象 school_aclass_teacher_assessment * 班主任考核对象 school_aclass_teacher_assessment
* *
* @author ruoyi * @author ruoyi
* @date 2023-12-12 * @date 2023-12-12
*/ */
...@@ -54,6 +54,9 @@ public class SchoolAclassTeacherAssessmentVo extends BaseEntity ...@@ -54,6 +54,9 @@ public class SchoolAclassTeacherAssessmentVo extends BaseEntity
/** 智育考核成绩 */ /** 智育考核成绩 */
private BigDecimal intellEduCheckAchievement; private BigDecimal intellEduCheckAchievement;
/** 考核结果 */
private String assessmentResults;
/** 删除状态 */ /** 删除状态 */
private String delFlag; private String delFlag;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentServiceImpl.java
...@@ -128,6 +128,11 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School ...@@ -128,6 +128,11 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
sb.append(index+"、学科字段不能为空"); sb.append(index+"、学科字段不能为空");
sb.append("<br/>"); sb.append("<br/>");
} }
//考核结果
if (StringUtils.isEmpty(date.getAssessmentResults())) {
sb.append(index+"、考核结果字段不能为空");
sb.append("<br/>");
}
} }
if (!StringUtils.isEmpty(sb.toString())){ if (!StringUtils.isEmpty(sb.toString())){
return sb.toString(); return sb.toString();
...@@ -195,12 +200,23 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School ...@@ -195,12 +200,23 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
schoolCheckVo = checkeDicet("class_type", date.getClassType()); schoolCheckVo = checkeDicet("class_type", date.getClassType());
if (schoolCheckVo !=null) { if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) { if (schoolCheckVo.getFlag()) {
date.setSub(schoolCheckVo.getVal()); date.setClassType(schoolCheckVo.getVal());
} else { } else {
sb.append(date.getTeacherName() + "用户 班级类型 录入不符合选择项:" + schoolCheckVo.getVal()); sb.append(date.getTeacherName() + "用户 班级类型 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>"); sb.append("<br/>");
} }
} }
//考核结果
schoolCheckVo = checkeDicet("assessment_results", date.getAssessmentResults());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setAssessmentResults(schoolCheckVo.getVal());
} else {
sb.append(date.getTeacherName() + "用户 考核结果 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
} }
return sb.toString(); return sb.toString();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolRewardsPunishments/SchoolScDisciplineServiceImpl.java
...@@ -246,8 +246,10 @@ public class SchoolScDisciplineServiceImpl extends ServiceImpl<SchoolScDisciplin ...@@ -246,8 +246,10 @@ public class SchoolScDisciplineServiceImpl extends ServiceImpl<SchoolScDisciplin
} }
//查询学期字典键值 //查询学期字典键值
List<SysDictData> semester = sysDictDataMapper.selectDictDataByType("semester_jsdzda"); List<SysDictData> semester = sysDictDataMapper.selectDictDataByType("semester_jsdzda");
//查询年级字典键值
List<SysDictData> gradeNames = sysDictDataMapper.selectDictDataByType("grade_da");
//查询班级类型字典键值 //查询班级类型字典键值
List<SysDictData> classType = sysDictDataMapper.selectDictDataByType("class_type"); List<SysDictData> classType = sysDictDataMapper.selectDictDataByType("class_type_wj");
//查询违纪类别字典键值 //查询违纪类别字典键值
List<SysDictData> wjlb = sysDictDataMapper.selectDictDataByType("violate_type"); List<SysDictData> wjlb = sysDictDataMapper.selectDictDataByType("violate_type");
//查询违纪次数字典键值 //查询违纪次数字典键值
...@@ -330,6 +332,14 @@ public class SchoolScDisciplineServiceImpl extends ServiceImpl<SchoolScDisciplin ...@@ -330,6 +332,14 @@ public class SchoolScDisciplineServiceImpl extends ServiceImpl<SchoolScDisciplin
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、届别输入错误,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、届别输入错误,请您重新输入! ");
}else { }else {
//判断年级输入是否正确
String gradeName = "";
for (SysDictData sysDictData : gradeNames) {
if (schoolScDisciplineVo.getGradeName().equals(sysDictData.getDictLabel())){
gradeName = sysDictData.getDictValue();
}
}
//判断班级类别输入是否正确 //判断班级类别输入是否正确
String classType1 = ""; String classType1 = "";
for (SysDictData sysDictData : classType) { for (SysDictData sysDictData : classType) {
...@@ -345,14 +355,17 @@ public class SchoolScDisciplineServiceImpl extends ServiceImpl<SchoolScDisciplin ...@@ -345,14 +355,17 @@ public class SchoolScDisciplineServiceImpl extends ServiceImpl<SchoolScDisciplin
} }
} }
if (StringUtils.isEmpty(gradeName)){
if (StringUtils.isEmpty(classType1)){ failureNum++;
failureMsg.append("<br/>" + failureNum + "、年级输入错误,请您重新输入! ");
}else if (StringUtils.isEmpty(classType1)){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、班级类型输入错误,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、班级类型输入错误,请您重新输入! ");
}else if (StringUtils.isEmpty(sex) && StringUtils.isNotEmpty(schoolScDisciplineVo.getSex())){ }else if (StringUtils.isEmpty(sex) && StringUtils.isNotEmpty(schoolScDisciplineVo.getSex())){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、性别输入错误,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、性别输入错误,请您重新输入! ");
}else { }else {
schoolScDisciplineVo.setGradeName(gradeName);
schoolScDisciplineVo.setClassType(classType1); schoolScDisciplineVo.setClassType(classType1);
schoolScDisciplineVo.setSex(sex); schoolScDisciplineVo.setSex(sex);
//判断身份证号输入是否正确 //判断身份证号输入是否正确
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/student/SchoolStudentAwardServiceImpl.java
...@@ -139,7 +139,7 @@ public class SchoolStudentAwardServiceImpl extends ServiceImpl<SchoolStudentAwar ...@@ -139,7 +139,7 @@ public class SchoolStudentAwardServiceImpl extends ServiceImpl<SchoolStudentAwar
//查询年级字典键值 //查询年级字典键值
List<SysDictData> grade = sysDictDataMapper.selectDictDataByType("grade_da"); List<SysDictData> grade = sysDictDataMapper.selectDictDataByType("grade_da");
//查询班级类型字典键值 //查询班级类型字典键值
List<SysDictData> type = sysDictDataMapper.selectDictDataByType("class_type"); List<SysDictData> type = sysDictDataMapper.selectDictDataByType("class_type_wj");
//查询性别字典键值 //查询性别字典键值
List<SysDictData> sex = sysDictDataMapper.selectDictDataByType("sys_user_sex"); List<SysDictData> sex = sysDictDataMapper.selectDictDataByType("sys_user_sex");
//查询嘉奖级别字典键值 //查询嘉奖级别字典键值
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/student/SchoolStudentAwardVo.java
...@@ -44,7 +44,7 @@ public class SchoolStudentAwardVo { ...@@ -44,7 +44,7 @@ public class SchoolStudentAwardVo {
private String className; private String className;
/** 班级类型 */ /** 班级类型 */
@Excel(name = "班级类型",combo = {"提高班","普通班","音乐班","美术班","体育班","特优班"}) @Excel(name = "班级类型",combo = {"提高班","普通班","音乐班","美术班","体育班","特优班","春季班"})
private String classType; private String classType;
/** 姓名 */ /** 姓名 */
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentMapper.xml
...@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="totalCheckAchievement" column="total_check_achievement" /> <result property="totalCheckAchievement" column="total_check_achievement" />
<result property="classType" column="class_type" /> <result property="classType" column="class_type" />
<result property="sub" column="sub" /> <result property="sub" column="sub" />
<result property="assessmentResults" column="assessment_results" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
...@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSchoolAclassTeacherAssessmentVo"> <sql id="selectSchoolAclassTeacherAssessmentVo">
select id, semester, year, school_year, grade, class_name, teacher_name, id_card, moral_edu_check_achievement, intell_edu_check_achievement, total_check_achievement, class_type, sub, remark, create_by, create_time, update_by, update_time, del_flag from school_aclass_teacher_assessment select id, semester, year, school_year, grade, class_name, teacher_name, id_card, moral_edu_check_achievement, intell_edu_check_achievement, total_check_achievement, class_type, sub, assessment_results, remark, create_by, create_time, update_by, update_time, del_flag from school_aclass_teacher_assessment
</sql> </sql>
<select id="selectSchoolAclassTeacherAssessmentList" parameterType="SchoolAclassTeacherAssessmentReq" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo"> <select id="selectSchoolAclassTeacherAssessmentList" parameterType="SchoolAclassTeacherAssessmentReq" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo">
...@@ -122,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -122,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="totalCheckAchievement != null">total_check_achievement,</if> <if test="totalCheckAchievement != null">total_check_achievement,</if>
<if test="classType != null">class_type,</if> <if test="classType != null">class_type,</if>
<if test="sub != null">sub,</if> <if test="sub != null">sub,</if>
<if test="assessmentResults != null">assessment_results,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
...@@ -142,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -142,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="totalCheckAchievement != null">#{totalCheckAchievement},</if> <if test="totalCheckAchievement != null">#{totalCheckAchievement},</if>
<if test="classType != null">#{classType},</if> <if test="classType != null">#{classType},</if>
<if test="sub != null">#{sub},</if> <if test="sub != null">#{sub},</if>
<if test="assessmentResults != null">#{assessmentResults},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
...@@ -166,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -166,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="totalCheckAchievement != null">total_check_achievement = #{totalCheckAchievement},</if> <if test="totalCheckAchievement != null">total_check_achievement = #{totalCheckAchievement},</if>
<if test="classType != null">class_type = #{classType},</if> <if test="classType != null">class_type = #{classType},</if>
<if test="sub != null">sub = #{sub},</if> <if test="sub != null">sub = #{sub},</if>
<if test="assessmentResults != null">assessment_results = #{assessmentResults},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
......
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