diff --git a/pom.xml b/pom.xml
index 1108c71..b8c1338 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,6 +358,38 @@
1.6.4
+
+ com.aspose
+ aspose-words
+ 15.8.0
+
+
+
+ fr.opensagres.xdocreport
+ fr.opensagres.xdocreport.core
+ 2.0.2
+
+
+ fr.opensagres.xdocreport
+ fr.opensagres.xdocreport.document
+ 2.0.2
+
+
+ fr.opensagres.xdocreport
+ fr.opensagres.xdocreport.template
+ 2.0.2
+
+
+ fr.opensagres.xdocreport
+ fr.opensagres.xdocreport.document.docx
+ 2.0.2
+
+
+ fr.opensagres.xdocreport
+ fr.opensagres.xdocreport.template.freemarker
+ 2.0.2
+
+
net.sf.json-lib
diff --git a/src/main/java/com/zcloud/controller/bus/ArchivesEduManagerController.java b/src/main/java/com/zcloud/controller/bus/ArchivesEduManagerController.java
new file mode 100644
index 0000000..ec0f768
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/bus/ArchivesEduManagerController.java
@@ -0,0 +1,503 @@
+package com.zcloud.controller.bus;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.PageData;
+import com.zcloud.entity.system.Dictionaries;
+import com.zcloud.service.archives.*;
+import com.zcloud.service.bus.CorpInfoService;
+import com.zcloud.service.bus.TrainingScheduleService;
+import com.zcloud.service.onlinexxks.*;
+import com.zcloud.service.system.Users2Service;
+import com.zcloud.util.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.util.*;
+
+/**
+ * 说明:年度安全培训教育管理台账
+ * 作者:luoxiaobao
+ * 时间:2021-12-17
+ * 官网:www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/archivesedumanager")
+public class ArchivesEduManagerController extends BaseController {
+
+ @Autowired
+ private ArchivesEduManagerService archivesEduManagerService;
+
+ @Autowired
+ private CorpInfoService corpInfoService;
+
+ @Autowired
+ private Users2Service corpUsersService;
+ @Autowired
+ private StudyTaskService studyTaskService;
+ @Autowired
+ private StageExamService stageExamService;
+ @Autowired
+ private StageExamRecordService stageExamRecordService;
+ @Autowired
+ private StageStudentRelationService stageStudentRelationService;
+ @Autowired
+ private ArchivesFilesService archivesFilesService;
+ @Autowired
+ private TrainingScheduleService trainingScheduleService;
+ @Autowired
+ private StageexampaperService stageExamPaperService;
+ @Autowired
+ private StageExamPaperQuestionService stageExamPaperQuestionService;
+ @Autowired
+ private ArchivesPostManService archivesPostManService;
+ @Autowired
+ private ArchivesTeacherService archivesTeacherService;
+ @Autowired
+ private ArchivesEduPlanService archivesEduPlanService;
+ @Autowired
+ private ArchivesCapitalService archivesCapitalService;
+
+
+ /**导出一人一档
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/exportExcelSystemLedger")
+ public void exportExcelSystemLedger(HttpServletResponse response) throws Exception{
+ PageData pd = this.getPageData();
+
+ String projectPath = PathUtil.getProjectpath();
+ List corpList = corpInfoService.getSelectByCorpInfo(pd);
+ ArrayList corpOutFiles = new ArrayList<>();
+ String now = DateUtil.getSdfTimesSSS();
+ for (PageData corp : corpList) {
+ ArrayList userOutfiles = new ArrayList<>();
+ List corpUserList = corpUsersService.listAllForExport(corp);
+ for (PageData user : corpUserList) {
+ ArrayList userFiles = new ArrayList<>();
+ if ("1".equals(user.getString2("ISMAIN"))) {
+ continue;
+ }
+ user.put("projectPath", projectPath);
+ String USER_NAME = user.getString2("NAME").replaceAll(" ","").replaceAll("\t","")+user.getString("USERNAME");
+ now = DateUtil.getSdfTimesSSS();
+ File pdf = archivesEduManagerService.registertable(user);
+ if (pdf != null) {
+ //人员登记表返回PDF文件
+ userFiles.add(pdf);
+ }
+ PageData st = new PageData();
+ st.put("USER_ID", user.getString2("USER_ID"));
+ List taskList = studyTaskService.listAll(st);
+ for (PageData task : taskList) {
+ now = DateUtil.getSdfTimesSSS();
+ List pathList = new ArrayList();
+ st.put("STUDYTASK_ID", task.getString2("STUDYTASK_ID"));
+ List stuList = stageStudentRelationService.listStudentTask(st);
+ PageData stu = new PageData();
+ if (stuList.size() > 0) {
+ stu = stuList.get(0);
+ } else {
+ continue;
+ }
+ stu.put("projectPath", projectPath);
+ stu.put("TYPE_OF_WORK_NAME", user.getString2("TYPE_OF_WORK_NAME"));
+ stu.put("PERSONNEL_TYPE_NAME",user.getString2("PERSONNEL_TYPE_NAME"));
+ stu.put("USERAVATARPREFIX", user.getString2("USERAVATARPREFIX"));
+ stu.put("USERAVATARURL_CONVERT", user.getString2("USERAVATARURL_CONVERT"));
+ task.put("STAGEEXAM_ID", stu.getString2("STAGEEXAM_ID"));
+ task.put("USER_ID", user.getString2("USER_ID"));
+ PageData para = new PageData();
+ para.put("CORP_NAME", corp.getString2("CORP_NAME"));
+ para.put("ENTERPRISE_NAME", corp.getString2("CORP_NAME")); //企业名称
+ para.put("ASSESSOR_SIGN", ""); //签字数据
+ para.put("RECORDOR_SIGN", ""); //签字数据
+ para.put("SAFETYDEPTOR_SIGN", ""); //签字数据
+ para.put("SIGNATURE_PATH", stu.getString2("SIGNATURE_PATH")); //签字数据
+ para.put("CLASS_ID", task.get("STUDYTASK_ID"));
+ para.put("POST_ID", stu.get("POST_ID"));
+ para.put("STUDENT_ID", stu.get("USER_ID"));
+ List personnelTypeList = new ArrayList<>();
+
+ List curList = studyTaskService.getcurriculumAllBystudyTaskId(task); // 任务 -- 课件关系
+ List coursewaresList = studyTaskService.getAllCourseware(task); //列出StudyTask列表
+
+ PageData paper = stageExamService.findResult(task);
+ String wordPathSy = archivesEduManagerService.homepage(stu, para, now, paper, task);
+ pathList.add(wordPathSy); //首页PDF
+ String wordPathXszm = archivesEduManagerService.classHour(stu, task, coursewaresList, corp, para, now, paper);
+ pathList.add(wordPathXszm); //学时证明
+// String wordPathSi = archivesEduManagerService.studyInfo(stu, task, curList, coursewaresList, para, now, corp, paper);
+// pathList.add(wordPathSi); // 学习档案
+ String wordPathKccl = archivesEduManagerService.curriculumword(stu, task, coursewaresList, corp, now);
+ pathList.add(wordPathKccl); //课程材料
+ if (!Tools.isEmpty(paper.get("QUESTIONLIST"))) { //有试卷就走里边
+ String wordPathKjxx = archivesEduManagerService.papermword(stu, task, corp, paper, now);
+ pathList.add(wordPathKjxx); //考卷信息
+ }
+ String wordPathPxkh = archivesEduManagerService.safelogword(stu, task, coursewaresList, para, corp, paper, now, personnelTypeList);
+ pathList.add(wordPathPxkh); //培训考核记录
+ WordToPdfUtil.mergePdf(pathList, projectPath + Const.FILEPATHFILE + USER_NAME + "-" + task.getString("STUDY_NAME") + "-档案详情-" + now + ".pdf");
+ //组装档案详情数据
+ userFiles.add(new File(projectPath + Const.FILEPATHFILE + USER_NAME + "-" + task.getString("STUDY_NAME") + "-档案详情-" + now + ".pdf"));
+ for (Object filepath : pathList) {
+ new File((String) filepath).delete(); //删除缓存文件
+ }
+ }
+ if (userFiles.size() == 0) {
+ System.out.println("学员【" + USER_NAME + "】无一人一档档案记录");
+ continue;
+ }
+ String path = projectPath + Const.TEMPZIPFILES + USER_NAME + "-" + now + ".zip";
+ FileZip.zipList(path, userFiles);
+ userOutfiles.add(new File(path));
+ }
+ if (userOutfiles.isEmpty()) {
+ System.out.println("企业【" + corp.getString("CORP_NAME") + "】暂无一人一档档案记录");
+ continue;
+ }
+ String path = projectPath + Const.TEMPZIPFILES + corp.getString("CORP_NAME") + "一人一档-" + now + ".zip";
+ FileZip.zipList(path, userOutfiles);
+ corpOutFiles.add(new File(path));
+ for (File filepath : userOutfiles) {
+ filepath.delete(); //删除缓存文件
+ }
+ }
+ if (!corpOutFiles.isEmpty()) {
+ String path = projectPath + Const.TEMPZIPFILES + "系统一人一档-" + now + ".zip";
+ FileZip.zipList(path, corpOutFiles);
+ for (File filepath : corpOutFiles) {
+ filepath.delete(); //删除缓存文件
+ }
+ FileDownload.mfFileDownload(response, path, "系统一人一档-" + now + ".zip");
+ }
+ }
+
+
+ /**导出到一期一档
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/exportExcelSystemLedgerEduArchive2")
+ public void exportExcelSystemLedgerEduArchive2(HttpServletResponse response) throws Exception{
+ PageData pd = this.getPageData();
+
+ String projectPath = PathUtil.getProjectpath();
+ List corpList = corpInfoService.getSelectByCorpInfo(pd);
+ String now = DateUtil.getSdfTimesSSS();
+ ArrayList outfiles = new ArrayList<>();
+ for (PageData corp : corpList) {
+ ArrayList userOutfiles = new ArrayList<>();
+ PageData st = new PageData();
+ st.put("CORPINFO_ID", corp.getString2("CORPINFO_ID"));
+ List taskList = studyTaskService.listAll(st);
+ for (PageData task : taskList) {
+ now = DateUtil.getSdfTimesSSS();
+ task.put("projectPath", projectPath);
+ String className = task.getString("STUDY_NAME");
+ ArrayList files = new ArrayList<>();
+ PageData af = new PageData();
+ af.put("STUDYTASK_ID", task.getString("STUDYTASK_ID"));
+ ArrayList archivesFiles = new ArrayList<>();
+ List fileList = archivesFilesService.listAll(af);
+ String saveDir= projectPath + Const.FILEPATHFILE;
+ for (PageData filePd : fileList) {
+ if ("5".equals(filePd.getString2("TYPE"))) { // 5.安全培训教材会审表
+ now = DateUtil.getSdfTimesSSS();
+ String url = Const.HTTPFILEURL + filePd.getString("FILE_PATH");
+ String name = filePd.getString2("YEAR")+filePd.getString2("FILE_NAME").substring(0, filePd.getString("FILE_NAME").lastIndexOf(".")) + now + filePd.getString2("FILE_NAME").substring(filePd.getString("FILE_NAME").lastIndexOf("."));
+ if ("ok".equals(FileDownload.downloadFile(url, name, saveDir))) {
+ File file = new File(saveDir + name);
+ archivesFiles.add(file);
+ }
+ }
+ }
+ if (archivesFiles.size() > 0) {
+ String path = projectPath + Const.TEMPZIPFILES + "安全培训教材会审表-" + now + ".zip";
+ FileZip.zipList(path, archivesFiles);
+ files.add(new File(path));
+ archivesFiles.clear();
+ }
+ // 培训日程安排通知/也可称为培训计划
+ List tsList = trainingScheduleService.listAll(task);
+ if (tsList.size() > 0) {
+ File pdf = archivesEduManagerService.exportPdfTrainingSchedule(task, tsList);
+ if (pdf != null) {
+ //人员登记表返回PDF文件
+ files.add(pdf);
+ }
+ }
+ // 安全培训教材或课程讲义
+ List coursewaresList = studyTaskService.getAllCourseware(task); //列出StudyTask列表
+ if (tsList.size() > 0) {
+ File pdf = archivesEduManagerService.exportPdfCourseware(task, coursewaresList);
+ if (pdf != null) {
+ //培训日程安排通知(也可称为培训计划)
+ files.add(pdf);
+ }
+ }
+ // 安全培训教育记录及签字表
+ List stuList = stageStudentRelationService.listStudentTask(task); //列出StudyTask列表
+ if (tsList.size() > 0) {
+ File pdf = archivesEduManagerService.exportPdfStudyTask(task, coursewaresList,stuList);
+ if (pdf != null) {
+ //培训日程安排通知(也可称为培训计划)
+ files.add(pdf);
+ }
+ }
+ // 培训影像资料
+ for (PageData filePd : fileList) {
+ if ("7".equals(filePd.getString2("TYPE"))) { // 7.培训影像资料
+ now = DateUtil.getSdfTimesSSS();
+ String url = Const.HTTPFILEURL + filePd.getString("FILE_PATH");
+ String name = filePd.getString2("YEAR")+filePd.getString2("FILE_NAME").substring(0, filePd.getString("FILE_NAME").lastIndexOf(".")) + now + filePd.getString2("FILE_NAME").substring(filePd.getString("FILE_NAME").lastIndexOf("."));
+ if ("ok".equals(FileDownload.downloadFile(url, name, saveDir))) {
+ File file = new File(saveDir + name);
+ archivesFiles.add(file);
+ }
+ }
+ }
+ if (archivesFiles.size() > 0) {
+ String path = projectPath + Const.TEMPZIPFILES + "培训影像资料-" + now + ".zip";
+ FileZip.zipList(path, archivesFiles);
+ files.add(new File(path));
+ archivesFiles.clear();
+ }
+
+ //培训考核试卷
+ PageData paper = stageExamPaperService.getDataById(task);
+ List questionList = stageExamPaperQuestionService.findByExamPaper(task);
+ File examPaper = archivesEduManagerService.exportPdfExamPaper(task, paper, questionList);
+ if (examPaper != null) {
+ files.add(examPaper);
+ }
+
+ //学员考核成绩统计表
+ File archivesStudentScore = archivesEduManagerService.exportPdfArchivesStudentScore(task, coursewaresList, stuList);
+ if (archivesStudentScore != null) {
+ files.add(archivesStudentScore);
+ }
+
+ //学员考核成绩统计表
+ List curList = studyTaskService.getcurriculumAllBystudyTaskId(task); // 任务 -- 课件关系
+ File archivesReport = archivesEduManagerService.exportPdfArchivesReport(task, curList, stuList);
+ if (archivesReport != null) {
+ files.add(archivesReport);
+ }
+ // 与培训机构签订的服务合同或者协议复印件
+ for (PageData filePd : fileList) {
+ if ("6".equals(filePd.getString2("TYPE"))) { // 7.与培训机构签订的服务合同或者协议复印件
+ now = DateUtil.getSdfTimesSSS();
+ String url = Const.HTTPFILEURL + filePd.getString("FILE_PATH");
+ String name = filePd.getString2("YEAR")+filePd.getString2("FILE_NAME").substring(0, filePd.getString("FILE_NAME").lastIndexOf(".")) + now + filePd.getString2("FILE_NAME").substring(filePd.getString("FILE_NAME").lastIndexOf("."));
+ if ("ok".equals(FileDownload.downloadFile(url, name, saveDir))) {
+ File file = new File(saveDir + name);
+ archivesFiles.add(file);
+ }
+ }
+ }
+ if (archivesFiles.size() > 0) {
+ String path = projectPath + Const.TEMPZIPFILES + "与培训机构签订的服务合同或者协议复印件-" + now + ".zip";
+ FileZip.zipList(path, archivesFiles);
+ files.add(new File(path));
+ archivesFiles.clear();
+ }
+
+ if (files.size() > 0) {
+ String path = projectPath + Const.TEMPZIPFILES + className + "-一期一档-" + now + ".zip";
+ FileZip.zipList(path, files);
+ for (File filepath : files) {
+ filepath.delete(); //删除缓存文件
+ }
+ userOutfiles.add(new File(path));
+ }
+ }
+ if (userOutfiles.isEmpty()) {
+ System.out.println("企业【" + corp.getString("CORP_NAME") + "】暂无一期一档档案记录");
+ continue;
+ }
+ String path = projectPath + Const.TEMPZIPFILES + corp.getString("CORP_NAME") + "【一期一档】-" + now + ".zip";
+ FileZip.zipList(path, userOutfiles);
+ for (File filepath : userOutfiles) {
+ filepath.delete(); //删除缓存文件
+ }
+ outfiles.add(new File(path));
+ }
+ if (outfiles.isEmpty()) {
+ System.out.println("系统暂无一期一档档案记录");
+ } else {
+ String path = projectPath + Const.TEMPZIPFILES + "系统一期一档-" + now + ".zip";
+ FileZip.zipList(path, outfiles);
+ FileDownload.mfFileDownload(response, path, "系统一期一档-" + now + ".zip");
+ }
+ }
+
+
+ /**导出到一期一档
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/exportExcelSystemLedgerEduArchive3")
+ public void exportExcelSystemLedgerEduArchive3(HttpServletResponse response) throws Exception{
+ PageData pd = this.getPageData();
+
+ String projectPath = PathUtil.getProjectpath();
+ List corpList = corpInfoService.getSelectByCorpInfo(pd);
+ String now = DateUtil.getSdfTimesSSS();
+ ArrayList outfiles = new ArrayList<>();
+ for (PageData corp : corpList) {
+ corp.put("projectPath", projectPath);
+ ArrayList userOutfiles = new ArrayList<>();
+ PageData st = new PageData();
+ st.put("CORPINFO_ID", corp.getString2("CORPINFO_ID"));
+ now = DateUtil.getSdfTimesSSS();
+ String corpName = corp.getString("CORP_NAME");
+ ArrayList files = new ArrayList<>();
+ ArrayList archivesFiles = new ArrayList<>();
+ List fileList = archivesFilesService.listAll(st);
+ String saveDir= projectPath + Const.FILEPATHFILE;
+ // 安全培训教育制度
+ for (PageData filePd : fileList) {
+ if ("1".equals(filePd.getString2("TYPE"))) { // 1.安全培训教育制度
+ now = DateUtil.getSdfTimesSSS();
+ String url = Const.HTTPFILEURL + filePd.getString("FILE_PATH");
+ String name = filePd.getString2("YEAR")+filePd.getString2("FILE_NAME").substring(0, filePd.getString("FILE_NAME").lastIndexOf(".")) + now + filePd.getString2("FILE_NAME").substring(filePd.getString("FILE_NAME").lastIndexOf("."));
+ if ("ok".equals(FileDownload.downloadFile(url, name, saveDir))) {
+ File file = new File(saveDir + name);
+ archivesFiles.add(file);
+ }
+ }
+ }
+ if (archivesFiles.size() > 0) {
+ String path = projectPath + Const.TEMPZIPFILES + "安全培训教育制度-" + now + ".zip";
+ FileZip.zipList(path, archivesFiles);
+ files.add(new File(path));
+ archivesFiles.clear();
+ }
+ // 关于任命安全教育主管部门和人员的文件
+ for (PageData filePd : fileList) {
+ if ("2".equals(filePd.getString2("TYPE"))) { // 关于任命安全教育主管部门和人员的文件
+ now = DateUtil.getSdfTimesSSS();
+ String url = Const.HTTPFILEURL + filePd.getString("FILE_PATH");
+ String name = filePd.getString2("YEAR")+filePd.getString2("FILE_NAME").substring(0, filePd.getString("FILE_NAME").lastIndexOf(".")) + now + filePd.getString2("FILE_NAME").substring(filePd.getString("FILE_NAME").lastIndexOf("."));
+ if ("ok".equals(FileDownload.downloadFile(url, name, saveDir))) {
+ File file = new File(saveDir + name);
+ archivesFiles.add(file);
+ }
+ }
+ }
+ if (archivesFiles.size() > 0) {
+ String path = projectPath + Const.TEMPZIPFILES + "关于任命安全教育主管部门和人员的文件-" + now + ".zip";
+ FileZip.zipList(path, archivesFiles);
+ files.add(new File(path));
+ archivesFiles.clear();
+ }
+ // 三岗人员管理台账
+ List archivesPostManList = archivesPostManService.listAll(corp);
+ if (archivesPostManList.size() > 0) {
+ File archivesPostMan = archivesEduManagerService.exportPdfArchivesPostMant(corp, archivesPostManList);
+ if (archivesPostMan != null) {
+ files.add(archivesPostMan);
+ }
+ }
+ // 培训需求调查表
+ for (PageData filePd : fileList) {
+ if ("3".equals(filePd.getString2("TYPE"))) { // 培训需求调查表
+ now = DateUtil.getSdfTimesSSS();
+ String url = Const.HTTPFILEURL + filePd.getString("FILE_PATH");
+ String name = filePd.getString2("YEAR")+filePd.getString2("FILE_NAME").substring(0, filePd.getString("FILE_NAME").lastIndexOf(".")) + now + filePd.getString2("FILE_NAME").substring(filePd.getString("FILE_NAME").lastIndexOf("."));
+ if ("ok".equals(FileDownload.downloadFile(url, name, saveDir))) {
+ File file = new File(saveDir + name);
+ archivesFiles.add(file);
+ }
+ }
+ }
+ if (archivesFiles.size() > 0) {
+ String path = projectPath + Const.TEMPZIPFILES + "培训需求调查表-" + now + ".zip";
+ FileZip.zipList(path, archivesFiles);
+ files.add(new File(path));
+ archivesFiles.clear();
+ }
+ // 本单位师资管理台账
+ List archivesTeacherList = archivesTeacherService.listAll(corp);
+ if (archivesTeacherList.size() > 0) {
+ File archivesTeacher = archivesEduManagerService.exportPdfArchivesTeacher(corp, archivesTeacherList);
+ if (archivesTeacher != null) {
+ files.add(archivesTeacher);
+ }
+ }
+ // 安全培训教育计划
+ List archivesEduPlanList = archivesEduPlanService.listAll(corp);
+ if (archivesEduPlanList.size() > 0) {
+ File archivesEduPlan = archivesEduManagerService.exportPdfArchivesEduPlan(corp, archivesEduPlanList);
+ if (archivesEduPlan != null) {
+ files.add(archivesEduPlan);
+ }
+ }
+ // 安全培训教育管理台账
+ List archivesEduManagerList = archivesEduManagerService.listAll(corp);
+ if (archivesEduManagerList.size() > 0) {
+ File archivesEduManager = archivesEduManagerService.exportPdfArchivesEduManager(corp, archivesEduManagerList);
+ if (archivesEduManager != null) {
+ files.add(archivesEduManager);
+ }
+ }
+ // 培训资金提取和使用情况管理台账
+ List archivesCapitalList = archivesCapitalService.listAll(corp);
+ if (archivesCapitalList.size() > 0) {
+ File archivesCapital = archivesEduManagerService.exportPdfArchivesCapital(corp, archivesCapitalList);
+ if (archivesCapital != null) {
+ files.add(archivesCapital);
+ }
+ }
+ // 培训条件证明材料
+ for (PageData filePd : fileList) {
+ if ("4".equals(filePd.getString2("TYPE"))) { // 培训条件证明材料
+ now = DateUtil.getSdfTimesSSS();
+ String url = Const.HTTPFILEURL + filePd.getString("FILE_PATH");
+ String name = filePd.getString2("YEAR")+filePd.getString2("FILE_NAME").substring(0, filePd.getString("FILE_NAME").lastIndexOf(".")) + now + filePd.getString2("FILE_NAME").substring(filePd.getString("FILE_NAME").lastIndexOf("."));
+ if ("ok".equals(FileDownload.downloadFile(url, name, saveDir))) {
+ File file = new File(saveDir + name);
+ archivesFiles.add(file);
+ }
+ }
+ }
+ if (archivesFiles.size() > 0) {
+ String path = projectPath + Const.TEMPZIPFILES + "培训条件证明材料-" + now + ".zip";
+ FileZip.zipList(path, archivesFiles);
+ files.add(new File(path));
+ archivesFiles.clear();
+ }
+
+
+ if (files.size() > 0) {
+ String path = projectPath + Const.TEMPZIPFILES + corpName + "-一企一档-" + now + ".zip";
+ FileZip.zipList(path, files);
+ for (File filepath : files) {
+ filepath.delete(); //删除缓存文件
+ }
+ userOutfiles.add(new File(path));
+ }
+ if (userOutfiles.isEmpty()) {
+ System.out.println("企业【" + corp.getString("CORP_NAME") + "】暂无一企一档档案记录");
+ continue;
+ }
+ String path = projectPath + Const.TEMPZIPFILES + corp.getString("CORP_NAME") + "【一企一档】-" + now + ".zip";
+ FileZip.zipList(path, userOutfiles);
+ for (File filepath : userOutfiles) {
+ filepath.delete(); //删除缓存文件
+ }
+ outfiles.add(new File(path));
+ }
+ if (outfiles.isEmpty()) {
+ System.out.println("系统暂无一企一档档案记录");
+ } else {
+ String path = projectPath + Const.TEMPZIPFILES + "系统一企一档-" + now + ".zip";
+ FileZip.zipList(path, outfiles);
+ FileDownload.mfFileDownload(response, path, "系统一企一档-" + now + ".zip");
+ }
+ }
+}
diff --git a/src/main/java/com/zcloud/controller/bus/CheckRecordController.java b/src/main/java/com/zcloud/controller/bus/CheckRecordController.java
index 18cfe4c..b798f6c 100644
--- a/src/main/java/com/zcloud/controller/bus/CheckRecordController.java
+++ b/src/main/java/com/zcloud/controller/bus/CheckRecordController.java
@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.zcloud.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
@@ -24,11 +25,6 @@ import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
-import com.zcloud.util.AliSmsUtil;
-import com.zcloud.util.DateUtil;
-import com.zcloud.util.Jurisdiction;
-import com.zcloud.util.ObjectExcelView;
-import com.zcloud.util.Tools;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.CheckRecordService;
import com.zcloud.service.bus.CorpInfoService;
@@ -119,5 +115,32 @@ public class CheckRecordController extends BaseController {
map.put("pd", pd);
map.put("result", errInfo);
return map;
- }
+ }
+
+ /**导出到excel
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/exportExcelSystemLedger")
+ public ModelAndView exportExcelSystemLedger() throws Exception{
+ ModelAndView mv = new ModelAndView();
+ PageData pd = this.getPageData();
+
+ Map dataMap = new HashMap<>();
+ List titles = new ArrayList<>();
+ titles.add("企业名称"); //1
+ titles.add("清单名称"); //2
+ titles.add("人员"); //3
+ titles.add("检查周期"); //4
+ titles.add("检查人"); //5
+ titles.add("检查时间"); //6
+ titles.add("检查状态"); //7
+ dataMap.put("titles", titles);
+ List list = checkrecordService.listExport(pd);
+
+ dataMap.put("varList", list);
+ ExcelExportCompressImg erv = new ExcelExportCompressImg();
+ mv = new ModelAndView(erv,dataMap);
+ return mv;
+ }
}
diff --git a/src/main/java/com/zcloud/controller/bus/HiddenController.java b/src/main/java/com/zcloud/controller/bus/HiddenController.java
index b67993c..cb31831 100644
--- a/src/main/java/com/zcloud/controller/bus/HiddenController.java
+++ b/src/main/java/com/zcloud/controller/bus/HiddenController.java
@@ -1,11 +1,10 @@
package com.zcloud.controller.bus;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import com.zcloud.entity.system.Dictionaries;
+import com.zcloud.service.system.*;
+import com.zcloud.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,13 +14,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
-import com.zcloud.util.Const;
-import com.zcloud.util.DateUtil;
-import com.zcloud.util.IniFileUtil;
-import com.zcloud.util.Jurisdiction;
-import com.zcloud.util.ObjectExcelView;
-import com.zcloud.util.PathUtil;
-import com.zcloud.util.Tools;
import net.sf.json.JSONArray;
@@ -30,8 +22,6 @@ import com.zcloud.service.bus.HiddenCheckService;
import com.zcloud.service.bus.HiddenSchemeService;
import com.zcloud.service.bus.HiddenService;
import com.zcloud.service.bus.ImgFilesService;
-import com.zcloud.service.system.DepartmentService;
-import com.zcloud.service.system.UsersService;
/**
* 说明:隐患表
@@ -51,6 +41,13 @@ public class HiddenController extends BaseController {
private HiddenSchemeService hiddenSchemeService;
@Autowired
private HiddenCheckService hiddenCheckService;
+ @Autowired
+ private DictionariesService dictionariesService;
+ @Autowired
+ private Users2Service users2Service;
+ @Autowired
+ private Department2Service department2Service;
+
/**新增
* @param
* @throws Exception
@@ -504,4 +501,364 @@ public class HiddenController extends BaseController {
map.put("result", errInfo);
return map;
}
+
+ /**
+ * 导出到excel
+ *
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value = "/exportExcelSystemLedger")
+ public ModelAndView exportExcelSystemLedger() throws Exception {
+ ModelAndView mv = new ModelAndView();
+ PageData pd = new PageData();
+ pd = this.getPageData();
+
+ String dicParentId = "5e7cf8620ba54ad89719d0be62133c7a";
+ List dicList = dictionariesService.listSubDictByParentId(dicParentId);// 字典
+ Map dicMap = new HashMap<>();
+ for (Dictionaries pageData : dicList) {
+ dicMap.put(pageData.getBIANMA(), pageData.getNAME());
+ }
+
+ PageData corpIdPd = new PageData();
+// corpIdPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());// CORPINFO_ID
+ Map userMap = new HashMap<>();// 查看企业下的所有用户,根据用户id匹配信息
+ List userList = users2Service.listAllUser(corpIdPd);
+ for (PageData pageData : userList) {
+ userMap.put(pageData.getString("USER_ID"), pageData.getString("NAME"));
+ }
+ Map deparMap = new HashMap<>();
+ List deparList = department2Service.listAll(corpIdPd);// 查看企业下的所有部门,根据部门id匹配信息
+ for (PageData pageData : deparList) {
+ deparMap.put(pageData.getString("DEPARTMENT_ID"), pageData.getString("NAME"));
+ }
+
+ Map sourceMap = new HashMap<>();
+ sourceMap.put("1", "隐患快报");
+ sourceMap.put("2", "隐患排查");
+ sourceMap.put("3", "隐患排查");
+ Map stateMap = new HashMap<>();
+ stateMap.put("-1", "已过期");
+ stateMap.put("0", "未提交");
+ stateMap.put("1", "未整改");
+ stateMap.put("2", "已整改");
+ stateMap.put("3", "待验收");
+ stateMap.put("4", "已验收");
+ Map rectifType = new HashMap<>();
+ rectifType.put("1", "立即整改");
+ rectifType.put("2", "限期整改");
+ Map haveschemeMap = new HashMap<>();
+ haveschemeMap.put("0", "无");
+ haveschemeMap.put("1", "有");
+ Map ysStatusMap = new HashMap<>();
+ ysStatusMap.put("0", "否");
+ ysStatusMap.put("1", "是");
+
+ Map dataMap = new HashMap();// 传给导出页面的数据
+// List imgKeyId = new ArrayList<>();// 需要查询图片的id标识信息
+ HashSet imgIds = new HashSet();
+// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id
+ // 查看隐患信息
+ List varOList = hiddenService.listAll(pd);
+ for (PageData pageData : varOList) {
+// imgKeyId.add(pageData.getString("HIDDEN_ID"));
+ imgIds.add(pageData.getString("HIDDEN_ID"));
+ }
+
+ // 查询整改方案
+ List schemeList = hiddenSchemeService.listExport(pd);
+ Map schemeMap = new HashMap<>();
+ for (PageData pageData : schemeList) {
+ schemeMap.put(pageData.getString("HIDDEN_ID"), pageData);
+// imgKeyId.add(pageData.getString("HIDDEN_ID"));
+// imgKeyId.add(pageData.getString("HIDDENSCHEME_ID"));
+
+ imgIds.add(pageData.getString("HIDDENSCHEME_ID"));
+ }
+ // 验收信息
+ List checkList = hiddenCheckService.listExport(pd);
+ Map> checkMap = new HashMap<>();
+ Integer checkMaxCount = 1;
+ for (PageData pageData : checkList) {
+ Integer checkCount = 1;
+ List vaList = new ArrayList<>();
+ if (checkMap.containsKey(pageData.get("HIDDEN_ID"))) {
+ vaList = checkMap.get(pageData.get("HIDDEN_ID"));
+ checkCount = vaList.size();
+ if (checkMaxCount < checkCount) {
+ checkMaxCount = checkCount;
+ }
+ }
+ vaList.add(pageData);
+ checkMap.put(pageData.get("HIDDEN_ID").toString(), vaList);
+// imgKeyId.add(pageData.getString("HIDDENCHECK_ID"));
+
+ imgIds.add(pageData.getString("HIDDENCHECK_ID"));
+ }
+
+
+// String[] imgId = new String[imgKeyId.size()];
+// for (int i = 0; i < imgKeyId.size(); i++) {
+// imgId[i] = imgKeyId.get(i);
+// }
+// String[] imgId = new String[imgIds.size()];
+// for(String imgid : imgIds) {
+// imgId[i] = imgid;
+// }
+//
+ List imgIdList = new ArrayList<>();
+ for(String imgid:imgIds) {
+ imgIdList.add(imgid);
+ }
+ PageData imgpd2 = new PageData();
+ String[] imgId =imgIdList.toArray(new String[imgIdList.size()]);
+ List imgList = new ArrayList();
+ if(imgId != null && imgId.length > 0){
+ imgpd2.put("ArrayDATA_IDS", imgId);
+ imgList = imgFilesService.listAllByIds(imgpd2);
+ }
+
+
+ Map imgCount = new HashMap<>();
+ Integer imgTypeMaxCount1 = 1, imgTypeMaxCount2 = 1, imgTypeMaxCount3 = 1, imgTypeMaxCount4 = 1,
+ imgTypeMaxCount5 = 1, imgTypeMaxCount6 = 1, imgTypeMaxCount7 = 1, imgTypeMaxCount8 = 1;
+
+ Map> imgMap = new HashMap<>();
+ for (int i = 0; i < imgList.size(); i++) {
+ if (Tools.isEmpty(imgList.get(i).get("TYPE"))) {
+ continue;
+ }
+ if (Tools.isEmpty(imgList.get(i).get("FOREIGN_KEY"))) {
+ continue;
+ }
+ List list = new ArrayList<>();
+ String key = imgList.get(i).getString("FOREIGN_KEY") + ";" + imgList.get(i).get("TYPE");
+ if (imgMap.containsKey(key)) {
+ list = imgMap.get(key);
+ }
+ list.add(imgList.get(i).getString("FILEPATH"));
+ imgMap.put(key, list);
+ String imgType = imgList.get(i).get("TYPE").toString();
+ Integer count = 1;
+ if (imgCount.containsKey(key)) {
+ count = imgCount.get(key) + 1;
+ }
+ if ("1".equals(imgType)) {
+ if (imgTypeMaxCount1 < count) {
+ imgTypeMaxCount1 = count;
+ }
+ }
+ if ("2".equals(imgType)) {
+ if (imgTypeMaxCount2 < count) {
+ imgTypeMaxCount2 = count;
+ }
+ }
+ if ("3".equals(imgType)) {
+ if (imgTypeMaxCount3 < count) {
+ imgTypeMaxCount3 = count;
+ }
+ }
+ if ("4".equals(imgType)) {
+ if (imgTypeMaxCount4 < count) {
+ imgTypeMaxCount4 = count;
+ }
+ }
+ if ("5".equals(imgType)) {
+ if (imgTypeMaxCount5 < count) {
+ imgTypeMaxCount5 = count;
+ }
+ }
+ if ("6".equals(imgType)) {
+ if (imgTypeMaxCount6 < count) {
+ imgTypeMaxCount6 = count;
+ }
+ }
+ if ("7".equals(imgType)) {
+ if (imgTypeMaxCount7 < count) {
+ imgTypeMaxCount7 = count;
+ }
+ }
+ if ("8".equals(imgType)) {
+ if (imgTypeMaxCount8 < count) {
+ imgTypeMaxCount8 = count;
+ }
+ }
+ imgCount.put(key, count);
+ }
+ List varList = new ArrayList();
+ for (PageData pageData : varOList) {
+ int count = 0;
+ PageData vpd = new PageData();
+ String hidId = pageData.getString("HIDDEN_ID");
+ vpd.put("var" + (1 + count), sourceMap.get(pageData.getString("SOURCE")));
+ vpd.put("var" + (2 + count), pageData.getString("RISK_UNIT"));
+ vpd.put("var" + (3 + count), pageData.getString("IDENTIFICATION"));
+ vpd.put("var" + (4 + count), pageData.getString("RISK_DESCR"));
+ vpd.put("var" + (5 + count), pageData.getString("LEVEL"));
+ vpd.put("var" + (6 + count), pageData.getString("CHECK_CONTENT"));
+ vpd.put("var" + (7 + count), dicMap.get(pageData.getString("HIDDENLEVEL")));
+ vpd.put("var" + (8 + count), stateMap.get(pageData.getString("STATE")));
+ vpd.put("var" + (9 + count), pageData.getString("HIDDENDESCR"));
+ vpd.put("var" + (10 + count), pageData.getString("HIDDENPART"));
+ vpd.put("var" + (11 + count), deparMap.get(pageData.getString("HIDDENFINDDEPT")));
+ vpd.put("var" + (12 + count), userMap.get(pageData.getString("CREATOR")));
+ vpd.put("var" + (13 + count), pageData.getString("CREATTIME"));
+ vpd.put("var" + (14 + count), rectifType.get(pageData.getString("RECTIFICATIONTYPE")));
+ vpd.put("var" + (15 + count), pageData.getString("RECTIFICATIONDEADLINE"));
+ List yhImg = imgMap.get(pageData.getString("HIDDEN_ID") + ";3");
+ for (int i = 0; i < imgTypeMaxCount3; i++) {
+ if (null != yhImg) {
+ if (i < yhImg.size()) {
+ vpd.put("img" + (16 + i), yhImg.get(i));
+ } else {
+ vpd.put("img" + (16 + i), "");
+ }
+ } else {
+ vpd.put("img" + (16 + i), "");
+ }
+
+ }
+ count += imgTypeMaxCount3;
+ vpd.put("var" + (16 + count), pageData.getString("RECTIFYDESCR"));// 整改描述
+ vpd.put("var" + (17 + count), deparMap.get(pageData.getString("RECTIFICATIONDEPT")));// 整改部门
+ vpd.put("var" + (18 + count), userMap.get(pageData.getString("RECTIFICATIONOR")));// 整改人
+ vpd.put("var" + (19 + count), pageData.getString("RECTIFICATIONTIME"));// 整改时间
+ List zgImg = imgMap.get(hidId + ";4");// 整改后图片
+ for (int i = 0; i < imgTypeMaxCount4; i++) {
+ if (null != zgImg) {
+ if (i < zgImg.size()) {
+ vpd.put("img" + (20 + count + i), zgImg.get(i));
+ } else {
+ vpd.put("img" + (20 + count + i), "");
+ }
+ } else {
+ vpd.put("img" + (20 + count + i), "");
+ }
+
+ }
+ count += imgTypeMaxCount4;
+ vpd.put("var" + (20 + count), haveschemeMap.get(pageData.getString("HAVESCHEME")));// 整改方案
+ if (schemeMap.containsKey(hidId)) {
+ PageData schemePd = schemeMap.get(hidId);
+ if ("1".equals(pageData.getString("HAVESCHEME"))) {
+ vpd.put("var" + (21 + count), schemePd.getString("SCREENINGDATE"));// 排查日期
+ vpd.put("var" + (22 + count), schemePd.getString("LISTNAME"));// 隐患清单
+ vpd.put("var" + (23 + count), schemePd.getString("GOVERNSTANDARDS"));// 治理标准要求
+ vpd.put("var" + (24 + count), schemePd.getString("GOVERNMETHOD"));// 治理方法
+ vpd.put("var" + (25 + count), schemePd.getString("EXPENDITURE"));// 经费和物资的落实
+ vpd.put("var" + (26 + count), schemePd.getString("PRINCIPAL"));// 负责治理人员
+ vpd.put("var" + (27 + count), schemePd.getString("PROGRAMMING"));// 工时安排
+ vpd.put("var" + (28 + count), schemePd.getString("TIMELIMITFOR"));// 时限要求
+ vpd.put("var" + (29 + count), pageData.getString("FILEPATH"));// 应急预案附件
+ vpd.put("var" + (30 + count), schemePd.getString("JOBREQUIREMENT"));// 工作要求
+ vpd.put("var" + (31 + count), schemePd.getString("OTHERBUSINESS"));// 其他事项
+ List ysImg = imgMap.get(schemePd.getString("HIDDENSCHEME_ID") + ";8");
+ for (int i = 0; i < imgTypeMaxCount8; i++) {
+ if (null != ysImg) {
+ if (i < ysImg.size()) {
+ vpd.put("img" + (32 + count + i), ysImg.get(i));// 方案图片
+ } else {
+ vpd.put("img" + (32 + count + i), "");
+ }
+ } else {
+ vpd.put("img" + (32 + count + i), "");
+ }
+ }
+
+ }
+ count += imgTypeMaxCount8;
+ if (checkMap.containsKey(hidId)) {
+ List check = checkMap.get(hidId);
+ for (PageData pageData2 : check) {
+ vpd.put("var" + (32 + count), ysStatusMap.get(pageData2.getString("CHECKDESCR")));// 验收描述
+ vpd.put("var" + (33 + count), pageData2.getString("STATUS"));// 是否合格
+ vpd.put("var" + (34 + count), pageData2.getString("CHECKDEPTNAME"));// 验收部门
+ vpd.put("var" + (35 + count), pageData2.getString("CHECKORNAME"));// 验收人
+ vpd.put("var" + (36 + count), pageData2.getString("CHECK_TIME"));// 验收时间
+// vpd.put("var"+(37+count),pageData2.getString("HIDDENCHECK_ID"));//验收图片
+ List ysImg = imgMap.get(pageData2.getString("HIDDENCHECK_ID") + ";5");// 整改后图片
+ for (int i = 0; i < imgTypeMaxCount5; i++) {
+ if (null != ysImg) {
+ if (i < ysImg.size()) {
+ vpd.put("img" + (37 + count + i), ysImg.get(i));
+ } else {
+ vpd.put("img" + (37 + count + i), "");
+ }
+ } else {
+ vpd.put("img" + (37 + count + i), "");
+ }
+
+ }
+ }
+
+ }
+ }
+
+ varList.add(vpd);
+ }
+
+ List titles = new ArrayList();
+
+ titles.add("隐患来源"); // 1
+ titles.add("风险点(单元)"); // 2
+ titles.add("辨识部位"); // 3
+ titles.add("存在风险"); // 4
+ titles.add("风险分级"); // 6
+ titles.add("检查内容"); // 7
+ titles.add("隐患级别"); // 16
+ titles.add("隐患状态"); // 17=
+ titles.add("隐患描述"); // 8
+ titles.add("隐患部位"); // 9
+ titles.add("隐患发现部门"); // 9 ````````
+ titles.add("发现人"); // 10
+ titles.add("发现时间"); // 11
+ titles.add("整改类型"); // 10
+ titles.add("整改期限"); // 11
+ for (int i = 0; i < imgTypeMaxCount3; i++) {
+ titles.add("隐患图片"); // 11
+ }
+
+ titles.add("整改描述");
+ titles.add("整改部门");
+ titles.add("整改人");
+ titles.add("整改时间");
+
+ for (int i = 0; i < imgTypeMaxCount4; i++) {
+ titles.add("整改后图片"); // 11
+ }
+
+ titles.add("整改方案");
+ titles.add("排查日期");
+ titles.add("隐患清单");
+ titles.add("治理标准要求");
+ titles.add("治理方法");
+ titles.add("经费和物资的落实");
+ titles.add("负责治理人员");
+ titles.add("工时安排");
+ titles.add("时限要求");
+ titles.add("应急预案附件");
+ titles.add("工作要求");
+ titles.add("其他事项");
+ for (int i = 0; i < imgTypeMaxCount8; i++) {
+ titles.add("方案图片"); // 11
+ }
+ for (int i = 0; i < checkMaxCount; i++) {
+ titles.add("验收描述");
+ titles.add("是否合格");
+ titles.add("验收部门");
+ titles.add("验收人");
+ titles.add("验收时间");
+
+ for (int j = 0; j < imgTypeMaxCount5; j++) {
+ titles.add("验收图片");
+ }
+ }
+ dataMap.put("titles", titles);
+ dataMap.put("varList", varList);
+ ExcelExportCompressImg erv2 = new ExcelExportCompressImg();
+ mv = new ModelAndView(erv2, dataMap);
+ return mv;
+
+ }
}
diff --git a/src/main/java/com/zcloud/controller/bus/ListManagerController.java b/src/main/java/com/zcloud/controller/bus/ListManagerController.java
new file mode 100644
index 0000000..437076e
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/bus/ListManagerController.java
@@ -0,0 +1,99 @@
+package com.zcloud.controller.bus;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.bus.*;
+import com.zcloud.service.system.DepartmentService;
+import com.zcloud.util.*;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.*;
+
+/**
+ * 说明:清单管理
+ * 作者:luoxiaobao
+ * 时间:2020-12-30
+ * 官网:www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/listmanager")
+public class ListManagerController extends BaseController {
+
+ @Autowired
+ private ListManagerService listmanagerService;
+
+
+ /**列表
+ * @param page
+ * @throws Exception
+ */
+ @RequestMapping(value="/list")
+ @ResponseBody
+ public Object list(Page page) throws Exception{
+ Map map = new HashMap();
+ String errInfo = "success";
+ PageData pd = new PageData();
+ pd = this.getPageData();
+ pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
+ pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
+ pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+// pd.put("ISMAIN", Jurisdiction.getIS_MAIN());
+// pd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE());
+ pd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
+ String DEPTIDS = pd.getString("DEPTIDS");
+ if(Tools.notEmpty(DEPTIDS)) {
+ String DEPT_IDS[] = DEPTIDS.split(",");
+ pd.put("DEPT_IDS", DEPT_IDS);
+ }
+ pd.put("HIDFORBIDDEN", "no"); //企业
+ String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
+ if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
+ String USERNAME = pd.getString("USERNAME"); //关键词检索条件
+ if(Tools.notEmpty(USERNAME))pd.put("USERNAME", USERNAME.trim());
+ page.setPd(pd);
+ List varList = listmanagerService.list(page); //列出ListManager列表
+ map.put("varList", varList);
+ map.put("page", page);
+ map.put("result", errInfo);
+ return map;
+ }
+
+ /**导出到excel
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/exportExcelSystemLedger")
+ public ModelAndView exportExcelSystemLedger() throws Exception{
+ ModelAndView mv = new ModelAndView();
+ PageData pd = this.getPageData();
+
+ Map dataMap = new HashMap<>();
+ List titles = new ArrayList<>();
+ titles.add("企业名称"); //1
+ titles.add("清单名称"); //2
+ titles.add("部门"); //3
+ titles.add("岗位"); //4
+ titles.add("人员"); //5
+ titles.add("排查周期"); //6
+ titles.add("清单类型"); //7
+ titles.add("排查类型"); //8
+ titles.add("状态"); //9
+ dataMap.put("titles", titles);
+ List list = listmanagerService.listExport(pd);
+
+ dataMap.put("varList", list);
+ ExcelExportCompressImg erv = new ExcelExportCompressImg();
+ mv = new ModelAndView(erv,dataMap);
+ return mv;
+ }
+
+}
diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageStudentRelationController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageStudentRelationController.java
new file mode 100644
index 0000000..0d0d93b
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/onlinexxks/StageStudentRelationController.java
@@ -0,0 +1,63 @@
+package com.zcloud.controller.onlinexxks;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.onlinexxks.StageStudentRelationService;
+import com.zcloud.util.*;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.*;
+
+/**
+ * 说明:阶段考试学员关系表
+ * 作者:luoxiaobao
+ * 时间:2021-10-08
+ * 官网:www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/stagestudentrelation")
+public class StageStudentRelationController extends BaseController {
+
+ @Autowired
+ private StageStudentRelationService stagestudentrelationService;
+
+
+ /**导出到excel
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/exportExcelSystemLedger")
+ public ModelAndView exportExcelSystemLedger() throws Exception{
+ ModelAndView mv = new ModelAndView();
+ PageData pd = this.getPageData();
+
+ Map dataMap = new HashMap<>();
+ List titles = new ArrayList<>();
+ titles.add("企业名称"); //1
+ titles.add("学习任务名称"); //2
+ titles.add("培训开始时间"); //3
+ titles.add("培训结束时间"); //4
+ titles.add("姓名"); //5
+ titles.add("电话"); //6
+ titles.add("部门"); //7
+ titles.add("岗位"); //8
+ titles.add("任务学时(分钟)"); //9
+ titles.add("已学习学时(分钟)"); //10
+ titles.add("学习状态"); //11
+ titles.add("考试成绩"); //12
+ titles.add("考试结果"); //13
+ dataMap.put("titles", titles);
+ List list = stagestudentrelationService.listExport(pd);
+
+ dataMap.put("varList", list);
+ ExcelExportCompressImg erv = new ExcelExportCompressImg();
+ mv = new ModelAndView(erv,dataMap);
+ return mv;
+ }
+}
diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java b/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java
new file mode 100644
index 0000000..062795c
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java
@@ -0,0 +1,61 @@
+package com.zcloud.controller.onlinexxks;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.onlinexxks.*;
+import com.zcloud.util.*;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.*;
+
+/**
+ * 说明:在线学习考试-任务
+ * 作者:luoxiaobao
+ * 时间:2021-12-20
+ * 官网:www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/studytask")
+public class StudyTaskController extends BaseController {
+
+ @Autowired
+ private StudyTaskService studytaskService;
+
+ /**导出到excel
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/exportExcelSystemLedger")
+ public ModelAndView exportExcelSystemLedger() throws Exception{
+ ModelAndView mv = new ModelAndView();
+ PageData pd = this.getPageData();
+
+ Map dataMap = new HashMap<>();
+ List titles = new ArrayList<>();
+ titles.add("企业名称"); //1
+ titles.add("学习任务名称"); //2
+ titles.add("培训行业类型"); //3
+ titles.add("岗位培训类型"); //4
+ titles.add("培训开始时间"); //5
+ titles.add("培训结束时间"); //6
+ titles.add("任务课时(分钟)"); //7
+ titles.add("应参考人数"); //8
+ titles.add("参考人数"); //9
+ titles.add("合格人数"); //10
+ titles.add("状态"); //11
+ dataMap.put("titles", titles);
+ List list = studytaskService.listExport(pd);
+
+ dataMap.put("varList", list);
+ ExcelExportCompressImg erv = new ExcelExportCompressImg();
+ mv = new ModelAndView(erv,dataMap);
+ return mv;
+ }
+}
diff --git a/src/main/java/com/zcloud/controller/superviseInspect/SuperviseInspectController.java b/src/main/java/com/zcloud/controller/superviseInspect/SuperviseInspectController.java
index 6ba7235..1540334 100644
--- a/src/main/java/com/zcloud/controller/superviseInspect/SuperviseInspectController.java
+++ b/src/main/java/com/zcloud/controller/superviseInspect/SuperviseInspectController.java
@@ -361,4 +361,20 @@ public class SuperviseInspectController extends BaseController {
return mv;
}
+ /**导出到excel
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/exportExcelSystemLedger")
+ public ModelAndView exportExcelSystemLedger() throws Exception{
+ ModelAndView mv = new ModelAndView();
+ PageData pd = this.getPageData();
+
+ Map dataMap = superviseinspectService.listExport(pd);
+
+ ExcelExportCompressImg erv = new ExcelExportCompressImg();
+ mv = new ModelAndView(erv,dataMap);
+ return mv;
+ }
+
}
diff --git a/src/main/java/com/zcloud/controller/superviseInspect/SuperviseInspectHiddenController.java b/src/main/java/com/zcloud/controller/superviseInspect/SuperviseInspectHiddenController.java
index 3ff6327..d46df44 100644
--- a/src/main/java/com/zcloud/controller/superviseInspect/SuperviseInspectHiddenController.java
+++ b/src/main/java/com/zcloud/controller/superviseInspect/SuperviseInspectHiddenController.java
@@ -7,10 +7,7 @@ import com.zcloud.service.superviseInspect.SuperviseInspectFilesService;
import com.zcloud.service.superviseInspect.SuperviseInspectHiddenService;
import com.zcloud.service.system.DepartmentService;
import com.zcloud.service.system.UsersService;
-import com.zcloud.util.DateUtil;
-import com.zcloud.util.Jurisdiction;
-import com.zcloud.util.ObjectExcelView;
-import com.zcloud.util.Tools;
+import com.zcloud.util.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -278,4 +275,20 @@ public class SuperviseInspectHiddenController extends BaseController {
return mv;
}
+ /**导出到excel
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/exportExcelSystemLedger")
+ public ModelAndView exportExcelSystemLedger() throws Exception{
+ ModelAndView mv = new ModelAndView();
+ PageData pd = this.getPageData();
+
+ Map dataMap = superviseinspecthiddenService.listExport(pd);
+
+ ExcelExportCompressImg erv = new ExcelExportCompressImg();
+ mv = new ModelAndView(erv,dataMap);
+ return mv;
+ }
+
}
diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java
index 48fd805..151be00 100644
--- a/src/main/java/com/zcloud/controller/system/LoginController.java
+++ b/src/main/java/com/zcloud/controller/system/LoginController.java
@@ -177,13 +177,13 @@ public class LoginController extends BaseController {
String errInfo = "success";
// 2023-04-17 新增需求如果当前时间大于10月1号,则不允许登录(房嘉恺)
// 2024-11-15 由于商务原因恢复系统登录限制(王鹏)
- Date today = new Date();
- Date limit_date = DateUtil.str2Date("2025-01-08 00:00:00");
- if (today.getTime() > limit_date.getTime()){
- errInfo = "error";
- map.put("msg", "系统开小差,请联系管理员");
- return map;
- }
+// Date today = new Date();
+// Date limit_date = DateUtil.str2Date("2025-01-08 00:00:00");
+// if (today.getTime() > limit_date.getTime()){
+// errInfo = "error";
+// map.put("msg", "系统开小差,请联系管理员");
+// return map;
+// }
String KEYDATA[] = pd.getString("KEYDATA").replaceAll("qdkjchina", "").split(",qd,");
if(null != KEYDATA && KEYDATA.length == 2){
String USERNAME = KEYDATA[0]; //登录过来的用户名
diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java
index 60b206c..9fdfe7b 100644
--- a/src/main/java/com/zcloud/controller/system/UsersController.java
+++ b/src/main/java/com/zcloud/controller/system/UsersController.java
@@ -8,6 +8,8 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.zcloud.service.bus.ImgFilesService;
+import com.zcloud.service.system.*;
+import com.zcloud.util.*;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.DisabledAccountException;
@@ -33,20 +35,6 @@ import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.entity.system.Department;
import com.zcloud.entity.system.Role;
-import com.zcloud.service.system.DepartmentService;
-import com.zcloud.service.system.FHlogService;
-import com.zcloud.service.system.RoleService;
-import com.zcloud.service.system.UeditorService;
-import com.zcloud.service.system.UsersService;
-import com.zcloud.util.Const;
-import com.zcloud.util.FileDownload;
-import com.zcloud.util.FileUpload;
-import com.zcloud.util.GetPinyin;
-import com.zcloud.util.Jurisdiction;
-import com.zcloud.util.ObjectExcelRead;
-import com.zcloud.util.ObjectExcelView;
-import com.zcloud.util.PathUtil;
-import com.zcloud.util.Tools;
/**
* 说明:系统用户处理类
@@ -69,6 +57,8 @@ public class UsersController extends BaseController {
private DepartmentService departmentService;
@Autowired
private ImgFilesService imgFilesService;
+ @Autowired
+ private Users2Service corpUsersService;
/**用户列表
* @param page
* @return
@@ -596,6 +586,74 @@ public class UsersController extends BaseController {
return map;
}
+ @RequestMapping(value="/goDaochu")
+ @ResponseBody
+ public Object goDaochu() throws Exception{
+ Map map = new HashMap();
+ String errInfo = "success";
+ PageData pd = new PageData();
+ pd = this.getPageData();
+ List