diff --git a/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java b/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java index 37b95a0..7fda2b5 100644 --- a/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java +++ b/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java @@ -16,10 +16,7 @@ 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; +import java.util.*; @Controller @RequestMapping("/assignedmanage") @@ -149,10 +146,13 @@ public class AssignedManageController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); page.setPd(pd); List varList = assignedManageService.list(page); //列出MajorDangerSource列表 + List vehicleList = new ArrayList<>(); + map.put("varList", varList); map.put("page", page); map.put("result", errInfo); 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/controller/freighttrailer/FreighttTrailerController.java b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java index a1bd090..840dd3c 100644 --- a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java +++ b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java @@ -75,7 +75,8 @@ public class FreighttTrailerController extends BaseController { pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID - + pd.put("ISSCRAP", "0"); + pd.put("ISASSIGNED", "0"); freightTrailerService.save(pd); map.put("pd", pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java index 32e5784..0fb7d07 100644 --- a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java +++ b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java @@ -55,6 +55,7 @@ public class ScrapManageController extends BaseController { pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + freightTrailerService.editScrapStatus(pd); scrapManageService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -84,6 +85,13 @@ public class ScrapManageController extends BaseController { PageData scrapVehicle = operatingVehiclesService.findByfindByPlateNumber(pd2); scrapVehicle.put("ISSCRAP", "0"); operatingVehiclesService.edit(scrapVehicle); + }else{ + PageData pd2 = new PageData(); + pd2.put("PLATE_NUMBER", pageData.get("PLATE_NUMBER")); + pd2.put("CORPINFO_ID", pageData.get("CORPINFO_ID")); + PageData scrapVehicle = freightTrailerService.findByPlateNumber(pd2); + scrapVehicle.put("ISSCRAP", "0"); + freightTrailerService.edit(scrapVehicle); } scrapManageService.delete(pd); map.put("result", errInfo); //返回结果 @@ -192,7 +200,7 @@ public class ScrapManageController extends BaseController { return map; } - @RequestMapping(value = "/getscrapfreighttrailerlist") + /*@RequestMapping(value = "/getscrapfreighttrailerlist") @ResponseBody public Object getScrapFreightTrailerList() throws Exception { Map map = new HashMap(); @@ -210,6 +218,18 @@ public class ScrapManageController extends BaseController { map.put("varList", freightList); map.put("result", errInfo); return map; + }*/ + + @RequestMapping(value = "/getscrapfreighttrailerlist") + @ResponseBody + public Object getScrapFreightTrailerList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + String corpId = Jurisdiction.getCORPINFO_ID(); + List freightList = freightTrailerService.trailerList(corpId); + map.put("varList", freightList); + map.put("result", errInfo); + return map; } diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index 444567e..4bf5500 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -191,7 +191,7 @@ public class TaxationManageController extends BaseController { List taxationList = taxationManageService.list(page); // 列出车船税列表 for (int i = 0; i < taxationList.size(); i++) { for (int j = 0; j < varList.size(); j++) { - if(taxationList.get(i).get("PLATE_NUMBER").equals(varList.get(j).get("PLATE_NUMBER"))){ + if (taxationList.get(i).get("PLATE_NUMBER").equals(varList.get(j).get("PLATE_NUMBER")) || varList.get(j).get("ISSCRAP").equals("1")) { varList.remove(j); } } diff --git a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java index 924bc7f..fed1081 100644 --- a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java @@ -78,5 +78,9 @@ public interface FreightTrailerMapper { List listOut(PageData pd); List listAll(PageData pd); + + void editScrapStatus(PageData pd); + + PageData findByPlateNumber(PageData pd2); } diff --git a/src/main/java/com/zcloud/mapper/datasource/operations/OperationsMapper.java b/src/main/java/com/zcloud/mapper/datasource/operations/OperationsMapper.java index 3486271..a0b3332 100644 --- a/src/main/java/com/zcloud/mapper/datasource/operations/OperationsMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/operations/OperationsMapper.java @@ -48,7 +48,7 @@ public interface OperationsMapper { * @param page * @throws Exception */ - List datalistPage(Page page); + List datalistPage2(Page page); /** 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/java/com/zcloud/service/freighttrailer/FreightTrailerService.java b/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java index 0728ce9..b06c52f 100644 --- a/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java +++ b/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java @@ -78,5 +78,9 @@ public interface FreightTrailerService { List listOut(PageData pd); List listAll(PageData pd); + + void editScrapStatus(PageData pd); + + PageData findByPlateNumber(PageData pd2); } diff --git a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java index 74d5c2a..55d94cf 100644 --- a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java +++ b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java @@ -113,5 +113,14 @@ public class FreightTrailerServiceImpl implements FreightTrailerService { return freightTrailerMapper.listAll(pd); } + @Override + public void editScrapStatus(PageData pd) { + freightTrailerMapper.editScrapStatus(pd); + } + + @Override + public PageData findByPlateNumber(PageData pd2) { + return freightTrailerMapper.findByPlateNumber(pd2); + } } diff --git a/src/main/java/com/zcloud/service/operations/impl/OperationsServiceImpl.java b/src/main/java/com/zcloud/service/operations/impl/OperationsServiceImpl.java index d197098..782605b 100644 --- a/src/main/java/com/zcloud/service/operations/impl/OperationsServiceImpl.java +++ b/src/main/java/com/zcloud/service/operations/impl/OperationsServiceImpl.java @@ -67,7 +67,7 @@ public class OperationsServiceImpl implements OperationsService { * @throws Exception */ public List list(Page page) throws Exception { - return operationsMapper.datalistPage(page); + return operationsMapper.datalistPage2(page); } diff --git a/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml b/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml index fa1721b..7da25c3 100644 --- a/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml +++ b/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml @@ -423,10 +423,10 @@ @@ -259,4 +266,24 @@ where f.ISDELETE = '0' + + update + + set + ISSCRAP = '1' + where + FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID} + and + CORPINFO_ID = #{CORPINFO_ID} + + + + diff --git a/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml b/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml index a17f555..77e1682 100644 --- a/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml +++ b/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml @@ -221,20 +221,14 @@ select f.*, case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, - v1.PLATE_NUMBER, - case - when btsm.PLATE_NUMBER is not null then '1' - when bta.RAW_PLATE_NUMBER is not null then '2' - else f.ARCHIVES_TYPE - end as NEW_ARCHIVES_TYPE, - COALESCE(bta.RAW_PLATE_NUMBER, '0') as RAW_PLATE_NUMBER + v1.PLATE_NUMBER from f - INNER JOIN v_traffic v1 on f.VEHICLE=v1.ID - LEFT JOIN BUS_TRAFFIC_SCRAP_MANAGEMENT btsm on v1.PLATE_NUMBER = btsm.PLATE_NUMBER - LEFT JOIN BUS_TRAFFIC_ASSIGNED bta on v1.PLATE_NUMBER = bta.RAW_PLATE_NUMBER - where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} + INNER JOIN v_traffic v1 on f.VEHICLE = v1.ID + LEFT JOIN BUS_TRAFFIC_OPERATINGVEHICLE o on o.OPERATING_ID = f.VEHICLE + LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} AND (o.ISSCRAP = '0' OR btmf.ISSCRAP = '0') and f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%') diff --git a/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml b/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml index f9a1029..b903cd8 100644 --- a/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml +++ b/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml @@ -257,4 +257,52 @@ ORDER BY f.CREATTIME DESC + + diff --git a/src/main/resources/mybatis/datasource/scrapManage/ScrapManage.xml b/src/main/resources/mybatis/datasource/scrapManage/ScrapManage.xml index 1fcf4ff..1751ff2 100644 --- a/src/main/resources/mybatis/datasource/scrapManage/ScrapManage.xml +++ b/src/main/resources/mybatis/datasource/scrapManage/ScrapManage.xml @@ -184,7 +184,8 @@ OPERATTIME = #{OPERATTIME}, DELETOR = #{DELETOR}, DELETORNAME = #{DELETORNAME}, - DELETTIME =#{DELETTIME}, + DELETTIME =#{DELETTIME} + SCRAPFLAG =#{SCRAPFLAG} where SCRAP_ID = #{SCRAP_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/datasource/taxationManage/TaxationManageMapper.xml b/src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml index e72a45b..ccb6d1b 100644 --- a/src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml +++ b/src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml @@ -403,17 +403,11 @@ 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}