diff --git a/src/main/java/com/zcloud/controller/eduApp/AppEduDictionariesController.java b/src/main/java/com/zcloud/controller/eduApp/AppEduDictionariesController.java index 081fb99..7418736 100644 --- a/src/main/java/com/zcloud/controller/eduApp/AppEduDictionariesController.java +++ b/src/main/java/com/zcloud/controller/eduApp/AppEduDictionariesController.java @@ -3,8 +3,7 @@ package com.zcloud.controller.eduApp; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.eduSystem.EduDictionariesService; -import org.springframework.beans.factory.annotation.Autowired; +import com.zcloud.service.system.DictionariesService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -25,7 +24,7 @@ import java.util.Map; public class AppEduDictionariesController extends BaseController { @Resource - private EduDictionariesService eduDictionariesService; + private DictionariesService dictionariesService; /** * 列表 @@ -43,11 +42,11 @@ public class AppEduDictionariesController extends BaseController { String DICTIONARIES_ID = null == pd.get("DICTIONARIES_ID") ? "" : pd.get("DICTIONARIES_ID").toString(); pd.put("DICTIONARIES_ID", DICTIONARIES_ID); //上级ID page.setPd(pd); - List varList = eduDictionariesService.list(page); //列出Dictionaries列表 + List varList = dictionariesService.list(page); //列出Dictionaries列表 if ("".equals(DICTIONARIES_ID) || "0".equals(DICTIONARIES_ID)) { map.put("PARENT_ID", "0"); //上级ID } else { - map.put("PARENT_ID", eduDictionariesService.findById(pd).getString("PARENT_ID")); //上级ID + map.put("PARENT_ID", dictionariesService.findById(pd).getString("PARENT_ID")); //上级ID } map.put("varList", varList); map.put("page", page); diff --git a/src/main/java/com/zcloud/controller/eduArchives/ArchivesAwardPuntLogController.java b/src/main/java/com/zcloud/controller/eduArchives/ArchivesAwardPuntLogController.java index 0410c69..6592766 100644 --- a/src/main/java/com/zcloud/controller/eduArchives/ArchivesAwardPuntLogController.java +++ b/src/main/java/com/zcloud/controller/eduArchives/ArchivesAwardPuntLogController.java @@ -33,7 +33,7 @@ public class ArchivesAwardPuntLogController extends BaseController { private ArchivesAwardPuntLogService archivesawardpuntlogService; @Autowired private InitPageDataUtil initPageDataUtil; - @Autowired + @Autowired(required = false) private ArchivesController archivesController; /** diff --git a/src/main/java/com/zcloud/controller/eduArchives/ArchivesCapitalController.java b/src/main/java/com/zcloud/controller/eduArchives/ArchivesCapitalController.java index f534328..345192e 100644 --- a/src/main/java/com/zcloud/controller/eduArchives/ArchivesCapitalController.java +++ b/src/main/java/com/zcloud/controller/eduArchives/ArchivesCapitalController.java @@ -112,7 +112,6 @@ public class ArchivesCapitalController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //机构 - pd.put("ENTERPRISE_ID", pd.get("ID")); //企业 List varList = archivescapitalService.listAll(pd); //列出ArchivesCapital列表 map.put("varList", varList); map.put("page", page); diff --git a/src/main/java/com/zcloud/controller/eduArchives/ArchivesController.java b/src/main/java/com/zcloud/controller/eduArchives/ArchivesController.java index 9a11e33..57857f1 100644 --- a/src/main/java/com/zcloud/controller/eduArchives/ArchivesController.java +++ b/src/main/java/com/zcloud/controller/eduArchives/ArchivesController.java @@ -259,7 +259,6 @@ public class ArchivesController extends BaseController { rpd.put("SUMCLASSHOUR", classhour == 0.0 ? 0 : classhourF.format(classhour)); rpd.put("CURRICULUMNAMES", CURRICULUMNAMES); rpd.put("CORPINFO_NAME", corpinfo.getString("NAME")); - rpd.put("enterpriseName", clazz.getString("enterpriseName")); map.put("studentList", studentList); map.put("clazz", clazz); @@ -463,9 +462,6 @@ public class ArchivesController extends BaseController { pd = this.getPageData(); page.setPd(pd); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //机构 - if ("0".equals(Jurisdiction.getIS_MAIN())){ - pd.put("USER_ID", Jurisdiction.getUSER_ID()); - } page.setPd(pd); List studentList = archivesService.getStudentslistPage(page); map.put("studentList", studentList); @@ -521,7 +517,7 @@ public class ArchivesController extends BaseController { //创建xdocreport上下文对象 IContext context = report.createContext(); - context.put("value1", Tools.notEmpty(awardUser.getString("ENTERPRISE_NAME")) ? awardUser.getString("ENTERPRISE_NAME") : ""); // 单位名称 + context.put("value1", Tools.notEmpty(awardUser.getString("CORP_NAME")) ? awardUser.getString("CORP_NAME") : ""); // 单位名称 context.put("value2", Tools.notEmpty(awardUser.getString("FILE_NUMBER")) ? awardUser.getString("FILE_NUMBER") : ""); // 档案编号 context.put("value3", Tools.notEmpty(awardUser.getString("STUDENT_NAME")) ? awardUser.getString("STUDENT_NAME") : awardUser.getString("NAME")); // 姓名 context.put("value4", Tools.notEmpty(awardUser.getString("SEX_NAME")) ? awardUser.getString("SEX_NAME") : ""); // 性别 @@ -564,7 +560,7 @@ public class ArchivesController extends BaseController { //创建xdocreport上下文对象 IContext context = report.createContext(); - context.put("value1", Tools.notEmpty(specialUser.getString("ENTERPRISE_NAME")) ? specialUser.getString("ENTERPRISE_NAME") : ""); // 单位名称 + context.put("value1", Tools.notEmpty(specialUser.getString("CORP_NAME")) ? specialUser.getString("CORP_NAME") : ""); // 单位名称 context.put("value2", Tools.notEmpty(specialUser.getString("FILE_NUMBER")) ? specialUser.getString("FILE_NUMBER") : ""); // 档案编号 context.put("value3", Tools.notEmpty(specialUser.getString("STUDENT_NAME")) ? specialUser.getString("STUDENT_NAME") : specialUser.getString("NAME")); // 姓名 context.put("value4", Tools.notEmpty(specialUser.getString("SEX_NAME")) ? specialUser.getString("SEX_NAME") : ""); // 性别 diff --git a/src/main/java/com/zcloud/controller/eduArchives/ArchivesEduManagerController.java b/src/main/java/com/zcloud/controller/eduArchives/ArchivesEduManagerController.java index 81384f4..801c310 100644 --- a/src/main/java/com/zcloud/controller/eduArchives/ArchivesEduManagerController.java +++ b/src/main/java/com/zcloud/controller/eduArchives/ArchivesEduManagerController.java @@ -50,7 +50,6 @@ public class ArchivesEduManagerController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //机构 - pd.put("ENTERPRISE_ID", pd.get("ID")); //企业 List varList = archivesedumanagerService.listAll(pd); //列出ArchivesEduManager列表 for (PageData var : varList) { SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd"); //日期格式 diff --git a/src/main/java/com/zcloud/controller/eduArchives/ArchivesEduPlanController.java b/src/main/java/com/zcloud/controller/eduArchives/ArchivesEduPlanController.java index 9a4c9db..fdd8eed 100644 --- a/src/main/java/com/zcloud/controller/eduArchives/ArchivesEduPlanController.java +++ b/src/main/java/com/zcloud/controller/eduArchives/ArchivesEduPlanController.java @@ -53,7 +53,6 @@ public class ArchivesEduPlanController extends BaseController { pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //机构 - pd.put("ENTERPRISE_ID", pd.get("ID")); //企业 List varList = archiveseduplanService.listAll(pd); //列出ArchivesEduPlan列表 for (PageData var : varList) { diff --git a/src/main/java/com/zcloud/controller/eduArchives/ArchivesFilesController.java b/src/main/java/com/zcloud/controller/eduArchives/ArchivesFilesController.java index 0669daa..0a1febd 100644 --- a/src/main/java/com/zcloud/controller/eduArchives/ArchivesFilesController.java +++ b/src/main/java/com/zcloud/controller/eduArchives/ArchivesFilesController.java @@ -56,7 +56,6 @@ public class ArchivesFilesController extends BaseController { if (pd.get("MODULE") != null && "corp".equals(pd.getString("MODULE"))) { //一企一档上传时 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //机构 - pd.put("ENTERPRISE_ID", pd.get("ID")); //企业 } for (MultipartFile file : files) { @@ -134,7 +133,6 @@ public class ArchivesFilesController extends BaseController { pd = this.getPageData(); if (pd.get("MODULE") != null && "corp".equals(pd.getString("MODULE"))) { //一企一档上传时 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //机构 - pd.put("ENTERPRISE_ID", pd.get("ID")); //企业 } List varList = archivesfilesService.listAll(pd); //列出ArchivesFiles列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/eduArchives/ArchivesPdfFileController.java b/src/main/java/com/zcloud/controller/eduArchives/ArchivesPdfFileController.java new file mode 100644 index 0000000..efae6f3 --- /dev/null +++ b/src/main/java/com/zcloud/controller/eduArchives/ArchivesPdfFileController.java @@ -0,0 +1,225 @@ +package com.zcloud.controller.eduArchives; + +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.eduArchives.ArchivesPdfFileService; +import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; +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 + * 时间：2023-08-25 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/archivespdffile") +public class ArchivesPdfFileController extends BaseController { + + @Autowired + private ArchivesPdfFileService archivespdffileService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("archivespdffile:add") + @ResponseBody + public Object add() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("ARCHIVESPDFFILE_ID", this.get32UUID()); //主键 + pd.put("CREATOR", ""); //上传人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //上传时间 + archivespdffileService.save(pd); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param out + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("archivespdffile:del") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + archivespdffileService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("archivespdffile:edit") + @ResponseBody + public Object edit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + archivespdffileService.edit(pd); + map.put("result", errInfo); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("archivespdffile: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("CORPINFO_NAME", Jurisdiction.getUsername()); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + if (StringUtils.isNotBlank(pd.getString("STARTTIME"))) + pd.put("STARTTIME", pd.getString("STARTTIME") + " 00:00:00"); + if (StringUtils.isNotBlank(pd.getString("ENDTIME"))) pd.put("ENDTIME", pd.getString("ENDTIME") + " 23:59:59"); + if ("0".equals(Jurisdiction.getIS_MAIN())){ + pd.put("USER_ID", Jurisdiction.getUSER_ID()); + } + page.setPd(pd); + List varList = archivespdffileService.list(page); //列出ArchivesPdfFile列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("archivespdffile:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = archivespdffileService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**批量删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/deleteAll") + @RequiresPermissions("archivespdffile:del") + @ResponseBody + public Object deleteAll() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if(Tools.notEmpty(DATA_IDS)){ + String ArrayDATA_IDS[] = DATA_IDS.split(","); + archivespdffileService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + }else{ + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /**导出到excel + * @param + * @throws Exception + */ + @RequestMapping(value="/excel") + @RequiresPermissions("toExcel") + public ModelAndView exportExcel() throws Exception{ + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("关联表名称"); //1 + titles.add("关联表id"); //2 + titles.add("文件路径"); //3 + titles.add("档案类型"); //4 + titles.add("上传状态 0-上传中 1-上传成功 -1 - 上传失败"); //5 + titles.add("上传失败错误原因（上传成功则不传）"); //6 + titles.add("上传人"); //7 + titles.add("上传时间"); //8 + dataMap.put("titles", titles); + List varOList = archivespdffileService.listAll(pd); + List varList = new ArrayList(); + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + PageData pdfInfo = archivespdffileService.findById(pd); + String methodName = pdfInfo.getString("METHOD_NAME"); + //获取方法参数的类型 + String[] classname = pdfInfo.getString("CLASS_NAME").split(","); + Class[] classNames = new Class[classname.length]; + for (int i = 0; i < classNames.length; i++) { + classNames[i] = Class.forName(classname[i]); + } + //获取方法参数的值 + JSONObject paramname = JSONObject.parseObject(pdfInfo.getString("PARAM_NAME")); + PageData w = new PageData(paramname); + PageData[] parm = new PageData[]{w}; + //需要调用方法所在的类 + ProxyUtil.methodInvoke("com.zcloud.service.archives.ArchivesPdfFileService",methodName,classNames,parm); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/eduArchives/ArchivesTeacherController.java b/src/main/java/com/zcloud/controller/eduArchives/ArchivesTeacherController.java index 8335b00..383df22 100644 --- a/src/main/java/com/zcloud/controller/eduArchives/ArchivesTeacherController.java +++ b/src/main/java/com/zcloud/controller/eduArchives/ArchivesTeacherController.java @@ -50,7 +50,6 @@ public class ArchivesTeacherController extends BaseController { pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //机构 - pd.put("ENTERPRISE_ID", pd.get("ID")); //企业 List varList = archivesteacherService.listAll(pd); //列出ArchivesTeacher列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/eduStudy/ClassController.java b/src/main/java/com/zcloud/controller/eduStudy/ClassController.java index fefdfaf..af1936d 100644 --- a/src/main/java/com/zcloud/controller/eduStudy/ClassController.java +++ b/src/main/java/com/zcloud/controller/eduStudy/ClassController.java @@ -2,12 +2,12 @@ package com.zcloud.controller.eduStudy; import com.zcloud.controller.base.BaseController; import com.zcloud.service.eduStudy.*; -import com.zcloud.service.eduSystem.EduDictionariesService; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.entity.TrainingPlanDao; import com.zcloud.service.corp.CorpInfoService; +import com.zcloud.service.system.DictionariesService; import com.zcloud.util.*; import fr.opensagres.xdocreport.document.IXDocReport; import fr.opensagres.xdocreport.document.images.FileImageProvider; @@ -52,7 +52,7 @@ public class ClassController extends BaseController { @Autowired private PostPaperService postPaperService; @Resource - private EduDictionariesService eduDictionariesService; + private DictionariesService dictionariesService; @Resource private CorpInfoService corpInfoService; @Autowired @@ -152,7 +152,6 @@ public class ClassController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); PageData data = new PageData(); - //注意数据权限。企业看企业数据，机构看机构数据 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); if ("0".equals(Jurisdiction.getIS_MAIN())){ pd.put("USER_ID", Jurisdiction.getUSER_ID()); @@ -784,13 +783,13 @@ public class ClassController extends BaseController { public List initDicTreeByNum(String dictionaries_bianma, int level) throws Exception { PageData dic = new PageData(); dic.put("BIANMA", dictionaries_bianma); - dic = eduDictionariesService.findByBianma(dic); + dic = dictionariesService.findByBianma(dic); dic.put("value", dic.get("DICTIONARIES_ID")); dic.put("numValue", dic.get("BIANMA")); dic.put("id", dic.get("DICTIONARIES_ID")); dic.put("label", dic.get("NAME")); dic.put("level", level); - List industryOption = eduDictionariesService.getTreeFromBelowHebei(new ArrayList(), dic); + List industryOption = dictionariesService.getTreeFromBelowHebei(new ArrayList(), dic); return industryOption; } diff --git a/src/main/java/com/zcloud/controller/eduStudy/StudentController.java b/src/main/java/com/zcloud/controller/eduStudy/StudentController.java index 4815456..1cd8619 100644 --- a/src/main/java/com/zcloud/controller/eduStudy/StudentController.java +++ b/src/main/java/com/zcloud/controller/eduStudy/StudentController.java @@ -8,7 +8,6 @@ import com.zcloud.entity.Response; import com.zcloud.entity.TrainingPlanDao; import com.zcloud.service.corp.CorpInfoService; import com.zcloud.service.system.DepartmentService; -import com.zcloud.service.system.DictionariesService; import com.zcloud.service.system.PostService; import com.zcloud.service.system.UsersService; import com.zcloud.util.*; @@ -49,8 +48,6 @@ public class StudentController extends BaseController { @Autowired private UsersService usersService; @Autowired - private DictionariesService dictionariesService; - @Autowired private StudentService studentService; @Autowired private DepartmentService departmentService; @@ -464,7 +461,6 @@ public class StudentController extends BaseController { Response response = Response.getResponse(); try { PageData request = this.getPageData(); - request.put("PERSONNELTYPE", "6"); request.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); if ("0".equals(Jurisdiction.getIS_MAIN())){ request.put("USER_ID", Jurisdiction.getUSER_ID()); @@ -689,9 +685,6 @@ public class StudentController extends BaseController { pd.put("CREATENDTIME", pd.getString("CREATENDTIME") + " 23:59:59"); } pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - if ("0".equals(Jurisdiction.getIS_MAIN())){ - pd.put("USER_ID", Jurisdiction.getUSER_ID()); - } page.setPd(pd); List varList = studentService.studentlistPage(page); map.put("varList", varList); @@ -733,9 +726,6 @@ public class StudentController extends BaseController { if (org.apache.commons.lang3.StringUtils.isNotBlank(pd.getString("CREATENDTIME"))) { pd.put("CREATENDTIME", pd.getString("CREATENDTIME") + " 23:59:59"); } - if ("0".equals(Jurisdiction.getIS_MAIN())){ - pd.put("USER_ID", Jurisdiction.getUSER_ID()); - } pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List varList = studentService.derivedRecord(pd); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/eduStudy/TrainingPlanController.java b/src/main/java/com/zcloud/controller/eduStudy/TrainingPlanController.java index 4fb9815..a597de0 100644 --- a/src/main/java/com/zcloud/controller/eduStudy/TrainingPlanController.java +++ b/src/main/java/com/zcloud/controller/eduStudy/TrainingPlanController.java @@ -115,12 +115,6 @@ public class TrainingPlanController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - if ("0".equals(Jurisdiction.getIS_MAIN())){ - pd.put("USER_ID", Jurisdiction.getUSER_ID()); - } - /*String training_content = pd.getString("TRAINING_CONTENT"); //关键词检索条件 - if(Tools.notEmpty(training_content))pd.put("TRAINING_CONTENT", training_content.trim()); - pd.put("ENTERPRISE_ID", Jurisdiction.getENTERPRISE_ID());*/ page.setPd(pd); List varList = classService.listStrengthenByCorpName(page); //列出TrainingPlan列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/eduSystem/EduDictionariesController.java b/src/main/java/com/zcloud/controller/eduSystem/EduDictionariesController.java deleted file mode 100644 index 12ae290..0000000 --- a/src/main/java/com/zcloud/controller/eduSystem/EduDictionariesController.java +++ /dev/null @@ -1,697 +0,0 @@ -package com.zcloud.controller.eduSystem; - -import com.github.benmanes.caffeine.cache.Cache; -import com.zcloud.controller.base.BaseController; -import com.zcloud.service.eduSystem.EduDictionariesService; -import com.zcloud.entity.Page; -import com.zcloud.entity.PageData; -import com.zcloud.entity.Response; -import com.zcloud.entity.system.Dictionaries; -import com.zcloud.util.CaffeineUtil; -import com.zcloud.util.Tools; -import net.sf.json.JSONArray; -import org.apache.commons.lang.StringUtils; -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.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 说明：数据字典处理类 - * 作者：luoxiaobao - * 官网：www.qdkjchina.com - */ -@Controller -@RequestMapping("/eduDictionaries") -public class EduDictionariesController extends BaseController { - - @Resource - private EduDictionariesService eduDictionariesService; - - @Resource - private Cache caffeineCache; - - @Resource - private CaffeineUtil caffeineUtil; - - /** - * 显示列表ztree - * - * @return - */ - @RequestMapping(value = "/listAllDict") - @RequiresPermissions("dictionaries:list") - @ResponseBody - public Object listAllDict() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - JSONArray arr = JSONArray.fromObject(eduDictionariesService.listAllDict("0")); - String json = arr.toString(); - json = json.replaceAll("DICTIONARIES_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("NAME", "name").replaceAll("subDict", "nodes").replaceAll("hasDict", "checked").replaceAll("treeurl", "url"); - map.put("zTreeNodes", json); - map.put("result", errInfo); - return map; - } - - /** - * 列表 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/list") - @RequiresPermissions("dictionaries:list") - @ResponseBody - public Object list(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); - String DICTIONARIES_ID = null == pd.get("DICTIONARIES_ID") ? "" : pd.get("DICTIONARIES_ID").toString(); - pd.put("DICTIONARIES_ID", DICTIONARIES_ID); //上级ID - page.setPd(pd); - List varList = eduDictionariesService.list(page); //列出Dictionaries列表 - if ("".equals(DICTIONARIES_ID) || "0".equals(DICTIONARIES_ID)) { - map.put("PARENT_ID", "0"); //上级ID - } else { - map.put("PARENT_ID", eduDictionariesService.findById(pd).getString("PARENT_ID")); //上级ID - } - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } - - /** - * 去新增页面 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/goAdd") - @ResponseBody - public Object goAdd() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DICTIONARIES_ID = null == pd.get("DICTIONARIES_ID") ? "" : pd.get("DICTIONARIES_ID").toString(); - pd.put("DICTIONARIES_ID", DICTIONARIES_ID); //上级ID - map.put("pds", eduDictionariesService.findById(pd)); //传入上级所有信息 - map.put("result", errInfo); - return map; - } - - /** - * 新增 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("DICTIONARIES_ID", this.get32UUID()); //主键 - eduDictionariesService.save(pd); - map.put("result", errInfo); - return map; - } - - /** - * 判断编码是否存在 - * - * @return - */ - @RequestMapping(value = "/hasBianma") - @ResponseBody - public Object hasBianma() { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - try { - pd = this.getPageData(); - if (eduDictionariesService.findByBianma(pd) != null) { - errInfo = "error"; - } - } catch (Exception e) { - errInfo = "error"; - } - map.put("result", errInfo); //返回结果 - return map; - } - - /** - * 去修改页面 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/goEdit") - @ResponseBody - public Object goEdit() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = eduDictionariesService.findById(pd); //根据ID读取 - map.put("pd", pd); //放入视图容器 - pd.put("DICTIONARIES_ID", pd.get("PARENT_ID").toString()); //用作上级信息 - map.put("pds", eduDictionariesService.findById(pd)); //传入上级所有信息 - map.put("result", errInfo); //返回结果 - return map; - } - - /** - * 去修改页面 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/findByBianma") - @ResponseBody - public Object findByBianma() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - map.put("DICTIONARIES_ID", eduDictionariesService.findByBianma(pd).get("DICTIONARIES_ID")); //传入上级所有信息 - map.put("result", errInfo); //返回结果 - return map; - } - - /** - * 修改 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/edit") - @ResponseBody - public Object edit() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - // 无法判断是否是行政区划修改 - // 删除缓存的数据 - - caffeineCache.invalidateAll(); - map.put("result", errInfo); //返回结果 - // 重新加载 异步 - caffeineUtil.loadOnce(caffeineCache); - return map; - } - - /** - * 删除 - * - * @param DICTIONARIES_ID - * @param - * @throws Exception - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String DICTIONARIES_ID) throws Exception { - Map map = new HashMap(); - PageData pd = new PageData(); - pd.put("DICTIONARIES_ID", DICTIONARIES_ID); - String errInfo = "success"; - if (eduDictionariesService.listSubDictByParentId(DICTIONARIES_ID).size() > 0) {//判断是否有子级，是：不允许删除 - errInfo = "error"; - } else { - pd = eduDictionariesService.findById(pd); //根据ID读取 - if ("yes".equals(pd.getString("YNDEL"))) return null; //当禁止删除字段值为yes, 则禁止删除，只能从手动从数据库删除 - if (null != pd.get("TBSNAME") && !"".equals(pd.getString("TBSNAME"))) { - String TBFIELD = pd.getString("TBFIELD"); - if (Tools.isEmpty(TBFIELD)) TBFIELD = "BIANMA"; //如果关联字段没有设置，就默认字段为 BIANMA - pd.put("TBFIELD", TBFIELD); - String[] table = pd.getString("TBSNAME").split(","); - for (int i = 0; i < table.length; i++) { - pd.put("thisTable", table[i]); - try { - if (Integer.parseInt(eduDictionariesService.findFromTbs(pd).get("zs").toString()) > 0) {//判断是否被占用，是：不允许删除(去排查表检查字典表中的编码字段) - errInfo = "error"; - break; - } - } catch (Exception e) { - errInfo = "error2"; - break; - } - } - } - } - if ("success".equals(errInfo)) { - eduDictionariesService.delete(pd); //执行删除 - } - map.put("result", errInfo); - return map; - } - - /** - * 获取连级数据 - * - * @return - * @throws Exception - */ - @RequestMapping(value = "/getLevels") - @ResponseBody - public Object getLevels() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID"); - DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID; - List varList = eduDictionariesService.listSubDictByParentId(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据 - List pdList = new ArrayList(); - for (Dictionaries d : varList) { - PageData pdf = new PageData(); - pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID()); - pdf.put("BIANMA", d.getBIANMA()); - pdf.put("NAME", d.getNAME()); - pdList.add(pdf); - } - map.put("list", pdList); - map.put("result", errInfo); //返回结果 - return map; - } - /** - * 获取连级数据 - * - * @return - * @throws Exception - */ - @RequestMapping(value = "/getLevelsHealth") - @ResponseBody - public Object getLevelsHealth() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID"); - DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID; - List varList = eduDictionariesService.listSubDictByParentId(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据 - List pdListHealth = new ArrayList(); - List pdList = new ArrayList(); - for (Dictionaries d : varList) { - if ("7633f231ba1748c1a7e5e4846d06db9f".equals(d.getDICTIONARIES_ID()) - || "cce04873ed014dfc9579290147dbfe94".equals(d.getDICTIONARIES_ID()) - || "ec57a1ac43c844be934d07e825318b4e".equals(d.getDICTIONARIES_ID())) { // 职业健康的人员类型 - PageData pdf = new PageData(); - pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID()); - pdf.put("BIANMA", d.getBIANMA()); - pdf.put("NAME", d.getNAME()); - pdListHealth.add(pdf); - } else { - PageData pdf = new PageData(); - pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID()); - pdf.put("BIANMA", d.getBIANMA()); - pdf.put("NAME", d.getNAME()); - pdList.add(pdf); - } - } - map.put("listHealth", pdListHealth); - map.put("list", pdList); - map.put("result", errInfo); //返回结果 - return map; - } - - /** - * 获取连级数据 - * - * @return - * @throws Exception - */ - @RequestMapping(value = "/getLevelsByCourseware") - @ResponseBody - public Object getLevelsByCourseware() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID"); - pd.put("DICTIONARIES_ID", (Tools.isEmpty(DICTIONARIES_ID) ? "f6a7c4f5602f46e291d06b1390a3f820" : DICTIONARIES_ID)); - List varList = eduDictionariesService.listSubDictByParentIdAndCourseware(pd); //通过ID获取其子级列表(学习考试课件相关) - List pdList = new ArrayList(); - for (Dictionaries d : varList) { - PageData pdf = new PageData(); - pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID()); - pdf.put("BIANMA", d.getBIANMA()); - pdf.put("NAME", d.getNAME()); - pdList.add(pdf); - } - map.put("list", pdList); - map.put("result", errInfo); //返回结果 - return map; - } - - /** - * 显示列表ztree (用于代码生成器引用数据字典) - * - * @return - */ - @RequestMapping(value = "/listAllDictToCreateCode") - @ResponseBody - public Object listAllDictToCreateCode() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - JSONArray arr = JSONArray.fromObject(eduDictionariesService.listAllDictToCreateCode("0")); - String json = arr.toString(); - json = json.replaceAll("DICTIONARIES_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("NAME", "name").replaceAll("subDict", "nodes").replaceAll("hasDict", "checked").replaceAll("treeurl", "click"); - map.put("zTreeNodes", json); - map.put("result", errInfo); //返回结果 - return map; - } - - @RequestMapping(value = "/listHylxDictToCreateCode") - @ResponseBody - public Object listHylxDictToCreateCode() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - JSONArray arr = JSONArray.fromObject(eduDictionariesService.listAllDictToCreateCode("f2598ba72e864eadabf0ca4b664d26b9")); - String json = arr.toString(); - json = json.replaceAll("DICTIONARIES_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("NAME", "name").replaceAll("subDict", "nodes").replaceAll("hasDict", "checked").replaceAll("treeurl", "click"); -// List zdicPdList = new ArrayList(); -// PageData dic = new PageData(); -// dic.put("DICTIONARIES_ID",pd.getString("DICTIONARIES_ID")); -// dic=this.dictionariesService.findById(dic); -// PageData node = new PageData(); -// node.put("id", dic.get("DICTIONARIES_ID")); -// node.put("parentId", dic.get("PARENT_ID")); -// node.put("name", dic.get("NAME")); -// node.put("icon", "../../../assets/images/user.gif"); -// zdicPdList.add(node); -// JSONArray arr = JSONArray.fromObject(dictionariesService.listAllDictToSelect(pd.getString("DICTIONARIES_ID"),zdicPdList)); -// map.put("zTreeNodes", (null == arr ?"":"{\"treeNodes\":" + arr.toString() + "}")); - map.put("zTreeNodes", json); - map.put("result", errInfo); - return map; - } - - @RequestMapping(value = "/listJjlxDictToCreateCode") - @ResponseBody - public Object listJjlxDictToCreateCode() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); -// String errInfo = "success"; - JSONArray arr = JSONArray.fromObject(eduDictionariesService.listAllDictToCreateCode("688d2cf1c6cd4dab999a0106e09aec83")); - String json = arr.toString(); - json = json.replaceAll("DICTIONARIES_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("NAME", "name").replaceAll("subDict", "nodes").replaceAll("hasDict", "checked").replaceAll("treeurl", "click"); -// List zdicPdList = new ArrayList(); -// PageData dic = new PageData(); -// dic.put("DICTIONARIES_ID",pd.getString("DICTIONARIES_ID")); -// dic=this.dictionariesService.findById(dic); -// PageData node = new PageData(); -// node.put("id", dic.get("DICTIONARIES_ID")); -// node.put("parentId", dic.get("PARENT_ID")); -// node.put("name", dic.get("NAME")); -// node.put("icon", "../../../assets/images/user.gif"); -// zdicPdList.add(node); -// JSONArray arr = JSONArray.fromObject(dictionariesService.listAllDictToSelect(pd.getString("DICTIONARIES_ID"),zdicPdList)); -// map.put("zTreeNodes", (null == arr ?"":"{\"treeNodes\":" + arr.toString() + "}")); - map.put("zTreeNodes", json); - map.put("result", errInfo); - return map; - } - - /** - * 获取某节点及下树形数据 - * - * @return - * @throws Exception - */ - @RequestMapping(value = "/getTreeDictByCode") - @ResponseBody - public Object getTreeDictByCode() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - JSONArray arr = JSONArray.fromObject(eduDictionariesService.listAllDictToCreateCode(pd.get("DICTIONARIES_ID").toString())); - String json = arr.toString(); - json = json.replaceAll("DICTIONARIES_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("NAME", "name").replaceAll("subDict", "nodes").replaceAll("hasDict", "checked").replaceAll("treeurl", "click"); - map.put("zTreeNodes", json); - map.put("result", errInfo); - return map; - } - - /** - * 获取连级数据 - * - * @return - * @throws Exception - */ - @RequestMapping(value = "/getLevelsAndSCount") - @ResponseBody - public Object getLevelsAndSCount() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID"); - DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID; - List varList = eduDictionariesService.listSubDictByParentIdAndSunCount(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据 - List pdList = new ArrayList(); - for (PageData d : varList) { - PageData pdf = new PageData(); - pdf.put("DICTIONARIES_ID", d.getString("DICTIONARIES_ID")); - pdf.put("BIANMA", d.getString("BIANMA")); - pdf.put("NAME", d.getString("NAME")); - pdf.put("zcount", d.get("zcount")); - pdList.add(pdf); - } - map.put("list", pdList); - map.put("result", errInfo); //返回结果 - return map; - } - - /** - * 获取连级数据(河北省内，到区） - * - * @return - * @throws Exception - */ - @RequestMapping(value = "/getHebeiPossession") - @ResponseBody - public Object getHebeiPossession() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID"); - DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID; - List varList = new ArrayList(); - boolean levelTwo = false; - if (pd.get("LEVEL") != null && Tools.notEmpty(pd.getString("LEVEL"))) { - varList = eduDictionariesService.listSubDictByParentIdAndSunCount(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据 - if ("2".equals(pd.getString("LEVEL"))) { - levelTwo = true; - } - } else { - PageData hebei = new PageData(); - hebei.put("DICTIONARIES_ID", "acd05c42faf346db9a0d067402b97c10"); - hebei = eduDictionariesService.findById(hebei); - varList.add(hebei); - } - List pdList = new ArrayList(); - for (PageData d : varList) { - PageData pdf = new PageData(); - pdf.put("DICTIONARIES_ID", d.getString("DICTIONARIES_ID")); - pdf.put("BIANMA", d.getString("BIANMA")); - pdf.put("NAME", d.getString("NAME")); - if (levelTwo) { - pdf.put("zcount", 0); - } else { - pdf.put("zcount", d.get("zcount")); - } - pdList.add(pdf); - } - map.put("list", pdList); - map.put("result", errInfo); //返回结果 - return map; - } - - /*导入exclint jj=0; - String pid=""; - String pid1=""; - String pid2=""; - for(PageData lpd:listPd) { - jj++; - PageData dic=new PageData(); - if(null!=lpd.get("var0")&&!"".equals(lpd.get("var0"))) { - dic.put("DICTIONARIES_ID", this.get32UUID()); - dic.put("NAME", lpd.get("var4")); - dic.put("BIANMA", lpd.get("var0")); - dic.put("PARENT_ID", "f2598ba72e864eadabf0ca4b664d26b9"); - dic.put("ORDER_BY", jj); - dic.put("YNDEL", "NO"); - dictionariesService.save(dic); - pid=dic.getString("DICTIONARIES_ID"); - } - if(null!=lpd.get("var1")&&!"".equals(lpd.get("var1"))) { - dic.put("DICTIONARIES_ID", this.get32UUID()); - dic.put("NAME", lpd.get("var4")); - dic.put("BIANMA", lpd.get("var1")); - dic.put("PARENT_ID", pid); - dic.put("ORDER_BY", jj); - dic.put("YNDEL", "NO"); - dictionariesService.save(dic); - pid1=dic.getString("DICTIONARIES_ID"); - } - if(null!=lpd.get("var2")&&!"".equals(lpd.get("var2"))) { - dic.put("DICTIONARIES_ID", this.get32UUID()); - dic.put("NAME", lpd.get("var4")); - dic.put("BIANMA", lpd.get("var2")); - dic.put("PARENT_ID", pid1); - dic.put("ORDER_BY", jj); - dic.put("YNDEL", "NO"); - dictionariesService.save(dic); - pid2=dic.getString("DICTIONARIES_ID"); - } - if(null!=lpd.get("var3")&&!"".equals(lpd.get("var3"))) { - dic.put("DICTIONARIES_ID", this.get32UUID()); - dic.put("NAME", lpd.get("var4")); - dic.put("BIANMA", lpd.get("var3")); - dic.put("PARENT_ID", pid2); - dic.put("ORDER_BY", jj); - dic.put("YNDEL", "NO"); - dictionariesService.save(dic); - }*/ - - /** - * 显示列表ztree (用于代码生成器引用数据字典) - * - * @return - */ - @RequestMapping(value = "/listAllDictToParId") - @ResponseBody - public Object listAllDictToParId() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - JSONArray arr = JSONArray.fromObject(eduDictionariesService.listAllDictToCreateCode(pd.getString("parentId"))); - String json = arr.toString(); - json = json.replaceAll("DICTIONARIES_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("NAME", "name").replaceAll("subDict", "nodes").replaceAll("hasDict", "checked").replaceAll("treeurl", "click"); - map.put("zTreeNodes", json); - map.put("result", errInfo); //返回结果 - return map; - } - - /** - * 显示列表ztree (用于代码生成器引用数据字典) - * - * @return - */ - @RequestMapping(value = "/listDictToParId") - @ResponseBody - public Object listDictToParId() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - JSONArray arr = JSONArray.fromObject(eduDictionariesService.listAllDictToCreateCode(pd.getString("parentId"))); - - String json = arr.toString().replaceAll("", ""); - json = json.replaceAll("DICTIONARIES_ID", "id") - .replaceAll("PARENT_ID", "pId") - .replaceAll("NAME", "name").replaceAll("subDict", "nodes") - .replaceAll("hasDict", "checked").replaceAll("treeurl", "click"); - String jsonb = json.replaceAll(",\"nodes\":\\[\\]", ""); - map.put("zTreeNodes", jsonb); - map.put("result", errInfo); //返回结果 - return map; - } - - @RequestMapping("/getRegion") - @ResponseBody - public Object getRegion() throws Exception { - Map map = new HashMap(); - try { - PageData request = this.getPageData(); - List info = eduDictionariesService.getRegionInfo(request.getString("ID")); - if (StringUtils.isBlank(request.getString("level"))) { - info = eduDictionariesService.killNode(info); - } - map.put("info", info); - map.put("result", "success"); - return map; - } catch (Exception e) { - e.printStackTrace(); - return ""; - } - } - - /** - * @Description: 行政区划 省市县 - * @Author: dearLin - * @Date: 2023/3/10/010 8:31 - * @Param: [] [] - * @Return: java.lang.Object - */ - @RequestMapping("/getAdminIstrative") - @ResponseBody - public Object getAdminIstrative() throws Exception { - PageData pageData = getPageData(); - // TODO 接口耗时长 需加缓存 递归处需要优化 - PageData res = eduDictionariesService.getAdminIstrative(pageData); - return res; - } - - - @RequestMapping("/getInfo") - @ResponseBody - public Response getInfo() throws Exception { - Response response = Response.getResponse(); - try { - PageData request = this.getPageData(); - if (StringUtils.isNotBlank(request.getString("region")) && "1".equals(request.getString("certificateType"))) { - List info = eduDictionariesService.getRegionInfo(request.getString("region")); - if (StringUtils.isBlank(request.getString("level"))) { - info = eduDictionariesService.killNode(info); - } - response.put("region", info); - } - - if (StringUtils.isNotBlank(request.getString("certificateType")) && "1".equals(request.getString("certificateType"))) { - List certificateType = eduDictionariesService.listSubDictByParentId("69ec4bfae8ac41d993e764f24ec41011"); - response.put("certificateType", certificateType); - } - - if (StringUtils.isNotBlank(request.getString("culturalLevel")) && "1".equals(request.getString("culturalLevel"))) { - List certificateType = eduDictionariesService.listSubDictByParentId("d7d80f08d73a4accbccf4fd3d8d1d867"); - response.put("culturalLevel", certificateType); - } - - if (StringUtils.isNotBlank(request.getString("industryType")) && "1".equals(request.getString("industryType"))) { - List certificateType = eduDictionariesService.getIndustryType(); - response.put("industryType", certificateType); - } - - return response.OK(); - } catch (Exception e) { - e.printStackTrace(); - return response.errorMessage(e.getMessage()); - } - } - - -} diff --git a/src/main/java/com/zcloud/controller/eduSystem/UserSignController.java b/src/main/java/com/zcloud/controller/eduSystem/UserSignController.java new file mode 100644 index 0000000..f54ab73 --- /dev/null +++ b/src/main/java/com/zcloud/controller/eduSystem/UserSignController.java @@ -0,0 +1,210 @@ +package com.zcloud.controller.eduSystem; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.eduSystem.UserSignService; +import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; +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.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：被培训企业用户签字信息 + * 作者：yangming + * 时间：2023-01-30 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/usersign") +public class UserSignController extends BaseController { + + @Autowired + private UserSignService userSignService; + @Autowired + private Smb smb; + + /** + * 用户签字新增 + * + * @param + * @throws Exception + */ + + @RequestMapping(value = "/save") + @ResponseBody + public Object save(@RequestParam(value = "SIGN_PICTURE_2", required = false) MultipartFile SIGN_PICTURE_2) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); +// +// //判断是否是同一签字人员类型（同一机构，同一企业下） +// List hasusersigntype = userSignService.findByUsersigntype(pd); +// if (hasusersigntype.size() > 0) { +// map.put("result", errInfo); +// map.put("message", "该签字人员类型已存在,请检查数据。"); +// return map; +// } + pd.put("USERSIGNID", this.get32UUID()); + pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", 0); + //签字方式以上传图片的形式存储数据 + if (SIGN_PICTURE_2 != null) { + pd.put("SIGN_PICTURE", smb.saveFile(SIGN_PICTURE_2, pd.getString("CORPINFO_ID"))); + } else { + //签字方式以签字的形式存储数据 + if (Tools.notEmpty(pd.getString("SIGN_PICTURE"))) { + if (StringUtils.isNotBlank(pd.getString("SIGN_PICTURE"))) { + MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("SIGN_PICTURE")); //base64转文件 + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + + pd.put("SIGN_PICTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + } + } + } + userSignService.add(pd); //列表 + map.put("result", errInfo); + return map; + } + + + /** + * 用户签字列表 + * + * @param + * @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("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("OPERATOR", ""); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + page.setPd(pd); + List varList = userSignService.signlistPage(page); //列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/isdelete") + @ResponseBody + public Object isdelete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + userSignService.deleteUserSign(pd); //列表 + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pageData = userSignService.findById(pd); //列表 + map.put("varList", pageData); + map.put("result", errInfo); + return map; + } + + + /** + * 获取档案签字列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listByEnt") + @ResponseBody + public Object listByEnt() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = userSignService.listByEnt(pd); //列表 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value = "SIGN_PICTURE_2", required = false) MultipartFile SIGN_PICTURE_2) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); +// //判断是否是同一签字人员类型（同一机构，同一企业下） +// List hasusersigntype = userSignService.findByUsersigntype(pd); +// if (hasusersigntype.size() > 0) { +// map.put("result", errInfo); +// map.put("message", "该签字人员类型已存在,请检查数据。"); +// return map; +// } + pd.put("OPERATOR", Jurisdiction.getUsername()); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + //签字方式以上传图片的形式存储数据 + if (SIGN_PICTURE_2 != null) { + pd.put("SIGN_PICTURE", smb.saveFile(SIGN_PICTURE_2, pd.getString("CORPINFO_ID"))); + } else { + //签字方式以签字的形式存储数据 + if (Tools.notEmpty(pd.getString("SIGN_PICTURE")) && pd.getString("SIGN_PICTURE").contains("data:image/png;base64,")) { + if (StringUtils.isNotBlank(pd.getString("SIGN_PICTURE"))) { + MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("SIGN_PICTURE")); //base64转文件 + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + + pd.put("SIGN_PICTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + } + } + } + userSignService.edit(pd); //列表 + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java index b5dbc9f..7b4e82b 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java @@ -156,4 +156,8 @@ public interface DictionariesMapper { List listgetAssignedVehicle(String parentId); List listgetVehicleType(String parentId); + + List getAll(); + + List listByDicId(String DICTIONARIES_ID); } diff --git a/src/main/java/com/zcloud/mapper/dsno3/eduArchives/ArchivesMapper.java b/src/main/java/com/zcloud/mapper/dsno3/eduArchives/ArchivesMapper.java index bcadc46..bca10d7 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/eduArchives/ArchivesMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno3/eduArchives/ArchivesMapper.java @@ -19,14 +19,6 @@ public interface ArchivesMapper { */ List getClasseslistPage(Page page) throws Exception; - /** - * 获取机构服务的企业 - * - * @param pd - * @throws Exception - */ - List getEnterprises(PageData pd); - /** * 获取班级内的工种 * @@ -61,13 +53,6 @@ public interface ArchivesMapper { */ List getStudents(PageData pd); - /** - * 获取机构服务的企业(分页) - * - * @param page - * @throws Exception - */ - List getEnterpriselistPage(Page page); /** * 获取企业参与过培训的机构(分页) diff --git a/src/main/java/com/zcloud/mapper/dsno3/eduSystem/EduDictionariesMapper.java b/src/main/java/com/zcloud/mapper/dsno3/eduSystem/EduDictionariesMapper.java deleted file mode 100644 index 712fc34..0000000 --- a/src/main/java/com/zcloud/mapper/dsno3/eduSystem/EduDictionariesMapper.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.zcloud.mapper.dsno3.eduSystem; - -import com.zcloud.entity.Page; -import com.zcloud.entity.PageData; -import com.zcloud.entity.system.Dictionaries; - -import java.util.List; - -/** - * 说明：数据字典Mapper - * 作者：luoxiaobao - * 官网：www.qdkjchina.com - */ -public interface EduDictionariesMapper { - - /** - * 通过ID获取其子级列表 - * - * @param parentId - * @return - * @throws Exception - */ - List listSubDictByParentId(String parentId); - - /** - * 通过ID获取其子级列表 - * - * @param pd - * @return - * @throws Exception - */ - List listSubDictByParent(PageData pd); - - /** - * 通过ID获取其子级列表(学习考试课件相关) - * - * @param pd - * @return - * @throws Exception - */ - List listSubDictByParentIdAndCourseware(PageData pd); - - /** - * 列表 - * - * @param page - * @throws Exception - */ - List datalistPage(Page page); - - /** - * 通过id获取数据 - * - * @param pd - * @throws Exception - */ - PageData findById(PageData pd); - - /** - * 通过名称获取数据 - * - * @param pd - * @throws Exception - */ - PageData findByName(PageData pd); - - /** - * 通过编码获取数据 - * - * @param pd - * @throws Exception - */ - PageData findByBianma(PageData pd); - - /** - * 新增 - * - * @param pd - * @throws Exception - */ - void save(PageData pd); - - /** - * 修改 - * - * @param pd - * @throws Exception - */ - void edit(PageData pd); - - /** - * 排查表检查是否被占用 - * - * @param pd - * @throws Exception - */ - PageData findFromTbs(PageData pd); - - /** - * 删除 - * - * @param pd - * @throws Exception - */ - void delete(PageData pd); - - /** - * 通过IDS获取列表 - * - * @param dictionariesIds - * @return - * @throws Exception - */ - List listSubDictByIdS(String[] dictionariesIds); - - /** - * 获取父节点信息下面的子节点个数 - * - * @param pd - * @throws Exception - */ - PageData getCountByParId(PageData pd); - - /** - * 获取 节点信息 获取字典信息 - * - * @param pd - * @throws Exception - */ - PageData getPdByParIdAndName(PageData pd); - - List listSubDictByParentIdAndSunCount(String parentId); - - /** - * 查询同一父级下的所有子集 - * - * @param parentId - * @return - */ - List listBySameParent(String parentId); - - /** - * @param DICTIONARIES_ID - * @return - */ - List listByDicId(String DICTIONARIES_ID); - - /** - * 通过id获取数据 - * - * @param pd - * @throws Exception - */ - PageData findMoreById(PageData pd); - - List getAll(); -} diff --git a/src/main/java/com/zcloud/service/eduArchives/ArchivesService.java b/src/main/java/com/zcloud/service/eduArchives/ArchivesService.java index 9ea4883..a14b7f7 100644 --- a/src/main/java/com/zcloud/service/eduArchives/ArchivesService.java +++ b/src/main/java/com/zcloud/service/eduArchives/ArchivesService.java @@ -22,13 +22,6 @@ public interface ArchivesService { */ public List getClasseslistPage(Page page) throws Exception; - /** - * 获取机构服务的企业 - * - * @param pd - * @throws Exception - */ - public List getEnterprises(PageData pd) throws Exception; /** * 获取班级内的工种 @@ -64,13 +57,6 @@ public interface ArchivesService { */ List getStudents(PageData pd) throws Exception; - /** - * 获取机构服务的企业(分页) - * - * @param page - * @throws Exception - */ - List getEnterpriselistPage(Page page) throws Exception; /** * 获取企业参与过培训的机构(分页) @@ -132,15 +118,6 @@ public interface ArchivesService { */ PageData getLearningRecord(PageData pd); - /** - * 获取登录的企业信息 - * - * @param pd - * @throws Exception - */ - PageData getEnterpriseInfo(PageData pd) throws Exception; - - List getStudentsByClass(PageData classList); /** * 获取班级试卷列表 diff --git a/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesServiceImpl.java b/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesServiceImpl.java index b1c949b..33012f4 100644 --- a/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesServiceImpl.java +++ b/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesServiceImpl.java @@ -48,11 +48,6 @@ public class ArchivesServiceImpl implements ArchivesService { return archivesMapper.getClasseslistPage(page); } - @Override - public List getEnterprises(PageData pd) throws Exception { - return archivesMapper.getEnterprises(pd); - } - @Override public List getPostlistPage(Page page) throws Exception { return archivesMapper.getPostlistPage(page); @@ -82,11 +77,6 @@ public class ArchivesServiceImpl implements ArchivesService { return archivesMapper.getStudents(pd); } - @Override - public List getEnterpriselistPage(Page page) throws Exception { - return archivesMapper.getEnterpriselistPage(page); - } - @Override public List getCorplistPage(Page page) throws Exception { return archivesMapper.getCorplistPage(page); @@ -146,16 +136,6 @@ public class ArchivesServiceImpl implements ArchivesService { return data; } - @Override - public PageData getEnterpriseInfo(PageData pd) { - return archivesMapper.getEnterpriseInfo(pd); - } - - @Override - public List getStudentsByClass(PageData pd) { - return archivesMapper.getStudentsByClass(pd); - } - @Override public List getPostlistAll(PageData pd) { return archivesMapper.getPostlistAll(pd); diff --git a/src/main/java/com/zcloud/service/eduSystem/DictionariesCacheService.java b/src/main/java/com/zcloud/service/eduSystem/DictionariesCacheService.java deleted file mode 100644 index 7dd3849..0000000 --- a/src/main/java/com/zcloud/service/eduSystem/DictionariesCacheService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.zcloud.service.eduSystem; - -import com.zcloud.entity.system.Dictionaries; - -import java.util.List; - -/** - * 说明：数据字典服务接口 - * 作者：luoxiaobao - * 官网：www.qdkjchina.com - */ -public interface DictionariesCacheService { - - List listAllDict(String parentId) throws Exception; - - List getIndustryType(String s) throws Exception; - - void warmUp() throws Exception; -} diff --git a/src/main/java/com/zcloud/service/eduSystem/UserSignService.java b/src/main/java/com/zcloud/service/eduSystem/UserSignService.java new file mode 100644 index 0000000..bbddf51 --- /dev/null +++ b/src/main/java/com/zcloud/service/eduSystem/UserSignService.java @@ -0,0 +1,51 @@ +package com.zcloud.service.eduSystem; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：用户签字接口 + * 作者：yangming + * 官网：www.qdkjchina.com + */ +public interface UserSignService { + + /** + * 新增用户签字数据 + * + * @param pd + * @throws Exception + */ + public void add(PageData pd) throws Exception; + + /*签字列表 + * @param pd + * @throws Exception + */ + public List signlistPage(Page page) throws Exception; + + void deleteUserSign(PageData pd) throws Exception; + + /*通过ID查询数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd) throws Exception; + + void edit(PageData pd) throws Exception; + + + /*获取档案签字列表 + * @param pd + * @throws Exception + */ + public List listByEnt(PageData pd) throws Exception; + + /*判断是否是同一签字人员类型（同一机构，同一企业下） + * @param pd + * @throws Exception + */ + public List findByUsersigntype(PageData pd) throws Exception; +} diff --git a/src/main/java/com/zcloud/service/eduSystem/impl/DictionariesCacheServiceImpl.java b/src/main/java/com/zcloud/service/eduSystem/impl/DictionariesCacheServiceImpl.java deleted file mode 100644 index 9558420..0000000 --- a/src/main/java/com/zcloud/service/eduSystem/impl/DictionariesCacheServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.zcloud.service.eduSystem.impl; - -import com.zcloud.mapper.dsno3.eduStudy.IndustryTypeMapper; -import com.zcloud.service.eduSystem.DictionariesCacheService; -import com.zcloud.entity.PageData; -import com.zcloud.entity.system.Dictionaries; -import com.zcloud.mapper.datasource.system.DictionariesMapper; -import com.zcloud.util.Jailer; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 说明：按钮权限服务接口实现类 - * 作者：luoxiaobao - * 官网：www.qdkjchina.com - */ -@Service -@Transactional //开启事物 -public class DictionariesCacheServiceImpl implements DictionariesCacheService { - - @Resource - private DictionariesMapper dictionariesMapper; - - @Resource - private IndustryTypeMapper industryTypeMapper; - - @Cacheable(value = "dictionaries", key = "#parentId") - public List listAllDict(String parentId) throws Exception { - List dictList = this.listSubDictByParentId(parentId); - for (Dictionaries dict : dictList) { - dict.setTreeurl("dictionaries_list.html?DICTIONARIES_ID=" + dict.getDICTIONARIES_ID()); - dict.setSubDict(this.listAllDict(dict.getDICTIONARIES_ID())); - dict.setTarget("treeFrame"); - } - return dictList; - } - - public List listSubDictByParentId(String parentId) throws Exception { - return dictionariesMapper.listSubDictByParentId(parentId); - } - - @Override - @Cacheable(value = "temporary", key = "#parentId") - public List getIndustryType(String parentId) throws Exception { - List raw_list = industryTypeMapper.listAll(new PageData()); - List _list = raw_list.stream().map(Jailer::mapDictionaries).collect(Collectors.toList()); - return analysis(_list, "0"); - } - - private List analysis(List list, String parentId) { - List parents = list.stream().parallel().filter(n -> n.getPARENT_ID().equals(parentId)).collect(Collectors.toList()); - for (Dictionaries x : parents) { - List children = analysis(list, x.getDICTIONARIES_ID()); - x.setSubDict(children); - } - return parents; - } - - /** - * description :系统热身，将地址数据放到缓存中 - */ -// @Scheduled(initialDelay = 1000*3 ,fixedDelay = 24 * 60 * 60 * 1000 ) - public void warmUp() throws Exception { - this.listAllDict("e725d2a91b8248f4b8f49889038df7de"); - } -} diff --git a/src/main/java/com/zcloud/service/eduSystem/impl/EduDictionariesServiceImpl.java b/src/main/java/com/zcloud/service/eduSystem/impl/EduDictionariesServiceImpl.java deleted file mode 100644 index ab33916..0000000 --- a/src/main/java/com/zcloud/service/eduSystem/impl/EduDictionariesServiceImpl.java +++ /dev/null @@ -1,481 +0,0 @@ -package com.zcloud.service.eduSystem.impl; - -import com.github.benmanes.caffeine.cache.Cache; -import com.zcloud.entity.system.Dictionaries; -import com.zcloud.service.eduSystem.DictionariesCacheService; -import com.zcloud.mapper.dsno3.eduSystem.EduDictionariesMapper; -import com.zcloud.entity.Page; -import com.zcloud.entity.PageData; -import com.zcloud.service.eduSystem.EduDictionariesService; -import com.zcloud.util.AdministrativeUntil; -import com.zcloud.util.Tools; -import com.zcloud.util.UuidUtil; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -/** - * 说明：按钮权限服务接口实现类 - * 作者：luoxiaobao - * 官网：www.qdkjchina.com - */ -@Service -@Transactional //开启事物 -public class EduDictionariesServiceImpl implements EduDictionariesService { - - @Resource - private EduDictionariesMapper eduDictionariesMapper; - @Autowired - private DictionariesCacheService cacheService; - - @Resource(name = "caffeineCache") - private Cache caffeineCache; - - /** - * 获取所有数据并填充每条数据的子级列表(递归处理) - * - * @param - * @return - * @throws Exception - */ - public List listAllDict(String parentId) throws Exception { - List dictList = this.listSubDictByParentId(parentId); - for (Dictionaries dict : dictList) { - dict.setTreeurl("dictionaries_list.html?DICTIONARIES_ID=" + dict.getDICTIONARIES_ID()); - dict.setSubDict(this.listAllDict(dict.getDICTIONARIES_ID())); - dict.setTarget("treeFrame"); - } - return dictList; - } - - /** - * 通过ID获取其子级列表 - * - * @param parentId - * @return - * @throws Exception - */ - public List listSubDictByParentId(String parentId) throws Exception { -// System.out.println(dictionariesMapper.listSubDictByParentId(parentId)); - return eduDictionariesMapper.listSubDictByParentId(parentId); - } - - /** - * 通过ID获取其子级列表 - * - * @param pd - * @return - * @throws Exception - */ - public List listSubDictByParent(PageData pd) throws Exception { - return eduDictionariesMapper.listSubDictByParent(pd); - } - - /** - * 通过ID获取其子级列表 - * - * @param - * @return - * @throws Exception - */ - public List listSubDictByParentIdAndCourseware(PageData pd) throws Exception { - return eduDictionariesMapper.listSubDictByParentIdAndCourseware(pd); - } - - /** - * 获取所有数据并填充每条数据的子级列表(递归处理)用于代码生成器引用数据字典 - * - * @param - * @return - * @throws Exception - */ - public List listAllDictToCreateCode(String parentId) throws Exception { - List dictList = this.listSubDictByParentId(parentId); - for (Dictionaries dict : dictList) { - dict.setTreeurl("setDID('" + dict.getDICTIONARIES_ID() + "');"); - dict.setSubDict(this.listAllDictToCreateCode(dict.getDICTIONARIES_ID())); - dict.setTarget("treeFrame"); - } - return dictList; - } - - /** - * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用 - * - * @param - * @return - * @throws Exception - */ - public List listAllDictToSelect(String parentId, List zdicPdList) throws Exception { - List[] arrayDep = this.listAllbyPd(parentId, zdicPdList); - List dicPdList = arrayDep[1]; - for (PageData pd : dicPdList) { - this.listAllDictToSelect(pd.getString("id"), arrayDep[0]); - } - return arrayDep[0]; - } - - /** - * 下拉ztree用 - * - * @param parentId - * @return - * @throws Exception - */ - @SuppressWarnings("unchecked") - public List[] listAllbyPd(String parentId, List zdicPdList) throws Exception { - List dicList = this.listSubDictByParentId(parentId); - List dicPdList = new ArrayList(); - for (Dictionaries dic : dicList) { - PageData pd = new PageData(); - pd.put("id", dic.getDICTIONARIES_ID()); - pd.put("parentId", dic.getPARENT_ID()); - pd.put("name", dic.getNAME()); - pd.put("icon", "../../../assets/images/user.gif"); - dicPdList.add(pd); - zdicPdList.add(pd); - } - List[] arrayDep = new List[2]; - arrayDep[0] = zdicPdList; - arrayDep[1] = dicPdList; - return arrayDep; - } - - /** - * 列表 - * - * @param page - * @throws Exception - */ - public List list(Page page) throws Exception { - return eduDictionariesMapper.datalistPage(page); - } - - /** - * 通过id获取数据 - * - * @param pd - * @throws Exception - */ - public PageData findById(PageData pd) throws Exception { - return eduDictionariesMapper.findById(pd); - } - - /** - * 通过名称获取数据 - * - * @param pd - * @throws Exception - */ - public PageData findByName(PageData pd) throws Exception { - return eduDictionariesMapper.findByName(pd); - } - - /** - * 通过编码获取数据 - * - * @param pd - * @throws Exception - */ - public PageData findByBianma(PageData pd) throws Exception { - return eduDictionariesMapper.findByBianma(pd); - } - - /** - * 新增 - * - * @param pd - * @throws Exception - */ - public void save(PageData pd) throws Exception { - eduDictionariesMapper.save(pd); - } - - /** - * 修改 - * - * @param pd - * @throws Exception - */ - public void edit(PageData pd) throws Exception { - eduDictionariesMapper.edit(pd); - } - - /** - * 排查表检查是否被占用 - * - * @param pd - * @throws Exception - */ - public PageData findFromTbs(PageData pd) throws Exception { - return eduDictionariesMapper.findFromTbs(pd); - } - - /** - * 删除 - * - * @param pd - * @throws Exception - */ - public void delete(PageData pd) throws Exception { - eduDictionariesMapper.delete(pd); - } - - /** - * 通过IDS获取列表 - * - * @param dictionariesIds - * @return - * @throws Exception - */ - public List listSubDictByIds(String[] dictionariesIds) throws Exception { - return eduDictionariesMapper.listSubDictByIdS(dictionariesIds); - } - - /** - * 新增(增加在线考试使用人员类别) - * - * @param pd - * @throws Exception - */ - public PageData saveSelf(PageData pd) throws Exception { - List list = this.listSubDictByParentId("532282f9c48346b8b646531909c739df"); - String BIANMA = "APPLICABLEPERSONNEL000"; - if (list.size() + 1 < 10) { - BIANMA = BIANMA.substring(0, BIANMA.length() - 1) + (list.size() + 1); - } else if (list.size() + 1 < 100) { - BIANMA = BIANMA.substring(0, BIANMA.length() - 2) + (list.size() + 1); - } else { - BIANMA = BIANMA.substring(0, BIANMA.length() - 3) + (list.size() + 1); - } - PageData lc = new PageData(); - lc.put("DICTIONARIES_ID", UuidUtil.get32UUID()); - lc.put("NAME", pd.getString("LEARNERCATEGORY")); - lc.put("NAME_EN", BIANMA); - lc.put("BIANMA", BIANMA); - lc.put("ORDER_BY", list.size() + 1); - lc.put("PARENT_ID", "532282f9c48346b8b646531909c739df"); - this.save(lc); - return lc; - } - - /** - * 新增(动态字典信息) - * - * @param pd - * @throws Exception - */ - public PageData saveByZidongxinzeng(PageData pd) throws Exception { - PageData lc = eduDictionariesMapper.getPdByParIdAndName(pd); - if (null == lc) { - PageData pageDataSize = eduDictionariesMapper.getCountByParId(pd); - Integer count = Integer.valueOf(pageDataSize.get("zs").toString()) + 1; - String BIANMA = pd.getString("BIANMA") + String.format("%04d", count); - lc = new PageData(); - lc.put("DICTIONARIES_ID", UuidUtil.get32UUID()); - lc.put("NAME", pd.getString("NAME")); - lc.put("NAME_EN", BIANMA); - lc.put("BIANMA", BIANMA); - lc.put("ORDER_BY", count); - lc.put("PARENT_ID", pd.getString("PARENT_ID")); - this.save(lc); - } - return lc; - } - - /** - * 通过编码获取数据 - * - * @param - * @throws Exception - */ - public PageData findByName(String name, String PARENT_ID) throws Exception { - PageData pageData = new PageData(); - pageData.put("NAME", name); - pageData.put("PARENT_ID", PARENT_ID); - return eduDictionariesMapper.getPdByParIdAndName(pageData); - } - - /** - * 获取根节点 - * - * @param id - * @return - * @throws Exception - */ - public PageData getRootDicById(String id) throws Exception { - PageData pd = new PageData(); - pd.put("DICTIONARIES_ID", id); - PageData dic = eduDictionariesMapper.findById(pd); - if (dic != null && dic.get("PARENT_ID") != null - && Tools.notEmpty(dic.get("PARENT_ID").toString()) - && !"f2598ba72e864eadabf0ca4b664d26b9".equals(dic.get("PARENT_ID").toString())) { - dic = getRootDicById(dic.get("PARENT_ID").toString()); - } - return dic; - } - - public List listSubDictByParentIdAndSunCount(String parentId) throws Exception { - return eduDictionariesMapper.listSubDictByParentIdAndSunCount(parentId); - } - - /** - * 从下而上查询树（无分支） - * - * @param dic - * @return - * @throws Exception - */ - public List getTreeFromBelow(List nextList, PageData dic) throws Exception { - List dicList = eduDictionariesMapper.listBySameParent(dic.get("PARENT_ID").toString()); - if (nextList != null && dicList != null && nextList.size() > 0 && dicList.size() > 0) { - for (PageData d : dicList) { - if (dic.getString("DICTIONARIES_ID").equals(d.getString("id"))) { - d.put("children", nextList); - } - } - } - PageData parDic = new PageData(); - parDic.put("DICTIONARIES_ID", dic.get("PARENT_ID")); - parDic.put("NOROOT", "1"); - parDic = eduDictionariesMapper.findById(parDic); - if (parDic != null && parDic.get("DICTIONARIES_ID") != null && !"0".equals(parDic.get("PARENT_ID").toString())) { - dicList = getTreeFromBelow(dicList, parDic); - } - return dicList; - } - - /** - * 从下而上查询树（无分支） - * - * @param dic - * @return - * @throws Exception - */ - public List getTreeFromBelowHebei(List nextList, PageData dic) throws Exception { - int level = (int) dic.get("level"); - List dicList = new ArrayList(); - if (level == 1) { - dicList = eduDictionariesMapper.listByDicId(dic.get("DICTIONARIES_ID").toString()); - } else { - dicList = eduDictionariesMapper.listBySameParent(dic.get("PARENT_ID").toString()); - if (level == 3) { - for (PageData d : dicList) { - d.put("leaf", 1); - } - } - } - if (nextList != null && dicList != null && nextList.size() > 0 && dicList.size() > 0) { - for (PageData d : dicList) { - - if (dic.getString("DICTIONARIES_ID").equals(d.getString("id"))) { - d.put("children", nextList); - } - } - } - PageData parDic = new PageData(); - parDic.put("DICTIONARIES_ID", dic.get("PARENT_ID")); - parDic.put("NOROOT", "1"); - parDic = eduDictionariesMapper.findById(parDic); - parDic.put("level", --level); - if (parDic != null && parDic.get("DICTIONARIES_ID") != null && !"0".equals(parDic.get("PARENT_ID").toString())) { - dicList = getTreeFromBelowHebei(dicList, parDic); - } - return dicList; - } - - /** - * 通过id获取数据 - * - * @param pd - * @throws Exception - */ - public PageData findMoreById(PageData pd) throws Exception { - return eduDictionariesMapper.findMoreById(pd); - } - - @Override - public List getRegionInfo(String id) throws Exception { - if (StringUtils.isEmpty(id)) throw new RuntimeException("数据异常，请联系管理员"); - List list = cacheService.listAllDict("e725d2a91b8248f4b8f49889038df7de"); - if ("e725d2a91b8248f4b8f49889038df7de".equals(id)) { - return list; - } - Dictionaries target = findTarget(list, id); - List targets = new ArrayList<>(); - targets.add(target); - return targets; - } - - @Override - public List killNode(List info) throws Exception { - return killNode(info, 3); - } - - @Override - public List killNode(List info, Integer level) throws Exception { - if (level == 0) throw new RuntimeException("不能清楚所有数据"); - for (Dictionaries x : info) { - this.killNode(x, 1, level); - } - return info; - } - - private void killNode(Dictionaries info, int level, int rule) { - if (level == rule) { - info.setSubDict(null); - } else { - for (Dictionaries x : info.getSubDict()) { - killNode(x, level + 1, rule); - } - } - - } - - private Dictionaries findTarget(List list, String id) throws Exception { - Optional target = list.stream().filter(n -> id.equals(n.getDICTIONARIES_ID())).findFirst(); - if (!target.isPresent()) { - for (Dictionaries potential_target : list) { - Dictionaries _target = findTarget(potential_target.getSubDict(), id); - if (_target != null) { - return _target; - } - } - return null; - } else { - return target.get(); - } - - } - - @Override - public List getIndustryType() throws Exception { - return cacheService.getIndustryType("4b0743adfb1e4af3a6bc3631afdfe68b"); - } - - @Override - public PageData getAdminIstrative(PageData pageData) { - Object xzqh = caffeineCache.get("xzqh", x -> { - List all = eduDictionariesMapper.getAll(); - Map fileSort = AdministrativeUntil.getFileSort(all); - return fileSort; - }); - PageData data = new PageData(); - if (xzqh == null) { - data.put("result", "error"); - data.put("msg", "系统开小差了，请联系管理员"); - } else { - data.put("result", "success"); - } - data.put("varList", xzqh); - return data; - } - -} diff --git a/src/main/java/com/zcloud/service/eduSystem/impl/UserSignServiceImpl.java b/src/main/java/com/zcloud/service/eduSystem/impl/UserSignServiceImpl.java new file mode 100644 index 0000000..e5df305 --- /dev/null +++ b/src/main/java/com/zcloud/service/eduSystem/impl/UserSignServiceImpl.java @@ -0,0 +1,65 @@ +package com.zcloud.service.eduSystem.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno3.eduSystem.UserSignMapper; +import com.zcloud.service.eduSystem.UserSignService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：用户签字接口实现类 + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +@Service +@Transactional //开启事物 +public class UserSignServiceImpl implements UserSignService { + + @Autowired + private UserSignMapper userSignMapper; + + @Override + public void add(PageData pd) throws Exception { + userSignMapper.saveUser(pd); + } + + @Override + public List signlistPage(Page page) throws Exception { + return userSignMapper.signlistPage(page); + } + + @Override + public void deleteUserSign(PageData pd) throws Exception { + userSignMapper.deleteUserSign(pd); + } + + @Override + public PageData findById(PageData pd) throws Exception { + return userSignMapper.findById(pd); + } + + @Override + public void edit(PageData pd) throws Exception { + userSignMapper.edit(pd); + } + + /*获取档案签字列表 + * @param pd + * @throws Exception + */ + public List listByEnt(PageData pd) throws Exception { + return userSignMapper.listByEnt(pd); + } + + /*判断是否是同一签字人员类型（同一机构，同一企业下） + * @param pd + * @throws Exception + */ + public List findByUsersigntype(PageData pd) throws Exception { + return userSignMapper.findByUsersigntype(pd); + } +} diff --git a/src/main/java/com/zcloud/service/system/DictionariesService.java b/src/main/java/com/zcloud/service/system/DictionariesService.java index 9a3275e..5d40cb0 100644 --- a/src/main/java/com/zcloud/service/system/DictionariesService.java +++ b/src/main/java/com/zcloud/service/system/DictionariesService.java @@ -4,6 +4,7 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.entity.system.Dictionaries; +import java.util.ArrayList; import java.util.List; /** @@ -15,7 +16,7 @@ public interface DictionariesService { /** * 获取所有数据并填充每条数据的子级列表(递归处理) - * @param MENU_ID + * @param * @return * @throws Exception */ @@ -85,7 +86,7 @@ public interface DictionariesService { /** * 获取所有数据并填充每条数据的子级列表(递归处理)用于代码生成器引用数据字典 - * @param MENU_ID + * @param * @return * @throws Exception */ @@ -201,4 +202,6 @@ public interface DictionariesService { List listgetAssignedVehicle(String parentId); List listgetVehicleType(String parentId); + + List getTreeFromBelowHebei(List nextList, PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java index 829cd05..f86d59a 100644 --- a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java @@ -33,7 +33,7 @@ public class DictionariesServiceImpl implements DictionariesService { /** * 获取所有数据并填充每条数据的子级列表(递归处理) - * @param MENU_ID + * @param * @return * @throws Exception */ @@ -84,7 +84,7 @@ public class DictionariesServiceImpl implements DictionariesService { /** * 通过ID获取其子级列表 - * @param parentId + * @param * @return * @throws Exception */ @@ -94,7 +94,7 @@ public class DictionariesServiceImpl implements DictionariesService { /** * 获取所有数据并填充每条数据的子级列表(递归处理)用于代码生成器引用数据字典 - * @param MENU_ID + * @param * @return * @throws Exception */ @@ -109,7 +109,7 @@ public class DictionariesServiceImpl implements DictionariesService { } /** * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用 - * @param MENU_ID + * @param * @return * @throws Exception */ @@ -263,7 +263,7 @@ public class DictionariesServiceImpl implements DictionariesService { return lc; } /**通过编码获取数据 - * @param pd + * @param * @throws Exception */ public PageData findByName(String name,String PARENT_ID)throws Exception{ @@ -275,7 +275,7 @@ public class DictionariesServiceImpl implements DictionariesService { /** * 获取根节点 - * @param MENU_ID + * @param * @return * @throws Exception */ @@ -501,4 +501,43 @@ public class DictionariesServiceImpl implements DictionariesService { public List listgetVehicleType(String parentId) { return dictionariesMapper.listgetVehicleType(parentId); } + /** + * 从下而上查询树（无分支） + * + * @param dic + * @return + * @throws Exception + */ + public List getTreeFromBelowHebei(List nextList, PageData dic) throws Exception{ + int level = (int) dic.get("level"); + List dicList = new ArrayList(); + if (level == 1) { + dicList = dictionariesMapper.listByDicId(dic.get("DICTIONARIES_ID").toString()); + } else { + dicList = dictionariesMapper.listBySameParent(dic.get("PARENT_ID").toString()); + if (level == 3) { + for (PageData d : dicList) { + d.put("leaf", 1); + } + } + } + if (nextList != null && dicList != null && nextList.size() > 0 && dicList.size() > 0) { + for (PageData d : dicList) { + + if (dic.getString("DICTIONARIES_ID").equals(d.getString("id"))) { + d.put("children", nextList); + } + } + } + PageData parDic = new PageData(); + parDic.put("DICTIONARIES_ID", dic.get("PARENT_ID")); + parDic.put("NOROOT", "1"); + parDic = dictionariesMapper.findById(parDic); + parDic.put("level", --level); + if (parDic != null && parDic.get("DICTIONARIES_ID") != null && !"0".equals(parDic.get("PARENT_ID").toString())) { + dicList = getTreeFromBelowHebei(dicList, parDic); + } + return dicList; + } + } diff --git a/src/main/java/com/zcloud/util/CaffeineUtil.java b/src/main/java/com/zcloud/util/CaffeineUtil.java index d86b7db..d6eb9a4 100644 --- a/src/main/java/com/zcloud/util/CaffeineUtil.java +++ b/src/main/java/com/zcloud/util/CaffeineUtil.java @@ -2,8 +2,8 @@ package com.zcloud.util; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import com.zcloud.mapper.dsno3.eduSystem.EduDictionariesMapper; import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.system.DictionariesMapper; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; @@ -23,7 +23,7 @@ import java.util.logging.Logger; public class CaffeineUtil { private static final Logger logger = Logger.getLogger(CaffeineUtil.class.getName()); @Resource - private EduDictionariesMapper eduDictionariesMapper; + private DictionariesMapper dictionariesMapper; @Bean(name = "caffeineCache") public Cache caffeineCache() { @@ -40,7 +40,7 @@ public class CaffeineUtil { })).build(); // 加载一次 build.get("xzqh", x -> { - List all = eduDictionariesMapper.getAll(); + List all = dictionariesMapper.getAll(); Map fileSort = AdministrativeUntil.getFileSort(all); return fileSort; }); @@ -80,7 +80,7 @@ public class CaffeineUtil { public void loadOnce(Cache build) { // 加载一次 build.get("xzqh", x -> { - List all = eduDictionariesMapper.getAll(); + List all = dictionariesMapper.getAll(); Map fileSort = AdministrativeUntil.getFileSort(all); return fileSort; }); diff --git a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml index 067021c..eb041c8 100644 --- a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml @@ -445,6 +445,28 @@ where PARENT_ID = #{parentId} order by ORDER_BY - - + + + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 341703e..4793a19 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" CULTURAL_LEVEL, PORTRAIT, ID_PHOTO, - SIGNATUR_FILE_PATH + SIGNATURE_FILE_PATH @@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{CULTURAL_LEVEL}, #{PORTRAIT}, #{ID_PHOTO}, - #{SIGNATUR_FILE_PATH} + #{SIGNATURE_FILE_PATH} @@ -188,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" f.CULTURAL_LEVEL, f.PORTRAIT, f.ID_PHOTO, - f.SIGNATUR_FILE_PATH + f.SIGNATURE_FILE_PATH @@ -1486,14 +1486,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.USER_ID_CARD, a.CREATTIME from a - LEFT JOIN bus_student s on s.USER_ID = a.USER_ID + LEFT JOIN `qa-traffic-education-org`.bus_student s on s.USER_ID = a.USER_ID left join SYS_DICTIONARIES b on b.DICTIONARIES_ID = a.CERTIFICATETYPE left join SYS_DICTIONARIES c on c.DICTIONARIES_ID = a.CULTURAL_LEVEL where a.USERNAME != 'admin' and a.ISDELETE = '0' - - and a.PERSONNELTYPE = #{pd.PERSONNELTYPE} - and a.NAME LIKE CONCAT(CONCAT('%', #{pd.NAME}),'%') diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesAwardPuntLogMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesAwardPuntLogMapper.xml index 801f336..41136bc 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesAwardPuntLogMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesAwardPuntLogMapper.xml @@ -1,6 +1,6 @@ - + @@ -178,11 +178,9 @@ when 0 then '女' else '未知' end as SEX_NAME, cl.NAME as DEGREE_OF_EDUCATION_NAME, - ci.NAME CORP_NAME, - be.name as ENTERPRISE_NAME + ci.NAME CORP_NAME from SYS_USER u left join bus_corp_info ci on ci.CORPINFO_ID = u.CORPINFO_ID - left join bus_enterprise be on be.ENTERPRISE_ID = u.ENTERPRISE_ID LEFT JOIN SYS_DICTIONARIES cl on cl.DICTIONARIES_ID = u.CULTURAL_LEVEL where u.USER_ID = #{USER_ID} diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesCapitalMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesCapitalMapper.xml index 8d57324..b693a71 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesCapitalMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesCapitalMapper.xml @@ -1,6 +1,6 @@ - + @@ -187,9 +187,6 @@ and f.CORPINFO_ID = #{CORPINFO_ID} - - and f.ENTERPRISE_ID = #{ENTERPRISE_ID} - and f.YEAR = #{YEAR} diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesEduManagerMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesEduManagerMapper.xml index 9797827..37d5a57 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesEduManagerMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesEduManagerMapper.xml @@ -1,6 +1,6 @@ - + SELECT f.*, - e.NAME as ENTERPRISE_NAME, c.NAME as CORP_NAME, ifnull(pn.count,0) as POST_NUM FROM BUS_CLASS f LEFT JOIN - BUS_ENTERPRISE e ON e.ENTERPRISE_ID = f.ENTERPRISE_ID - LEFT JOIN BUS_CORP_INFO c ON c.CORPINFO_ID = f.CORPINFO_ID LEFT JOIN (SELECT COUNT(1) count,p.CLASS_ID FROM bus_class_post p WHERE p.ISDELETE = 0 GROUP BY p.CLASS_ID) pn ON @@ -24,9 +21,6 @@ AND f.CORPINFO_ID = #{pd.CORPINFO_ID} - - AND f.ENTERPRISE_ID = #{pd.ENTERPRISE_ID} - AND ( f.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') ) @@ -36,28 +30,9 @@ AND f.TRAINTYPE != #{pd.TRAINTYPE_ID} - - AND e.CREATOR = #{pd.USER_ID} - ORDER BY f.CREATTIME DESC - - - - - - @@ -363,7 +297,6 @@ select s.USER_ID, corp.CORPINFO_ID, - e.ENTERPRISE_ID, c.CLASS_ID, -- COUNT(DISTINCT c.CLASS_ID) CLASS_COUNT, c.NAME, @@ -395,8 +328,7 @@ corp.NAME as CORP_NAME, us1.SIGN_PICTURE RECORDOR_SIGN, us2.SIGN_PICTURE ASSESSOR_SIGN, - us3.SIGN_PICTURE SAFETYDEPTOR_SIGN, - e.NAME ENTERPRISE_NAME + us3.SIGN_PICTURE SAFETYDEPTOR_SIGN from BUS_CLASS c LEFT JOIN @@ -422,8 +354,6 @@ SYS_USER_SIGN us2 ON us2.USERSIGNID = c.ASSESSOR LEFT JOIN SYS_USER_SIGN us3 ON us3.USERSIGNID = c.SAFETYDEPTOR - LEFT JOIN - BUS_ENTERPRISE e on e.ENTERPRISE_ID = c.ENTERPRISE_ID WHERE s.ISDELETE = 0 AND sr.ISDELETE = 0 AND c.ISDELETE = '0' @@ -434,9 +364,6 @@ AND s.CORPINFO_ID = #{pd.CORPINFO_ID} - - AND s.ENTERPRISE_ID = #{pd.ENTERPRISE_ID} - AND c.STATE = #{pd.STATE} @@ -606,8 +533,6 @@ LEFT JOIN bus_faceimglog fil ON fil.STUDENT_ID = bs.STUDENT_ID AND fil.VIDEOCOURSEWARE_ID IS NOT NULL AND fil.VIDEOCOURSEWARE_ID != '' --- LEFT JOIN vi_courseware_num vi --- ON bs.STUDENT_ID = vi.STUDENT_ID LEFT JOIN ( SELECT s.STUDENT_ID,count(1) ALL_COCOURSEWARE_NUM from bus_student s LEFT JOIN bus_class bc on bc.CLASS_ID = s.CLASS_ID diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesPdfFileMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesPdfFileMapper.xml index 8bf51e2..bda7d72 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesPdfFileMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesPdfFileMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesPostManMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesPostManMapper.xml index 2ae910f..a9f8402 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesPostManMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesPostManMapper.xml @@ -1,6 +1,6 @@ - + @@ -165,9 +165,6 @@ and f.CORPINFO_ID = #{CORPINFO_ID} - - and f.ENTERPRISE_ID = #{ENTERPRISE_ID} - and f.YEAR = #{YEAR} diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewMapper.xml index 177351b..49e5033 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewRecordMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewRecordMapper.xml index 8766f98..bbf7271 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewRecordMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewRecordMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewUserMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewUserMapper.xml index 2fc5ced..a510fe7 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewUserMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewUserMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesSpecialWorkMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesSpecialWorkMapper.xml index bbf82d0..52acebc 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesSpecialWorkMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesSpecialWorkMapper.xml @@ -1,6 +1,6 @@ - + @@ -196,11 +196,9 @@ when 0 then '女' else '未知' end as SEX_NAME, cl.NAME as DEGREE_OF_EDUCATION_NAME, - ci.NAME CORP_NAME, - be.name as ENTERPRISE_NAME + ci.NAME CORP_NAME from SYS_USER u left join bus_corp_info ci on ci.CORPINFO_ID = u.CORPINFO_ID - left join bus_enterprise be on be.ENTERPRISE_ID = u.ENTERPRISE_ID LEFT JOIN SYS_DICTIONARIES cl on cl.DICTIONARIES_ID = u.CULTURAL_LEVEL where u.USER_ID = #{USER_ID} diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesStudentMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesStudentMapper.xml index cc53ebc..ce561f1 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesStudentMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesStudentMapper.xml @@ -1,6 +1,6 @@ - + @@ -178,7 +178,6 @@ f where f.USER_ID = #{USER_ID} - and f.ENTERPRISE_ID= #{ENTERPRISE_ID} @@ -208,11 +207,9 @@ cl.NAME as DEGREE_OF_EDUCATION_NAME, d.NAME AS DUTIES_NAME, u.ID_PHOTO, - u.PORTRAIT, - en.NAME as ENT_NAME + u.PORTRAIT FROM BUS_STUDENT s left join sys_user u on u.user_id = s.user_id - LEFT JOIN BUS_ENTERPRISE en ON en.ENTERPRISE_ID = s.ENTERPRISE_ID AND en.ISDELETE = '0' LEFT JOIN SYS_DICTIONARIES cl on cl.DICTIONARIES_ID = s.DEGREE_OF_EDUCATION LEFT JOIN SYS_DICTIONARIES d on d.DICTIONARIES_ID = s.DUTIES where s.STUDENT_ID = #{STUDENT_ID} diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesTeacherMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesTeacherMapper.xml index 5be5344..d8cc0da 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesTeacherMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesTeacherMapper.xml @@ -1,6 +1,6 @@ - + @@ -377,7 +375,6 @@ sd3.NAME as COUNTY_NAME, sd4.NAME as VILLAGE_NAME, sd5.NAME as STREET_NAME, - be.NAME as ENTERPRISE_NAME, (SELECT COUNT(cp.POST_ID) FROM BUS_CLASS_POST cp WHERE cp.CLASS_ID = f.CLASS_ID AND cp.ISDELETE = '0' ) POSTNUM, IFNULL(students.num ,0) AS STUDENT_NUM, pa.num as PASS_NUM, @@ -393,7 +390,6 @@ LEFT JOIN sys_dictionaries sd3 ON sd3.BIANMA = f.COUNTY LEFT JOIN sys_dictionaries sd4 ON sd4.BIANMA = f.VILLAGE LEFT JOIN sys_dictionaries sd5 ON sd5.BIANMA = f.STREET - LEFT JOIN bus_enterprise be ON be.ENTERPRISE_ID = f.ENTERPRISE_ID LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt ON tlt.TRAINLEVEL_ID = f.TRAINLEVEL LEFT JOIN(SELECT COUNT(1) num,s.CLASS_ID FROM BUS_STUDENT s WHERE s.ISDELETE = '0' GROUP BY s.CLASS_ID ) students ON students.CLASS_ID = f.CLASS_ID @@ -460,10 +456,6 @@ - - - and f.ENTERPRISE_ID = #{pd.ENTERPRISE_ID} - and f.STATE = #{pd.STATE} @@ -756,16 +748,15 @@ , count(bt.STUDENT_ID) ALLSTUDENTCOUNT, count(bss.STUDENT_ID) PASSSTUDENTCOUNT, - bs.name ENTERPRISENAME, - bs.INDUSTRY_ALL_NAME INDUSTRYNAME, - bs.COMMANDER, - bs.COMMANDER_PHONE + bc.CORP_NAME, + bc.CORP_TYPE_NAME, + bc.CONTACTS, + bc.CONTACTS_PHONE FROM f LEFT JOIN ( SELECT * FROM bus_corp_info WHERE CORPINFO_ID = #{pd.CORPINFO_ID} AND ISDELETE = 0) bc ON bc.CORPINFO_ID = f.CORPINFO_ID - left JOIN bus_enterprise bs on bs.ENTERPRISE_ID = f.ENTERPRISE_ID left join bus_student bt on bt.CLASS_ID = f.CLASS_ID and bt.ISDELETE = '0' left join ( select * from bus_strengthenstudentrelation where STRENGTHENEXAMSTATE = '3' and ISDELETE = 0) bss on bss.STUDENT_ID = bt.STUDENT_ID @@ -777,17 +768,7 @@ OR f.ISSTRENGTHEN = '2' ) AND f.ISDELETE = 0 and bc.CORPINFO_ID = #{pd.CORPINFO_ID} - - and bs.NAME LIKE CONCAT(CONCAT('%', #{pd.ENTERPRISE_NAME}),'%') - - - and bs.CREATTIME LIKE CONCAT(CONCAT('%', #{pd.YEAR}),'%') - - - and bs.CREATOR = #{pd.USER_ID} - and CEILING(bsr.STAGEEXAMSCORE) != bsi.EXAMSCORE - GROUP BY bs.ENTERPRISE_ID diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml index 7967fc4..9f8aa2a 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml @@ -464,7 +464,6 @@ f.DEPARTMENT_NAME, f.POST_NAME, f.MAJOR, - f.ENTERPRISE_NAME, f.CREATTIME, doe.NAME DEGREE_OF_EDUCATION_NAME, (select sum(c.CLASSHOUR) @@ -532,9 +531,6 @@ and ssr.STAGEEXAMSTATE = #{pd.STAGEEXAMSTATE} - - AND e.CREATOR = #{pd.USER_ID} - GROUP BY f.STUDENT_ID ORDER BY c.START_TIME desc, c.CLASS_ID diff --git a/src/main/resources/mybatis/dsno3/eduSystem/DepartmentMapper.xml b/src/main/resources/mybatis/dsno3/eduSystem/DepartmentMapper.xml deleted file mode 100644 index e9f1145..0000000 --- a/src/main/resources/mybatis/dsno3/eduSystem/DepartmentMapper.xml +++ /dev/null @@ -1,404 +0,0 @@ - - - - - - - - - - - - - OA_DEPARTMENT - - - - - NAME - , - DESCR, - DEPARTMENT_ID, - CORPINFO_ID, - ENTERPRISE_ID, - ISDELETE, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME - - - - - f - . - NAME - , - f.DESCR, - f.DEPARTMENT_ID, - f.CORPINFO_ID, - f.ENTERPRISE_ID, - f.ISDELETE, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME - - - - - #{NAME} - , - #{DESCR}, - #{DEPARTMENT_ID}, - #{CORPINFO_ID}, - #{ENTERPRISE_ID}, - #{ISDELETE}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME} - - - - - insert into - - ( - - ) values ( - - ) - - - - - delete from - - where - DEPARTMENT_ID = #{DEPARTMENT_ID} - - - - - update - - set - NAME = #{NAME}, - NAME_EN = #{NAME_EN}, - HEADMAN = #{HEADMAN}, - BZ = #{BZ}, - TEL = #{TEL}, - FUNCTIONS = #{FUNCTIONS}, - ADDRESS = #{ADDRESS}, - LEVEL = #{LEVEL}, - DEPARTMENT_ID = DEPARTMENT_ID, - DEP_ORDER = #{DEP_ORDER}, - ISSUPERVISE = #{ISSUPERVISE} - where - DEPARTMENT_ID = #{DEPARTMENT_ID} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mybatis/dsno3/eduSystem/FileUploadLogMapper.xml b/src/main/resources/mybatis/dsno3/eduSystem/FileUploadLogMapper.xml index d7d4170..0878847 100644 --- a/src/main/resources/mybatis/dsno3/eduSystem/FileUploadLogMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduSystem/FileUploadLogMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno3/eduSystem/UserSignMapper.xml b/src/main/resources/mybatis/dsno3/eduSystem/UserSignMapper.xml index 7a460d0..789a522 100644 --- a/src/main/resources/mybatis/dsno3/eduSystem/UserSignMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduSystem/UserSignMapper.xml @@ -15,7 +15,7 @@ USERSIGNTYPE, USERADDTYPE, USERNAME, - ENTERPRISE_ID, + CORPINFO_ID, SIGN_PICTURE, CREATOR, CREATTIME, @@ -33,7 +33,7 @@ #{USERSIGNTYPE}, #{USERADDTYPE}, #{USERNAME}, - #{ENTERPRISE_ID}, + #{CORPINFO_ID}, #{SIGN_PICTURE}, #{CREATOR}, #{CREATTIME}, @@ -52,7 +52,7 @@ f.USERSIGNTYPE, f.USERADDTYPE, f.USERNAME, - f.ENTERPRISE_ID, + f.CORPINFO_ID, f.SIGN_PICTURE, f.CREATOR, f.CREATTIME, @@ -81,8 +81,9 @@ left join sys_dictionaries s on s.DICTIONARIES_ID = f.USERSIGNTYPE left join sys_dictionaries d on d.DICTIONARIES_ID = f.USERADDTYPE where f.ISDELETE = 0 - - and f.ENTERPRISE_ID = #{pd.ENTERPRISE_ID} + and f.CORPINFO_ID = #{CORPINFO_ID} + + and f.USERNAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') ORDER BY f.CREATTIME desc @@ -105,7 +106,7 @@ USERSIGNTYPE = #{USERSIGNTYPE}, USERADDTYPE = #{USERADDTYPE}, USERNAME = #{USERNAME}, - ENTERPRISE_ID =#{ENTERPRISE_ID}, + CORPINFO_ID =#{CORPINFO_ID}, SIGN_PICTURE = #{SIGN_PICTURE}, OPERATOR = #{OPERATOR}, OPERATTIME = #{OPERATTIME}, @@ -133,7 +134,7 @@ f where f.ISDELETE = '0' - and f.ENTERPRISE_ID = #{ENTERPRISE_ID} + and f.CORPINFO_ID = #{CORPINFO_ID} and f.USERSIGNTYPE = #{USERSIGNTYPE} @@ -147,7 +148,7 @@ from f where - ENTERPRISE_ID = #{ENTERPRISE_ID} + CORPINFO_ID = #{CORPINFO_ID} and USERSIGNTYPE = #{USERSIGNTYPE} and ISDELETE = 0