forked from integrated_whb/integrated_whb
教培bug修复
parent
d671401c31
commit
1879d56889
|
@ -503,7 +503,7 @@ public class ArchivesServiceImpl implements ArchivesService {
|
||||||
context.put("examinevalue8", student.get("DUTIES") != null ? student.getString("DUTIES") : ""); //职称
|
context.put("examinevalue8", student.get("DUTIES") != null ? student.getString("DUTIES") : ""); //职称
|
||||||
context.put("examinevalue9", student.get("DEPARTMENT_NAME") != null ? student.getString("DEPARTMENT_NAME") : ""); //部门
|
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("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") : ""); //联系电话
|
context.put("examinevalue12", student.get("PHONE") != null ? student.getString("PHONE") : ""); //联系电话
|
||||||
|
|
||||||
List<TrainingPlanDao> list2 = new ArrayList<>(); //一共多少航
|
List<TrainingPlanDao> list2 = new ArrayList<>(); //一共多少航
|
||||||
|
|
|
@ -517,7 +517,7 @@
|
||||||
cs.NAME CORP_STATE_NAME,
|
cs.NAME CORP_STATE_NAME,
|
||||||
sub.NAME SUBORDINATIONNAME,
|
sub.NAME SUBORDINATIONNAME,
|
||||||
abl.NAME AQ_BZ_LEVEL_NAME,
|
abl.NAME AQ_BZ_LEVEL_NAME,
|
||||||
dicT.NAME as TRAINTYPE_NAME,
|
dicT.NAME as INDUSTRY_TYPE_NAME,
|
||||||
b.ISSTOP,
|
b.ISSTOP,
|
||||||
pls.POST_URL,
|
pls.POST_URL,
|
||||||
(
|
(
|
||||||
|
@ -541,7 +541,7 @@
|
||||||
LEFT JOIN SYS_DICTIONARIES cs on cs.DICTIONARIES_ID = f.CORP_STATE
|
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 sub on sub.DICTIONARIES_ID = f.SUBORDINATION
|
||||||
LEFT JOIN SYS_DICTIONARIES abl on abl.DICTIONARIES_ID = r.AQ_BZ_LEVEL
|
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_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
|
left join bus_corp_pls_info pls on pls.CORPINFO_ID = f.CORPINFO_ID
|
||||||
where
|
where
|
||||||
|
|
|
@ -413,7 +413,7 @@
|
||||||
f.MAJOR,
|
f.MAJOR,
|
||||||
ui.ID_PHOTO,
|
ui.ID_PHOTO,
|
||||||
ui.PORTRAIT,
|
ui.PORTRAIT,
|
||||||
ci.CORP_TYPE_NAME,
|
it.NAME as INDUSTRY_TYPE_NAME,
|
||||||
ci.CORP_NAME,
|
ci.CORP_NAME,
|
||||||
CONCAT_WS('-', IF(t.NAME = '', null, t.NAME), IF(iei.NAME = '', null, iei.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,
|
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 dd on dd.DICTIONARIES_ID = ui.DUTIES
|
||||||
LEFT JOIN SYS_DICTIONARIES_CORP dt on dt.DICTIONARIES_ID = ui.TITLE
|
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_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}
|
WHERE f.STUDENT_ID = #{STUDENT_ID}
|
||||||
AND s.ISDELETE = '0'
|
AND s.ISDELETE = '0'
|
||||||
AND c.ISDELETE = '0'
|
AND c.ISDELETE = '0'
|
||||||
|
|
|
@ -1123,7 +1123,7 @@
|
||||||
sst.OPERATTIME as STRENGTHEN_OPERATTIME,
|
sst.OPERATTIME as STRENGTHEN_OPERATTIME,
|
||||||
sst.STRENGTHEN_STAGEEXAMPAPER_INPUT_ID,
|
sst.STRENGTHEN_STAGEEXAMPAPER_INPUT_ID,
|
||||||
CONCAT(dic3.NAME ,'/' , dic4.NAME ) as DUTIES_NAME,
|
CONCAT(dic3.NAME ,'/' , dic4.NAME ) as DUTIES_NAME,
|
||||||
ci.CORP_TYPE_NAME
|
it.NAME as INDUSTRY_TYPE_NAME
|
||||||
from
|
from
|
||||||
<include refid="tableName"></include> f
|
<include refid="tableName"></include> f
|
||||||
left join <include refid="dicTableName"></include> dic1 on f.DEGREE_OF_EDUCATION = dic1.DICTIONARIES_ID
|
left join <include refid="dicTableName"></include> 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_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 dic3 on ui.DUTIES = dic3.DICTIONARIES_ID
|
||||||
left join SYS_DICTIONARIES_CORP dic4 on ui.TITLE = dic4.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
|
where
|
||||||
f.STUDENT_ID = #{STUDENT_ID}
|
f.STUDENT_ID = #{STUDENT_ID}
|
||||||
</select>
|
</select>
|
||||||
|
|
Loading…
Reference in New Issue