From c957d50f8f5405b9ff54d345ed25a03215f6ca67 Mon Sep 17 00:00:00 2001 From: zhangyanli Date: Sat, 30 Mar 2024 14:58:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=9F=B9=E5=8A=9F=E8=83=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eduStudy/CurriculumController.java | 7 + .../impl/ArchivesPdfFileServiceImpl.java | 5 +- .../eduArchives/impl/ArchivesServiceImpl.java | 17 +- .../impl/ArchivesStudentServiceImpl.java | 2 +- .../datasource/corp/CorpInfoMapper.xml | 290 +++++++++++++----- .../datasource/system/UserInfoMapper.xml | 37 ++- .../dsno3/eduArchives/ArchivesMapper.xml | 12 +- .../eduArchives/ArchivesStudentMapper.xml | 5 +- .../mybatis/dsno3/eduStudy/ClassMapper.xml | 4 +- .../dsno3/eduStudy/CurriculumMapper.xml | 2 +- .../eduStudy/StageStudentRelationMapper.xml | 1 + .../mybatis/dsno3/eduStudy/StudentMapper.xml | 8 +- .../dsno3/eduStudy/VideoCoursewareMapper.xml | 4 +- 13 files changed, 289 insertions(+), 105 deletions(-) diff --git a/src/main/java/com/zcloud/controller/eduStudy/CurriculumController.java b/src/main/java/com/zcloud/controller/eduStudy/CurriculumController.java index 1ef8d5d..176441a 100644 --- a/src/main/java/com/zcloud/controller/eduStudy/CurriculumController.java +++ b/src/main/java/com/zcloud/controller/eduStudy/CurriculumController.java @@ -10,6 +10,7 @@ import com.zcloud.service.eduStudy.CurriculumPrivateService; import com.zcloud.service.eduStudy.CurriculumService; import com.zcloud.service.eduStudy.VideoCoursewareService; import com.zcloud.util.*; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -61,6 +62,12 @@ public class CurriculumController extends BaseController { pd = this.getPageData(); 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"); + } pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = curriculumService.list(page); //列出Curriculum列表 diff --git a/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesPdfFileServiceImpl.java b/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesPdfFileServiceImpl.java index 69dbeac..4973d1e 100644 --- a/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesPdfFileServiceImpl.java +++ b/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesPdfFileServiceImpl.java @@ -670,9 +670,8 @@ public class ArchivesPdfFileServiceImpl implements ArchivesPdfFileService { pathList.add(wordPathKccl); //课程材料 } if (checkArchivesList.toString().contains("师傅带徒弟实习教育")) { - String[] industryList = classInfo.getString("INDUSTRY_ALL_TYPE").split(","); if (classInfo.getString("POSTTYPE").equals("d302da12d8724faaa24e5008adab8ce8") && - industryList[0].equals("1b250e1ec1e24576aaa84daa804e9ab2") && + corpinfo.getString("CORP_TYPE").equals("1b250e1ec1e24576aaa84daa804e9ab2") && classInfo.getString("TRAINLEVEL").equals("c698a92dda3848b9a40d4bcee79f23a3")) { //满足条件才进去 String wordPathSf = archivesService.practiceword(student, para, classInfo, corpinfo, now, personnelTypeList); pathList.add(wordPathSf); //师傅带徒弟实习教育 @@ -903,7 +902,7 @@ public class ArchivesPdfFileServiceImpl implements ArchivesPdfFileService { if (checkArchivesList.toString().contains("师傅带徒弟实习教育")) { String[] industryList = classInfo.getString("INDUSTRY_ALL_TYPE").split(","); if (classInfo.getString("POSTTYPE").equals("d302da12d8724faaa24e5008adab8ce8") && - industryList[0].equals("1b250e1ec1e24576aaa84daa804e9ab2") && + corpinfo.getString("CORP_TYPE").equals("1b250e1ec1e24576aaa84daa804e9ab2") && classInfo.getString("TRAINLEVEL").equals("c698a92dda3848b9a40d4bcee79f23a3")) { //满足条件才进去 String wordPathSf = archivesService.practiceword(stu, para, classInfo, corpinfo, now, personnelTypeList); pathList.add(wordPathSf); //师傅带徒弟实习教育 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 2bba7f8..d9bb901 100644 --- a/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesServiceImpl.java +++ b/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesServiceImpl.java @@ -187,7 +187,7 @@ public class ArchivesServiceImpl implements ArchivesService { } else { context.put("value4", ""); //建档日期 } - context.put("value5", pd.getString("ENTERPRISE_NAME")); // 单位名称 + context.put("value5", student.getString("CORP_NAME")); // 单位名称 //输出到本地目录 FileOutputStream out = new FileOutputStream(new File(student.getString("projectPath") + Const.FILEPATHFILE + "一人一档首页-" + now + ".docx")); @@ -220,7 +220,7 @@ public class ArchivesServiceImpl implements ArchivesService { context.put("value2", student.getString("STUDENT_NAME") != null ? student.getString("STUDENT_NAME") : student.getString("NAME")); //姓名 context.put("value3", "身份证"); //证件类型 context.put("value4", student.getString("USER_ID_CARD")); //证件编号 - context.put("value5", pd.getString("CORP_NAME")); //培训单位名称 + context.put("value5", classInfo.getString("CORP_NAME")); //培训单位名称 context.put("value6", classInfo.getString("NAME")); //班级名称 context.put("value7", (Tools.notEmpty(student.getString("START_TIME")) ? student.getString("START_TIME").substring(0, 10) : "") + "至" + (Tools.notEmpty(student.getString("END_TIME")) ? student.getString("END_TIME").substring(0, 10) : "")); //培训日期 context.put("value8", classInfo.getString("TYPENAME")); //培训类型 @@ -319,7 +319,7 @@ public class ArchivesServiceImpl implements ArchivesService { currnames.append(curname.get("CURRICULUMNAME")).append(","); } context.put("value10", currnames.substring(0,currnames.length()-1)); //培训科目 - context.put("value11", classInfo.getString("enterpriseName")); //单位名称 + context.put("value11", student.getString("CORP_NAME")); //单位名称 String path = Const.HTTPFILEURL + student.getString("PORTRAIT"); URL url = new URL(path); @@ -420,7 +420,7 @@ public class ArchivesServiceImpl implements ArchivesService { template = configuration.getTemplate("practice.ftl"); Map context = new HashMap(); context = new HashMap(); - context.put("practicevalue1", pd.getString("ENTERPRISE_NAME")); //机构名称 + context.put("practicevalue1", pd.getString("CORP_NAME")); //机构名称 context.put("practicevalue2", student.getString("FILE_NUMBER") != null ? student.getString("FILE_NUMBER") : ""); //档案编号 context.put("practicevalue3", student.getString("STUDENT_NAME") != null ? student.getString("STUDENT_NAME") : student.getString("NAME")); //姓名 context.put("practicevalue4", student.getString("SEX_NAME") != null ? student.getString("SEX_NAME") : ""); //性别 @@ -493,7 +493,7 @@ public class ArchivesServiceImpl implements ArchivesService { template = configuration.getTemplate("safelog.ftl"); Map context = new HashMap(); context = new HashMap(); - context.put("examinevalue1", pd.get("ENTERPRISE_NAME") != null ? pd.getString("ENTERPRISE_NAME") : ""); //机构名称 再次培训安全培训考核记录 + context.put("examinevalue1", classInfo.get("CORP_NAME") != null ? classInfo.getString("CORP_NAME") : ""); //机构名称 再次培训安全培训考核记录 context.put("examinevalue2", Tools.notEmpty(student.getString("FILE_NUMBER")) ? student.getString("FILE_NUMBER") : ""); //档案名称 context.put("examinevalue3", student.get("STUDENT_NAME") != null ? student.getString("STUDENT_NAME") : student.getString("NAME")); //姓名 context.put("examinevalue4", student.get("SEX_NAME") != null ? student.getString("SEX_NAME") : ""); //性别 @@ -503,7 +503,7 @@ public class ArchivesServiceImpl implements ArchivesService { context.put("examinevalue8", student.get("DUTIES") != null ? student.getString("DUTIES") : ""); //职称 context.put("examinevalue9", student.get("DEPARTMENT_NAME") != null ? student.getString("DEPARTMENT_NAME") : ""); //部门 context.put("examinevalue10", student.get("POST_NAME") != null ? student.getString("POST_NAME") : ""); //工种 - context.put("examinevalue11", classInfo.get("INDUSTRY_ALL_NAME") != null ? classInfo.getString("INDUSTRY_ALL_NAME") : ""); //行业类别 + context.put("examinevalue11", corpinfo.get("CORP_TYPE_NAME") != null ? corpinfo.getString("CORP_TYPE_NAME") : ""); //行业类别 context.put("examinevalue12", student.get("PHONE") != null ? student.getString("PHONE") : ""); //联系电话 List list2 = new ArrayList<>(); //一共多少航 @@ -513,7 +513,7 @@ public class ArchivesServiceImpl implements ArchivesService { String STUDY_START_TIME = Tools.notEmpty(student.getString("START_TIME")) ? student.getString("START_TIME").substring(0, 10) : ""; String STUDY_END_TIME = Tools.notEmpty(student.getString("END_TIME")) ? student.getString("END_TIME").substring(0, 10) : ""; trainingPlanDao.setValue2(STUDY_START_TIME + "至" + STUDY_END_TIME); //培训名称 - trainingPlanDao.setValue3(pd.getString("ENTERPRISE_NAME")); //课时 + trainingPlanDao.setValue3(classInfo.getString("CORP_NAME")); //培训地点 trainingPlanDao.setValue4((String) coursewaresList.get(i).get("COURSEWARENAME")); //主要内容 DecimalFormat df = new DecimalFormat("0.0"); //保留一位小数 Double hour = (Double) coursewaresList.get(i).get("CLASSHOUR"); @@ -575,9 +575,8 @@ public class ArchivesServiceImpl implements ArchivesService { str = sb.toString().substring(0, 11); context.put("examinevalue13", str); - String[] industryList = classInfo.getString("INDUSTRY_ALL_TYPE").split(","); if (classInfo.getString("POSTTYPE").equals("d302da12d8724faaa24e5008adab8ce8")) { //岗位类型:三级教育培训 - if (industryList[0].equals("1b250e1ec1e24576aaa84daa804e9ab2")) { //高危行业 + if ("1b250e1ec1e24576aaa84daa804e9ab2".equals(corpinfo.getString("CORP_TYPE"))) { //高危行业 context.put("examinevalue14", classInfo.getString("TRAINLEVEL_NAME") + "安全培训考核记录"); //培训级别+固定值 } else { context.put("examinevalue14", "一般行业生产经营单位新入职从业人员安全培训考核记录" + "(" + classInfo.getString("TRAINLEVEL_NAME") + ")"); //固定值+培训级别 diff --git a/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesStudentServiceImpl.java b/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesStudentServiceImpl.java index 71d9e05..c15334d 100644 --- a/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesStudentServiceImpl.java +++ b/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesStudentServiceImpl.java @@ -149,7 +149,7 @@ public class ArchivesStudentServiceImpl implements ArchivesStudentService { context.put("value17", Tools.notEmpty(stu.getString("WORK_EXPERIENCE")) ? stu.getString("WORK_EXPERIENCE") : ""); // 主要工作经历 context.put("value18", Tools.notEmpty(stu.getString("CERTIFICATES")) ? stu.getString("CERTIFICATES") : ""); // 有关的岗位证书等情况 context.put("value19", Tools.notEmpty(stu.getString("PUNISH")) ? stu.getString("PUNISH") : ""); // 是否受到刑事处罚 - context.put("value20", Tools.notEmpty(stu.getString("ENT_NAME")) ? stu.getString("ENT_NAME") : ""); // 生产经营单位名 + context.put("value20", Tools.notEmpty(stu.getString("CORP_NAME")) ? stu.getString("CORP_NAME") : ""); // 生产经营单位名 context.put("value21", Tools.notEmpty(stu.getString("FILE_NUMBER")) ? stu.getString("FILE_NUMBER") : ""); // 档案编号 if (Tools.notEmpty(stu.getString("PORTRAIT"))) { String path = Const.HTTPFILEURL + stu.getString("PORTRAIT"); diff --git a/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml b/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml index 2972ae6..aae5c03 100644 --- a/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml @@ -94,7 +94,9 @@ f.VIPLEVEL, f.USERS_NUM, f.REGULARTYPE, - f.OFFICIAL_SEAL_PATH + f.OFFICIAL_SEAL_PATH, + f.INDUSTRY_TYPE, + f.INDUSTRY_NAME @@ -150,7 +152,9 @@ SMALL_TYPE2, USERS_NUM, REGULARTYPE, - OFFICIAL_SEAL_PATH + OFFICIAL_SEAL_PATH, + INDUSTRY_TYPE, + INDUSTRY_NAME @@ -206,7 +210,9 @@ #{SMALL_TYPE2}, #{USERS_NUM}, #{REGULARTYPE}, - #{OFFICIAL_SEAL_PATH} + #{OFFICIAL_SEAL_PATH}, + #{INDUSTRY_TYPE}, + #{INDUSTRY_NAME} @@ -247,76 +253,214 @@ update set - CORP_NAME = #{CORP_NAME}, - CODE = #{CODE}, - COMPANY_AREA = #{COMPANY_AREA}, - ADDRESS = #{ADDRESS}, - CREATE_DATE = #{CREATE_DATE}, - SCALE = #{SCALE}, - LONGITUDE = #{LONGITUDE}, - LATITUDE = #{LATITUDE}, - POSTAL_CODE = #{POSTAL_CODE}, - EMPLOYEES = #{EMPLOYEES}, - AREA_COVERED = #{AREA_COVERED}, - TOTALASSETS = #{TOTALASSETS}, - REGCAPITAL = #{REGCAPITAL}, - SALESREVENUE = #{SALESREVENUE}, - ANNUALPROFIT = #{ANNUALPROFIT}, - ECO_TYPE = #{ECO_TYPE}, - ECO_TYPE2 = #{ECO_TYPE2}, - ECO_TYPE_NAME=#{ECO_TYPE_NAME}, - INDUSTRY = #{INDUSTRY}, - CORP_TYPE = #{CORP_TYPE}, - CORP_TYPE2 = #{CORP_TYPE2}, - CORP_TYPE3 = #{CORP_TYPE3}, - CORP_TYPE4 = #{CORP_TYPE4}, - CORP_TYPE_NAME = #{CORP_TYPE_NAME}, - CORP_TYPE_SMALL = #{CORP_TYPE_SMALL}, - LR_NAME = #{LR_NAME}, - LR_POSITION = #{LR_POSITION}, - LR_PHONE = #{LR_PHONE}, - LR_MOBILE = #{LR_MOBILE}, - CONTACTS = #{CONTACTS}, - CONTACTS_PHONE = #{CONTACTS_PHONE}, - CHECKPERSON = #{CHECKPERSON}, - CHECKPERSONPHONE = #{CHECKPERSONPHONE}, - OPERATOR = #{OPERATOR}, - OPERATTIME = #{OPERATTIME}, - CREATOR = #{CREATOR}, - - FOURTYPE=#{FOURTYPE}, - - PROVINCE=#{PROVINCE}, - CITY=#{CITY}, - VILLAGE = #{VILLAGE}, - LOGIN_USER_ID = #{LOGIN_USER_ID}, - ADDRESS_BUSINESS = #{ADDRESS_BUSINESS}, - ADDRESS_OFFICE = #{ADDRESS_OFFICE}, - CORP_STATE = #{CORP_STATE}, - FIXED_ASSETS = #{FIXED_ASSETS}, - YEAR_OUTPUT_VALUE = #{YEAR_OUTPUT_VALUE}, - REG_TYPE = #{REG_TYPE}, - SUBORDINATION = #{SUBORDINATION}, - CORP_OF_TYPE = #{CORP_OF_TYPE}, - CORP_OF_TYPE2 = #{CORP_OF_TYPE2}, - INDUSTRY_DEPARTMENT = #{INDUSTRY_DEPARTMENT}, - SCALE_TYPE = #{SCALE_TYPE}, - SAFETY_NAME = #{SAFETY_NAME}, - SAFETY_POST = #{SAFETY_POST}, - SAFETY_NUMBER = #{SAFETY_NUMBER}, - SAFETY_PHONE = #{SAFETY_PHONE}, - CORP_CONFIRM = #{CORP_CONFIRM}, - CORP_EXAMINE = #{CORP_EXAMINE}, - REPORT_CYCLE=#{REPORT_CYCLE}, - REPORT_STATUS=#{REPORT_STATUS}, - STREET=#{STREET}, - COUNTY=#{COUNTY}, - ISSMALL=#{ISSMALL}, - TRAINTYPE=#{TRAINTYPE}, - LR_PERSONID=#{LR_PERSONID}, - CORPINFO_ID = CORPINFO_ID, - USERS_NUM = #{USERS_NUM}, - OFFICIAL_SEAL_PATH = #{OFFICIAL_SEAL_PATH} + + CORP_NAME = #{CORP_NAME}, + + + CODE = #{CODE}, + + + COMPANY_AREA = #{COMPANY_AREA}, + + + ADDRESS = #{ADDRESS}, + + + CREATE_DATE = #{CREATE_DATE}, + + + SCALE = #{SCALE}, + + + LONGITUDE = #{LONGITUDE}, + + + LATITUDE = #{LATITUDE}, + + + POSTAL_CODE = #{POSTAL_CODE}, + + + EMPLOYEES = #{EMPLOYEES}, + + + AREA_COVERED = #{AREA_COVERED}, + + + TOTALASSETS = #{TOTALASSETS}, + + + REGCAPITAL = #{REGCAPITAL}, + + + SALESREVENUE = #{SALESREVENUE}, + + + ANNUALPROFIT = #{ANNUALPROFIT}, + + + ECO_TYPE = #{ECO_TYPE}, + + + ECO_TYPE2 = #{ECO_TYPE2}, + + + ECO_TYPE_NAME=#{ECO_TYPE_NAME}, + + + INDUSTRY = #{INDUSTRY}, + + + CORP_TYPE = #{CORP_TYPE}, + + + CORP_TYPE2 = #{CORP_TYPE2}, + + + CORP_TYPE3 = #{CORP_TYPE3}, + + + CORP_TYPE4 = #{CORP_TYPE4}, + + + CORP_TYPE_NAME = #{CORP_TYPE_NAME}, + + + CORP_TYPE_SMALL = #{CORP_TYPE_SMALL}, + + + LR_NAME = #{LR_NAME}, + + + LR_POSITION = #{LR_POSITION}, + + + LR_PHONE = #{LR_PHONE}, + + + LR_MOBILE = #{LR_MOBILE}, + + + CONTACTS = #{CONTACTS}, + + + CONTACTS_PHONE = #{CONTACTS_PHONE}, + + + CHECKPERSON = #{CHECKPERSON}, + + + CHECKPERSONPHONE = #{CHECKPERSONPHONE}, + + + OPERATOR = #{OPERATOR}, + + + OPERATTIME = #{OPERATTIME}, + + + CREATOR = #{CREATOR}, + + + FOURTYPE=#{FOURTYPE}, + + + PROVINCE=#{PROVINCE}, + + + CITY=#{CITY}, + + + VILLAGE = #{VILLAGE}, + + + LOGIN_USER_ID = #{LOGIN_USER_ID}, + + + ADDRESS_BUSINESS = #{ADDRESS_BUSINESS}, + + + ADDRESS_OFFICE = #{ADDRESS_OFFICE}, + + + CORP_STATE = #{CORP_STATE}, + + + FIXED_ASSETS = #{FIXED_ASSETS}, + + + YEAR_OUTPUT_VALUE = #{YEAR_OUTPUT_VALUE}, + + + REG_TYPE = #{REG_TYPE}, + + + SUBORDINATION = #{SUBORDINATION}, + + + CORP_OF_TYPE = #{CORP_OF_TYPE}, + + + CORP_OF_TYPE2 = #{CORP_OF_TYPE2}, + + + INDUSTRY_DEPARTMENT = #{INDUSTRY_DEPARTMENT}, + + + SCALE_TYPE = #{SCALE_TYPE}, + + + SAFETY_NAME = #{SAFETY_NAME}, + + + SAFETY_POST = #{SAFETY_POST}, + + + SAFETY_NUMBER = #{SAFETY_NUMBER}, + + + SAFETY_PHONE = #{SAFETY_PHONE}, + + + CORP_CONFIRM = #{CORP_CONFIRM}, + + + CORP_EXAMINE = #{CORP_EXAMINE}, + + + REPORT_CYCLE=#{REPORT_CYCLE}, + + + REPORT_STATUS=#{REPORT_STATUS}, + + + STREET=#{STREET}, + + + COUNTY=#{COUNTY}, + + + ISSMALL=#{ISSMALL}, + + + TRAINTYPE=#{TRAINTYPE}, + + + LR_PERSONID=#{LR_PERSONID}, + + + USERS_NUM = #{USERS_NUM}, + + + OFFICIAL_SEAL_PATH = #{OFFICIAL_SEAL_PATH}, + + + INDUSTRY_TYPE = #{INDUSTRY_TYPE}, + + + INDUSTRY_NAME = #{INDUSTRY_NAME}, + + CORPINFO_ID = CORPINFO_ID where CORPINFO_ID = #{CORPINFO_ID} diff --git a/src/main/resources/mybatis/datasource/system/UserInfoMapper.xml b/src/main/resources/mybatis/datasource/system/UserInfoMapper.xml index fd423c0..abc6380 100644 --- a/src/main/resources/mybatis/datasource/system/UserInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UserInfoMapper.xml @@ -306,10 +306,39 @@ update set - PERSONNEL_TYPE = #{PERSONNEL_TYPE}, - DEGREE_OF_EDUCATION = #{DEGREE_OF_EDUCATION}, - POLITICAL_OUTLOOK = #{POLITICAL_OUTLOOK}, - WORKING_DATE = #{WORKING_DATE}, + + POLITICAL_OUTLOOK = #{POLITICAL_OUTLOOK}, + + + DEGREE_OF_EDUCATION = #{DEGREE_OF_EDUCATION}, + + + PERSONNEL_TYPE = #{PERSONNEL_TYPE}, + + + WORKING_DATE = #{WORKING_DATE}, + + + PREVIOUS_POST_DATE = #{PREVIOUS_POST_DATE}, + + + HEALTH = #{HEALTH}, + + + WORK_EXPERIENCE = #{WORK_EXPERIENCE}, + + + CERTIFICATES = #{CERTIFICATES}, + + + PUNISH = #{PUNISH}, + + + UNIVERSITY = #{UNIVERSITY}, + + + RESIDENCE = #{RESIDENCE}, + USER_ID = USER_ID where USER_ID = #{USER_ID} diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml index 6454836..129e0a8 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml @@ -370,9 +370,6 @@ c. NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') ) - - AND c.STATE = #{pd.STATE} - AND c.START_TIME >= #{pd.STARTTIME} @@ -413,13 +410,15 @@ f.CORPINFO_ID, f.DEPARTMENT_NAME, f.POST_NAME, - f.DUTIES, f.MAJOR, ui.ID_PHOTO, ui.PORTRAIT, + ci.CORP_TYPE_NAME, + ci.CORP_NAME, CONCAT_WS('-', IF(t.NAME = '', null, t.NAME), IF(iei.NAME = '', null, iei.NAME), IF(p.NAME = '', null, p.NAME), IF(tlt.NAME = '', null, tlt.NAME)) TYPENAME, - cl.NAME as DEGREE_OF_EDUCATION_NAME + cl.NAME as DEGREE_OF_EDUCATION_NAME, + CONCAT(dd.NAME,'/',dt.NAME) as DUTIES_NAME FROM BUS_STUDENT f LEFT JOIN BUS_STAGESTUDENTRELATION s ON s.STUDENT_ID = f.STUDENT_ID @@ -430,6 +429,9 @@ LEFT JOIN BUS_TRAIN_LEVEL_TYPE tlt on tlt.TRAINLEVEL_ID = c.TRAINLEVEL LEFT JOIN SYS_USERINFO ui on ui.USER_ID = f.USER_ID LEFT JOIN SYS_DICTIONARIES cl on cl.DICTIONARIES_ID = ui.DEGREE_OF_EDUCATION + LEFT JOIN SYS_DICTIONARIES_CORP dd on dd.DICTIONARIES_ID = ui.DUTIES + LEFT JOIN SYS_DICTIONARIES_CORP dt on dt.DICTIONARIES_ID = ui.TITLE + LEFT JOIN BUS_CORP_INFO ci on ci.CORPINFO_ID = c.CORPINFO_ID WHERE f.STUDENT_ID = #{STUDENT_ID} AND s.ISDELETE = '0' AND c.ISDELETE = '0' diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesStudentMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesStudentMapper.xml index 22fc0cd..fbdbb38 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesStudentMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesStudentMapper.xml @@ -204,7 +204,7 @@ when 0 then '女' else '未知' end as SEX_NAME, cl.NAME as DEGREE_OF_EDUCATION_NAME, - d.NAME AS DUTIES_NAME, + CONCAT(dd.NAME,'/',dt.NAME) as DUTIES_NAME, tw.NAME AS TYPE_OF_WORK_NAME, po.NAME AS POLITICAL_OUTLOOK_NAME, na.NAME AS NATION_NAME, @@ -224,9 +224,10 @@ FROM BUS_STUDENT s left join sys_userinfo ui on ui.user_id = s.user_id LEFT JOIN SYS_DICTIONARIES cl on cl.DICTIONARIES_ID = ui.DEGREE_OF_EDUCATION - LEFT JOIN SYS_DICTIONARIES d on d.DICTIONARIES_ID = ui.DUTIES LEFT JOIN SYS_DICTIONARIES po on po.DICTIONARIES_ID = ui.POLITICAL_OUTLOOK LEFT JOIN SYS_DICTIONARIES na on na.DICTIONARIES_ID = ui.NATION + LEFT JOIN SYS_DICTIONARIES_CORP dd on dd.DICTIONARIES_ID = ui.DUTIES + LEFT JOIN SYS_DICTIONARIES_CORP dt on dt.DICTIONARIES_ID = ui.TITLE LEFT JOIN SYS_POST tw on tw.POST_ID = ui.TYPE_OF_WORK LEFT JOIN BUS_CORP_INFO ci on ci.CORPINFO_ID = s.CORPINFO_ID and ci.ISDELETE = '0' where s.STUDENT_ID = #{STUDENT_ID} diff --git a/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml index fe40adc..d76591a 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml @@ -796,8 +796,8 @@ and ( f.ISSTRENGTHEN = '1' OR f.ISSTRENGTHEN = '2' ) and CEILING(bsr.STAGEEXAMSCORE) != bsi.EXAMSCORE - - and bs.NAME LIKE CONCAT(CONCAT('%', #{pd.STUDENTNAME}),'%') + + and bs.NAME LIKE CONCAT(CONCAT('%', #{pd.NAME}),'%') and f.CREATTIME LIKE CONCAT(#{pd.YEAR},'%') diff --git a/src/main/resources/mybatis/dsno3/eduStudy/CurriculumMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/CurriculumMapper.xml index ebfd9d2..e91b3cb 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/CurriculumMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/CurriculumMapper.xml @@ -307,7 +307,7 @@ and f.INDUSTRY_END_ID = #{pd.INDUSTRY_END_ID} GROUP BY f.CURRICULUM_ID - ORDER BY f.CURRICULUMNAME + ORDER BY f.CREATTIME DESC diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml index 063088d..eadd356 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml @@ -542,6 +542,7 @@ s.STUDENT_ID, s.POST_ID, ci.CORP_NAME, + ci.CORP_TYPE_NAME, od.NAME as DEPATEMENT_NAME, sp.NAME as POST_NAME, t.ISSTRENGTHEN, diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml index 65070dc..f15dc6b 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml @@ -1122,7 +1122,8 @@ sst.STRENGTHENEXAMSCORE, sst.OPERATTIME as STRENGTHEN_OPERATTIME, sst.STRENGTHEN_STAGEEXAMPAPER_INPUT_ID, - CONCAT_WS(dic3.NAME ,'/' , dic4.NAME ) DUTIES + CONCAT(dic3.NAME ,'/' , dic4.NAME ) as DUTIES_NAME, + ci.CORP_TYPE_NAME from f left join dic1 on f.DEGREE_OF_EDUCATION = dic1.DICTIONARIES_ID @@ -1134,8 +1135,9 @@ left join bus_strengthenstudentrelation sst on sst.STUDENT_ID = f.STUDENT_ID left join bus_strengthenstageexampaper_input ssti on sst.STRENGTHEN_STAGEEXAMPAPER_INPUT_ID = ssti.STRENGTHEN_STAGEEXAMPAPER_INPUT_ID left join sys_userinfo ui on ui.user_id = f.user_id - left join dic3 on ui.DUTIES = dic3.DICTIONARIES_ID - left join dic4 on ui.TITLE = dic4.DICTIONARIES_ID + left join SYS_DICTIONARIES_CORP dic3 on ui.DUTIES = dic3.DICTIONARIES_ID + left join SYS_DICTIONARIES_CORP dic4 on ui.TITLE = dic4.DICTIONARIES_ID + LEFT JOIN BUS_CORP_INFO ci on ci.CORPINFO_ID = c.CORPINFO_ID where f.STUDENT_ID = #{STUDENT_ID} diff --git a/src/main/resources/mybatis/dsno3/eduStudy/VideoCoursewareMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/VideoCoursewareMapper.xml index f85e82e..6acd33b 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/VideoCoursewareMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/VideoCoursewareMapper.xml @@ -224,8 +224,8 @@ and f.ISCOMPLETE = #{pd.ISCOMPLETE} - - and f.INDUSTRY_END_ID = #{pd.INDUSTRY} + + and f.INDUSTRY_END_ID = #{pd.INDUSTRY_END_ID}