BUG优化

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

@@ -51,7 +51,7 @@ public class AssignedManageController extends BaseController {
         pd.put("ASSIGNED_ID", this.get32UUID());    //车船税主键
         pd.put("ISDELETE", "0");    //是否删除(0:有效 1：删除)
         pd.put("CREATOR", Jurisdiction.getUSER_ID());    //添加人id
-        pd.put("CREATORNAME", Jurisdiction.getUsername());    //添加人名字
+        pd.put("CREATORNAME", Jurisdiction.getName());    //添加人名字
         pd.put("CREATTIME", DateUtil.date2Str(new Date()));    //添加时间
         pd.put("ASSIGNED_DATE", pd.get("TRANSACTION_DATE"));
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
@@ -98,7 +98,7 @@ public class AssignedManageController extends BaseController {
         PageData pd = new PageData();
         pd = this.getPageData();
         pd.put("DELETOR", Jurisdiction.getUSER_ID());
-        pd.put("DELETORNAME", Jurisdiction.getUsername());
+        pd.put("DELETORNAME", Jurisdiction.getName());
         pd.put("DELETTIME", DateUtil.date2Str(new Date()));
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         PageData assignedInfo = new PageData();
@@ -145,15 +145,14 @@ public class AssignedManageController extends BaseController {
         pd = this.getPageData();
         pd.put("ISDELETE", "0");    //是否删除(0:有效 1：删除)
         pd.put("CREATOR", Jurisdiction.getUSER_ID());    //添加人id
-        pd.put("CREATORNAME", Jurisdiction.getUsername());    //添加人名字
+        pd.put("CREATORNAME", Jurisdiction.getName());    //添加人名字
         pd.put("CREATTIME", DateUtil.date2Str(new Date()));    //添加时间
         pd.put("OPERATOR", Jurisdiction.getUSER_ID());    //修改人id
-        pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
+        pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
         pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
         String expireDate = pd.getString("EXPIRE_DATE");
         String day = DateUtil.getDay();
-        boolean flag = DateUtil.compareDate(expireDate, day);
+        if (DateUtil.compareDate(expireDate, day)) {
-        if (flag) {
             pd.put("EXPIRE_STATUS", "expirestatus_01");
         } else {
             pd.put("EXPIRE_STATUS", "expirestatus_02");

src/main/java/com/zcloud/controller/beidou/BeidouController.java

@@ -213,14 +213,23 @@ public class BeidouController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
         page.setPd(pd);
         List<PageData> varList = beidouService.list(page);    //列出Question列表
-        for (PageData operation : varList) {
+
+        varList.stream().anyMatch(data -> {
+            if ("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) {
+                data.put("ARCHIVES_TYPE", "1");
+            } else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) {
+                data.put("ARCHIVES_TYPE", "2");
+            }
+            return false;
+        });
+        /*for (PageData operation : varList) {
             if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
                 operation.put("ARCHIVES_TYPE", "1");
             }
             if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
                 operation.put("ARCHIVES_TYPE", "2");
             }
-        }
+        }*/
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);
@@ -295,12 +304,15 @@ public class BeidouController extends BaseController {
             List<PageData> freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID"));
             page.setPd(pd);
             List<PageData> insAnnually = beidouService.list(page);
-            for (int i = 0; i < insAnnually.size(); i++) {
+
-                for (int j = 0; j < freightList.size(); j++) {
+            List<PageData> varList = new ArrayList<>();
-                    if(freightList.get(j).get("FREIGHTTRAILER_ID").equals(insAnnually.get(i).get("VEHICLE"))) {
+            if (!CollectionUtils.isEmpty(insAnnually)) {
-                        freightList.remove(j);
+                varList = freightList.stream().parallel()
-                    }
+                        .filter(freight -> insAnnually.stream()
-                }
+                                .noneMatch(ins -> StringUtils.equals(freight.getString("FREIGHTTRAILER_ID"), ins.getString("VEHICLE"))))
+                        .collect(Collectors.toList());
+            } else {
+                varList = freightList;
             }
             if (pd.containsKey("ID")) {
                 pd.put("FREIGHTTRAILER_ID", pd.getString("ID"));
@@ -309,10 +321,10 @@ public class BeidouController extends BaseController {
                 List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
                 map.put("drivingLicenseImgs", drivingLicenseImgs);
             }
-            freightList.forEach(freight -> {
+            varList.forEach(freight -> {
                 freight.put("ID", freight.getString("FREIGHTTRAILER_ID"));
             });
-            map.put("list", freightList);
+            map.put("list", varList);
             map.put("result", errInfo);
             return map;
         }

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

@@ -215,9 +215,9 @@ public class TrafficSafetyMeetingController extends BaseController {
         String PRACTITIONER = pd.getString("PRACTITIONER"); // 关键词检索条件
         if (Tools.notEmpty(PRACTITIONER))
             pd.put("PRACTITIONER", PRACTITIONER.trim());
-        String PRACTITIONERTYPE = pd.getString("PRACTITIONERTYPE"); // 关键词检索条件
+        String PRACTITIONERTYPE = pd.getString("PRACTITIONER_TYPE"); // 关键词检索条件
         if (Tools.notEmpty(PRACTITIONERTYPE))
-            pd.put("PRACTITIONERTYPE", PRACTITIONERTYPE.trim());
+            pd.put("PRACTITIONER_TYPE", PRACTITIONERTYPE.trim());
         String SIGNEDSTATUS = pd.getString("SIGNEDSTATUS"); // 关键词检索条件
         if (Tools.notEmpty(SIGNEDSTATUS))
             pd.put("SIGNEDSTATUS", SIGNEDSTATUS.trim());

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

@@ -26,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Controller
 @RequestMapping("/securitycustomer")

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

@@ -17,6 +17,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/managementagreement")
@@ -114,6 +115,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController
 
     /**
      * 列表
+     *
      * @param page
      * @return
      * @throws Exception
@@ -129,15 +131,15 @@ public class TrafficSecurityManagementAgreementController extends BaseController
 
         page.setPd(pd);
         List<PageData> varList = managementAgreementService.listForManagementAgreementlist(page);
-        varList.forEach(data -> {
+
-            if(DateUtil.getDay().equals(data.getString("EXPIRYDATE"))) {
+        /*varList.stream().anyMatch(data -> {
+            if (DateUtil.getDay().equals(data.getString("EXPIRYDATE")) || DateUtil.compareDate(data.getString("EXPIRYDATE"), DateUtil.getDay())) {
                 data.put("VALIDSTATUS", "1");
-            } else if(DateUtil.compareDate( DateUtil.getDay(),data.getString("EXPIRYDATE")) ) {
+            } else {
                 data.put("VALIDSTATUS", "0");
-            } else if (DateUtil.compareDate( data.getString("EXPIRYDATE"),DateUtil.getDay()) || DateUtil.getDay().equals(data.getString("EXPIRYDATE"))) {
-                data.put("VALIDSTATUS","1");
             }
-        });
+            return false;
+        });*/
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);
@@ -160,6 +162,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController
 
     /**
      * 删除
+     *
      * @return
      * @throws Exception
      */

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

@@ -25,8 +25,6 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
     @Autowired
     private TrafficSecurityViolationRegistrationService violationRegistrationService;
 
-    @Autowired
-    private UsersService usersService;
     @Autowired
     private Smb smb;
 
@@ -55,7 +53,7 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            String fileName = file.getOriginalFilename();
             smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
             pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
             pd.put("ATTACHMENT_NAME", pd.getString("CREATORNAME"));
@@ -86,7 +84,9 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
         return map;
     }
 
-    /**删除
+    /**
+     * 删除
+     *
      * @param
      * @throws Exception
      */
@@ -107,6 +107,7 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
 
     /**
      * 查看详情
+     *
      * @return
      * @throws Exception
      */
@@ -144,7 +145,7 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-            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"));

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

@@ -59,6 +59,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
 
     /**
      * 查看详情
+     *
      * @return
      * @throws Exception
      */
@@ -122,6 +123,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
 
     /**
      * 删除
+     *
      * @return
      * @throws Exception
      */
@@ -135,12 +137,15 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
         pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
         pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
         pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
+        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         trafficSecurityWaybillRegistrationService.delete(pd);
         map.put("result", errInfo);
         return map;
     }
 
-    /**批量删除
+    /**
+     * 批量删除
+     *
      * @param
      * @throws Exception
      */
@@ -159,6 +164,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
                 pd.put("WAYBILLREGISTRATION_ID", id);
                 pd.put("DELETORNAME", Jurisdiction.getName());//删除人
                 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
+                pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
                 trafficSecurityWaybillRegistrationService.delete(pd);
             }
             errInfo = "success";
@@ -178,14 +184,12 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
+        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         pd = trafficSecurityWaybillRegistrationService.findById(pd);//根据ID读
-        if("".equals(pd.getString("TRUCKCART")) || "undefined".equals(pd.getString("TRUCKCART")) || StringUtils.isEmpty(pd.getString("TRUCKCART"))) {
+
-            pd.put("TRUCKCART","");
-        }
         String[] dispatchers = pd.getString("DISPATCHER").split(",");
         List<PageData> names = new ArrayList<>();
         for (String dispatcher : dispatchers) {
-            // 通过 用户id获取用户名
             PageData user = new PageData();
             user.put("USER_ID", dispatcher.trim());
             PageData pageData1 = usersService.findById(user);

src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java

@@ -4,12 +4,8 @@ import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.service.enterpriseSafetyProduction.EnterpriseSafetyProductionService;
-import com.zcloud.service.freighttrailer.FreightTrailerService;
-import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
-import com.zcloud.service.scrapManage.ScrapManageService;
 import com.zcloud.util.DateUtil;
 import com.zcloud.util.Jurisdiction;
-import com.zcloud.util.Smb;
 import com.zcloud.util.Tools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -28,10 +24,9 @@ public class EnterpriseSafetyProductionController extends BaseController {
     @Autowired
     private EnterpriseSafetyProductionService enterpriseSafetyProductionService;
 
-    @Autowired
+    /**
-    private Smb smb;
+     * 新增
-
+     *
-    /**新增
      * @param
      * @throws Exception
      */
@@ -54,7 +49,9 @@ public class EnterpriseSafetyProductionController extends BaseController {
         return map;
     }
 
-    /**删除
+    /**
+     * 删除
+     *
      * @param
      * @throws Exception
      */
@@ -74,7 +71,9 @@ public class EnterpriseSafetyProductionController extends BaseController {
         return map;
     }
 
-    /**修改
+    /**
+     * 修改
+     *
      * @param
      * @throws Exception
      */
@@ -94,7 +93,10 @@ public class EnterpriseSafetyProductionController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
-    /**去修改页面获取数据
+
+    /**
+     * 去修改页面获取数据
+     *
      * @param
      * @throws Exception
      */

src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java

@@ -27,13 +27,12 @@ public class FirefightingEquipmentFacilityController extends BaseController {
     @Autowired
     private FirefightingEquipmentFacilityService firefightingEquipmentFacilityService;
 
-    @Autowired
-    private Smb smb;
-
     @Autowired
     private ImgFilesService imgfilesService;
 
-    /**新增
+    /**
+     * 新增
+     *
      * @param
      * @throws Exception
      */
@@ -56,7 +55,9 @@ public class FirefightingEquipmentFacilityController extends BaseController {
         return map;
     }
 
-    /**删除
+    /**
+     * 删除
+     *
      * @param
      * @throws Exception
      */
@@ -76,7 +77,9 @@ public class FirefightingEquipmentFacilityController extends BaseController {
         return map;
     }
 
-    /**修改
+    /**
+     * 修改
+     *
      * @param
      * @throws Exception
      */
@@ -96,7 +99,10 @@ public class FirefightingEquipmentFacilityController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
-    /**去修改页面获取数据
+
+    /**
+     * 去修改页面获取数据
+     *
      * @param
      * @throws Exception
      */

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

@@ -160,15 +160,16 @@ public class InspectAnnuallyController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
         page.setPd(pd);
         List<PageData> varList = inspectAnnuallyService.list(page);    //列出年检列表
-        varList.forEach(inspectAnnually -> {
+
-            boolean isScrapFlag = varList.stream().anyMatch(data -> "1".equals(inspectAnnually.get("OPEAR_ISSCRAP")) || "1".equals(inspectAnnually.get("FREIGHT_ISSCRAP")));
+        varList.stream().anyMatch(data -> {
-            boolean isAssignedFlag = varList.stream().anyMatch(data -> "1".equals(inspectAnnually.get("OPEAR_ISASSIGNED")) || "1".equals(inspectAnnually.get("FREIGHT_ISASSIGNED")));
+            if("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) {
-            if (isScrapFlag) {
+                data.put("ARCHIVES_TYPE", "2");
-                inspectAnnually.put("ARCHIVES_TYPE", "2");
+            } else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) {
-            } else if (isAssignedFlag) {
+                data.put("ARCHIVES_TYPE", "1");
-                inspectAnnually.put("ARCHIVES_TYPE", "1");
             }
+            return false;
         });
+
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

src/main/java/com/zcloud/controller/maintain/MaintainController.java

@@ -50,9 +50,6 @@ public class MaintainController extends BaseController {
         pd.put("CREATOR", Jurisdiction.getUSER_ID());	//添加人id
         pd.put("CREATORNAME", Jurisdiction.getUsername());	//添加人名字
         pd.put("CREATTIME", DateUtil.date2Str(new Date()));	//添加时间
-        pd.put("OPERATOR", Jurisdiction.getUSER_ID());	//修改人id
-        pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
-        pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
         maintainService.save(pd);
         map.put("pd", pd);
         map.put("result", errInfo);
@@ -71,7 +68,7 @@ public class MaintainController extends BaseController {
         PageData pd = new PageData();
         pd = this.getPageData();
         pd.put("DELETOR", Jurisdiction.getUSER_ID());
-        pd.put("DELETORNAME", Jurisdiction.getUsername());
+        pd.put("DELETORNAME", Jurisdiction.getName());
         pd.put("DELETTIME", DateUtil.date2Str(new Date()));
         maintainService.delete(pd);
         map.put("result", errInfo);				//返回结果
@@ -90,11 +87,8 @@ public class MaintainController extends BaseController {
         PageData pd = new PageData();
         pd = this.getPageData();
         pd.put("ISDELETE", "0");	//是否删除(0:有效 1：删除)
-        pd.put("CREATOR", Jurisdiction.getUSER_ID());	//添加人id
-        pd.put("CREATORNAME", Jurisdiction.getUsername());	//添加人名字
-        pd.put("CREATTIME", DateUtil.date2Str(new Date()));	//添加时间
         pd.put("OPERATOR", Jurisdiction.getUSER_ID());	//修改人id
-        pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
+        pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
         pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
         maintainService.edit(pd);
         map.put("pd", pd);

src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java

@@ -156,15 +156,18 @@ public class MaintenanceController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
         page.setPd(pd);
         List<PageData> varList = maintenanceService.list(page);    //列出Question列表
-        for (PageData operation : varList) {
+
-            if ("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
+        varList.stream().anyMatch(data -> {
-                operation.put("ARCHIVES_TYPE", "2");
+            if ("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) {
-            } else if ("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
+                data.put("ARCHIVES_TYPE", "2");
-                operation.put("ARCHIVES_TYPE", "1");
+            } else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) {
+                data.put("ARCHIVES_TYPE", "1");
             } else {
-                operation.put("ARCHIVES_TYPE", "0");
+                data.put("ARCHIVES_TYPE", "0");
-            }
             }
+            return false;
+        });
+
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);
@@ -238,14 +241,18 @@ public class MaintenanceController extends BaseController {
             // 货运挂车
             List<PageData> freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID"));
             page.setPd(pd);
-            List<PageData> insAnnually = maintenanceService.list(page);
+            List<PageData> maintenanceList = maintenanceService.list(page);
-            for (int i = 0; i < insAnnually.size(); i++) {
+
-                for (int j = 0; j < freightList.size(); j++) {
+            List<PageData> varList = new ArrayList<>();
-                    if(freightList.get(j).get("FREIGHTTRAILER_ID").equals(insAnnually.get(i).get("VEHICLE"))) {
+            if (!CollectionUtils.isEmpty(maintenanceList)) {
-                        freightList.remove(j);
+                varList = freightList.stream().parallel()
-                    }
+                        .filter(freight -> freightList.stream()
-                }
+                                .noneMatch(maintenance -> StringUtils.equals(freight.getString("FREIGHTTRAILER_ID"), maintenance.getString("VEHICLE"))))
+                        .collect(Collectors.toList());
+            } else {
+                varList = freightList;
             }
+
             if (pd.containsKey("ID")) {
                 pd.put("FREIGHTTRAILER_ID", pd.getString("ID"));
                 pd.put("FOREIGN_KEY", pd.getString("FREIGHTTRAILER_ID"));
@@ -253,10 +260,10 @@ public class MaintenanceController extends BaseController {
                 List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
                 map.put("drivingLicenseImgs", drivingLicenseImgs);
             }
-            freightList.forEach(freight -> {
+            varList.forEach(freight -> {
                 freight.put("ID", freight.getString("FREIGHTTRAILER_ID"));
             });
-            map.put("list", freightList);
+            map.put("list", varList);
             map.put("result", errInfo);
             return map;
         }

src/main/java/com/zcloud/controller/operations/OperationsController.java

@@ -156,14 +156,16 @@ public class OperationsController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
         page.setPd(pd);
         List<PageData> varList = operationsService.list(page);    //列出Question列表
-        for (PageData operation : varList) {
+
-            if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
+        varList.stream().anyMatch(data -> {
-                operation.put("ARCHIVES_TYPE", "2");
+            if("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) {
-            }
+                data.put("ARCHIVES_TYPE", "2");
-            if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
+            } else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) {
-                operation.put("ARCHIVES_TYPE", "1");
+                data.put("ARCHIVES_TYPE", "1");
-            }
             }
+            return false;
+        });
+
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

src/main/java/com/zcloud/controller/reportedIncident/ReportedIncidentController.java

@@ -30,11 +30,6 @@ public class ReportedIncidentController extends BaseController {
 
     @Autowired
     private ReportedIncidentService reportedIncidentService;
-    @Autowired
-    private ImgFilesService imgfilesService;
-
-    @Autowired
-    private ScrapManageService scrapManageService;
 
     /**
      * 新增

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

@@ -53,7 +53,7 @@ public class ScrapManageController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         pd.put("ISDELETE", "0");	//是否删除(0:有效 1：删除)
         pd.put("CREATOR", Jurisdiction.getUSER_ID());	//添加人id
-        pd.put("CREATORNAME", Jurisdiction.getUsername());	//添加人名字
+        pd.put("CREATORNAME", Jurisdiction.getName());	//添加人名字
         pd.put("CREATTIME", DateUtil.date2Str(new Date()));	//添加时间
         pd.put("ISSCRAP", "1");
         freightTrailerService.editScrapStatus(pd);
@@ -75,7 +75,7 @@ public class ScrapManageController extends BaseController {
         PageData pd = new PageData();
         pd = this.getPageData();
         pd.put("DELETOR", Jurisdiction.getUSER_ID());
-        pd.put("DELETORNAME", Jurisdiction.getUsername());
+        pd.put("DELETORNAME", Jurisdiction.getName());
         pd.put("DELETTIME", DateUtil.date2Str(new Date()));
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         PageData pageData = scrapManageService.findById(pd);
@@ -112,10 +112,10 @@ public class ScrapManageController extends BaseController {
         pd = this.getPageData();
         pd.put("ISDELETE", "0");	//是否删除(0:有效 1：删除)
         pd.put("CREATOR", Jurisdiction.getUSER_ID());	//添加人id
-        pd.put("CREATORNAME", Jurisdiction.getUsername());	//添加人名字
+        pd.put("CREATORNAME", Jurisdiction.getName());	//添加人名字
         pd.put("CREATTIME", DateUtil.date2Str(new Date()));	//添加时间
         pd.put("OPERATOR", Jurisdiction.getUSER_ID());	//修改人id
-        pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
+        pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
         pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
         scrapManageService.edit(pd);
         map.put("pd", pd);

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

@@ -32,12 +32,6 @@ public class TaxationManageController extends BaseController {
     @Autowired
     private TaxationManageService taxationManageService;
 
-    @Autowired
-    private Smb smb;
-
-    @Autowired
-    private AssignedManageService assignedManageService;
-
     @Autowired
     private FreightTrailerService freightTrailerService;
 
@@ -63,8 +57,7 @@ public class TaxationManageController extends BaseController {
         if ("".equals(pd.getString("EXPIRE_STATUS"))) {
             String expireDate = pd.getString("EXPIRE_DATE");
             String day = DateUtil.getDay();
-            boolean flag = DateUtil.compareDate(expireDate, day);
+            if (DateUtil.compareDate(expireDate, day)) {
-            if (flag) {
                 pd.put("EXPIRE_STATUS", "1");
             } else {
                 pd.put("EXPIRE_STATUS", "0");
@@ -159,15 +152,17 @@ public class TaxationManageController extends BaseController {
         if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         page.setPd(pd);
-        List<PageData> taxationList = taxationManageService.list(page);    //列出MajorDangerSource列表
+        List<PageData> varList = taxationManageService.list(page);    //列出MajorDangerSource列表
-        taxationList.forEach(taxation -> {
+
-            if ("1".equals(taxation.get("ISSCRAP"))) {
+        varList.stream().anyMatch(data -> {
-                taxation.put("ARCHIVES_TYPE", "1");
+            if ("1".equals(data.getString("ISSCRAP"))) {
-            } else if ("1".equals(taxation.get("ISASSIGNED"))) {
+                data.put("ARCHIVES_TYPE", "1");
-                taxation.put("ARCHIVES_TYPE", "2");
+            } else if ("1".equals(data.getString("ISASSIGNED"))) {
+                data.put("ARCHIVES_TYPE", "2");
             }
+            return false;
         });
-        map.put("varList", taxationList);
+        map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);
         return map;

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

@@ -153,7 +153,7 @@
             and u.NAME = #{pd.PRACTITIONER}
         </if>
         <if test="pd.PRACTITIONER_TYPE != null and pd.PRACTITIONER_TYPE != ''"><!-- 关键词检索-从业类型 -->
-            and f.PRACTITIONER_TYPE = #{pd.PRACTITIONER_TYPE}
+            and sd.BIANMA = #{pd.PRACTITIONER_TYPE}
         </if>
         <if test="pd.ATTENDANCE_STATUS != null and pd.ATTENDANCE_STATUS != ''"><!-- 关键词检索-参会状态 -->
             and f.ATTENDANCE_STATUS = #{pd.ATTENDANCE_STATUS}

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

@@ -153,6 +153,7 @@
         <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">
             and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS}
         </if>
+        GROUP BY u.NAME
         ORDER BY c.OPERATTIME DESC
     </select>
 

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

@@ -153,6 +153,7 @@
         <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
             and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS}
         </if>
+        GROUP BY u.NAME
         ORDER BY c.OPERATTIME DESC
     </select>
 

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

@@ -162,6 +162,8 @@
         <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">
             and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS}
         </if>
+        GROUP BY u.NAME
+        ORDER BY c.OPERATTIME DESC
     </select>
 
     <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">

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

@@ -134,6 +134,7 @@
         <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/TrafficSecurityViolationRegistrationMapper.xml

@@ -135,15 +135,16 @@
         u.PHONE
         from
         <include refid="tableName"></include> f
-        left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID
+        LEFT JOIN bus_corp_info i ON f.CORPINFO_ID = i.CORPINFO_ID
-        left join sys_user u on f.USER_ID = u.USER_ID
+        LEFT JOIN sys_user u ON f.USER_ID = u.USER_ID
-        where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+        WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{pd.CORPINFO_ID}
         <if test="pd.USER_ID != null and pd.USER_ID != ''">
-            and u.NAME LIKE CONCAT(CONCAT('%', #{pd.USER_ID}),'%')
+            AND u.NAME LIKE CONCAT(CONCAT('%', #{pd.USER_ID}),'%')
         </if>
         <if test="pd.PENALTYTIME != null and pd.PENALTYTIME != ''"><!-- 检索-处罚时间 -->
-            and f.PENALTYTIME = #{pd.PENALTYTIME}
+            AND f.PENALTYTIME = #{pd.PENALTYTIME}
         </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/TrafficSecurityWaybillRegistrationMapper.xml

@@ -145,6 +145,8 @@
         DELETETIME = #{DELETETIME}
         where
         WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID}
+        AND
+        CORPINFO_ID = #{CORPINFO_ID}
     </delete>
 
     <update id="edit" parameterType="pd">
@@ -220,7 +222,7 @@
             and f.WAYBILLSTATUS = #{pd.WAYBILLSTATUS}
         </if>
         <if test="pd.TRANSPORTVEHICLE != null and pd.TRANSPORTVEHICLE != ''"><!-- 关键词检索-车辆车牌 -->
-            and f.TRANSPORTVEHICLE = #{pd.TRANSPORTVEHICLE}
+            and f.TRANSPORTVEHICLE LIKE CONCAT(CONCAT('%', #{pd.TRANSPORTVEHICLE}),'%')
         </if>
         <if test="pd.USER_ID != null and pd.USER_ID != ''"><!-- 关键词检索-从业人员 -->
             and f.PRACTITIONER = #{pd.USER_ID}
@@ -271,6 +273,8 @@
          left join bus_traffic_customer_contact btcc2 on btcc2.CONTACT_ID = f.CONFIRMINGPERSON
         where
         f.WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID}
+        AND
+        f.CORPINFO_ID = #{CORPINFO_ID}
     </select>
 
 

src/main/resources/mybatis/datasource/equipmentFacility/EquipmentFacilityMapper.xml

@@ -350,6 +350,7 @@
 		<if test="pd.FACILITY_LOCALTION != null and pd.FACILITY_LOCALTION != ''"><!-- 关键词检索 -->
 			and f.FACILITY_LOCALTION LIKE CONCAT(CONCAT('%', #{pd.FACILITY_LOCALTION}),'%')
 		</if>
+		ORDER BY f.OPERATTIME DESC
 	</select>
 
 	<select id="listAll" parameterType="pd" resultType="pd">

src/main/resources/mybatis/datasource/firefightingEquipmentFacility/FirefightingEquipmentFacilityMapper.xml

@@ -350,7 +350,7 @@
 		<if test="pd.FACILITY_LOCALTION != null and pd.FACILITY_LOCALTION != ''"><!-- 关键词检索 -->
 			and f.FACILITY_LOCALTION LIKE CONCAT(CONCAT('%', #{pd.FACILITY_LOCALTION}),'%')
 		</if>
-		ORDER BY f.CREATTIME desc
+		ORDER BY f.OPERATTIME desc
 	</select>
 
 	<select id="listAll" parameterType="pd" resultType="pd">

src/main/resources/mybatis/datasource/labourEntrenchThing/LabourEntrenchThingMapper.xml

@@ -350,7 +350,7 @@
 		<if test="pd.PERSON_NAME != null and pd.PERSON_NAME != ''"><!-- 关键词检索 -->
 			and f.PERSON_NAME LIKE CONCAT(CONCAT('%', #{pd.PERSON_NAME}),'%')
 		</if>
-		ORDER BY f.CREATTIME desc
+		ORDER BY f.OPERATTIME desc
 	</select>
 
 	<select id="listAll" parameterType="pd" resultType="pd">

src/main/resources/mybatis/datasource/maintain/MaintainMapper.xml

@@ -345,6 +345,7 @@
 		f.ISDELETE = '0'
 		AND
 		f.PRODUCTIONFACILITY_ID = #{pd.PRODUCTIONFACILITY_ID}
+		ORDER BY f.OPERATTIME DESC
 	</select>
 
 

src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentPlanMapper.xml

@@ -145,7 +145,7 @@
 		<if test="pd.STATUS != null and pd.STATUS != ''"><!-- 关键词检索 -->
 			and f.STATUS = #{pd.STATUS}
 		</if>
-		order by f.PLAN_YEAR DESC, f.PLAN_PERIOD, f.STATUS = 0 desc, f.CREATTIME desc
+		order by f.PLAN_YEAR DESC, f.PLAN_PERIOD, f.STATUS = 0 desc, f.OPERATTIME desc
 	</select>
 
 	<!-- 列表(全部) -->
@@ -164,7 +164,7 @@
 			ISDELETE = '1'
 		where
 			SAFETYINVESTMENTPLAN_ID in
-		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
                  #{item}
 		</foreach>
 	</delete>

src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentUseMapper.xml

@@ -151,7 +151,7 @@
 			ISDELETE = '1'
 		where
 			SAFETYINVESTMENTUSE_ID in
-		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
                  #{item}
 		</foreach>
 	</delete>