From 1879d568898024cb8d719fd7810514d4022dba17 Mon Sep 17 00:00:00 2001 From: zhangyanli Date: Mon, 1 Apr 2024 08:34:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=9F=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/service/eduArchives/impl/ArchivesServiceImpl.java | 2 +- .../resources/mybatis/datasource/corp/CorpInfoMapper.xml | 4 ++-- .../resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml | 3 ++- src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) 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 d9bb901..bc9d8db 100644 --- a/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesServiceImpl.java +++ b/src/main/java/com/zcloud/service/eduArchives/impl/ArchivesServiceImpl.java @@ -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", corpinfo.get("CORP_TYPE_NAME") != null ? corpinfo.getString("CORP_TYPE_NAME") : ""); //行业类别 + context.put("examinevalue11", corpinfo.get("INDUSTRY_TYPE_NAME") != null ? corpinfo.getString("INDUSTRY_TYPE_NAME") : ""); //行业类别 context.put("examinevalue12", student.get("PHONE") != null ? student.getString("PHONE") : ""); //联系电话 List list2 = new ArrayList<>(); //一共多少航 diff --git a/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml b/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml index aae5c03..d5ca9ce 100644 --- a/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml @@ -517,7 +517,7 @@ cs.NAME CORP_STATE_NAME, sub.NAME SUBORDINATIONNAME, abl.NAME AQ_BZ_LEVEL_NAME, - dicT.NAME as TRAINTYPE_NAME, + dicT.NAME as INDUSTRY_TYPE_NAME, b.ISSTOP, pls.POST_URL, ( @@ -541,7 +541,7 @@ LEFT JOIN SYS_DICTIONARIES cs on cs.DICTIONARIES_ID = f.CORP_STATE LEFT JOIN SYS_DICTIONARIES sub on sub.DICTIONARIES_ID = f.SUBORDINATION LEFT JOIN SYS_DICTIONARIES abl on abl.DICTIONARIES_ID = r.AQ_BZ_LEVEL - left join SYS_DICTIONARIES dicT on dicT.DICTIONARIES_ID = f.TRAINTYPE + left join BUS_INDUSTRY_TYPE dicT on dicT.INDUSTRYTYPE_ID = f.INDUSTRY_TYPE left join BUS_CORPTYPE t on t.CORPTYPE_ID = f.REGULARTYPE and t.ISDELETE = '0' left join bus_corp_pls_info pls on pls.CORPINFO_ID = f.CORPINFO_ID where diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml index 129e0a8..e6c0b94 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml @@ -413,7 +413,7 @@ f.MAJOR, ui.ID_PHOTO, ui.PORTRAIT, - ci.CORP_TYPE_NAME, + it.NAME as INDUSTRY_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, @@ -432,6 +432,7 @@ 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 + left join BUS_INDUSTRY_TYPE it on it.INDUSTRYTYPE_ID = ci.INDUSTRY_TYPE WHERE f.STUDENT_ID = #{STUDENT_ID} AND s.ISDELETE = '0' AND c.ISDELETE = '0' diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml index f15dc6b..0da262a 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml @@ -1123,7 +1123,7 @@ sst.OPERATTIME as STRENGTHEN_OPERATTIME, sst.STRENGTHEN_STAGEEXAMPAPER_INPUT_ID, CONCAT(dic3.NAME ,'/' , dic4.NAME ) as DUTIES_NAME, - ci.CORP_TYPE_NAME + it.NAME as INDUSTRY_TYPE_NAME from f left join dic1 on f.DEGREE_OF_EDUCATION = dic1.DICTIONARIES_ID @@ -1137,7 +1137,8 @@ left join sys_userinfo ui on ui.user_id = f.user_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 + left join BUS_CORP_INFO ci on ci.CORPINFO_ID = c.CORPINFO_ID + left join BUS_INDUSTRY_TYPE it on it.INDUSTRYTYPE_ID = ci.INDUSTRY_TYPE where f.STUDENT_ID = #{STUDENT_ID}