Skip to content

D
dd_school
Commit b779ba64 by heneng
Options

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

(1)"周课时量"改名"周课时总量"
(2)增加：早读、正课、晚自习、周末课时、是否满工作量
parent 6aa634ca
Showing with 230 additions and 129 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
......@@ -174,14 +174,14 @@
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="聘任岗位" align="center" prop="appointmentPost" sortable :min-width="screenWidth * 0.05"
<el-table-column label="聘任岗位" align="center" prop="appointmentPost" sortable :min-width="screenWidth * 0.06"
show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" />
</template>
</el-table-column>
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" sortable
:min-width="screenWidth * 0.04" show-overflow-tooltip />
:min-width="screenWidth * 0.05" show-overflow-tooltip />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" sortable
:min-width="screenWidth * 0.04" show-overflow-tooltip>
<template slot-scope="scope">
......@@ -200,19 +200,23 @@
</span>
</template>
</el-table-column>
<!-- <el-table-column label="早读" align="center" prop="earlyReading" sortable width="60px" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" sortable width="60px" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="70px"
show-overflow-tooltip /> -->
<el-table-column label="周课时量" align="center" prop="weeklyClassHours" :min-width="screenWidth * 0.03"
sortable width="80px" />
<el-table-column label="早读" align="center" prop="earlyReading" sortable width="70px" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" sortable width="70px" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="70px" show-overflow-tooltip />
<el-table-column label="周末课时" align="center" prop="weekendClassHours" sortable width="80px" show-overflow-tooltip />
<el-table-column label="周课时总量" align="center" prop="weeklyClassHours" sortable width="80px" />
<el-table-column label="是否满工作量" align="center" prop="workloadFullFlag" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.workloadFullFlag" />
</template>
</el-table-column>
<!-- <el-table-column label="合计" align="center" prop="amountTo" sortable show-overflow-tooltip /> -->
<el-table-column label="证明人" :min-width="screenWidth * 0.04" align="center" prop="userName" width="70px"
sortable show-overflow-tooltip />
<el-table-column label="备注" :min-width="screenWidth * 0.06" align="center" prop="remark" sortable
show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"
:min-width="screenWidth * 0.08">
:min-width="screenWidth * 0.08" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:aworkload:edit']">修改</el-button>
......@@ -227,7 +231,7 @@
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改工作量信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
......@@ -334,7 +338,7 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-row>
<el-col :span="12">
<el-form-item label="早读" prop="earlyReading">
<el-input v-model="form.earlyReading" type="number" clearable placeholder="请输入" />
......@@ -345,25 +349,42 @@
<el-input v-model="form.requiredCourses" type="number" clearable placeholder="请输入" />
</el-form-item>
</el-col>
</el-row> -->
</el-row>
<el-row>
<el-col :span="12">
<!-- <el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" type="number" clearable placeholder="请输入" />
</el-form-item> -->
<!-- weeklyClassHours -->
<el-form-item label="周课时量" prop="weeklyClassHours">
<el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" type="number" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="周末课时" prop="weekendClassHours">
<el-input v-model="form.weekendClassHours" type="number" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="周课时总量" prop="weeklyClassHours">
<el-input v-model="form.weeklyClassHours" type="number" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入" clearable />
<el-form-item label="是否满工作量" prop="workloadFullFlag">
<el-select v-model="form.workloadFullFlag" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" clearable />
</el-form-item>
......@@ -377,7 +398,7 @@
</el-dialog>
<!-- 修改工作量信息对话框 -->
<el-dialog :title="title" :visible.sync="edit" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
......@@ -484,37 +505,52 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row> -->
<!-- <el-col :span="12">
<el-row>
<el-col :span="12">
<el-form-item label="早读" prop="earlyReading">
<el-input v-model="form.earlyReading" placeholder="请输入" clearable />
<el-input v-model="form.earlyReading" type="number" clearable placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="正课" prop="requiredCourses">
<el-input v-model="form.requiredCourses" placeholder="请输入" clearable />
<el-input v-model="form.requiredCourses" type="number" clearable placeholder="请输入" />
</el-form-item>
</el-col> -->
<!-- </el-row> -->
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="周课时量" prop="weeklyClassHours">
<el-input v-model="form.weeklyClassHours" type="number" placeholder="请输入" clearable />
<el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" type="number" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入证明人" clearable />
<el-form-item label="周末课时" prop="weekendClassHours">
<el-input v-model="form.weekendClassHours" type="number" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="合计" prop="amountTo">
<el-input v-model="form.amountTo" placeholder="请输入合计" clearable />
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="周课时总量" prop="weeklyClassHours">
<el-input v-model="form.weeklyClassHours" type="number" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否满工作量" prop="workloadFullFlag">
<el-select v-model="form.workloadFullFlag" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" clearable />
......@@ -529,7 +565,7 @@
</el-dialog>
<!--查看工作量信息对话框 -->
<el-dialog :title="title" :visible.sync="look" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px" :disabled="isEdit">
<el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="isEdit">
<el-row>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
......@@ -634,43 +670,55 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-row>
<el-col :span="12">
<el-form-item label="早读" prop="earlyReading">
<el-input v-model="form.earlyReading" placeholder="请输入早读" />
<el-input v-model="form.earlyReading" type="number" clearable placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="正课" prop="requiredCourses">
<el-input v-model="form.requiredCourses" placeholder="请输入正课" />
<el-input v-model="form.requiredCourses" type="number" clearable placeholder="请输入" />
</el-form-item>
</el-col>
</el-row> -->
</el-row>
<el-row>
<el-col :span="12">
<!-- <el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" placeholder="请输入晚自习" />
</el-form-item> -->
<el-form-item label="周课时量" prop="weeklyClassHours">
<el-input v-model="form.weeklyClassHours" type="number" placeholder="请输入" clearable />
<el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" type="number" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入证明人" />
<el-form-item label="周末课时" prop="weekendClassHours">
<el-input v-model="form.weekendClassHours" type="number" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="周课时总量" prop="weeklyClassHours">
<el-input v-model="form.weeklyClassHours" type="number" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="合计" prop="amountTo">
<el-input v-model="form.amountTo" placeholder="请输入合计" />
<el-col :span="12">
<el-form-item label="是否满工作量" prop="workloadFullFlag">
<el-select v-model="form.workloadFullFlag" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" clearable />
</el-form-item>
</el-col>
</el-row>
......@@ -720,7 +768,7 @@ import { getToken } from "@/utils/auth";
export default {
name: "Aworkload",
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions'],
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions','sys_yes_no'],
data() {
return {
......@@ -817,15 +865,21 @@ export default {
appointmentPost: [
{ required: true, message: "聘任岗位不能为空", trigger: "blur" }
],
earlyReading: [
{ required: true, message: "早读不能为空", trigger: "blur" }
],
requiredCourses: [
{ required: true, message: "正课不能为空", trigger: "blur" }
],
eveningSelfStudy: [
{ required: true, message: "晚自习不能为空", trigger: "blur" }
],
weekendClassHours: [
{ required: true, message: "周末课时不能为空", trigger: "blur" }
],
weeklyClassHours: [
{ required: true, message: "周课时量不能为空", trigger: "blur" }
{ required: true, message: "周课时总量不能为空", trigger: "blur" }
],
// requiredCourses: [
// { required: true, message: "正读不能为空", trigger: "blur" }
// ],
// eveningSelfStudy: [
// { required: true, message: "晚自习不能为空", trigger: "blur" }
// ],
userName: [
{ required: true, message: "证明人不能为空", trigger: "blur" }
]
......@@ -881,7 +935,7 @@ export default {
},
handleQuerycx() {
this.query = true;
this.resetcx();
this.resetQuery();
},
/** 查询工作量信息列表 */
getList() {
......@@ -965,6 +1019,9 @@ export default {
earlyReading: null,
requiredCourses: null,
eveningSelfStudy: null,
weekendClassHours:null,
weeklyClassHours:null,
workloadFullFlag:null,
userId: null,
userName: null,
remark: null,
......
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/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAworkloadServiceImpl.java
......@@ -26,8 +26,7 @@ import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService
* @date 2023-12-11
*/
@Service
public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapper, SchoolAworkload> implements ISchoolAworkloadService
{
public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapper, SchoolAworkload> implements ISchoolAworkloadService {
@Autowired
private SchoolAworkloadMapper schoolAworkloadMapper;
......@@ -41,8 +40,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
* @return 工作量信息
*/
@Override
public SchoolAworkload selectSchoolAworkloadById(Long id)
{
public SchoolAworkload selectSchoolAworkloadById(Long id) {
SchoolAworkload date = schoolAworkloadMapper.selectSchoolAworkloadById(id);
// date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
return date;
......@@ -50,78 +48,79 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
/**
* 新增并校验
*
* @return
*/
@Override
public AjaxResult saveAndChecked(List<SchoolAworkload> list) {
String s = this.dataCheck(list);
if (!StringUtils.isEmpty(s)){
if (!StringUtils.isEmpty(s)) {
return AjaxResult.error(s);
}
//1.插入数据
boolean b = iSchoolAworkloadService.saveBatch(list);
return AjaxResult.success("导入数据:"+list.size());
return AjaxResult.success("导入数据:" + list.size());
}
public String dataCheck(List<SchoolAworkload> list){
public String dataCheck(List<SchoolAworkload> list) {
StringBuffer sb = new StringBuffer();
Integer index = 0;
SchoolCheckVo schoolCheckVo = null;
for (SchoolAworkload date: list) {
for (SchoolAworkload date : list) {
index++;
//非空验证
//学年
if (StringUtils.isEmpty(date.getSchoolYear())) {
sb.append(index+ "、学年字段不能为空");
sb.append(index + "、学年字段不能为空");
sb.append("<br/>");
}
//学期
if (StringUtils.isEmpty(date.getSemester())) {
sb.append(index+ "、学期字段不能为空");
sb.append(index + "、学期字段不能为空");
sb.append("<br/>");
}
//届别
if (StringUtils.isEmpty(date.getYear())) {
sb.append(index+ "、届别字段不能为空");
sb.append(index + "、届别字段不能为空");
sb.append("<br/>");
}
//年级
if (StringUtils.isEmpty(date.getGrade())) {
sb.append(index+ "、年级字段不能为空");
sb.append(index + "、年级字段不能为空");
sb.append("<br/>");
}
//姓名
if (StringUtils.isEmpty(date.getName())) {
sb.append(index+ "、姓名字段不能为空");
sb.append(index + "、姓名字段不能为空");
sb.append("<br/>");
}
//学科
if (StringUtils.isEmpty(date.getSub())) {
sb.append(index+ "、学科字段不能为空");
sb.append(index + "、学科字段不能为空");
sb.append("<br/>");
}
//身份证号
if (StringUtils.isEmpty(date.getIdCard())) {
sb.append(index+ "、身份证号不能为空");
sb.append(index + "、身份证号不能为空");
sb.append("<br/>");
}
//聘任岗位
if (StringUtils.isEmpty(date.getAppointmentPost())) {
sb.append(index+ "、聘任岗位不能为空");
sb.append(index + "、聘任岗位不能为空");
sb.append("<br/>");
}
//班级
if (StringUtils.isEmpty(date.getClassName())) {
sb.append(index+ "、班级不能为空");
sb.append(index + "、班级不能为空");
sb.append("<br/>");
}
//班级类型
if (StringUtils.isEmpty(date.getClassType())) {
sb.append(index+ "、班级类型不能为空");
sb.append(index + "、班级类型不能为空");
sb.append("<br/>");
}
// //早读
......@@ -142,29 +141,29 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
//周课时量
if (date.getWeeklyClassHours() == null) {
sb.append(index+ "、周课时量不能为空");
sb.append(index + "、周课时量不能为空");
sb.append("<br/>");
}
//证明人
if (StringUtils.isEmpty(date.getUserName())) {
sb.append(index+ "、证明人不能为空");
sb.append(index + "、证明人不能为空");
sb.append("<br/>");
}
}
if (!StringUtils.isEmpty(sb.toString())){
if (!StringUtils.isEmpty(sb.toString())) {
return sb.toString();
}
//格式验证
for (SchoolAworkload date: list) {
for (SchoolAworkload date : list) {
//学年
schoolCheckVo = checkeDicet("yearda", date.getSchoolYear());
if (schoolCheckVo !=null){
if (schoolCheckVo.getFlag()){
if (schoolCheckVo != null) {
if (schoolCheckVo.getFlag()) {
date.setSchoolYear(schoolCheckVo.getVal());
}else {
sb.append(date.getName()+"用户 学年 录入不符合选择项:"+schoolCheckVo.getVal() );
} else {
sb.append(date.getName() + "用户 学年 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
......@@ -172,7 +171,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
//学期
schoolCheckVo = checkeDicet("semester_jsdzda", date.getSemester());
if (schoolCheckVo !=null) {
if (schoolCheckVo != null) {
if (schoolCheckVo.getFlag()) {
date.setSemester(schoolCheckVo.getVal());
} else {
......@@ -182,7 +181,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
}
//届别
schoolCheckVo = checkeDicet("rankda", date.getYear());
if (schoolCheckVo !=null) {
if (schoolCheckVo != null) {
if (schoolCheckVo.getFlag()) {
date.setYear(schoolCheckVo.getVal());
} else {
......@@ -192,7 +191,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
}
//年级
schoolCheckVo = checkeDicet("grade_da", date.getGrade());
if (schoolCheckVo !=null) {
if (schoolCheckVo != null) {
if (schoolCheckVo.getFlag()) {
date.setGrade(schoolCheckVo.getVal());
} else {
......@@ -202,7 +201,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
}
//学科
schoolCheckVo = checkeDicet("teaching_subjects", date.getSub());
if (schoolCheckVo !=null) {
if (schoolCheckVo != null) {
if (schoolCheckVo.getFlag()) {
date.setSub(schoolCheckVo.getVal());
} else {
......@@ -211,14 +210,14 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
}
}
//身份证号
if (date.getIdCard().length() != 18){
sb.append(date.getName()+"用户 身份证号 录入信息错误");
if (date.getIdCard().length() != 18) {
sb.append(date.getName() + "用户 身份证号 录入信息错误");
sb.append("<br/>");
}
//聘任岗位
schoolCheckVo = checkeDicet("appointment_positions", date.getAppointmentPost());
if (schoolCheckVo !=null) {
if (schoolCheckVo != null) {
if (schoolCheckVo.getFlag()) {
date.setAppointmentPost(schoolCheckVo.getVal());
} else {
......@@ -228,7 +227,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
}
//聘任情况
schoolCheckVo = checkeDicet("appointment_situation", date.getAppointmentSituation());
if (schoolCheckVo !=null) {
if (schoolCheckVo != null) {
if (schoolCheckVo.getFlag()) {
date.setAppointmentSituation(schoolCheckVo.getVal());
} else {
......@@ -236,6 +235,16 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
sb.append("<br/>");
}
}
//是否满工作量
schoolCheckVo = checkeDicet("sys_yes_no", date.getWorkloadFullFlag());
if (schoolCheckVo != null) {
if (schoolCheckVo.getFlag()) {
date.setWorkloadFullFlag(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户 是否满工作量 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
}
return sb.toString();
}
......@@ -243,12 +252,13 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
/**
* 校验时间
*
* @param date
* @return
*/
public SchoolCheckVo checkeDateTime(Date date){
public SchoolCheckVo checkeDateTime(Date date) {
SchoolCheckVo sc = new SchoolCheckVo();
if (null == date){
if (null == date) {
sc.setFlag(false);
sc.setVal(null);
return sc;
......@@ -258,8 +268,8 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
String format = sdf.format(date);
sc.setFlag(true);
sc.setVal(format);
sc.setDate( DateUtils.parseDate(format));
}catch (Exception e){
sc.setDate(DateUtils.parseDate(format));
} catch (Exception e) {
sc.setFlag(false);
sc.setVal(date.toString());
}
......@@ -268,37 +278,39 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
/**
* 校验字典数据
*
* @param type 类型 vlaue 值
* @return
* @throws ParseException
*/
public SchoolCheckVo checkeDicet(String type,String value){
public SchoolCheckVo checkeDicet(String type, String value) {
SchoolCheckVo sc = new SchoolCheckVo();
if (StringUtils.isEmpty(value)){
if (StringUtils.isEmpty(value)) {
return null;
}
if (StringUtils.isEmpty(value)){
if (StringUtils.isEmpty(value)) {
sc.setFlag(false);
sc.setVal(value);
return sc;
}
//解析值
String val = DictUtils.getDictValue(type, value, ",");
if (StringUtils.isEmpty(val)){
if (StringUtils.isEmpty(val)) {
sc.setFlag(false);
sc.setVal(value);
return sc;
}
if (StringUtils.isEmpty(val)){
if (StringUtils.isEmpty(val)) {
sc.setFlag(false);
sc.setVal(value);
}else {
} else {
sc.setFlag(true);
sc.setVal(val);
}
return sc;
}
/**
* 查询工作量信息列表
*
......@@ -306,8 +318,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
* @return 工作量信息
*/
@Override
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkloadVo schoolAworkloadVo)
{
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkloadVo schoolAworkloadVo) {
List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadMapper.selectSchoolAworkloadList(schoolAworkloadVo);
// //计算合计
// for (SchoolAworkloadVo date : schoolAworkloadVos){
......@@ -318,8 +329,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
@Override
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkloadVo schoolAworkloadVo)
{
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkloadVo schoolAworkloadVo) {
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadMapper.selectAworkloadList(schoolAworkloadVo);
// //计算合计
// for (SchoolAworkloadExport date : schoolAworkloadVos){
......@@ -336,8 +346,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
* @return 结果
*/
@Override
public int insertSchoolAworkload(SchoolAworkload schoolAworkload)
{
public int insertSchoolAworkload(SchoolAworkload schoolAworkload) {
schoolAworkload.setCreateTime(DateUtils.getNowDate());
return schoolAworkloadMapper.insertSchoolAworkload(schoolAworkload);
}
......@@ -349,8 +358,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
* @return 结果
*/
@Override
public int updateSchoolAworkload(SchoolAworkload schoolAworkload)
{
public int updateSchoolAworkload(SchoolAworkload schoolAworkload) {
schoolAworkload.setUpdateTime(DateUtils.getNowDate());
return schoolAworkloadMapper.updateSchoolAworkload(schoolAworkload);
}
......@@ -362,8 +370,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
* @return 结果
*/
@Override
public int deleteSchoolAworkloadByIds(Long[] ids)
{
public int deleteSchoolAworkloadByIds(Long[] ids) {
return schoolAworkloadMapper.deleteSchoolAworkloadByIds(ids);
}
......@@ -374,8 +381,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
* @return 结果
*/
@Override
public int deleteSchoolAworkloadById(Long id)
{
public int deleteSchoolAworkloadById(Long id) {
return schoolAworkloadMapper.deleteSchoolAworkloadById(id);
}
}
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