src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java

@@ -1,6 +1,5 @@
 package com.zcloud.controller.assignedManage;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
@@ -9,15 +8,12 @@ import com.zcloud.service.freighttrailer.FreightTrailerService;
 import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
 import com.zcloud.service.system.ImgFilesService;
 import com.zcloud.util.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/assignedmanage")
@@ -199,6 +195,7 @@ public class AssignedManageController extends BaseController {
         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);
@@ -258,26 +255,40 @@ public class AssignedManageController extends BaseController {
         PageData pd = new PageData();
         String corpId = Jurisdiction.getCORPINFO_ID();
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
-        List<PageData> allOperatingVehicleList = operatingVehiclesService.getPulldownVehicleList(pd);   // 查询出所有不包括 删除、报废的营运车辆
+        List<PageData> allOperatingVehicleList = operatingVehiclesService.getPulldownVehicleList(pd);   // 查询出所有不包括 删除、报废的车辆
         List<PageData> allAssignedList = assignedManageService.assignedList(corpId); // 所有过户的车辆
-        List<PageData> varList = new ArrayList<>();
+        for (int i = 0; i < allAssignedList.size(); i++) {
-        if(!CollectionUtil.isEmpty(allAssignedList)) {
+            for (int j = 0; j < allOperatingVehicleList.size(); j++) {
-            varList = allOperatingVehicleList.stream().filter(operating -> {
+                if(allAssignedList.get(i).get("RAW_PLATE_NUMBER").equals(allOperatingVehicleList.get(j).get("OPERATING_ID"))) {
-                for (PageData assigned : allAssignedList) {
+                    allOperatingVehicleList.remove(j);
-                    if(!StringUtils.equals(operating.getString("OPERATING_ID"),assigned.getString("RAW_PLATE_NUMBER"))) {
-                        return true;
-                    }
                 }
-                return false;
+            }
-            }).collect(Collectors.toList());
-        }else{
-            varList = allOperatingVehicleList;
         }
-        map.put("varList", varList);
+        map.put("varList", allOperatingVehicleList);
         map.put("result", errInfo);
         return map;
     }
 
+    /*@RequestMapping(value = "/getassignedfreighttrailerlist")
+    @ResponseBody
+    public Object getAssignedFreightTrailerList() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        String corpId = Jurisdiction.getCORPINFO_ID();
+        List<PageData> freightList = freightTrailerService.trailerList(corpId);
+        List<PageData> assignedList = assignedManageService.assignedList(corpId);
+        for (int i = 0; i < assignedList.size(); i++) {
+            for (int j = 0; j < freightList.size(); j++) {
+                if(assignedList.get(i).get("RAW_PLATE_NUMBER").equals(freightList.get(j).get("PLATE_NUMBER"))) {
+                    freightList.remove(j);
+                }
+            }
+        }
+        map.put("varList", freightList);
+        map.put("result", errInfo);
+        return map;
+    }*/
+
     @RequestMapping(value = "/getAssignedFreightTrailerList")
     @ResponseBody
     public Object getAssignedFreightTrailerList() throws Exception {
@@ -286,20 +297,14 @@ public class AssignedManageController extends BaseController {
         String corpId = Jurisdiction.getCORPINFO_ID();
         List<PageData> freightList = freightTrailerService.getPulldownVehicleList(corpId);
         List<PageData> assignedList = assignedManageService.assignedList(corpId);
-        List<PageData> varList = new ArrayList<>();
+        for (int i = 0; i < assignedList.size(); i++) {
-        if(!CollectionUtils.isEmpty(assignedList)) {
+            for (int j = 0; j < freightList.size(); j++) {
-            varList = freightList.stream().filter(freight -> {
+                if(assignedList.get(i).get("RAW_PLATE_NUMBER").equals(freightList.get(j).get("FREIGHTTRAILER_ID"))) {
-                for (PageData assigned : assignedList) {
+                    freightList.remove(j);
-                    if(!StringUtils.equals(freight.getString("FREIGHTTRAILER_ID"),assigned.getString("RAW_PLATE_NUMBER"))) {
-                        return true;
-                    }
                 }
-                return false;
+            }
-            }).collect(Collectors.toList());
-        }else {
-            varList = freightList;
         }
-        map.put("varList", varList);
+        map.put("varList", freightList);
         map.put("result", errInfo);
         return map;
     }

src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java

@@ -125,5 +125,4 @@ public class TrafficDrivingTypeController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
-
 }

src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java

@@ -1,6 +1,5 @@
 package com.zcloud.controller.comprehensive;
 
-import com.alibaba.excel.util.DateUtils;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
@@ -59,8 +58,7 @@ public class TrafficSafetyActivitiesController extends BaseController {
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-            //String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-            String fileName = file.getOriginalFilename();
             smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
             pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
@@ -87,13 +85,6 @@ public class TrafficSafetyActivitiesController extends BaseController {
         pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
         pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
         pd.put("ISDELETE", "0");
-
-        if(!StringUtils.isEmpty(pd.getString("EXPIRYDATE")) && DateUtil.compareDate(pd.getString("EXPIRYDATE"),DateUtil.getDay())) {
-            pd.put("VALIDSTATUS","1");
-        } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("EXPIRYDATE"))) {
-            pd.put("VALIDSTATUS","0");
-        }
-
         String ffile = DateUtil.getDays();
 
         if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
@@ -105,7 +96,7 @@ public class TrafficSafetyActivitiesController extends BaseController {
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-            String fileName = file.getOriginalFilename();
+            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
             smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
             pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
@@ -147,13 +138,6 @@ public class TrafficSafetyActivitiesController extends BaseController {
 
         page.setPd(pd);
         List<PageData> varList = activeService.listForSafetyActivitieslist(page);
-        varList.forEach(active -> {
-            if(DateUtil.getDay().equals(active.getString("EXPIRYDATE")) || DateUtil.compareDate(active.getString("EXPIRYDATE"),DateUtil.getDay())){
-                active.put("VALIDSTATUS","1");
-            } else if (DateUtil.compareDate(DateUtil.getDay(),active.getString("EXPIRYDATE"))) {
-                active.put("VALIDSTATUS","0");
-            }
-        });
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java

@@ -87,7 +87,6 @@ public class TrafficSafetyAssessmentController extends BaseController {
         pd.put("ISDELETE", "0");
         String ffile = DateUtil.getDays();
 
-
         if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
             pd.put("COMPLETIONSTATUS", "1");
             String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@@ -97,16 +96,13 @@ public class TrafficSafetyAssessmentController extends BaseController {
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-//            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-            String fileName = file.getOriginalFilename();
             smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
             pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
             pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
         }
 
-
-
         safetyAssessmentService.edit(pd);
 
         map.put("result", errInfo);
@@ -142,13 +138,6 @@ public class TrafficSafetyAssessmentController extends BaseController {
 
         page.setPd(pd);
         List<PageData> varList = safetyAssessmentService.listForSafetyAssessment(page);
-        varList.forEach(safetyAssessment -> {
-            if(DateUtil.getDay().equals(safetyAssessment.get("EXPIRYDATE")) || DateUtil.compareDate(safetyAssessment.getString("EXPIRYDATE"),DateUtil.getDay())) {
-                safetyAssessment.put("VALIDSTATUS","1");
-            } else if (DateUtil.compareDate(DateUtil.getDay(),safetyAssessment.getString("EXPIRYDATE"))) {
-                safetyAssessment.put("VALIDSTATUS","0");
-            }
-        });
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java

@@ -57,8 +57,7 @@ public class TrafficSafetyManualController extends BaseController {
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-            //String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-            String fileName = file.getOriginalFilename();
             smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
             pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
@@ -85,14 +84,6 @@ public class TrafficSafetyManualController extends BaseController {
         pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
         pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
         pd.put("ISDELETE", "0");
-
-
-        if(!StringUtils.isEmpty(pd.getString("EXPIRYDATE")) && DateUtil.compareDate(pd.getString("EXPIRYDATE"),DateUtil.getDay())) {
-            pd.put("VALIDSTATUS","1");
-        } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("EXPIRYDATE"))) {
-            pd.put("VALIDSTATUS","0");
-        }
-
         String ffile = DateUtil.getDays();
 
         if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
@@ -104,8 +95,7 @@ public class TrafficSafetyManualController extends BaseController {
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-            //String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-            String fileName = file.getOriginalFilename();
             smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
             pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
@@ -147,13 +137,6 @@ public class TrafficSafetyManualController extends BaseController {
 
         page.setPd(pd);
         List<PageData> varList = safetyManualService.listForSafetyManuallist(page);
-        varList.forEach(manual -> {
-            if(DateUtil.getDay().equals(manual.getString("EXPIRYDATE")) || DateUtil.compareDate(manual.getString("EXPIRYDATE"),DateUtil.getDay())){
-                manual.put("VALIDSTATUS","1");
-            } else if (DateUtil.compareDate(DateUtil.getDay(),manual.getString("EXPIRYDATE"))) {
-                manual.put("VALIDSTATUS","0");
-            }
-        });
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java

@@ -68,14 +68,14 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController {
             pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
         }
 
-        /*page.setPd(pd);
+        page.setPd(pd);
         List<PageData> varList = occupationalHazardsService.listForSafetyOccupationalHazardsUser(page);
         if (!varList.isEmpty()){
             for(PageData varPd : varList){
                 varPd.put("VALIDSTATUS", "2");
                 occupationalHazardsService.edit(varPd);
             }
-        }*/
+        }
         occupationalHazardsService.save(pd);
 
         map.put("result", errInfo);
@@ -97,14 +97,8 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController {
         pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
         pd.put("ISDELETE", "0");
         pd.put("COMPLETIONSTATUS", "1");
+        pd.put("VALIDSTATUS", "1");
         pd.put("ISSIGNED", "1");
-
-        if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) {
-            pd.put("VALIDSTATUS", "0");
-        } else {
-            pd.put("VALIDSTATUS", "1");
-        }
-
         String ffile = DateUtil.getDays();
 
         if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
@@ -161,8 +155,6 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController {
         if (Tools.notEmpty(ISSIGNED))
             pd.put("ISSIGNED", ISSIGNED.trim());
 
-        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
-
         page.setPd(pd);
         List<PageData> varList = occupationalHazardsService.listForSecurityOccupationalHazards(page);
         map.put("varList", varList);
@@ -187,15 +179,6 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController {
 
         page.setPd(pd);
         List<PageData> varList = occupationalHazardsService.listForSafetyOccupationalHazardsUser(page);
-        varList.forEach(occupational -> {
-            if(DateUtil.getDay().equals(occupational.getString("EXPIRYDATE"))) {
-                occupational.put("VALIDSTATUS", "1");
-            } else if(DateUtil.compareDate(DateUtil.getDay(), occupational.getString("EXPIRYDATE"))) {
-                occupational.put("VALIDSTATUS", "2");
-            }else{
-                occupational.put("VALIDSTATUS", "1");
-            }
-        });
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);
@@ -235,18 +218,4 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
-
-
-    @RequestMapping(value="/getSafetyOccupationalHazardsEdit")
-    @ResponseBody
-    public Object getSafetyOccupationalHazardsEdit() throws Exception{
-        Map<String,Object> map = new HashMap<String,Object>();
-        String errInfo = "success";
-        PageData pd = new PageData();
-        pd = this.getPageData();
-        List<PageData> varList = occupationalHazardsService.getSafetyOccupationalHazardsEdit(pd);	//根据ID读取
-        map.put("varList", varList);
-        map.put("result", errInfo);
-        return map;
-    }
 }

src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java

@@ -42,7 +42,7 @@ public class TrafficSafetyProductionController extends BaseController {
         pd.put("ISDELETE", "0");
 
         if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) {
-            pd.put("VALIDSTATUS", "2");
+            pd.put("VALIDSTATUS", "0");
         } else {
             pd.put("VALIDSTATUS", "1");
         }
@@ -57,16 +57,11 @@ public class TrafficSafetyProductionController extends BaseController {
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-            String fileName = file.getOriginalFilename();
+            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
             smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
             pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
             pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
-            /*String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-            smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
-            pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
-            pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
-            pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));*/
         }
 
         safetyProductionService.save(pd);
@@ -89,13 +84,6 @@ public class TrafficSafetyProductionController extends BaseController {
         pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
         pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
         pd.put("ISDELETE", "0");
-
-        if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) {
-            pd.put("VALIDSTATUS", "2");
-        } else {
-            pd.put("VALIDSTATUS", "1");
-        }
-
         String ffile = DateUtil.getDays();
 
         if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
@@ -107,8 +95,7 @@ public class TrafficSafetyProductionController extends BaseController {
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-//            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-            String fileName = file.getOriginalFilename();
             smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
             pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
@@ -150,15 +137,6 @@ public class TrafficSafetyProductionController extends BaseController {
 
         page.setPd(pd);
         List<PageData> varList = safetyProductionService.listForSafetyProductionlist(page);
-        varList.forEach(safetyProduction -> {
-            if(DateUtil.getDay().equals(safetyProduction.getString("EXPIRYDATE"))) {
-                safetyProduction.put("VALIDSTATUS", "1");
-            } else if(DateUtil.compareDate(DateUtil.getDay(), safetyProduction.getString("EXPIRYDATE"))) {
-                safetyProduction.put("VALIDSTATUS", "2");
-            }else{
-                safetyProduction.put("VALIDSTATUS", "1");
-            }
-        });
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);
@@ -198,18 +176,4 @@ public class TrafficSafetyProductionController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
-
-
-    @RequestMapping(value="/getSafetyProductionEdit")
-    @ResponseBody
-    public Object getSafetyProductionEdit() throws Exception{
-        Map<String,Object> map = new HashMap<String,Object>();
-        String errInfo = "success";
-        PageData pd = new PageData();
-        pd = this.getPageData();
-        List<PageData> varList = safetyProductionService.getSafetyProductionEdit(pd);	//根据ID读取
-        map.put("varList", varList);
-        map.put("result", errInfo);
-        return map;
-    }
 }

src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java

@@ -66,14 +66,14 @@ public class TrafficSafetyResponsibilityController extends BaseController {
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
             pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
         }
-        /*page.setPd(pd);
+        page.setPd(pd);
         List<PageData> varList = responseService.listForSafetyResponsibilityUser(page);
         if (!varList.isEmpty()){
             for(PageData varPd : varList){
                 varPd.put("VALIDSTATUS", "2");
                 responseService.edit(varPd);
             }
-        }*/
+        }
         responseService.save(pd);
 
         map.put("result", errInfo);
@@ -93,12 +93,6 @@ public class TrafficSafetyResponsibilityController extends BaseController {
         pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名
         pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
         pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
-
-        if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) {
-            pd.put("VALIDSTATUS", "0");
-        } else {
-            pd.put("VALIDSTATUS", "1");
-        }
         String ffile = DateUtil.getDays();
 
         if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
@@ -155,8 +149,6 @@ public class TrafficSafetyResponsibilityController extends BaseController {
         if (Tools.notEmpty(ISSIGNED))
             pd.put("ISSIGNED", ISSIGNED.trim());
 
-        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
-
         page.setPd(pd);
         List<PageData> varList = responseService.listForSecurityResponsibility(page);
         map.put("varList", varList);
@@ -195,15 +187,6 @@ public class TrafficSafetyResponsibilityController extends BaseController {
 
         page.setPd(pd);
         List<PageData> varList = responseService.listForSafetyResponsibilityUser(page);
-        varList.forEach(response -> {
-            if(DateUtil.getDay().equals(response.getString("EXPIRYDATE"))) {
-                response.put("VALIDSTATUS", "1");
-            } else if(DateUtil.compareDate(DateUtil.getDay(), response.getString("EXPIRYDATE"))) {
-                response.put("VALIDSTATUS", "2");
-            }else{
-                response.put("VALIDSTATUS", "1");
-            }
-        });
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java

@@ -66,6 +66,14 @@ public class TrafficSecurityCommitmentController extends BaseController {
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
             pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
         }
+        page.setPd(pd);
+        List<PageData> varList = securityCommitmentService.listForSecurityCommitmentUser(page);
+        if (!varList.isEmpty()){
+            for(PageData varPd : varList){
+                varPd.put("VALIDSTATUS", "2");
+                securityCommitmentService.edit(varPd);
+            }
+        }
         securityCommitmentService.save(pd);
         map.put("result", errInfo);
         map.put("pd", pd);
@@ -147,8 +155,6 @@ public class TrafficSecurityCommitmentController extends BaseController {
         if (Tools.notEmpty(ISSIGNED))
             pd.put("ISSIGNED", ISSIGNED.trim());
 
-        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
-
         page.setPd(pd);
         List<PageData> varList = securityCommitmentService.listForSecurityCommitment(page);
         map.put("varList", varList);
@@ -173,9 +179,7 @@ public class TrafficSecurityCommitmentController extends BaseController {
         page.setPd(pd);
         List<PageData> varList = securityCommitmentService.listForSecurityCommitmentUser(page);
         varList.forEach(securityCommitment -> {
-            if(DateUtil.getDay().equals(securityCommitment.getString("EXPIRYDATE"))) {
+            if(DateUtil.compareDate(DateUtil.getDay(), securityCommitment.getString("EXPIRYDATE"))) {
-                securityCommitment.put("VALIDSTATUS", "1");
-            } else if(DateUtil.compareDate(DateUtil.getDay(), securityCommitment.getString("EXPIRYDATE"))) {
                 securityCommitment.put("VALIDSTATUS", "2");
             }else{
                 securityCommitment.put("VALIDSTATUS", "1");

src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java

@@ -140,15 +140,6 @@ public class TrafficSecurityManagementAgreementController extends BaseController
 
         page.setPd(pd);
         List<PageData> varList = managementAgreementService.listForManagementAgreementlist(page);
-        varList.forEach(data -> {
-            if(DateUtil.getDay().equals(data.getString("EXPIRYDATE"))) {
-                data.put("VALIDSTATUS","1");
-            } else if(DateUtil.compareDate( DateUtil.getDay(),data.getString("EXPIRYDATE")) ) {
-                data.put("VALIDSTATUS","0");
-            } else if (DateUtil.compareDate( data.getString("EXPIRYDATE"),DateUtil.getDay()) || DateUtil.getDay().equals(data.getString("EXPIRYDATE"))) {
-                data.put("VALIDSTATUS","1");
-            }
-        });
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java

@@ -13,7 +13,6 @@ import com.zcloud.util.Jurisdiction;
 import com.zcloud.util.ObjectExcelView;
 import com.zcloud.util.Tools;
 import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +20,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 年检管理
@@ -159,13 +157,11 @@ public class InspectAnnuallyController extends BaseController {
         pd = this.getPageData();
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
         page.setPd(pd);
-        List<PageData> varList = inspectAnnuallyService.list(page);    //列出年检列表
+        List<PageData> varList = inspectAnnuallyService.list(page);    //列出Question列表
         varList.forEach(inspectAnnually -> {
-            boolean isScrapFlag = varList.stream().anyMatch(data -> "1".equals(inspectAnnually.get("OPEAR_ISSCRAP")) || "1".equals(inspectAnnually.get("FREIGHT_ISSCRAP")));
+            if("1".equals(inspectAnnually.get("OPEAR_ISSCRAP")) || "1".equals(inspectAnnually.get("FREIGHT_ISSCRAP"))) {
-            boolean isAssignedFlag = varList.stream().anyMatch(data -> "1".equals(inspectAnnually.get("OPEAR_ISASSIGNED")) || "1".equals(inspectAnnually.get("FREIGHT_ISASSIGNED")));
-            if(isScrapFlag) {
                 inspectAnnually.put("ARCHIVES_TYPE","2");
-            } else if (isAssignedFlag) {
+            } else if ("1".equals(inspectAnnually.get("OPEAR_ISASSIGNED")) || "1".equals(inspectAnnually.get("FREIGHT_ISASSIGNED"))) {
                 inspectAnnually.put("ARCHIVES_TYPE","1");
             }
         });

src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java

@@ -166,7 +166,7 @@ public class OperatingVehiclesController extends BaseController {
         List<PageData> headstockphoto = imgfilesService.listAll(pd);//车头照片
         pd.put("TYPE",121);
         List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
-        pd.put("TYPE",122);
+        pd.put("TYPE",132);
         List<PageData> operatingcertificatephoto = imgfilesService.listAll(pd);//运营证照片
 
         List<PageData> zdepartmentPdList = new ArrayList<PageData>();

src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java

@@ -9,8 +9,6 @@ import com.zcloud.service.freighttrailer.FreightTrailerService;
 import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
 import com.zcloud.service.scrapManage.ScrapManageService;
 import com.zcloud.util.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.ObjectUtils;
@@ -19,8 +17,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.*;
+import java.util.Date;
-import java.util.stream.Collectors;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/scrapmanage")
@@ -211,24 +211,38 @@ public class ScrapManageController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         List<PageData> operationList = operatingVehiclesService.getScrapPulldownVehicleList(pd);    //列出Question列表
         List<PageData> scrapList = scrapManageService.scrapListAll(corpId);
-        List<PageData> varList = new ArrayList<>();
+        for (int i = 0; i < scrapList.size(); i++) {
-        if(!CollectionUtils.isEmpty(scrapList)) {
+            for (int j = 0; j < operationList.size(); j++) {
-            varList = operationList.stream().filter(operation -> {
+                if(scrapList.get(i).get("PLATE_NUMBER").equals(operationList.get(j).get("PLATE_NUMBER"))) {
-                for (PageData scrap : scrapList) {
+                    operationList.remove(j);
-                    if(StringUtils.equals(operation.getString("PLATE_NUMBER"),scrap.getString("PLATE_NUMBER"))) {
-                        return true;
-                    }
                 }
-                return false;
+            }
-            }).collect(Collectors.toList());
-        }else {
-            varList = operationList;
         }
-        map.put("varList", varList);
+        map.put("varList", operationList);
         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);
+        List<PageData> scrapList = scrapManageService.scrapListAll(corpId);
+        for (int i = 0; i < scrapList.size(); i++) {
+            for (int j = 0; j < freightList.size(); j++) {
+                if(scrapList.get(i).get("PLATE_NUMBER").equals(freightList.get(j).get("PLATE_NUMBER"))) {
+                    freightList.remove(j);
+                }
+            }
+        }
+        map.put("varList", freightList);
+        map.put("result", errInfo);
+        return map;
+    }*/
+
     @RequestMapping(value = "/getScrapFreightTrailerList")
     @ResponseBody
     public Object getAssignedFreightTrailerList() throws Exception {
@@ -237,20 +251,14 @@ public class ScrapManageController extends BaseController {
         String corpId = Jurisdiction.getCORPINFO_ID();
         List<PageData> freightList = freightTrailerService.getScrapPulldownVehicleList(corpId);
         List<PageData> scrapList = scrapManageService.scrapListAll(corpId);
-        List<PageData> varList = new ArrayList<>();
+        for (int i = 0; i < scrapList.size(); i++) {
-        if(!CollectionUtils.isEmpty(scrapList)) {
+            for (int j = 0; j < freightList.size(); j++) {
-            varList = freightList.stream().filter(freight -> {
+                if(scrapList.get(i).get("PLATE_NUMBER").equals(freightList.get(j).get("PLATE_NUMBER"))) {
-                for (PageData scrap : scrapList) {
+                    freightList.remove(j);
-                    if(StringUtils.equals(freight.getString("PLATE_NUMBER"),scrap.getString("PLATE_NUMBER"))){
-                        return true;
-                    }
                 }
-                return false;
+            }
-            }).collect(Collectors.toList());
-        }else{
-            varList = freightList;
         }
-        map.put("varList", varList);
+        map.put("varList", freightList);
         map.put("result", errInfo);
         return map;
     }

src/main/java/com/zcloud/controller/system/UsersController.java

@@ -2984,35 +2984,4 @@ public class UsersController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
-
-
-
-    @RequestMapping("/getTrafficPenaltyUserList")
-    @ResponseBody
-    public Object getTrafficPenaltyUserList(Page page) throws Exception {
-        Map<String, Object> map = new HashMap<String, Object>();
-        String errInfo = "success";
-        PageData pd = new PageData();
-        pd = this.getPageData();
-
-        /*检索条件*/
-        String ROLE_ID = pd.getString("ROLE_ID");                        //角色ID
-        String KEYWORDS = pd.getString("KEYWORDS");                        //关键词检索条件
-        if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
-        String DEPARTMENT_ID = pd.getString("DEPARTMENT_ID");                        //关键词检索条件
-        if (Tools.notEmpty(DEPARTMENT_ID)) pd.put("DEPARTMENT_ID", DEPARTMENT_ID.trim());
-        String STARTTIME = pd.getString("STARTTIME");                    //开始时间
-        String ENDTIME = pd.getString("ENDTIME");                        //结束时间
-        if (Tools.notEmpty(STARTTIME)) pd.put("STARTTIME", STARTTIME + " 00:00:00");
-        if (Tools.notEmpty(ENDTIME)) pd.put("ENDTIME", ENDTIME + " 00:00:00");
-        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
-        page.setPd(pd);
-        Object practitionerPage = this.getPractitionerPage(page);//列出用户列表
-        map.put("userList", practitionerPage);
-        map.put("page", page);
-        map.put("pd", pd);
-
-        map.put("result", errInfo);
-        return map;
-    }
 }

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.java

@@ -19,6 +19,4 @@ public interface TrafficSafetyOccupationalHazardsMapper {
     List<PageData> datalistPageUser(Page page);
 
     void delete(PageData pd);
-
-    List<PageData> getSafetyOccupationalHazardsEdit(PageData pd);
 }

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java

@@ -17,6 +17,4 @@ public interface TrafficSafetyProductionMapper {
     PageData findById(PageData pd);
 
     void delete(PageData pd);
-
-    List<PageData> getSafetyProductionEdit(PageData pd);
 }

src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java

@@ -297,5 +297,4 @@ public interface UsersMapper {
 	List<PageData> userSelectPersonTypelist(PageData pd);
 
 	PageData getUserByUserId(PageData pd);
-
 }

src/main/java/com/zcloud/service/comprehensive/TrafficDrivingTypeService.java

@@ -31,5 +31,4 @@ public interface TrafficDrivingTypeService {
     void delete(PageData pd);
 
     PageData findById(PageData pd) throws Exception;
-
 }

src/main/java/com/zcloud/service/comprehensive/TrafficSafetyOccupationalHazardsService.java

@@ -17,6 +17,4 @@ public interface TrafficSafetyOccupationalHazardsService {
     List<PageData> listForSafetyOccupationalHazardsUser(Page page);
 
     void delete(PageData pd);
-
-    List<PageData> getSafetyOccupationalHazardsEdit(PageData pd);
 }

src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java

@@ -15,6 +15,4 @@ public interface TrafficSafetyProductionService {
     PageData findById(PageData pd);
 
     void delete(PageData pd);
-
-    List<PageData> getSafetyProductionEdit(PageData pd);
 }

src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java

@@ -62,8 +62,6 @@ public class TrafficDrivingTypeServiceImpl implements TrafficDrivingTypeService
     public PageData findById(PageData pd) {
         return trafficDrivingTypeMapper.findById(pd);
     }
-
-
     @Autowired
     private TrafficDrivingSignMapper trafficDrivingSignMapper;
 

src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyOccupationalHazardsServiceImpl.java

@@ -43,9 +43,4 @@ public class TrafficSafetyOccupationalHazardsServiceImpl implements TrafficSafet
     public void delete(PageData pd) {
         occupationalHazardsMapper.delete(pd);
     }
-
-    @Override
-    public List<PageData> getSafetyOccupationalHazardsEdit(PageData pd) {
-        return occupationalHazardsMapper.getSafetyOccupationalHazardsEdit(pd);
-    }
 }

src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java

@@ -37,9 +37,4 @@ public class TrafficSafetyProductionServiceImpl implements TrafficSafetyProducti
     public void delete(PageData pd) {
         speedProductionMapper.delete(pd);
     }
-
-    @Override
-    public List<PageData> getSafetyProductionEdit(PageData pd) {
-        return speedProductionMapper.getSafetyProductionEdit(pd);
-    }
 }

src/main/java/com/zcloud/service/system/UsersService.java

@@ -370,5 +370,4 @@ public interface UsersService {
 	List<PageData> userSelectPersonTypelist(PageData pd);
 
 	PageData getUserByUserId(PageData pd);
-
 }

src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java

@@ -1340,5 +1340,4 @@ public class UsersServiceImpl implements UsersService {
         return usersMapper.getUserByUserId(pd);
     }
 
-
 }

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml

@@ -96,13 +96,9 @@
         OPERATOR = #{OPERATOR},
         OPERATORNAME = #{OPERATORNAME},
         OPERATTIME = #{OPERATTIME},
-        ACTIVITIESNAME = #{ACTIVITIESNAME},
         EXPIRYDATE = #{EXPIRYDATE},
         CYCLE = #{CYCLE},
         ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
-        <if test="VALIDSTATUS != null">
-            ,VALIDSTATUS = #{VALIDSTATUS}
-        </if>
         where
         ACTIVITIES_ID = #{ACTIVITIES_ID}
     </update>

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml

@@ -97,7 +97,7 @@
         OPERATORNAME = #{OPERATORNAME},
         OPERATTIME = #{OPERATTIME},
         EXPIRYDATE = #{EXPIRYDATE},
-        ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
+        ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE},
         <if test="VALIDSTATUS != null">
             ,VALIDSTATUS = #{VALIDSTATUS}
         </if>
@@ -135,7 +135,6 @@
         <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
             and f.VALIDSTATUS = #{pd.VALIDSTATUS}
         </if>
-        ORDER BY f.OPERATTIME DESC
     </select>
 
     <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml

@@ -93,12 +93,8 @@
         OPERATOR = #{OPERATOR},
         OPERATORNAME = #{OPERATORNAME},
         OPERATTIME = #{OPERATTIME},
-        MANUALNAME = #{MANUALNAME},
         EXPIRYDATE = #{EXPIRYDATE},
         ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
-        <if test="VALIDSTATUS != null">
-            ,VALIDSTATUS = #{VALIDSTATUS}
-        </if>
         where
         MANUAL_ID = #{MANUAL_ID}
     </update>

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.xml

@@ -141,7 +141,6 @@
                 left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID
                 left join BUS_TRAFFIC_OCCUPATIONAL_HAZARDS c on u.USER_ID = c.USER_ID and c.ISDELETE !='1'
         where u.ISDELETE = '0'
-        and u.CORPINFO_ID = #{pd.CORPINFO_ID}
           and u.ISMAIN != '1'
         and (c.VALIDSTATUS != '2' or c.VALIDSTATUS is null)
         <if test="pd.OCCUPATIONALNAME != null and pd.OCCUPATIONALNAME != ''"><!-- 关键词检索-名称 -->
@@ -178,34 +177,5 @@
         <if test="pd.USER_ID != null and pd.USER_ID != ''">
             and f.USER_ID = #{pd.USER_ID}
         </if>
-        ORDER BY f.OPERATTIME DESC
-    </select>
-
-
-    <!--列表-->
-    <select id="getSafetyOccupationalHazardsEdit" parameterType="page" resultType="pd">
-        select
-        u.NAME,
-        u.USER_ID,
-        i.CORP_NAME,
-        f.OCCUPATIONALNAME,
-        f.COMPLETIONSTATUS,
-        f.VALIDSTATUS,
-        f.EXPIRYDATE,
-        f.CONTENT,
-        f.CREATETIME,
-        f.OPERATTIME,
-        f.ATTACHMENT_ROUTE,
-        f.OCCUPATIONALHAZARDS_ID
-        from
-        <include refid="tableName"></include> f
-        left join sys_user u ON u.USER_ID = f.USER_ID and f.ISDELETE !='1'
-        left JOIN bus_corp_info i ON u.CORPINFO_ID = i.CORPINFO_ID
-        WHERE
-        u.ISDELETE = '0'
-        and (f.ISDELETE='0' or f.ISDELETE is null )
-        AND u.ISMAIN != '1'
-        AND ( f.VALIDSTATUS != '2' OR f.VALIDSTATUS IS NULL )
-        and f.OCCUPATIONALHAZARDS_ID = #{OCCUPATIONALHAZARDS_ID}
     </select>
 </mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml

@@ -96,7 +96,6 @@
         OPERATOR = #{OPERATOR},
         OPERATORNAME = #{OPERATORNAME},
         OPERATTIME = #{OPERATTIME},
-        EXPIRYDATE = #{EXPIRYDATE},
         ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
         where
         SAFETYPRODUCTION_ID = #{SAFETYPRODUCTION_ID}
@@ -132,7 +131,7 @@
         <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
             and f.VALIDSTATUS = #{pd.VALIDSTATUS}
         </if>
-        ORDER BY f.OPERATTIME DESC
+        ORDER BY f.CREATETIME DESC
     </select>
 
     <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
@@ -143,19 +142,4 @@
         where
         f.SAFETYPRODUCTION_ID = #{SAFETYPRODUCTION_ID}
     </select>
-
-
-    <!--列表-->
-    <select id="getSafetyProductionEdit" parameterType="page" resultType="pd">
-        select
-        f.*,
-        i.CORP_NAME
-        from
-        <include refid="tableName"></include> f
-        left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
-        WHERE
-        f.ISDELETE = '0'
-        AND f.VALIDSTATUS IS NOT NULL
-        and f.SAFETYPRODUCTION_ID = #{SAFETYPRODUCTION_ID}
-    </select>
 </mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml

@@ -141,7 +141,6 @@
                 left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID
                 left join BUS_TRAFFIC_SAFETY_RESPONSIBILITY c on u.USER_ID = c.USER_ID and c.ISDELETE !='1'
         where u.ISDELETE = '0'
-        and u.CORPINFO_ID = #{pd.CORPINFO_ID}
           and u.ISMAIN != '1'
           and (c.VALIDSTATUS != '2' or c.VALIDSTATUS is null)
         <if test="pd.RESPONSIBILITYNAME != null and pd.RESPONSIBILITYNAME != ''"><!-- 关键词检索-制度名称 -->
@@ -178,7 +177,6 @@
         <if test="pd.USER_ID != null and pd.USER_ID != ''">
             and f.USER_ID = #{pd.USER_ID}
         </if>
-        ORDER BY f.OPERATTIME DESC
     </select>
 
     <!--列表-->

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml

@@ -112,7 +112,7 @@
             ,VALIDSTATUS = #{VALIDSTATUS}
         </if>
         where
-        SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID}
+            SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID}
     </update>
 
     <!-- 删除-->
@@ -149,7 +149,6 @@
         left JOIN BUS_TRAFFIC_SECURITY_COMMITMENT c ON u.USER_ID = c.USER_ID and c.ISDELETE !='1'
         WHERE
         u.ISDELETE = '0'
-        and u.CORPINFO_ID = #{pd.CORPINFO_ID}
         and (c.ISDELETE='0' or c.ISDELETE is null )
         AND u.ISMAIN != '1'
         AND ( c.VALIDSTATUS != '2' OR c.VALIDSTATUS IS NULL )
@@ -214,7 +213,7 @@
         u.ISDELETE = '0'
         and (f.ISDELETE='0' or f.ISDELETE is null )
         AND u.ISMAIN != '1'
-        AND f.VALIDSTATUS IS NOT NULL
+        AND ( f.VALIDSTATUS != '2' OR f.VALIDSTATUS IS NULL )
         and f.SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID}
         and f.USER_ID = #{USER_ID}
     </select>

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml

@@ -97,7 +97,6 @@
         OPERATOR = #{OPERATOR},
         OPERATORNAME = #{OPERATORNAME},
         OPERATTIME = #{OPERATTIME},
-        MANAGEMENTAGREEMENTNAME = #{MANAGEMENTAGREEMENTNAME},
         EXPIRYDATE = #{EXPIRYDATE},
         ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
         where

src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml

@@ -598,11 +598,10 @@
 		v.PLATE_NUMBER
 		from
 		<include refid="tableName"></include> f
-		LEFT JOIN v_traffic v on v.ID = f.OPERATING_ID
+		INNER JOIN v_traffic v on v.ID = f.OPERATING_ID
 		where
 		f.CORPINFO_ID = #{corpId}
-		AND (f.ISDELETE = '0' OR f.ISDELETE IS NULL)
+		and f.ISDELETE = '0' and f.ISSCRAP = '0'
-		AND (f.ISSCRAP = '0' OR f.ISSCRAP IS NULL)
 	</select>
 
 	<!-- 所属企业列表 -->

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

@@ -1838,5 +1838,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where
 		USER_ID = #{USER_ID}
 	</update>
-
 </mapper>