wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

dev
xiepeng 2024-04-01 10:46:13 +08:00
parent c9e097caaa d671401c31
commit d6a122c369
17 changed files with 293 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zcloud/controller/eduStudy/CurriculumController.java
View File

@ -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<PageData> varList = curriculumService.list(page); //列出Curriculum列表

5
src/main/java/com/zcloud/service/eduArchives/impl/ArchivesPdfFileServiceImpl.java
View File

@ -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); //师傅带徒弟实习教育

17
src/main/java/com/zcloud/service/eduArchives/impl/ArchivesServiceImpl.java
View File

@ -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<String, Object> context = new HashMap<String, Object>();
context = new HashMap<String, Object>();
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<String, Object> context = new HashMap<String, Object>();
context = new HashMap<String, Object>();
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<TrainingPlanDao> 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") + ")"); //固定值+培训级别

2
src/main/java/com/zcloud/service/eduArchives/impl/ArchivesStudentServiceImpl.java
View File

@ -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");

1
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.xml
View File

@ -134,6 +134,7 @@
c.CONTENT,
c.CREATETIME,
c.OPERATTIME,
c.ATTACHMENT_ROUTE,
c.OCCUPATIONALHAZARDS_ID
from
sys_user u

1
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml
View File

@ -134,6 +134,7 @@
c.CREATETIME,
c.OPERATTIME,
c.CONTENT,
c.ATTACHMENT_ROUTE,
c.SAFETYRESPONSIBILITY_ID
from
sys_user u

1
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml
View File

@ -140,6 +140,7 @@
c.OPERATTIME,
c.CONTENT,
c.ISDELETE,
c.ATTACHMENT_ROUTE,
c.SECURITYCOMMITMENT_ID
FROM
sys_user u

1
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLaborContractMapper.xml
View File

@ -137,6 +137,7 @@
c.CONTENT,
c.CREATETIME,
c.OPERATTIME,
c.ATTACHMENT_ROUTE,
c.LABORCONTRACT_ID
from
sys_user u

290
src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml
View File

@ -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
</sql>
<!-- 字段用于新增 -->
@ -150,7 +152,9 @@
SMALL_TYPE2,
USERS_NUM,
REGULARTYPE,
OFFICIAL_SEAL_PATH
OFFICIAL_SEAL_PATH,
INDUSTRY_TYPE,
INDUSTRY_NAME
</sql>
<!-- 字段值 -->
@ -206,7 +210,9 @@
#{SMALL_TYPE2},
#{USERS_NUM},
#{REGULARTYPE},
#{OFFICIAL_SEAL_PATH}
#{OFFICIAL_SEAL_PATH},
#{INDUSTRY_TYPE},
#{INDUSTRY_NAME}
</sql>
<!-- 新增-->
@ -247,76 +253,214 @@
update
<include refid="tableName"></include>
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},
<if test="FOURTYPE != null and FOURTYPE != ''">
FOURTYPE=#{FOURTYPE},
</if>
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}
<if test="CORP_NAME != null and CORP_NAME != ''">
CORP_NAME = #{CORP_NAME},
</if>
<if test="CODE != null and CODE != ''">
CODE = #{CODE},
</if>
<if test="COMPANY_AREA != null and COMPANY_AREA != ''">
COMPANY_AREA = #{COMPANY_AREA},
</if>
<if test="ADDRESS != null and ADDRESS != ''">
ADDRESS = #{ADDRESS},
</if>
<if test="CREATE_DATE != null and CREATE_DATE != ''">
CREATE_DATE = #{CREATE_DATE},
</if>
<if test="SCALE != null and SCALE != ''">
SCALE = #{SCALE},
</if>
<if test="LONGITUDE != null and LONGITUDE != ''">
LONGITUDE = #{LONGITUDE},
</if>
<if test="LATITUDE != null and LATITUDE != ''">
LATITUDE = #{LATITUDE},
</if>
<if test="POSTAL_CODE != null and POSTAL_CODE != ''">
POSTAL_CODE = #{POSTAL_CODE},
</if>
<if test="EMPLOYEES != null and EMPLOYEES != ''">
EMPLOYEES = #{EMPLOYEES},
</if>
<if test="AREA_COVERED != null and AREA_COVERED != ''">
AREA_COVERED = #{AREA_COVERED},
</if>
<if test="TOTALASSETS != null and TOTALASSETS != ''">
TOTALASSETS = #{TOTALASSETS},
</if>
<if test="REGCAPITAL != null and REGCAPITAL != ''">
REGCAPITAL = #{REGCAPITAL},
</if>
<if test="SALESREVENUE != null and SALESREVENUE != ''">
SALESREVENUE = #{SALESREVENUE},
</if>
<if test="ANNUALPROFIT != null and ANNUALPROFIT != ''">
ANNUALPROFIT = #{ANNUALPROFIT},
</if>
<if test="ECO_TYPE != null and ECO_TYPE != ''">
ECO_TYPE = #{ECO_TYPE},
</if>
<if test="ECO_TYPE2 != null and ECO_TYPE2 != ''">
ECO_TYPE2 = #{ECO_TYPE2},
</if>
<if test="ECO_TYPE_NAME != null and ECO_TYPE_NAME != ''">
ECO_TYPE_NAME=#{ECO_TYPE_NAME},
</if>
<if test="INDUSTRY != null and INDUSTRY != ''">
INDUSTRY = #{INDUSTRY},
</if>
<if test="CORP_TYPE != null and CORP_TYPE != ''">
CORP_TYPE = #{CORP_TYPE},
</if>
<if test="CORP_TYPE2 != null and CORP_TYPE2 != ''">
CORP_TYPE2 = #{CORP_TYPE2},
</if>
<if test="CORP_TYPE3 != null and CORP_TYPE3 != ''">
CORP_TYPE3 = #{CORP_TYPE3},
</if>
<if test="CORP_TYPE4 != null and CORP_TYPE4 != ''">
CORP_TYPE4 = #{CORP_TYPE4},
</if>
<if test="CORP_TYPE_NAME != null and CORP_TYPE_NAME != ''">
CORP_TYPE_NAME = #{CORP_TYPE_NAME},
</if>
<if test="CORP_TYPE_SMALL != null and CORP_TYPE_SMALL != ''">
CORP_TYPE_SMALL = #{CORP_TYPE_SMALL},
</if>
<if test="LR_NAME != null and LR_NAME != ''">
LR_NAME = #{LR_NAME},
</if>
<if test="LR_POSITION != null and LR_POSITION != ''">
LR_POSITION = #{LR_POSITION},
</if>
<if test="LR_PHONE != null and LR_PHONE != ''">
LR_PHONE = #{LR_PHONE},
</if>
<if test="LR_MOBILE != null and LR_MOBILE != ''">
LR_MOBILE = #{LR_MOBILE},
</if>
<if test="CONTACTS != null and CONTACTS != ''">
CONTACTS = #{CONTACTS},
</if>
<if test="CONTACTS_PHONE != null and CONTACTS_PHONE != ''">
CONTACTS_PHONE = #{CONTACTS_PHONE},
</if>
<if test="CHECKPERSON != null and CHECKPERSON != ''">
CHECKPERSON = #{CHECKPERSON},
</if>
<if test="CHECKPERSONPHONE != null and CHECKPERSONPHONE != ''">
CHECKPERSONPHONE = #{CHECKPERSONPHONE},
</if>
<if test="OPERATOR != null and OPERATOR != ''">
OPERATOR = #{OPERATOR},
</if>
<if test="OPERATTIME != null and OPERATTIME != ''">
OPERATTIME = #{OPERATTIME},
</if>
<if test="CREATOR != null and CREATOR != ''">
CREATOR = #{CREATOR},
</if>
<if test="FOURTYPE != null and FOURTYPE != ''">
FOURTYPE=#{FOURTYPE},
</if>
<if test="PROVINCE != null and PROVINCE != ''">
PROVINCE=#{PROVINCE},
</if>
<if test="CITY != null and CITY != ''">
CITY=#{CITY},
</if>
<if test="VILLAGE != null and VILLAGE != ''">
VILLAGE = #{VILLAGE},
</if>
<if test="LOGIN_USER_ID != null and LOGIN_USER_ID != ''">
LOGIN_USER_ID = #{LOGIN_USER_ID},
</if>
<if test="ADDRESS_BUSINESS != null and ADDRESS_BUSINESS != ''">
ADDRESS_BUSINESS = #{ADDRESS_BUSINESS},
</if>
<if test="ADDRESS_OFFICE != null and ADDRESS_OFFICE != ''">
ADDRESS_OFFICE = #{ADDRESS_OFFICE},
</if>
<if test="CORP_STATE != null and CORP_STATE != ''">
CORP_STATE = #{CORP_STATE},
</if>
<if test="FIXED_ASSETS != null and FIXED_ASSETS != ''">
FIXED_ASSETS = #{FIXED_ASSETS},
</if>
<if test="YEAR_OUTPUT_VALUE != null and YEAR_OUTPUT_VALUE != ''">
YEAR_OUTPUT_VALUE = #{YEAR_OUTPUT_VALUE},
</if>
<if test="REG_TYPE != null and REG_TYPE != ''">
REG_TYPE = #{REG_TYPE},
</if>
<if test="SUBORDINATION != null and SUBORDINATION != ''">
SUBORDINATION = #{SUBORDINATION},
</if>
<if test="CORP_OF_TYPE != null and CORP_OF_TYPE != ''">
CORP_OF_TYPE = #{CORP_OF_TYPE},
</if>
<if test="CORP_OF_TYPE2 != null and CORP_OF_TYPE2 != ''">
CORP_OF_TYPE2 = #{CORP_OF_TYPE2},
</if>
<if test="INDUSTRY_DEPARTMENT != null and INDUSTRY_DEPARTMENT != ''">
INDUSTRY_DEPARTMENT = #{INDUSTRY_DEPARTMENT},
</if>
<if test="SCALE_TYPE != null and SCALE_TYPE != ''">
SCALE_TYPE = #{SCALE_TYPE},
</if>
<if test="SAFETY_NAME != null and SAFETY_NAME != ''">
SAFETY_NAME = #{SAFETY_NAME},
</if>
<if test="SAFETY_POST != null and SAFETY_POST != ''">
SAFETY_POST = #{SAFETY_POST},
</if>
<if test="SAFETY_NUMBER != null and SAFETY_NUMBER != ''">
SAFETY_NUMBER = #{SAFETY_NUMBER},
</if>
<if test="SAFETY_PHONE != null and SAFETY_PHONE != ''">
SAFETY_PHONE = #{SAFETY_PHONE},
</if>
<if test="CORP_CONFIRM != null and CORP_CONFIRM != ''">
CORP_CONFIRM = #{CORP_CONFIRM},
</if>
<if test="CORP_EXAMINE != null and CORP_EXAMINE != ''">
CORP_EXAMINE = #{CORP_EXAMINE},
</if>
<if test="REPORT_CYCLE != null and REPORT_CYCLE != ''">
REPORT_CYCLE=#{REPORT_CYCLE},
</if>
<if test="REPORT_STATUS != null and REPORT_STATUS != ''">
REPORT_STATUS=#{REPORT_STATUS},
</if>
<if test="STREET != null and STREET != ''">
STREET=#{STREET},
</if>
<if test="COUNTY != null and COUNTY != ''">
COUNTY=#{COUNTY},
</if>
<if test="ISSMALL != null and ISSMALL != ''">
ISSMALL=#{ISSMALL},
</if>
<if test="TRAINTYPE != null and TRAINTYPE != ''">
TRAINTYPE=#{TRAINTYPE},
</if>
<if test="LR_PERSONID != null and LR_PERSONID != ''">
LR_PERSONID=#{LR_PERSONID},
</if>
<if test="USERS_NUM != null and USERS_NUM != ''">
USERS_NUM = #{USERS_NUM},
</if>
<if test="OFFICIAL_SEAL_PATH != null and OFFICIAL_SEAL_PATH != ''">
OFFICIAL_SEAL_PATH = #{OFFICIAL_SEAL_PATH},
</if>
<if test="INDUSTRY_TYPE != null and INDUSTRY_TYPE != ''">
INDUSTRY_TYPE = #{INDUSTRY_TYPE},
</if>
<if test="INDUSTRY_NAME != null and INDUSTRY_NAME != ''">
INDUSTRY_NAME = #{INDUSTRY_NAME},
</if>
CORPINFO_ID = CORPINFO_ID
where
CORPINFO_ID = #{CORPINFO_ID}
</update>

37
src/main/resources/mybatis/datasource/system/UserInfoMapper.xml
View File

@ -306,10 +306,39 @@
update
<include refid="tableName"></include>
set
PERSONNEL_TYPE = #{PERSONNEL_TYPE},
DEGREE_OF_EDUCATION = #{DEGREE_OF_EDUCATION},
POLITICAL_OUTLOOK = #{POLITICAL_OUTLOOK},
WORKING_DATE = #{WORKING_DATE},
<if test="POLITICAL_OUTLOOK != null and POLITICAL_OUTLOOK != ''">
POLITICAL_OUTLOOK = #{POLITICAL_OUTLOOK},
</if>
<if test="DEGREE_OF_EDUCATION != null and DEGREE_OF_EDUCATION != ''">
DEGREE_OF_EDUCATION = #{DEGREE_OF_EDUCATION},
</if>
<if test="PERSONNEL_TYPE != null and PERSONNEL_TYPE != ''">
PERSONNEL_TYPE = #{PERSONNEL_TYPE},
</if>
<if test="WORKING_DATE != null and WORKING_DATE != ''">
WORKING_DATE = #{WORKING_DATE},
</if>
<if test="PREVIOUS_POST_DATE != null and PREVIOUS_POST_DATE != ''">
PREVIOUS_POST_DATE = #{PREVIOUS_POST_DATE},
</if>
<if test="HEALTH != null and HEALTH != ''">
HEALTH = #{HEALTH},
</if>
<if test="WORK_EXPERIENCE != null and WORK_EXPERIENCE != ''">
WORK_EXPERIENCE = #{WORK_EXPERIENCE},
</if>
<if test="CERTIFICATES != null and CERTIFICATES != ''">
CERTIFICATES = #{CERTIFICATES},
</if>
<if test="PUNISH != null and PUNISH != ''">
PUNISH = #{PUNISH},
</if>
<if test="UNIVERSITY != null and UNIVERSITY != ''">
UNIVERSITY = #{UNIVERSITY},
</if>
<if test="RESIDENCE != null and RESIDENCE != ''">
RESIDENCE = #{RESIDENCE},
</if>
USER_ID = USER_ID
where
USER_ID = #{USER_ID}

12
src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml
View File

@ -370,9 +370,6 @@
c. NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
<if test="pd.STATE != null and pd.STATE != ''">
AND c.STATE = #{pd.STATE}
</if>
<if test="pd.STARTTIME != null and pd.STARTTIME != ''">
AND c.START_TIME &gt;= #{pd.STARTTIME}
</if>
@ -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'

5
src/main/resources/mybatis/dsno3/eduArchives/ArchivesStudentMapper.xml
View File

@ -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}

4
src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml
View File

@ -796,8 +796,8 @@
and ( f.ISSTRENGTHEN = '1'
OR f.ISSTRENGTHEN = '2' )
and CEILING(bsr.STAGEEXAMSCORE) != bsi.EXAMSCORE
<if test="pd.STUDENTNAME != null and pd.STUDENTNAME != ''">
and bs.NAME LIKE CONCAT(CONCAT('%', #{pd.STUDENTNAME}),'%')
<if test="pd.NAME != null and pd.NAME != ''">
and bs.NAME LIKE CONCAT(CONCAT('%', #{pd.NAME}),'%')
</if>
<if test="pd.YEAR != null and pd.YEAR != ''">
and f.CREATTIME LIKE CONCAT(#{pd.YEAR},'%')

2
src/main/resources/mybatis/dsno3/eduStudy/CurriculumMapper.xml
View File

@ -307,7 +307,7 @@
and f.INDUSTRY_END_ID = #{pd.INDUSTRY_END_ID}
</if>
GROUP BY f.CURRICULUM_ID
ORDER BY f.CURRICULUMNAME
ORDER BY f.CREATTIME DESC
</select>
<!-- 列表(全部) -->

1
src/main/resources/mybatis/dsno3/eduStudy/StageStudentRelationMapper.xml
View File

@ -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,

8
src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml
View File

@ -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
<include refid="tableName"></include> f
left join <include refid="dicTableName"></include> 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 <include refid="dicTableName"></include> dic3 on ui.DUTIES = dic3.DICTIONARIES_ID
left join <include refid="dicTableName"></include> 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}
</select>

4
src/main/resources/mybatis/dsno3/eduStudy/VideoCoursewareMapper.xml
View File

@ -224,8 +224,8 @@
and f.ISCOMPLETE = #{pd.ISCOMPLETE}
</if>
<if test="pd.INDUSTRY != null and pd.INDUSTRY != ''">
and f.INDUSTRY_END_ID = #{pd.INDUSTRY}
<if test="pd.INDUSTRY_END_ID != null and pd.INDUSTRY_END_ID != ''">
and f.INDUSTRY_END_ID = #{pd.INDUSTRY_END_ID}
</if>
<if test="pd.teacherKey != null and pd.teacherKey != ''"><!-- 教师姓名 -->