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

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.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @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<PageData> varList = assignedManageService.list(page);	//列出MajorDangerSource列表
+        List<PageData> vehicleList = new ArrayList<>();
+
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

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

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

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<String, Object> map = new HashMap<String, Object>();
@@ -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<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        String corpId = Jurisdiction.getCORPINFO_ID();
+        List<PageData> freightList = freightTrailerService.trailerList(corpId);
+        map.put("varList", freightList);
+        map.put("result", errInfo);
+        return map;
     }
 
 

src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java

@@ -191,7 +191,7 @@ public class TaxationManageController extends BaseController {
         List<PageData> 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);
                 }
             }

src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java

@@ -78,5 +78,9 @@ public interface FreightTrailerMapper {
     List<PageData> listOut(PageData pd);
 
     List<PageData> listAll(PageData pd);
+
+    void editScrapStatus(PageData pd);
+
+    PageData findByPlateNumber(PageData pd2);
 }
 

src/main/java/com/zcloud/mapper/datasource/operations/OperationsMapper.java

@@ -48,7 +48,7 @@ public interface OperationsMapper {
      * @param page
      * @throws Exception
      */
-    List<PageData> datalistPage(Page page);
+    List<PageData> datalistPage2(Page page);
 
 
     /**

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

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<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") + ")");  //固定值+培训级别

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

src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java

@@ -78,5 +78,9 @@ public interface FreightTrailerService {
     List<PageData> listOut(PageData pd);
 
     List<PageData> listAll(PageData pd);
+
+    void editScrapStatus(PageData pd);
+
+    PageData findByPlateNumber(PageData pd2);
 }
 

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);
+    }
 }
 

src/main/java/com/zcloud/service/operations/impl/OperationsServiceImpl.java

@@ -67,7 +67,7 @@ public class OperationsServiceImpl implements OperationsService {
      * @throws Exception
      */
     public List<PageData> list(Page page) throws Exception {
-        return operationsMapper.datalistPage(page);
+        return operationsMapper.datalistPage2(page);
     }
 
 

src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml

@@ -423,10 +423,10 @@
 	<!-- 列表(全部) -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
-		<include refid="Field"></include>
+		f.*
 		from
 		<include refid="tableName"></include> f
-		where f.ISDELETE = '0'
+		where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
 		<if test="pd.ASSIGNED_TYPE != null and pd.ASSIGNED_TYPE != ''"><!-- 关键词检索 -->
 			and f.ASSIGNED_TYPE = #{pd.ASSIGNED_TYPE}
 		</if>

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
 	</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},
+		    <if test="CORP_NAME != null and CORP_NAME != ''">
-		CODE = #{CODE},
+				CORP_NAME = #{CORP_NAME},
-		COMPANY_AREA = #{COMPANY_AREA},
+			</if>
-		ADDRESS = #{ADDRESS},
+			<if test="CODE != null and CODE != ''">
-		CREATE_DATE = #{CREATE_DATE},
+				CODE = #{CODE},
-		SCALE = #{SCALE},
+			</if>
-		LONGITUDE = #{LONGITUDE},
+			<if test="COMPANY_AREA != null and COMPANY_AREA != ''">
-		LATITUDE = #{LATITUDE},
+				COMPANY_AREA = #{COMPANY_AREA},
-		POSTAL_CODE = #{POSTAL_CODE},
+			</if>
-		EMPLOYEES = #{EMPLOYEES},
+			<if test="ADDRESS != null and ADDRESS != ''">
-		AREA_COVERED = #{AREA_COVERED},
+				ADDRESS = #{ADDRESS},
-		TOTALASSETS = #{TOTALASSETS},
+			</if>
-		REGCAPITAL = #{REGCAPITAL},
+			<if test="CREATE_DATE != null and CREATE_DATE != ''">
-		SALESREVENUE = #{SALESREVENUE},
+				CREATE_DATE = #{CREATE_DATE},
-		ANNUALPROFIT = #{ANNUALPROFIT},
+			</if>
-		ECO_TYPE = #{ECO_TYPE},
+			<if test="SCALE != null and SCALE != ''">
-		ECO_TYPE2 = #{ECO_TYPE2},
+				SCALE = #{SCALE},
-		ECO_TYPE_NAME=#{ECO_TYPE_NAME},
+			</if>
-		INDUSTRY = #{INDUSTRY},
+			<if test="LONGITUDE != null and LONGITUDE != ''">
-		CORP_TYPE = #{CORP_TYPE},
+				LONGITUDE = #{LONGITUDE},
-		CORP_TYPE2 = #{CORP_TYPE2},
+			</if>
-		CORP_TYPE3 = #{CORP_TYPE3},
+			<if test="LATITUDE != null and LATITUDE != ''">
-		CORP_TYPE4 = #{CORP_TYPE4},
+				LATITUDE = #{LATITUDE},
-		CORP_TYPE_NAME = #{CORP_TYPE_NAME},
+			</if>
-		CORP_TYPE_SMALL = #{CORP_TYPE_SMALL},
+			<if test="POSTAL_CODE != null and POSTAL_CODE != ''">
-		LR_NAME = #{LR_NAME},
+				POSTAL_CODE = #{POSTAL_CODE},
-		LR_POSITION = #{LR_POSITION},
+			</if>
-		LR_PHONE = #{LR_PHONE},
+			<if test="EMPLOYEES != null and EMPLOYEES != ''">
-		LR_MOBILE = #{LR_MOBILE},
+				EMPLOYEES = #{EMPLOYEES},
-		CONTACTS = #{CONTACTS},
+			</if>
-		CONTACTS_PHONE = #{CONTACTS_PHONE},
+			<if test="AREA_COVERED != null and AREA_COVERED != ''">
-		CHECKPERSON = #{CHECKPERSON},
+				AREA_COVERED = #{AREA_COVERED},
-		CHECKPERSONPHONE = #{CHECKPERSONPHONE},
+			</if>
-		OPERATOR = #{OPERATOR},
+			<if test="TOTALASSETS != null and TOTALASSETS != ''">
-		OPERATTIME = #{OPERATTIME},
+				TOTALASSETS = #{TOTALASSETS},
-		CREATOR = #{CREATOR},
+			</if>
-		<if test="FOURTYPE != null and FOURTYPE != ''">
+			<if test="REGCAPITAL != null and REGCAPITAL != ''">
-			FOURTYPE=#{FOURTYPE},
+				REGCAPITAL = #{REGCAPITAL},
-		</if>
+			</if>
-		PROVINCE=#{PROVINCE},
+			<if test="SALESREVENUE != null and SALESREVENUE != ''">
-		CITY=#{CITY},
+				SALESREVENUE = #{SALESREVENUE},
-		VILLAGE = #{VILLAGE},
+			</if>
-	    LOGIN_USER_ID = #{LOGIN_USER_ID},
+			<if test="ANNUALPROFIT != null and ANNUALPROFIT != ''">
-	    ADDRESS_BUSINESS = #{ADDRESS_BUSINESS},
+				ANNUALPROFIT = #{ANNUALPROFIT},
-	    ADDRESS_OFFICE = #{ADDRESS_OFFICE},
+			</if>
-	    CORP_STATE = #{CORP_STATE},
+			<if test="ECO_TYPE != null and ECO_TYPE != ''">
-	    FIXED_ASSETS = #{FIXED_ASSETS},
+				ECO_TYPE = #{ECO_TYPE},
-	    YEAR_OUTPUT_VALUE = #{YEAR_OUTPUT_VALUE},
+			</if>
-	    REG_TYPE = #{REG_TYPE},
+			<if test="ECO_TYPE2 != null and ECO_TYPE2 != ''">
-	    SUBORDINATION = #{SUBORDINATION},
+				ECO_TYPE2 = #{ECO_TYPE2},
-	    CORP_OF_TYPE = #{CORP_OF_TYPE},
+			</if>
-	    CORP_OF_TYPE2 = #{CORP_OF_TYPE2},
+			<if test="ECO_TYPE_NAME != null and ECO_TYPE_NAME != ''">
-	    INDUSTRY_DEPARTMENT = #{INDUSTRY_DEPARTMENT},
+				ECO_TYPE_NAME=#{ECO_TYPE_NAME},
-	    SCALE_TYPE = #{SCALE_TYPE},
+			</if>
-	    SAFETY_NAME = #{SAFETY_NAME},
+			<if test="INDUSTRY != null and INDUSTRY != ''">
-	    SAFETY_POST = #{SAFETY_POST},
+				INDUSTRY = #{INDUSTRY},
-	    SAFETY_NUMBER = #{SAFETY_NUMBER},
+			</if>
-	    SAFETY_PHONE = #{SAFETY_PHONE},
+			<if test="CORP_TYPE != null and CORP_TYPE != ''">
-	    CORP_CONFIRM = #{CORP_CONFIRM},
+				CORP_TYPE = #{CORP_TYPE},
-	    CORP_EXAMINE = #{CORP_EXAMINE},
+			</if>
-	    REPORT_CYCLE=#{REPORT_CYCLE},
+			<if test="CORP_TYPE2 != null and CORP_TYPE2 != ''">
-		REPORT_STATUS=#{REPORT_STATUS},
+				CORP_TYPE2 = #{CORP_TYPE2},
-		STREET=#{STREET},
+			</if>
-		COUNTY=#{COUNTY},
+			<if test="CORP_TYPE3 != null and CORP_TYPE3 != ''">
-		ISSMALL=#{ISSMALL},
+				CORP_TYPE3 = #{CORP_TYPE3},
-		TRAINTYPE=#{TRAINTYPE},
+			</if>
-		LR_PERSONID=#{LR_PERSONID},
+			<if test="CORP_TYPE4 != null and CORP_TYPE4 != ''">
-		CORPINFO_ID = CORPINFO_ID,
+				CORP_TYPE4 = #{CORP_TYPE4},
-		USERS_NUM = #{USERS_NUM},
+			</if>
-		OFFICIAL_SEAL_PATH = #{OFFICIAL_SEAL_PATH}
+			<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>

src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml

@@ -39,7 +39,9 @@
 		CREATOR,
 		CREATORNAME,
 		CREATTIME,
-		ISDELETE
+		ISDELETE,
+		ISSCRAP,
+		ISASSIGNED
 	</sql>
 
 	<!-- 字段值 -->
@@ -73,7 +75,9 @@
 		#{CREATOR},
 		#{CREATORNAME},
 		#{CREATTIME},
-		#{ISDELETE}
+		#{ISDELETE},
+		#{ISSCRAP},
+		#{ISASSIGNED}
 	</sql>
 
 	<!-- 新增-->
@@ -95,7 +99,8 @@
 		ISDELETE = '1',
 		DELETEOR = #{DELETEOR},
 		DELETEORNAME = #{DELETEORNAME},
-		DELETTIME = #{DELETTIME}
+		DELETTIME = #{DELETTIME},
+		ISSCRAP = '1'
 		where
 		FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID}
 	</delete>
@@ -130,7 +135,9 @@
 		OPER_CERTIFICATE_IMG = #{OPER_CERTIFICATE_IMG},
 		TRAILER_INFO = #{TRAILER_INFO},
 		OPERATOR = #{OPERATOR},
-		OPERATTIME = #{OPERATTIME}
+		OPERATTIME = #{OPERATTIME},
+		ISSCRAP = #{ISSCRAP},
+		ISASSIGNED = #{ISASSIGNED}
 		where
 		FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID}
 	</update>
@@ -222,7 +229,7 @@
 		*
 		from
 		<include refid="tableName"></include> f
-		where f.ISDELETE = '0' and f.CORPINFO_ID = #{corpId}
+		where f.ISDELETE = '0' and f.CORPINFO_ID = #{corpId} AND f.ISSCRAP = '0'
 	</select>
 
 	<!-- 货运挂车列表ALL -->
@@ -259,4 +266,24 @@
 		where f.ISDELETE = '0'
 	</select>
 
+	<update id="editScrapStatus" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		ISSCRAP = '1'
+		where
+		FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID}
+		and
+		CORPINFO_ID = #{CORPINFO_ID}
+	</update>
+
+	<select id="findByPlateNumber" parameterType="pd" resultType="pd">
+		select
+		*
+		from
+		<include refid="tableName"></include>
+		f
+		where f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID} and f.PLATE_NUMBER = #{PLATE_NUMBER}
+	</select>
+
 </mapper>

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,
+        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
         from
         <include refid="tableName"></include>
         f
-        INNER JOIN v_traffic v1 on f.VEHICLE=v1.ID
+        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_OPERATINGVEHICLE o on o.OPERATING_ID = f.VEHICLE
-        LEFT JOIN BUS_TRAFFIC_ASSIGNED bta on v1.PLATE_NUMBER = bta.RAW_PLATE_NUMBER
+        LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE
-        where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+        where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} AND (o.ISSCRAP = '0' OR btmf.ISSCRAP = '0')
         <if test="pd.BASICINFO_LICENSE_PLATE != null and pd.BASICINFO_LICENSE_PLATE != ''">
             and f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%')
         </if>

src/main/resources/mybatis/datasource/operations/OperationsMapper.xml

@@ -257,4 +257,52 @@
         ORDER BY f.CREATTIME DESC
     </select>
 
+    <select id="datalistPage2" parameterType="page" resultType="pd">
+        select
+        b.NAME,
+        f.*,
+        case when f.DUE_DATE &lt; NOW() then 0 else 1 end as DUE_DATE_TYPE,
+        v1.PLATE_NUMBER,
+        v1.TRAFFIC_TYPE
+        from
+        <include refid="tableName"></include> f
+        left join sys_dictionaries b on b.DICTIONARIES_ID=f.CYCLE AND b.PARENT_ID='8b7dea3977fd4360a3cc8112368b90ff'
+        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')
+        <if test="pd.BASICINFO_LICENSE_PLATE != null and pd.BASICINFO_LICENSE_PLATE != ''">
+            and f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%')
+        </if>
+        <if test="pd.CAR_OWNERS != null and pd.CAR_OWNERS != ''">
+            and f.CAR_OWNERS LIKE CONCAT(CONCAT('%', #{pd.CAR_OWNERS}),'%')
+        </if>
+        <if test="pd.REGISTRANT != null and pd.REGISTRANT != ''">
+            and f.REGISTRANT LIKE CONCAT(CONCAT('%', #{pd.REGISTRANT}),'%')
+        </if>
+        <if test="pd.DUE_DATE != null and pd.DUE_DATE != ''">
+            and f.DUE_DATE = #{pd.DUE_DATE}
+        </if>
+        <if test="pd.VEHICLE_MODEL != null and pd.VEHICLE_MODEL != ''">
+            and f.VEHICLE_MODEL LIKE CONCAT(CONCAT('%', #{pd.VEHICLE_MODEL}),'%')
+        </if>
+        <if test="pd.REMINDER_STATUS != null and pd.REMINDER_STATUS != ''">
+            and f.REMINDER_STATUS = #{pd.REMINDER_STATUS}
+        </if>
+        <if test="pd.PLATE_NUMBER != null and pd.PLATE_NUMBER != ''">
+            and v1.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%')
+        </if>
+        <if test="pd.DUE_DATE_TYPE != null and pd.DUE_DATE_TYPE != ''">
+            -- 添加条件：只有当当前时间（NOW()）处于提醒时间段内时，才会返回相应的记录。
+            -- 提醒时间段是由两个日期定义的：
+            -- 1. 提前提醒的日期，即从DUE_DATE字段指定的到期日期减去REMINDER_DAYS字段指定的天数。
+            -- 2. 到期日期（DUE_DATE字段）本身。
+            -- DATE_SUB函数用于计算提前提醒的日期。它从到期日期中减去一定天数，以得到提醒开始的日期。
+            -- DATE_SUB的第一个参数是到期日期（f.DUE_DATE），
+            -- 第二个参数INTERVAL f.REMINDER_DAYS DAY指定从到期日期向前推算的天数（f.REMINDER_DAYS字段的值）
+            and NOW() BETWEEN DATE_SUB(f.DUE_DATE, INTERVAL f.REMINDER_DAYS DAY) AND f.DUE_DATE
+        </if>
+        ORDER BY f.CREATTIME DESC
+    </select>
+
 </mapper>

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}
 	</update>

src/main/resources/mybatis/datasource/system/UserInfoMapper.xml

@@ -306,10 +306,39 @@
 		update
 		<include refid="tableName"></include>
 		set
-		PERSONNEL_TYPE = #{PERSONNEL_TYPE},
+		<if test="POLITICAL_OUTLOOK != null and POLITICAL_OUTLOOK != ''">
-		DEGREE_OF_EDUCATION = #{DEGREE_OF_EDUCATION},
+			POLITICAL_OUTLOOK = #{POLITICAL_OUTLOOK},
-		POLITICAL_OUTLOOK = #{POLITICAL_OUTLOOK},
+		</if>
-		WORKING_DATE = #{WORKING_DATE},
+		<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}

src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml

@@ -403,17 +403,11 @@
 	<!-- 列表(全部) -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		SELECT
-		f.*,
+		f.*
-		CASE
-		WHEN btsm.PLATE_NUMBER IS NOT NULL THEN '1'
-		WHEN bta.RAW_PLATE_NUMBER IS NOT NULL THEN '2'
-		ELSE '0'
-		END AS NEW_ARCHIVES_TYPE
 		FROM
 		<include refid="tableName"></include> f
-		LEFT JOIN BUS_TRAFFIC_SCRAP_MANAGEMENT btsm ON f.PLATE_NUMBER = btsm.PLATE_NUMBER
+		LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.FREIGHTTRAILER_ID
-		LEFT JOIN BUS_TRAFFIC_ASSIGNED bta ON f.PLATE_NUMBER = bta.RAW_PLATE_NUMBER
+		WHERE f.ISDELETE = '0' AND btmf.ISSCRAP = '0'
-		WHERE f.ISDELETE = '0'
 		<if test="pd.PLATE_NUMBER != null and pd.PLATE_NUMBER != ''">
 			AND f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}), '%')
 		</if>

src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml

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

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}

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
-        <if test="pd.STUDENTNAME != null and pd.STUDENTNAME != ''">
+        <if test="pd.NAME != null and pd.NAME != ''">
-            and bs.NAME LIKE CONCAT(CONCAT('%', #{pd.STUDENTNAME}),'%')
+            and bs.NAME LIKE CONCAT(CONCAT('%', #{pd.NAME}),'%')
         </if>
         <if test="pd.YEAR != null and pd.YEAR != ''">
             and f.CREATTIME LIKE CONCAT(#{pd.YEAR},'%')

src/main/resources/mybatis/dsno3/eduStudy/CurriculumMapper.xml

@@ -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>
 
     <!-- 列表(全部) -->

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,

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
         <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 SYS_DICTIONARIES_CORP 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 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>

src/main/resources/mybatis/dsno3/eduStudy/VideoCoursewareMapper.xml

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