wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

交通类型bug修复

dev
zhangyanli 2024-05-20 17:59:01 +08:00
parent 8b613dda3a
commit 2c9b23cef2
6 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zcloud/service/eduArchives/impl/ArchivesServiceImpl.java
View File

@ -363,6 +363,7 @@ public class ArchivesServiceImpl implements ArchivesService {
//创建xdocreport上下文对象 //创建xdocreport上下文对象
IContext context = report.createContext(); IContext context = report.createContext();
context.put("value14", classInfo.getString("TRAINTYPE")); //培训类型
context.put("value15", student.getString("STUDENT_NAME") != null ? student.getString("STUDENT_NAME") : student.getString("NAME")); //姓名 context.put("value15", student.getString("STUDENT_NAME") != null ? student.getString("STUDENT_NAME") : student.getString("NAME")); //姓名
context.put("value16", student.getString("USER_ID_CARD")); //身份证ID context.put("value16", student.getString("USER_ID_CARD")); //身份证ID
context.put("value17", classInfo.getString("NAME")); //考卷详情班级名称 context.put("value17", classInfo.getString("NAME")); //考卷详情班级名称
@ -381,7 +382,13 @@ public class ArchivesServiceImpl implements ArchivesService {
TrainingPlanDao trainingPlanDao = new TrainingPlanDao(); //每行的内容实体类 TrainingPlanDao trainingPlanDao = new TrainingPlanDao(); //每行的内容实体类
trainingPlanDao.setValue1(String.valueOf(i + 1)); //序号 trainingPlanDao.setValue1(String.valueOf(i + 1)); //序号
trainingPlanDao.setValue2((String) coursewaresList.get(i).get("COURSEWARENAME")); //课程名称 trainingPlanDao.setValue2((String) coursewaresList.get(i).get("COURSEWARENAME")); //课程名称
trainingPlanDao.setValue3("1课时"); //课时 DecimalFormat df = new DecimalFormat("0.0"); //保留一位小数
Double hour = (Double) coursewaresList.get(i).get("CLASSHOUR");
if ("bd2a3b7767db49968e26cfccc3c2b4a4".equals(classInfo.getString("TRAINTYPE"))) {
trainingPlanDao.setValue3(hour == 0.0 ? "0" : df.format(hour) + "学时"); //学时
} else {
trainingPlanDao.setValue3("1课时"); //课时
}
if (coursewaresList.get(i).get("TEACHERNAME") != null) { if (coursewaresList.get(i).get("TEACHERNAME") != null) {
trainingPlanDao.setValue4((String) coursewaresList.get(i).get("TEACHERNAME")); //教师 trainingPlanDao.setValue4((String) coursewaresList.get(i).get("TEACHERNAME")); //教师
} else { } else {

2
src/main/java/com/zcloud/util/archivesUtil/TrainingAbsHandler.java
View File

@ -207,7 +207,7 @@ public class TrainingAbsHandler extends AbsHandlerBatchExport {
} }
if (trainingData.get("IS_SELECT2") != null && "是".equals(trainingData.getString("IS_SELECT2"))) { if (trainingData.get("IS_SELECT2") != null && "是".equals(trainingData.getString("IS_SELECT2"))) {
context.put("value13", "☑是 □否"); context.put("value13", "☑是 □否");
} else if (trainingData.get("IS_SELECT2") != null && "否".equals(trainingData.getString("IS_SELECT1"))) { } else if (trainingData.get("IS_SELECT2") != null && "否".equals(trainingData.getString("IS_SELECT2"))) {
context.put("value13", "□是 ☑否"); context.put("value13", "□是 ☑否");
} else { } else {
context.put("value13", "□是 □否"); context.put("value13", "□是 □否");

2
src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml
View File

@ -406,6 +406,7 @@
c.START_TIME, c.START_TIME,
c.END_TIME, c.END_TIME,
c.CODE, c.CODE,
c.TRAINTYPE,
f.PERSONNEL_TYPE, f.PERSONNEL_TYPE,
f.POST_ID, f.POST_ID,
f.CLASS_ID, f.CLASS_ID,
@ -527,6 +528,7 @@
(CONVERT(bsr.STAGEEXAMSCORE, DECIMAL) >= CONVERT(bsei.PASSSCORE, DECIMAL), '合格', (CONVERT(bsr.STAGEEXAMSCORE, DECIMAL) >= CONVERT(bsei.PASSSCORE, DECIMAL), '合格',
'不合格') EXAM_RESULT, '不合格') EXAM_RESULT,
bc.EXAMINATION, bc.EXAMINATION,
bc.TRAINTYPE,
u.PORTRAIT u.PORTRAIT
FROM bus_student bs FROM bus_student bs
LEFT JOIN bus_class bc ON bs.CLASS_ID = bc.CLASS_ID LEFT JOIN bus_class bc ON bs.CLASS_ID = bc.CLASS_ID

2
src/main/webapp/TrafficFile/uploadFiles/wordTemplate/curriculum.docx
View File

@ -4,7 +4,7 @@
<<${value17}>> <<${value17}>>
序号 序号
课程内容 课程内容
课时 <<[#if>>学时<<[#else]>>课时<<[/#if]>>
讲师 讲师
<<${list1.value1}>> <<${list1.value1}>>
<<${list1.value2}>> <<${list1.value2}>>

26
src/main/webapp/TrafficFile/uploadFiles/wordTemplate/learningRecord.docx
View File

@ -1,22 +1,20 @@
学习记录 学习记录
班级名称 班级名称
<<${baseInfo.CLASS_NAME}>> <<${baseInfo.CLASS_NAME}>>
要求课时 <<[#if>>应学学时<<[#else]>>应学课时<<[/#if]>>
<<${baseInfo.SUM_CLASSHOUR}>> <<${baseInfo.SUM_CLASSHOUR}>>
已学课时 <<[#if>>已学学时<<[#else]>>已学课时<<[/#if]>>
<<${baseInfo.COMPLETE_CLASSHOUR}>> <<${baseInfo.COMPLETE_CLASSHOUR}>>
是否完成 是否完成
<<${baseInfo.STUDYSTATE}>> <<${baseInfo.STUDYSTATE}>>
身份证号 完成率
<<${baseInfo.STUDYSTATE}>>
到课率
<<${baseInfo.ARRIVING}>> <<${baseInfo.ARRIVING}>>
课程考试正确率 人脸验证记录
<<${baseInfo.ACCURACY}>> 共有<<${baseInfo.FACELOG}>>次人脸认证记录。
考试成绩
<<${baseInfo.STAGEEXAMSCORE}>> <<[#if>><<@before-row[#list>>
是否合格 随机照片<<${ddd}>> <<${ddd}>>
<<${baseInfo.EXAM_RESULT}>> 课件：<<${ddd}>>
考试试卷名称 <<@after-row[/#list]>><<[/#if]>>
<<${baseInfo.EXAMNAME}>>
备注：仅限用于线上学习证明材料，其他使用无效。

19
src/main/webapp/TrafficFile/uploadFiles/wordTemplate/learningRecordnoface.docx
View File

@ -1,22 +1,13 @@
学习记录 学习记录
班级名称 班级名称
<<${baseInfo.CLASS_NAME}>> <<${baseInfo.CLASS_NAME}>>
要求课时 <<[#if>>应学学时<<[#else]>>应学课时<<[/#if]>>
<<${baseInfo.SUM_CLASSHOUR}>> <<${baseInfo.SUM_CLASSHOUR}>>
已学课时 <<[#if>>已学学时<<[#else]>>已学课时<<[/#if]>>
<<${baseInfo.COMPLETE_CLASSHOUR}>> <<${baseInfo.COMPLETE_CLASSHOUR}>>
是否完成 是否完成
<<${baseInfo.STUDYSTATE}>> <<${baseInfo.STUDYSTATE}>>
身份证号 完成率
<<${baseInfo.STUDYSTATE}>>
到课率
<<${baseInfo.ARRIVING}>> <<${baseInfo.ARRIVING}>>
课程考试正确率
<<${baseInfo.ACCURACY}>>
考试成绩
<<${baseInfo.STAGEEXAMSCORE}>>
是否合格
<<${baseInfo.EXAM_RESULT}>><<[#if>>
考试试卷名称
<<${baseInfo.EXAMNAME}>><<[/#if]>>
备注：仅限用于线上学习证明材料，其他使用无效。