Skip to content

D
dd_school
Commit df49e31f by WYM
Options

违纪管理新增、修改报错

parent 8ec89e70
Showing with 20 additions and 8 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
...@@ -587,6 +587,11 @@ ...@@ -587,6 +587,11 @@
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="70px" /> <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="70px" />
<el-table-column label="周末课时" align="center" prop="weekendClassHours" width="80px" /> <el-table-column label="周末课时" align="center" prop="weekendClassHours" width="80px" />
<el-table-column label="周课时总量" align="center" prop="weeklyClassHours" width="80px" /> <el-table-column label="周课时总量" align="center" prop="weeklyClassHours" width="80px" />
<el-table-column label="是否满工作量" align="center" prop="workloadFullFlag" width="100px">
<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="userName" width="120px" fixed="right" <el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip />
...@@ -888,7 +893,7 @@ export default { ...@@ -888,7 +893,7 @@ export default {
"award_type_fdjs", "award_type_fdjs",
"award_type_fdxs", "award_type_fdxs",
"award_rank", "award_rank",
"awards_level", 'coachingr', 'check_result', 'appointment_situation', 'award_categoriesjs', 'award_categoriesjk', 'award_categories', 'project_research', 'assessment_results'], "awards_level", 'coachingr', 'check_result', 'appointment_situation','sys_yes_no', 'award_categoriesjs', 'award_categoriesjk', 'award_categories', 'project_research', 'assessment_results'],
data() { data() {
return { return {
sex: '', sex: '',
......
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="70px" /> <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="70px" />
<el-table-column label="周末课时" align="center" prop="weekendClassHours" sortable width="80px" /> <el-table-column label="周末课时" align="center" prop="weekendClassHours" sortable width="80px" />
<el-table-column label="周课时总量" align="center" prop="weeklyClassHours" sortable width="80px" /> <el-table-column label="周课时总量" align="center" prop="weeklyClassHours" sortable width="80px" />
<el-table-column label="是否满工作量" align="center" prop="workloadFullFlag" width="100px" show-overflow-tooltip> <el-table-column label="是否满工作量" align="center" prop="workloadFullFlag" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.workloadFullFlag" /> <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.workloadFullFlag" />
</template> </template>
......
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue
...@@ -575,6 +575,11 @@ ...@@ -575,6 +575,11 @@
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="70px" /> <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="70px" />
<el-table-column label="周末课时" align="center" prop="weekendClassHours" width="80px" /> <el-table-column label="周末课时" align="center" prop="weekendClassHours" width="80px" />
<el-table-column label="周课时总量" align="center" prop="weeklyClassHours" width="80px" /> <el-table-column label="周课时总量" align="center" prop="weeklyClassHours" width="80px" />
<el-table-column label="是否满工作量" align="center" prop="workloadFullFlag" width="100px">
<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="userName" width="120px" fixed="right" <el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip />
...@@ -875,7 +880,7 @@ export default { ...@@ -875,7 +880,7 @@ export default {
"award_type_fdjs", "award_type_fdjs",
"award_type_fdxs", "award_type_fdxs",
"award_rank", "award_rank",
"awards_level", 'coachingr', 'check_result', 'appointment_situation', 'award_categoriesjs', 'award_categoriesjk', 'award_categories', 'project_research', 'assessment_results'], "awards_level", 'coachingr', 'check_result', 'appointment_situation', 'sys_yes_no','award_categoriesjs', 'award_categoriesjk', 'award_categories', 'project_research', 'assessment_results'],
data() { data() {
return { return {
sex: '', sex: '',
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
...@@ -517,7 +517,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -517,7 +517,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
document.add(pdfPTable); document.add(pdfPTable);
//2.表格 工作量信息 //2.表格 工作量信息
PdfPTable pdfPTablegz = PDFUtil.getPdfPTable(17, 100, 1500); PdfPTable pdfPTablegz = PDFUtil.getPdfPTable(18, 100, 1500);
Chunk qtchunkgz = PDFUtil.getChunk("工作量信息",font); Chunk qtchunkgz = PDFUtil.getChunk("工作量信息",font);
Paragraph qtParagraphgz = PDFUtil.getParagraph(qtchunkgz, Element.ALIGN_LEFT, 0, null); Paragraph qtParagraphgz = PDFUtil.getParagraph(qtchunkgz, Element.ALIGN_LEFT, 0, null);
qtParagraphgz.setSpacingAfter(5f); qtParagraphgz.setSpacingAfter(5f);
...@@ -542,6 +542,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -542,6 +542,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPTitleCell("晚自习", cellFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPTitleCell("晚自习", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("周末课时", cellFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPTitleCell("周末课时", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("周课时总量", cellFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPTitleCell("周课时总量", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("是否满工作量", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("证明人", cellFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPTitleCell("证明人", cellFont, pdfCell, pdfPTablegz, 20);
for (SchoolAworkloadVo date: schoolAworkload){ for (SchoolAworkloadVo date: schoolAworkload){
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("yearda",date.getSchoolYear()), cellcoentFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("yearda",date.getSchoolYear()), cellcoentFont, pdfCell, pdfPTablegz, 20);
...@@ -560,6 +561,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -560,6 +561,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(isNotString(date.getEveningSelfStudy()), cellcoentFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPCell(isNotString(date.getEveningSelfStudy()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getWeekendClassHours()), cellcoentFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPCell(isNotString(date.getWeekendClassHours()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getWeeklyClassHours()), cellcoentFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPCell(isNotString(date.getWeeklyClassHours()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sys_yes_no",date.getWorkloadFullFlag()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getUserName()), cellcoentFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPCell(isNotString(date.getUserName()), cellcoentFont, pdfCell, pdfPTablegz, 20);
} }
document.add(pdfPTablegz); document.add(pdfPTablegz);
......
smart-campus/src/main/resources/mapper/schoolRewardsPunishments/SchoolScDisciplineMapper.xml
...@@ -149,8 +149,8 @@ ...@@ -149,8 +149,8 @@
<if test="name != null">#{name},</if> <if test="name != null">#{name},</if>
<if test="sex != null">#{sex},</if> <if test="sex != null">#{sex},</if>
<if test="idCard != null">#{idCard},</if> <if test="idCard != null">#{idCard},</if>
<if test="classTeacher != null">(select user_id from sys_user where user_name = #{classTeacher}),#{classTeacher},</if> <if test="classTeacher != null">(select user_id from sys_user where user_name = #{classTeacher} and del_flag = '0'),#{classTeacher},</if>
<if test="gradeDirector != null">(select user_id from sys_user where user_name = #{gradeDirector}),#{gradeDirector},</if> <if test="gradeDirector != null">(select user_id from sys_user where user_name = #{gradeDirector} and del_flag = '0'),#{gradeDirector},</if>
<if test="violateType != null">#{violateType},</if> <if test="violateType != null">#{violateType},</if>
<if test="violateNum != null">#{violateNum},</if> <if test="violateNum != null">#{violateNum},</if>
<if test="punishResult != null">#{punishResult},</if> <if test="punishResult != null">#{punishResult},</if>
...@@ -181,8 +181,8 @@ ...@@ -181,8 +181,8 @@
<if test="name != null">name = #{name},</if> <if test="name != null">name = #{name},</if>
<if test="sex != null">sex = #{sex},</if> <if test="sex != null">sex = #{sex},</if>
<if test="idCard != null">id_card = #{idCard},</if> <if test="idCard != null">id_card = #{idCard},</if>
<if test="classTeacher != null">class_teacher_id = (select user_id from sys_user where user_name = #{classTeacher}), class_teacher = #{classTeacher}, </if> <if test="classTeacher != null">class_teacher_id = (select user_id from sys_user where user_name = #{classTeacher} and del_flag = '0'), class_teacher = #{classTeacher}, </if>
<if test="gradeDirector != null">grade_director_id = (select user_id from sys_user where user_name = #{gradeDirector}), grade_director = #{gradeDirector},</if> <if test="gradeDirector != null">grade_director_id = (select user_id from sys_user where user_name = #{gradeDirector} and del_flag = '0'), grade_director = #{gradeDirector},</if>
<if test="violateType != null">violate_type = #{violateType},</if> <if test="violateType != null">violate_type = #{violateType},</if>
<if test="violateNum != null">violate_num = #{violateNum},</if> <if test="violateNum != null">violate_num = #{violateNum},</if>
<if test="punishResult != null">punish_result = #{punishResult},</if> <if test="punishResult != null">punish_result = #{punishResult},</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