From c9e097caaadf987c302ee349880a4b1786e6a65b Mon Sep 17 00:00:00 2001 From: xiepeng Date: Mon, 1 Apr 2024 10:46:03 +0800 Subject: [PATCH 01/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectAnnuallyController.java | 66 ++++---- .../OperatingVehiclesController.java | 156 ++++++++++++++++++ .../scrapManage/ScrapManageController.java | 1 + .../TaxationManageController.java | 7 +- .../OperatingVehiclesMapper.java | 2 + .../OperatingVehiclesService.java | 2 + .../impl/OperatingVehiclesServiceImpl.java | 5 + .../datasource/beidou/BeidouMapper.xml | 14 +- .../inspectAnnually/InspectAnnuallyMapper.xml | 18 +- .../datasource/insure/InsureMapper.xml | 4 +- .../OperatingVehiclesMapper.xml | 12 +- 11 files changed, 239 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java index d9d4545..8a84bc8 100644 --- a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java +++ b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java @@ -245,43 +245,45 @@ public class InspectAnnuallyController extends BaseController { } Map dataMap = new HashMap(); List titles = new ArrayList(); - titles.add("年检车辆"); //1 - titles.add("车架号"); //2 - //titles.add("车身编号"); //3 - titles.add("车辆类型"); //4 - titles.add("运营证号"); //5 - titles.add("归属部门"); //6 - titles.add("车主"); //7 - titles.add("车主电话"); //8 - titles.add("初登日期"); //9 - titles.add("发证日期"); //10 - titles.add("到期日期"); //11 - titles.add("车辆品牌"); //12 - titles.add("车辆型号"); //13 - titles.add("核定总质量"); //14 - titles.add("核定载质量"); //15 - //titles.add("容积"); //16 + titles.add("自编号"); //1 + titles.add("年检车辆"); //2 + titles.add("车辆品牌"); //3 + titles.add("年检车型"); //4 + titles.add("车主业户"); //5 + titles.add("联系电话"); //6 + titles.add("登记人"); //7 + titles.add("办理日期"); //8 + titles.add("年检周期"); //9 + titles.add("到期日期"); //10 + titles.add("年检费用"); //11 + titles.add("实收费用"); //12 + titles.add("年检地址"); //13 + titles.add("提醒天数"); //14 + titles.add("提醒日期"); //15 + titles.add("年检资料"); //16 + titles.add("备注"); //17 dataMap.put("titles", titles); List varOList = inspectAnnuallyService.listOut(pd); List varList = new ArrayList(); for(int i=0;i map = new HashMap(); + String errInfo = "success"; + StringBuffer errorStr = new StringBuffer(); + if (null != file && !file.isEmpty()) { + File tempFile = new File(file.getOriginalFilename()); //新建file + FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); //将MultipartFile复制到File + List listPd = (List) ObjectExcelRead.readExcel(tempFile, 1, 0, 0); // 执行读EXCEL操作,读出的数据导入List + // 2:从第3行开始；0:从第A列开始；0:第0个sheet + /** + * var0 :风险点（单元） var1 :所属部门 + */ + + try { + if (listPd.size() < 1) { + map.put("result", "error"); // 返回结果 + map.put("resultStr", "Excel数据为空，请检查数据后，重新上传！"); + FileUtils.deleteQuietly(tempFile);//删除临时文件 + return map; + } + List riskunitList = new ArrayList<>(); + PageData pd = new PageData(); + pd.put("ISDELETE", "0"); + pd.put("BELONGING_DEPT", Jurisdiction.getCORPINFO_ID()); + List riskunitListAll = operatingVehiclesService.listAll(pd); + Map riskunitMapAll = new HashMap<>(); + for (PageData pageData : riskunitListAll) { + // 使用车牌号作为键 + String plateNumberKey = Tools.excelHandle(pageData.getString("PLATE_NUMBER")); + riskunitMapAll.put(plateNumberKey, pageData); + } + List header = new ArrayList<>(); + header.add("自编号"); + header.add("车牌号"); + header.add("车架号"); + /*header.add("车身编号");*/ + header.add("车辆类型"); + header.add("运营证号"); + header.add("归属部门"); + header.add("车主"); + header.add("车主电话"); + header.add("联系人"); + header.add("联系电话"); + header.add("初登日期"); + header.add("发证日期"); + header.add("到期日期"); + header.add("车辆品牌"); + header.add("车辆型号"); + header.add("核定总质量"); + header.add("核定载质量"); + /*header.add("容积");*/ + header.add("备注"); + Map hasRiskUnit = new HashMap<>(); + int succeeNum = 1; + for (PageData lpd : listPd) { + succeeNum++; + convertExcelDate(lpd, "var10"); // 初登日期 FIRSTSHOW_DATE + convertExcelDate(lpd, "var11"); // 发证日期 CERTIFICATE_DATE + convertExcelDate(lpd, "var12"); // 到期日期 EXPIRE_DATE + System.out.println(lpd.get("var10")+"--"+lpd.get("var11")+"--"+lpd.get("var12")); + for (int i = 0; i < header.size(); i++) { + if (!lpd.containsKey("var" + i)) { + errorStr.append("

第" + succeeNum + "行的\"" + header.get(i) + "\"无数据

"); + continue; + } + if (Tools.isEmpty(lpd.get("var" + i))) { + errorStr.append("

第" + succeeNum + "行的\"" + header.get(i) + "\"无数据

"); + continue; + } + } + + String plateNumberVar = Tools.isEmpty(lpd.get("var1")) ? "" : Tools.excelHandle(lpd.get("var1")); + + if (riskunitMapAll.containsKey(plateNumberVar)) { + errorStr.append("

第" + succeeNum + "行:" + "车牌号为\"" + plateNumberVar + "\"的记录已存在，请检查！" + "

"); + continue; + } + if (hasRiskUnit.containsKey(plateNumberVar)) { + errorStr.append("

第" + succeeNum + "行:" + "车牌号重复，请重新检查内容！" + "

"); + continue; + } + hasRiskUnit.put(plateNumberVar, "1"); + PageData riskunit = new PageData(); + riskunit.put("GOODSSELFNUMBER", lpd.get("var0")); + riskunit.put("PLATE_NUMBER", lpd.get("var1")); + riskunit.put("FRAMES_NUMBER", lpd.get("var2")); + riskunit.put("VEHICLE_TYPE", lpd.get("var3")); + riskunit.put("OPERATING_CERTIFICATE", lpd.get("var4")); + riskunit.put("BELONGING_DEPARTMENT", lpd.get("var5")); + riskunit.put("VEHICLEOWNER", lpd.get("var6")); + riskunit.put("VEHICLEOWNER_NUMBER", lpd.get("var7")); + riskunit.put("CONTACT", lpd.get("var8")); + riskunit.put("CONTACT_NUMBER", lpd.get("var9")); + riskunit.put("FIRSTSHOW_DATE", lpd.get("var10")); + riskunit.put("CERTIFICATE_DATE", lpd.get("var11")); + riskunit.put("EXPIRE_DATE", lpd.get("var12")); + riskunit.put("VEHICLE_BRAND", lpd.get("var13")); + riskunit.put("VEHICLE_MODEL", lpd.get("var14")); + riskunit.put("VOUCH_TOTALMASS", lpd.get("var15")); + riskunit.put("VOUCH_PAYLOAD", lpd.get("var16")); + riskunit.put("REMARK", lpd.get("var18")); + riskunit.put("OPERATING_ID", this.get32UUID()); + riskunit.put("ISDELETE", "0"); + riskunit.put("CREATOR", Jurisdiction.getUsername()); + riskunit.put("CREATTIME", DateUtil.date2Str(new Date())); + riskunit.put("OPERATOR", Jurisdiction.getUsername()); + riskunit.put("OPERATTIME", DateUtil.date2Str(new Date())); + riskunit.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + riskunitList.add(riskunit); + } + if (Tools.isEmpty(errorStr.toString())) { + for (PageData riskunit : riskunitList) { + operatingVehiclesService.save(riskunit); + } + errorStr.append("成功导入" + riskunitList.size() + "条数据!"); + } else { + errInfo = "error"; + } + + FileUtils.deleteQuietly(tempFile);//删除临时文件 + } catch (Exception e) { + map.put("result", "fail"); // 返回结果 + map.put("resultStr", errorStr.toString()); + FileUtils.deleteQuietly(tempFile);//删除临时文件 + return map; + } + } + map.put("result", "success");//返回结果 + map.put("resultType", errInfo);//返回message类型 + map.put("isExcel","1");//返回类型 + map.put("resultStr", errorStr.toString()); + return map; + } + + private void convertExcelDate(PageData lpd, String field) { + Object excelDateObj = lpd.get(field); + if (excelDateObj != null) { + // 尝试将对象转换为Double，因为Excel中的日期是以Double类型的数字存储的 + double excelDate = Double.parseDouble(excelDateObj.toString()); + // 使用Apache POI的DateUtil获取Java日期对象 + Date javaDate = org.apache.poi.ss.usermodel.DateUtil.getJavaDate(excelDate); + // 使用您的DateUtil工具类进行日期格式化 + String formattedDate = DateUtil.date2Str(javaDate, "yyyy-MM-dd"); + // 更新lpd对象中的日期字段 + lpd.put(field, formattedDate); + } + } + } diff --git a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java index 0fb7d07..6166a74 100644 --- a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java +++ b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java @@ -55,6 +55,7 @@ public class ScrapManageController extends BaseController { pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("ISSCRAP", "1"); freightTrailerService.editScrapStatus(pd); scrapManageService.save(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index 4bf5500..adb64d1 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -51,9 +51,6 @@ public class TaxationManageController 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())); // 修改时间 if("".equals(pd.getString("EXPIRE_STATUS"))) { String expireDate = pd.getString("EXPIRE_DATE"); String day = DateUtil.getDay(); @@ -188,10 +185,10 @@ public class TaxationManageController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = freightTrailerService.list(page); // 列出所有挂车列表 - List taxationList = taxationManageService.list(page); // 列出车船税列表 + List taxationList = taxationManageService.taxationList(pd.getString("CORPINFO_ID")); // 列出车船税列表 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")) || varList.get(j).get("ISSCRAP").equals("1")) { + if (taxationList.get(i).get("PLATE_NUMBER").equals(varList.get(j).get("PLATE_NUMBER")) && varList.get(j).get("ISSCRAP").equals("1")) { varList.remove(j); } } diff --git a/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java b/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java index d342cee..3bd32b6 100644 --- a/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java @@ -43,4 +43,6 @@ public interface OperatingVehiclesMapper { void setScrapStatus(PageData pd); List listOut(PageData pd); + + List listAll(PageData pd); } diff --git a/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java b/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java index 213a58c..aa74322 100644 --- a/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java +++ b/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java @@ -43,4 +43,6 @@ public interface OperatingVehiclesService { void setScrapStatus(PageData pd); List listOut(PageData pd); + + List listAll(PageData pd); } diff --git a/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java b/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java index 340c82f..c826c8e 100644 --- a/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java +++ b/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java @@ -66,4 +66,9 @@ public class OperatingVehiclesServiceImpl implements OperatingVehiclesService { public List listOut(PageData pd) { return operatingVehiclesMapper.listOut(pd); } + + @Override + public List listAll(PageData pd) { + return operatingVehiclesMapper.listAll(pd); + } } diff --git a/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml b/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml index 17624e0..2819260 100644 --- a/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml +++ b/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml @@ -262,18 +262,20 @@ select f.*, case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, - v1.PLATE_NUMBER, - case + 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 + end as NEW_ARCHIVES_TYPE*/ from f INNER JOIN v_traffic v1 on f.VEHICLE=v1.ID - LEFT JOIN BUS_TRAFFIC_SCRAP_MANAGEMENT btsm on v1.PLATE_NUMBER = btsm.PLATE_NUMBER - LEFT JOIN BUS_TRAFFIC_ASSIGNED bta on v1.PLATE_NUMBER = bta.RAW_PLATE_NUMBER - where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} + /*LEFT JOIN BUS_TRAFFIC_SCRAP_MANAGEMENT btsm on v1.PLATE_NUMBER = btsm.PLATE_NUMBER + LEFT JOIN BUS_TRAFFIC_ASSIGNED bta on v1.PLATE_NUMBER = bta.RAW_PLATE_NUMBER*/ + LEFT JOIN bus_traffic_mechanical_freighttrailer btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE + LEFT JOIN bus_traffic_operatingvehicle bto on bto.OPERATING_ID = f.VEHICLE + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and (btmf.ISSCRAP = '0' OR bto.ISSCRAP = '0') and f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%') diff --git a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml index 78263cd..14c2ead 100644 --- a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml +++ b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml @@ -187,8 +187,10 @@ from f left join sys_dictionaries b on f.ANNUAL_INSPECTION_CYCLE = b.DICTIONARIES_ID AND b.PARENT_ID = '8b7dea3977fd4360a3cc8112368b90ff' - INNER JOIN v_traffic v1 on f.VEHICLE=v1.ID - where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} + INNER JOIN v_traffic v1 on f.VEHICLE = v1.ID + LEFT JOIN bus_traffic_operatingvehicle bto on bto.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 (bto.ISSCRAP = '0' OR btmf.ISSCRAP = '0') and v1.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%') @@ -224,5 +226,17 @@ f.CORPINFO_ID = #{pd.CORPINFO_ID} + + diff --git a/src/main/resources/mybatis/datasource/insure/InsureMapper.xml b/src/main/resources/mybatis/datasource/insure/InsureMapper.xml index 0dd2fbd..3e8880e 100644 --- a/src/main/resources/mybatis/datasource/insure/InsureMapper.xml +++ b/src/main/resources/mybatis/datasource/insure/InsureMapper.xml @@ -197,7 +197,9 @@ f INNER JOIN v_traffic v1 on f.VEHICLE=v1.ID - where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} + LEFT JOIN bus_traffic_operatingvehicle bto on bto.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 (bto.ISSCRAP = '0' OR btmf.ISSCRAP = '0') and f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%') diff --git a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml index 1922030..943f11d 100644 --- a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml +++ b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml @@ -313,6 +313,14 @@ f.CORPINFO_ID = #{CORPINFO_ID} + + + + + @@ -263,14 +267,16 @@ f.*, case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, v1.PLATE_NUMBER, - v1.TRAFFIC_TYPE + v1.TRAFFIC_TYPE, + o.ISSCRAP AS OPEAR_ISSCRAP, + btmf.ISSCRAP AS FREIGHT_ISSCRAP from 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') + WHERE f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%') From 1d133a37c9e18b8d369880588122b06590d10c37 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 3 Apr 2024 17:56:58 +0800 Subject: [PATCH 04/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssignedManageController.java | 104 ++++++++++++++++-- .../controller/beidou/BeidouController.java | 12 +- .../TrafficSecurityCommitmentController.java | 1 - .../InspectAnnuallyController.java | 12 +- .../maintenance/MaintenanceController.java | 4 + .../operations/OperationsController.java | 4 + .../scrapManage/ScrapManageController.java | 38 ++++++- .../TaxationManageController.java | 5 +- .../freighttrailer/FreightTrailerMapper.java | 7 ++ .../OperatingVehiclesMapper.java | 6 + .../freighttrailer/FreightTrailerService.java | 6 + .../impl/FreightTrailerServiceImpl.java | 15 +++ .../OperatingVehiclesService.java | 6 + .../impl/OperatingVehiclesServiceImpl.java | 15 +++ .../assignedManage/AssignedManageMapper.xml | 4 +- .../datasource/beidou/BeidouMapper.xml | 37 ++++--- ...TrafficSafetyOccupationalHazardsMapper.xml | 1 + .../TrafficSafetyResponsibilityMapper.xml | 1 + .../freighttrailer/FreightTrailerMapper.xml | 41 ++++++- .../inspectAnnually/InspectAnnuallyMapper.xml | 15 ++- .../maintenance/MaintenanceMapper.xml | 11 +- .../OperatingVehiclesMapper.xml | 43 +++++++- .../operations/OperationsMapper.xml | 14 ++- 23 files changed, 343 insertions(+), 59 deletions(-) diff --git a/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java b/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java index 7fda2b5..aeaf41c 100644 --- a/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java +++ b/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java @@ -7,14 +7,11 @@ import com.zcloud.service.assignedManage.AssignedManageService; import com.zcloud.service.freighttrailer.FreightTrailerService; import com.zcloud.service.operatingvehicles.OperatingVehiclesService; import com.zcloud.service.system.ImgFilesService; -import com.zcloud.service.taxationManage.TaxationManageService; import com.zcloud.util.*; 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.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; import java.util.*; @@ -25,9 +22,6 @@ public class AssignedManageController extends BaseController { @Autowired private AssignedManageService assignedManageService; - @Autowired - private Smb smb; - @Autowired private ImgFilesService imgfilesService; @@ -58,6 +52,27 @@ public class AssignedManageController extends BaseController { pd.put("VEHICLE_TYPE",pd.get("ASSIGNED_VEHICLE_MODEL")); pd.put("NOW_CONTACT_NUMBER",pd.get("NOW_OWNERS_NUMBER")); assignedManageService.save(pd); + PageData pageData = assignedManageService.findById(pd); + String vehicle = pageData.getString("RAW_PLATE_NUMBER"); + PageData pd2 = new PageData(); + pd2.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + pd2.put("ID", vehicle); + List vehicleInfo = freightTrailerService.vehicleList(pd2); + if ("1".equals(vehicleInfo.get(0).get("TRAFFIC_TYPE") + "")) { + // 营运车辆 + PageData operating = new PageData(); + operating.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + operating.put("OPERATING_ID", vehicleInfo.get(0).get("ID")); + operating.put("ISASSIGNED", "1"); + operatingVehiclesService.setAssinedStatus(operating); + }else if("2".equals(vehicleInfo.get(0).get("TRAFFIC_TYPE") + "")) { + // 货运挂车 + PageData freightTrailer = new PageData(); + freightTrailer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + freightTrailer.put("FREIGHTTRAILER_ID", vehicleInfo.get(0).get("ID")); + freightTrailer.put("ISASSIGNED", "1"); + freightTrailerService.setAssinedStatus(freightTrailer); + } map.put("pd", pd); map.put("result", errInfo); return map; @@ -77,6 +92,31 @@ public class AssignedManageController extends BaseController { pd.put("DELETOR", Jurisdiction.getUSER_ID()); pd.put("DELETORNAME", Jurisdiction.getUsername()); pd.put("DELETTIME", DateUtil.date2Str(new Date())); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData assignedInfo = new PageData(); + assignedInfo.put("ASSIGNED_ID", pd.get("ASSIGNED_ID")); + assignedInfo.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData pageData = assignedManageService.findById(assignedInfo); + String vehicle = pageData.getString("RAW_PLATE_NUMBER"); + PageData pd2 = new PageData(); + pd2.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + pd2.put("ID", vehicle); + List vehicleInfo = freightTrailerService.vehicleList(pd2); + if ("1".equals(vehicleInfo.get(0).get("TRAFFIC_TYPE") + "")) { + // 营运车辆 + PageData operating = new PageData(); + operating.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + operating.put("OPERATING_ID", vehicleInfo.get(0).get("ID")); + operating.put("ISASSIGNED", "0"); + operatingVehiclesService.setAssinedStatus(operating); + }else if("2".equals(vehicleInfo.get(0).get("TRAFFIC_TYPE") + "")) { + // 货运挂车 + PageData freightTrailer = new PageData(); + freightTrailer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + freightTrailer.put("FREIGHTTRAILER_ID", vehicleInfo.get(0).get("ID")); + freightTrailer.put("ISASSIGNED", "0"); + freightTrailerService.setAssinedStatus(freightTrailer); + } assignedManageService.delete(pd); map.put("result", errInfo); //返回结果 return map; @@ -126,7 +166,11 @@ public class AssignedManageController extends BaseController { pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd = assignedManageService.findById(pd); - + PageData pd2 = new PageData(); + pd2.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + pd2.put("ID", pd.get("RAW_PLATE_NUMBER")); + List pageData = freightTrailerService.vehicleList(pd2); + pd.put("PLATE_NUMBER",pageData.get(0).get("PLATE_NUMBER")); pd.put("FOREIGN_KEY", pd.getString("ASSIGNED_ID")); pd.put("TYPE",120); List nowVehicleOperationCertificateImgs = imgfilesService.listAll(pd);//车头照片 @@ -183,7 +227,7 @@ public class AssignedManageController extends BaseController { return map; } - @RequestMapping(value = "/getassignedoperationvehiclelist") + /*@RequestMapping(value = "/getassignedoperationvehiclelist") @ResponseBody public Object getAssignedOperationVehicleList() throws Exception { Map map = new HashMap(); @@ -201,9 +245,31 @@ public class AssignedManageController extends BaseController { map.put("varList", operationList); map.put("result", errInfo); return map; + }*/ + + @RequestMapping(value = "/getAssignedVehicleList") + @ResponseBody + public Object getAssignedVehicleList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + String corpId = Jurisdiction.getCORPINFO_ID(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List allOperatingVehicleList = operatingVehiclesService.getPulldownVehicleList(pd); // 查询出所有不包括 删除、报废的车辆 + List allAssignedList = assignedManageService.assignedList(corpId); // 所有过户的车辆 + for (int i = 0; i < allAssignedList.size(); i++) { + for (int j = 0; j < allOperatingVehicleList.size(); j++) { + if(allAssignedList.get(i).get("RAW_PLATE_NUMBER").equals(allOperatingVehicleList.get(j).get("OPERATING_ID"))) { + allOperatingVehicleList.remove(j); + } + } + } + map.put("varList", allOperatingVehicleList); + map.put("result", errInfo); + return map; } - @RequestMapping(value = "/getassignedfreighttrailerlist") + /*@RequestMapping(value = "/getassignedfreighttrailerlist") @ResponseBody public Object getAssignedFreightTrailerList() throws Exception { Map map = new HashMap(); @@ -221,5 +287,25 @@ public class AssignedManageController extends BaseController { map.put("varList", freightList); map.put("result", errInfo); return map; + }*/ + + @RequestMapping(value = "/getAssignedFreightTrailerList") + @ResponseBody + public Object getAssignedFreightTrailerList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + String corpId = Jurisdiction.getCORPINFO_ID(); + List freightList = freightTrailerService.getPulldownVehicleList(corpId); + List 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("FREIGHTTRAILER_ID"))) { + freightList.remove(j); + } + } + } + map.put("varList", freightList); + map.put("result", errInfo); + return map; } } diff --git a/src/main/java/com/zcloud/controller/beidou/BeidouController.java b/src/main/java/com/zcloud/controller/beidou/BeidouController.java index 6432e50..901435a 100644 --- a/src/main/java/com/zcloud/controller/beidou/BeidouController.java +++ b/src/main/java/com/zcloud/controller/beidou/BeidouController.java @@ -71,8 +71,8 @@ public class BeidouController extends BaseController { pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 - pd.put("ARCHIVES_TYPE", "正常"); //档案状态 - + pd.put("ARCHIVES_TYPE", "0"); //档案状态 + pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态 String ffile = DateUtil.getDays(); if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); @@ -214,6 +214,14 @@ public class BeidouController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = beidouService.list(page); //列出Question列表 + 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); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java index 5fdfde0..4a59d2c 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java @@ -169,7 +169,6 @@ public class TrafficSecurityCommitmentController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - page.setPd(pd); List varList = securityCommitmentService.listForSecurityCommitmentUser(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java index 8a84bc8..70d29d0 100644 --- a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java +++ b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java @@ -61,8 +61,8 @@ public class InspectAnnuallyController 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("ARCHIVES_TYPE", "正常"); //档案状态 - + pd.put("ARCHIVES_TYPE", "0"); //档案状态 + pd.put("VEHICLE",pd.get("PLATE_NUMBER")); inspectAnnuallyService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -158,6 +158,14 @@ public class InspectAnnuallyController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = inspectAnnuallyService.list(page); //列出Question列表 + for (PageData operation : varList) { + if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) { + operation.put("ARCHIVES_TYPE", "2"); + } + if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) { + operation.put("ARCHIVES_TYPE", "1"); + } + } map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java index 78c1a14..7e6de49 100644 --- a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java +++ b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java @@ -61,6 +61,7 @@ public class MaintenanceController extends BaseController { pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("ARCHIVES_TYPE", "0"); //档案状态 + pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态 maintenanceService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -160,6 +161,9 @@ public class MaintenanceController extends BaseController { if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) { operation.put("ARCHIVES_TYPE", "2"); } + if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) { + operation.put("ARCHIVES_TYPE", "1"); + } } map.put("varList", varList); map.put("page", page); diff --git a/src/main/java/com/zcloud/controller/operations/OperationsController.java b/src/main/java/com/zcloud/controller/operations/OperationsController.java index d6fd22e..90b4c4a 100644 --- a/src/main/java/com/zcloud/controller/operations/OperationsController.java +++ b/src/main/java/com/zcloud/controller/operations/OperationsController.java @@ -61,6 +61,7 @@ public class OperationsController extends BaseController { pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("ARCHIVES_TYPE", "0"); //档案状态 + pd.put("VEHICLE", pd.get("PLATE_NUMBER")); operationsService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -160,6 +161,9 @@ public class OperationsController extends BaseController { if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) { operation.put("ARCHIVES_TYPE", "2"); } + if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) { + operation.put("ARCHIVES_TYPE", "1"); + } } map.put("varList", varList); map.put("page", page); diff --git a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java index 6166a74..788a307 100644 --- a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java +++ b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java @@ -181,7 +181,7 @@ public class ScrapManageController extends BaseController { return map; } - @RequestMapping(value = "/getscrapoperationvehiclelist") + /*@RequestMapping(value = "/getscrapoperationvehiclelist") @ResponseBody public Object getScrapOperationVehicleList() throws Exception { Map map = new HashMap(); @@ -199,6 +199,28 @@ public class ScrapManageController extends BaseController { map.put("varList", operationList); map.put("result", errInfo); return map; + }*/ + + @RequestMapping(value = "/getScrapOperationVehicleList") + @ResponseBody + public Object getScrapOperationVehicleList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + String corpId = Jurisdiction.getCORPINFO_ID(); + PageData pd = new PageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List operationList = operatingVehiclesService.getScrapPulldownVehicleList(pd); //列出Question列表 + List scrapList = scrapManageService.scrapListAll(corpId); + for (int i = 0; i < scrapList.size(); i++) { + for (int j = 0; j < operationList.size(); j++) { + if(scrapList.get(i).get("PLATE_NUMBER").equals(operationList.get(j).get("PLATE_NUMBER"))) { + operationList.remove(j); + } + } + } + map.put("varList", operationList); + map.put("result", errInfo); + return map; } /*@RequestMapping(value = "/getscrapfreighttrailerlist") @@ -221,13 +243,21 @@ public class ScrapManageController extends BaseController { return map; }*/ - @RequestMapping(value = "/getscrapfreighttrailerlist") + @RequestMapping(value = "/getScrapFreightTrailerList") @ResponseBody - public Object getScrapFreightTrailerList() throws Exception { + public Object getAssignedFreightTrailerList() throws Exception { Map map = new HashMap(); String errInfo = "success"; String corpId = Jurisdiction.getCORPINFO_ID(); - List freightList = freightTrailerService.trailerList(corpId); + List freightList = freightTrailerService.getScrapPulldownVehicleList(corpId); + List 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; diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index adb64d1..4e0a967 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -51,6 +51,7 @@ public class TaxationManageController extends BaseController { pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("ARCHIVES_TYPE", "0"); //档案状态 if("".equals(pd.getString("EXPIRE_STATUS"))) { String expireDate = pd.getString("EXPIRE_DATE"); String day = DateUtil.getDay(); @@ -109,9 +110,9 @@ public class TaxationManageController extends BaseController { String day = DateUtil.getDay(); boolean flag = DateUtil.compareDate(expireDate, day); if(flag) { - pd.put("EXPIRE_STATUS","未到期"); + pd.put("EXPIRE_STATUS","1"); }else{ - pd.put("EXPIRE_STATUS","已到期"); + pd.put("EXPIRE_STATUS","0"); } taxationManageService.edit(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java index 982a184..67e5ca1 100644 --- a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java @@ -84,5 +84,12 @@ public interface FreightTrailerMapper { PageData findByPlateNumber(PageData pd2); PageData vehicle(PageData pd); + + List getPulldownVehicleList(String corpId); + + void setAssinedStatus(PageData freightTrailer); + + List getScrapPulldownVehicleList(String corpId); + } diff --git a/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java b/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java index 3bd32b6..ebbd085 100644 --- a/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java @@ -45,4 +45,10 @@ public interface OperatingVehiclesMapper { List listOut(PageData pd); List listAll(PageData pd); + + List getPulldownVehicleList(PageData pd); + + void setAssinedStatus(PageData operating); + + List getScrapPulldownVehicleList(PageData pd); } diff --git a/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java b/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java index cdfbc61..8b96cd5 100644 --- a/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java +++ b/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java @@ -84,5 +84,11 @@ public interface FreightTrailerService { PageData findByPlateNumber(PageData pd2); PageData vehicle(PageData pd); + + List getPulldownVehicleList(String corpId); + + void setAssinedStatus(PageData freightTrailer); + + List getScrapPulldownVehicleList(String corpId); } diff --git a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java index 1493bfa..dccc616 100644 --- a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java +++ b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java @@ -127,5 +127,20 @@ public class FreightTrailerServiceImpl implements FreightTrailerService { public PageData vehicle(PageData pd) { return freightTrailerMapper.vehicle(pd); } + + @Override + public List getPulldownVehicleList(String corpId) { + return freightTrailerMapper.getPulldownVehicleList(corpId); + } + + @Override + public void setAssinedStatus(PageData freightTrailer) { + freightTrailerMapper.setAssinedStatus(freightTrailer); + } + + @Override + public List getScrapPulldownVehicleList(String corpId) { + return freightTrailerMapper.getScrapPulldownVehicleList(corpId); + } } diff --git a/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java b/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java index aa74322..9989d7e 100644 --- a/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java +++ b/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java @@ -45,4 +45,10 @@ public interface OperatingVehiclesService { List listOut(PageData pd); List listAll(PageData pd); + + List getPulldownVehicleList(PageData pd); + + void setAssinedStatus(PageData operating); + + List getScrapPulldownVehicleList(PageData pd); } diff --git a/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java b/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java index c826c8e..9fdc98b 100644 --- a/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java +++ b/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java @@ -71,4 +71,19 @@ public class OperatingVehiclesServiceImpl implements OperatingVehiclesService { public List listAll(PageData pd) { return operatingVehiclesMapper.listAll(pd); } + + @Override + public List getPulldownVehicleList(PageData pd) { + return operatingVehiclesMapper.getPulldownVehicleList(pd); + } + + @Override + public void setAssinedStatus(PageData operating) { + operatingVehiclesMapper.setAssinedStatus(operating); + } + + @Override + public List getScrapPulldownVehicleList(PageData pd) { + return operatingVehiclesMapper.getScrapPulldownVehicleList(pd); + } } diff --git a/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml b/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml index 7da25c3..9b3c26b 100644 --- a/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml +++ b/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml @@ -423,9 +423,11 @@ @@ -262,20 +266,17 @@ select f.*, case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, - v1.PLATE_NUMBER - /*case - when btsm.PLATE_NUMBER is not null then '1' - when bta.RAW_PLATE_NUMBER is not null then '2' - else f.ARCHIVES_TYPE - end as NEW_ARCHIVES_TYPE*/ + v1.PLATE_NUMBER, + o.ISSCRAP AS OPEAR_ISSCRAP, + btmf.ISSCRAP AS FREIGHT_ISSCRAP, + o.ISASSIGNED AS OPEAR_ISASSIGNED, + btmf.ISASSIGNED AS FREIGHT_ISASSIGNED from f - INNER JOIN v_traffic v1 on f.VEHICLE=v1.ID - /*LEFT JOIN BUS_TRAFFIC_SCRAP_MANAGEMENT btsm on v1.PLATE_NUMBER = btsm.PLATE_NUMBER - LEFT JOIN BUS_TRAFFIC_ASSIGNED bta on v1.PLATE_NUMBER = bta.RAW_PLATE_NUMBER*/ - LEFT JOIN bus_traffic_mechanical_freighttrailer btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE - LEFT JOIN bus_traffic_operatingvehicle bto on bto.OPERATING_ID = f.VEHICLE - where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and (btmf.ISSCRAP = '0' OR bto.ISSCRAP = '0') + 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 f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.xml index 9492c75..9d5fbe9 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.xml @@ -152,6 +152,7 @@ and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS} + ORDER BY c.OPERATTIME DESC @@ -226,12 +226,25 @@ + + + + update + + set + ISASSIGNED = #{ISASSIGNED} + where + FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID} + and + CORPINFO_ID = #{CORPINFO_ID} + + + + + + diff --git a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml index 14c2ead..85297d0 100644 --- a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml +++ b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml @@ -161,7 +161,8 @@ f.CREATORNAME, f.CREATTIME, (SELECT sd.NAME FROM sys_dictionaries sd where sd.DICTIONARIES_ID=f.ANNUAL_INSPECTION_CYCLE) as ANNUAL_INSPECTION_CYCLE_NAME, - v.COMPANY_AREA as AREA + v.COMPANY_AREA as AREA, + v.PLATE_NUMBER from f left join v_traffic v on f.VEHICLE = v.ID @@ -183,14 +184,18 @@ b.NAME, f.*, case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, - v1.PLATE_NUMBER + v1.PLATE_NUMBER, + o.ISSCRAP AS OPEAR_ISSCRAP, + btmf.ISSCRAP AS FREIGHT_ISSCRAP, + o.ISASSIGNED AS OPEAR_ISASSIGNED, + btmf.ISASSIGNED AS FREIGHT_ISASSIGNED from f left join sys_dictionaries b on f.ANNUAL_INSPECTION_CYCLE = b.DICTIONARIES_ID AND b.PARENT_ID = '8b7dea3977fd4360a3cc8112368b90ff' INNER JOIN v_traffic v1 on f.VEHICLE = v1.ID - LEFT JOIN bus_traffic_operatingvehicle bto on bto.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 (bto.ISSCRAP = '0' OR btmf.ISSCRAP = '0') + 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 v1.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%') diff --git a/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml b/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml index 77e129c..bb37554 100644 --- a/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml +++ b/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml @@ -203,10 +203,11 @@ f.OPERATTIME, f.DELETEOR, f.DELETEORNAME, - f.DELETTIME + f.DELETTIME, + v.PLATE_NUMBER from - - f + f + INNER JOIN v_traffic v on v.ID = f.VEHICLE where f.MAINTENANCE_ID = #{MAINTENANCE_ID} @@ -226,7 +227,9 @@ case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, v1.PLATE_NUMBER, o.ISSCRAP AS OPEAR_ISSCRAP, - btmf.ISSCRAP AS FREIGHT_ISSCRAP + btmf.ISSCRAP AS FREIGHT_ISSCRAP, + o.ISASSIGNED AS OPEAR_ISASSIGNED, + btmf.ISASSIGNED AS FREIGHT_ISASSIGNED from f diff --git a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml index 943f11d..de2ee1e 100644 --- a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml +++ b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml @@ -301,6 +301,17 @@ CORPINFO_ID = #{CORPINFO_ID} + + update + + set + ISASSIGNED = #{ISASSIGNED} + where + OPERATING_ID = #{OPERATING_ID} + and + CORPINFO_ID = #{CORPINFO_ID} + + + + + + @@ -543,10 +577,11 @@ select - b.NAME, + b.NAME AS CYCLE_NAME, f.*, case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, v1.PLATE_NUMBER, v1.TRAFFIC_TYPE, o.ISSCRAP AS OPEAR_ISSCRAP, - btmf.ISSCRAP AS FREIGHT_ISSCRAP + btmf.ISSCRAP AS FREIGHT_ISSCRAP, + o.ISASSIGNED AS OPEAR_ISASSIGNED, + btmf.ISASSIGNED AS FREIGHT_ISASSIGNED from f - left join sys_dictionaries b on b.DICTIONARIES_ID=f.CYCLE AND b.PARENT_ID='8b7dea3977fd4360a3cc8112368b90ff' + 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 @@ -306,7 +310,7 @@ -- 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 + and case when f.DUE_DATE < NOW() then 0 else 1 end = #{pd.DUE_DATE_TYPE} ORDER BY f.CREATTIME DESC From 02de9b04dbd66095f9ba919f4fa5722ba9fa5a0c Mon Sep 17 00:00:00 2001 From: xiepeng Date: Sun, 7 Apr 2024 18:50:21 +0800 Subject: [PATCH 05/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...TrafficSafetyResponsibilityController.java | 14 ++++ .../TrafficSecurityCommitmentController.java | 28 +++++++ .../FreighttTrailerController.java | 1 + .../InspectAnnuallyController.java | 13 ++- .../OperatingVehiclesController.java | 52 ++++++------ .../TaxationManageController.java | 42 +++++++--- .../TrafficSafetyResponsibilityMapper.java | 2 + .../TrafficSecurityCommitmentMapper.java | 2 + .../TrafficSafetyResponsibilityService.java | 2 + .../TrafficSecurityCommitmentService.java | 2 + ...rafficSafetyResponsibilityServiceImpl.java | 5 ++ .../TrafficSecurityCommitmentServiceImpl.java | 5 ++ .../TrafficSafetyAssessmentMapper.xml | 6 +- .../TrafficSafetyResponsibilityMapper.xml | 28 +++++++ .../TrafficSecurityCommitmentMapper.xml | 38 ++++++++- ...rafficSecurityManagementStaffingMapper.xml | 3 +- .../freighttrailer/FreightTrailerMapper.xml | 79 ++++++++++++++++++- .../OperatingVehiclesMapper.xml | 39 ++++++++- .../taxationManage/TaxationManageMapper.xml | 12 ++- 19 files changed, 309 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java index 2c3ccd0..3c32de2 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java @@ -212,4 +212,18 @@ public class TrafficSafetyResponsibilityController extends BaseController { map.put("result", errInfo); return map; } + + + @RequestMapping(value="/getSafetyResponsibilityEdit") + @ResponseBody + public Object safetyCommitment() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = responseService.safetyCommitmentById(pd); //根据ID读取 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java index 4a59d2c..ea8e52c 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java @@ -92,6 +92,13 @@ public class TrafficSecurityCommitmentController 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"))){ @@ -171,6 +178,13 @@ public class TrafficSecurityCommitmentController extends BaseController { pd = this.getPageData(); page.setPd(pd); List varList = securityCommitmentService.listForSecurityCommitmentUser(page); + varList.forEach(securityCommitment -> { + if(DateUtil.compareDate(DateUtil.getDay(), securityCommitment.getString("EXPIRYDATE"))) { + securityCommitment.put("VALIDSTATUS", "2"); + }else{ + securityCommitment.put("VALIDSTATUS", "1"); + } + }); map.put("varList", varList); map.put("page", page); map.put("result", errInfo); @@ -210,4 +224,18 @@ public class TrafficSecurityCommitmentController extends BaseController { map.put("result", errInfo); return map; } + + + @RequestMapping(value="/safetyCommitment") + @ResponseBody + public Object safetyCommitment() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = securityCommitmentService.safetyCommitmentById(pd); //根据ID读取 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java index 840dd3c..3d908e0 100644 --- a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java +++ b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java @@ -26,6 +26,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletResponse; import java.io.File; import java.util.*; +import java.util.stream.Collectors; /** * 企业信息管理-货运挂车 diff --git a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java index 70d29d0..e19a148 100644 --- a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java +++ b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java @@ -158,14 +158,13 @@ public class InspectAnnuallyController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = inspectAnnuallyService.list(page); //列出Question列表 - for (PageData operation : varList) { - if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) { - operation.put("ARCHIVES_TYPE", "2"); + varList.forEach(inspectAnnually -> { + if("1".equals(inspectAnnually.get("OPEAR_ISSCRAP")) || "1".equals(inspectAnnually.get("FREIGHT_ISSCRAP"))) { + inspectAnnually.put("ARCHIVES_TYPE","2"); + } else if ("1".equals(inspectAnnually.get("OPEAR_ISASSIGNED")) || "1".equals(inspectAnnually.get("FREIGHT_ISASSIGNED"))) { + inspectAnnually.put("ARCHIVES_TYPE","1"); } - if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) { - operation.put("ARCHIVES_TYPE", "1"); - } - } + }); map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index 0c58553..bff57f1 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -313,20 +313,18 @@ public class OperatingVehiclesController extends BaseController { List titles = new ArrayList(); titles.add("车牌号"); //1 titles.add("车架号"); //2 - //titles.add("车身编号"); //3 - titles.add("车辆类型"); //4 - titles.add("运营证号"); //5 - titles.add("归属部门"); //6 - titles.add("车主"); //7 - titles.add("车主电话"); //8 - titles.add("初登日期"); //9 - titles.add("发证日期"); //10 - titles.add("到期日期"); //11 - titles.add("车辆品牌"); //12 - titles.add("车辆型号"); //13 - titles.add("核定总质量"); //14 - titles.add("核定载质量"); //15 - //titles.add("容积"); //16 + titles.add("车辆类型"); //3 + titles.add("运营证号"); //4 + titles.add("归属部门"); //5 + titles.add("车主"); //6 + titles.add("车主电话"); //7 + titles.add("初登日期"); //8 + titles.add("发证日期"); //9 + titles.add("到期日期"); //10 + titles.add("车辆品牌"); //11 + titles.add("车辆型号"); //12 + titles.add("核定总质量"); //13 + titles.add("核定载质量"); //14 dataMap.put("titles", titles); List varOList = operatingVehiclesService.listOut(pd); List varList = new ArrayList(); @@ -334,20 +332,18 @@ public class OperatingVehiclesController extends BaseController { PageData vpd = new PageData(); vpd.put("var1", varOList.get(i).getString("PLATE_NUMBER"));//1 vpd.put("var2", varOList.get(i).getString("FRAMES_NUMBER"));//2 - //vpd.put("var3", varOList.get(i).getString("VEHICLE_BODY_NUMBER"));//3 - vpd.put("var4", varOList.get(i).getString("VEHICLE_TYPE"));//4 - vpd.put("var5", varOList.get(i).getString("OPERATING_CERTIFICATE"));//5 - vpd.put("var6", varOList.get(i).getString("BELONGING_DEPARTMENT"));//6 - vpd.put("var7", varOList.get(i).getString("VEHICLEOWNER"));//7 - vpd.put("var8", varOList.get(i).getString("VEHICLEOWNER_NUMBER"));//8 - vpd.put("var9", varOList.get(i).getString("FIRSTSHOW_DATE"));//9 - vpd.put("var10", varOList.get(i).getString("CERTIFICATE_DATE"));//10 - vpd.put("var11", varOList.get(i).getString("EXPIRE_DATE"));//11 - vpd.put("var12", varOList.get(i).getString("VEHICLE_BRAND"));//12 - vpd.put("var13", varOList.get(i).getString("VEHICLE_MODEL"));//13 - vpd.put("var14", varOList.get(i).getString("VOUCH_TOTALMASS"));//14 - vpd.put("var15", varOList.get(i).getString("VOUCH_PAYLOAD"));//15 - //vpd.put("var16", varOList.get(i).getString("VOLUME"));//16 + vpd.put("var3", varOList.get(i).getString("VEHICLE_TYPE"));//3 + vpd.put("var4", varOList.get(i).getString("OPERATING_CERTIFICATE"));//4 + vpd.put("var5", varOList.get(i).getString("BELONGING_DEPARTMENT"));//5 + vpd.put("var6", varOList.get(i).getString("VEHICLEOWNER"));//6 + vpd.put("var7", varOList.get(i).getString("VEHICLEOWNER_NUMBER"));//7 + vpd.put("var8", varOList.get(i).getString("FIRSTSHOW_DATE"));//8 + vpd.put("var9", varOList.get(i).getString("CERTIFICATE_DATE"));//9 + vpd.put("var10", varOList.get(i).getString("EXPIRE_DATE"));//10 + vpd.put("var11", varOList.get(i).getString("VEHICLE_BRAND"));//11 + vpd.put("var12", varOList.get(i).getString("VEHICLE_MODEL"));//12 + vpd.put("var13", varOList.get(i).getString("VOUCH_TOTALMASS"));//13 + vpd.put("var14", varOList.get(i).getString("VOUCH_PAYLOAD"));//14 varList.add(vpd); } dataMap.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index 4e0a967..9b10a4a 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -10,6 +10,9 @@ import com.zcloud.service.freighttrailer.FreightTrailerService; import com.zcloud.service.system.DictionariesService; import com.zcloud.service.taxationManage.TaxationManageService; import com.zcloud.util.*; +import org.apache.commons.lang3.ObjectUtils; +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; @@ -18,6 +21,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import java.util.*; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; @Controller @RequestMapping("/taxationmanage") @@ -100,9 +106,6 @@ public class TaxationManageController 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("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 @@ -147,7 +150,14 @@ public class TaxationManageController extends BaseController { if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); page.setPd(pd); List taxationList = taxationManageService.list(page); //列出MajorDangerSource列表 - List assignedList = assignedManageService.assignedList(Jurisdiction.getCORPINFO_ID()); + taxationList.forEach(taxation -> { + if("1".equals(taxation.get("ISSCRAP"))) { + taxation.put("ARCHIVES_TYPE", "1"); + } else if ("1".equals(taxation.get("ISASSIGNED"))) { + taxation.put("ARCHIVES_TYPE", "2"); + } + }); + /*List assignedList = assignedManageService.assignedList(Jurisdiction.getCORPINFO_ID()); List varList = new ArrayList<>(); for (int i = 0; i < taxationList.size(); i++) { for (int j = 0; j < assignedList.size(); j++) { @@ -157,8 +167,8 @@ public class TaxationManageController extends BaseController { } } varList.add(taxationList.get(i)); - } - map.put("varList", varList); + }*/ + map.put("varList", taxationList); map.put("page", page); map.put("result", errInfo); return map; @@ -187,14 +197,22 @@ public class TaxationManageController extends BaseController { page.setPd(pd); List varList = freightTrailerService.list(page); // 列出所有挂车列表 List taxationList = taxationManageService.taxationList(pd.getString("CORPINFO_ID")); // 列出车船税列表 - 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")) && varList.get(j).get("ISSCRAP").equals("1")) { - varList.remove(j); + List pageDataStream = new ArrayList<>(); + if(!CollectionUtils.isEmpty(taxationList)) { + pageDataStream = varList.stream().filter(trailer -> { // 去除车船税类表中已有的车辆 + for (PageData taxation : taxationList) { + if (!StringUtils.equals(taxation.getString("PLATE_NUMBER"), trailer.getString("PLATE_NUMBER"))) { + return true; + } } - } + return false; + }).collect(Collectors.toList()); + }else{ + pageDataStream = varList; } - map.put("varList", varList); + // 过滤掉车船税下拉列表中已报废的车辆信息 + List choiceTrailerList = pageDataStream.stream().filter(data -> !"1".equals(data.get("ISSCRAP"))).collect(Collectors.toList()); + map.put("varList", choiceTrailerList); map.put("page", page); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyResponsibilityMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyResponsibilityMapper.java index c4c13ce..9652fbd 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyResponsibilityMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyResponsibilityMapper.java @@ -19,4 +19,6 @@ public interface TrafficSafetyResponsibilityMapper { List datalistPageUser(Page page); void delete(PageData pd); + + List safetyCommitmentById(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCommitmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCommitmentMapper.java index a48ccf8..c8b6dc3 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCommitmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCommitmentMapper.java @@ -19,4 +19,6 @@ public interface TrafficSecurityCommitmentMapper { List datalistPageUser(Page page); void delete(PageData pd); + + List safetyCommitmentById(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyResponsibilityService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyResponsibilityService.java index a466852..6aed914 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyResponsibilityService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyResponsibilityService.java @@ -17,4 +17,6 @@ public interface TrafficSafetyResponsibilityService { List listForSafetyResponsibilityUser(Page page); void delete(PageData pd); + + List safetyCommitmentById(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentService.java index 154f12b..4c5d373 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentService.java @@ -17,4 +17,6 @@ public interface TrafficSecurityCommitmentService { List listForSecurityCommitmentUser(Page page); void delete(PageData pd); + + List safetyCommitmentById(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyResponsibilityServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyResponsibilityServiceImpl.java index a6307a5..4fadd0e 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyResponsibilityServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyResponsibilityServiceImpl.java @@ -43,4 +43,9 @@ public class TrafficSafetyResponsibilityServiceImpl implements TrafficSafetyResp public void delete(PageData pd) { responseMapper.delete(pd); } + + @Override + public List safetyCommitmentById(PageData pd) { + return responseMapper.safetyCommitmentById(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java index f21d038..6ef9575 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java @@ -43,4 +43,9 @@ public class TrafficSecurityCommitmentServiceImpl implements TrafficSecurityComm public void delete(PageData pd) { securityCommitmentMapper.delete(pd); } + + @Override + public List safetyCommitmentById(PageData pd) { + return securityCommitmentMapper.safetyCommitmentById(pd); + } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml index 1635d24..d558d81 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml @@ -96,7 +96,11 @@ OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, OPERATTIME = #{OPERATTIME}, - ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE} + EXPIRYDATE = #{EXPIRYDATE}, + ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}, + + ,VALIDSTATUS = #{VALIDSTATUS} + where SAFETYASSESSMENT_ID = #{SAFETYASSESSMENT_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml index f64bf60..4a2e3d9 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml @@ -178,4 +178,32 @@ and f.USER_ID = #{pd.USER_ID} + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml index 2d358b3..812240b 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml @@ -109,9 +109,10 @@ CONTENT = #{CONTENT}, ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE} - , VALIDSTATUS = #{VALIDSTATUS} + ,VALIDSTATUS = #{VALIDSTATUS} - where SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID} + where + SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID} @@ -160,7 +161,6 @@ and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS} - ORDER BY c.OPERATTIME DESC + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml index 8dd6376..9246d2b 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml @@ -98,7 +98,8 @@ OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, OPERATTIME = #{OPERATTIME}, - ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE} + ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}, + EXPIRYDATE=#{EXPIRYDATE} where STAFFING_ID = #{STAFFING_ID} diff --git a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml index 98e0253..290ea9e 100644 --- a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml +++ b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml @@ -8,6 +8,43 @@ + + + f.FREIGHTTRAILER_ID, + f.CORPINFO_ID, + f.NUM, + f.PLATE_NUMBER, + f.VIN, + f.VEHICLE_BODY_NUMBER, + f.TRAILER_TYPE, + f.OPER_CERTIFICATE_NUM, + f.BELONGING_DEPT, + f.CAR_OWNERS, + f.CAR_OWNERS_TEL, + f.CONTACTS, + f.CONTACT_PHONE, + f.INITIAL_REGISTRATION_DATE, + f.CERTIFICATE_DATE, + f.DUE_DATE, + f.TRAILER_BRAND, + f.TRAILER_MODEL, + f.APPROVED_TOTAL_MASS, + f.APPROVED_LOAD_CAPACITY, + f.VOLUME, + f.NOTES, + f.TRAILER_IMG, + f.DRIVING_LICENSE_IMG, + f.OPER_CERTIFICATE_IMG, + f.TRAILER_INFO, + f.CREATOR, + f.CREATORNAME, + f.CREATTIME, + f.ISDELETE, + f.ISSCRAP, + f.ISASSIGNED + + + FREIGHTTRAILER_ID, @@ -274,16 +311,50 @@ + + @@ -598,9 +615,23 @@ SELECT - f.* + f.*, + btmf.ISSCRAP AS ISSCRAP, + btmf.ISASSIGNED AS ISASSIGNED FROM f LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.FREIGHTTRAILER_ID - WHERE f.ISDELETE = '0' AND btmf.ISSCRAP = '0' + WHERE f.ISDELETE = '0' AND f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}), '%') @@ -447,7 +449,7 @@ from f - where f.TAXATION_ID = '0' + where f.ISDELETE = '0' From 91cef5e03e9860b825ee29de964daadea2bfc65f Mon Sep 17 00:00:00 2001 From: wangpeng Date: Mon, 8 Apr 2024 17:10:10 +0800 Subject: [PATCH 06/44] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=20=E4=BF=AE=E5=A4=8D=E4=BE=8B=E4=BC=9A=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/corp/CorpInfoController.java | 42 +++++++++++++++++++ src/main/resources/application.properties | 28 ++++++------- .../TrafficSecurityReadDetailMapper.xml | 2 +- 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zcloud/controller/corp/CorpInfoController.java b/src/main/java/com/zcloud/controller/corp/CorpInfoController.java index 8565a82..ccc1d32 100644 --- a/src/main/java/com/zcloud/controller/corp/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/corp/CorpInfoController.java @@ -62,6 +62,9 @@ public class CorpInfoController extends BaseController { private ListManagerService listManagerService; @Autowired private HiddenService hiddenService; +// @Autowired +// private StudyTaskService studyTaskService; + @Autowired private Smb smb; @@ -631,4 +634,43 @@ public class CorpInfoController extends BaseController { map.put("result", errInfo); return map; } + + /**根据企业ID获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/getDiagnosis") + @ResponseBody + @LogAnno(menuType= "双重预控",menuServer= "持续改进",instructionsOperate = "企业报告",instructionsType = "公司详情") + + public Object getDiagnosis() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + PageData cpd = corpinfoService.findById(pd); //根据ID读取 + pd.put("CORPCREATTIME",cpd.getString("CREATTIME").substring(0,7)); + PageData riskpd = riskPointService.getDiagnosis(pd); + List lists = listManagerService.listAllForDiagnosis(pd); + List thismonth = listManagerService.thisMonthListmanager(pd); + List hdlist = hiddenService.listAllForDiagnosis(pd); +// PageData studypd = studyTaskService.getDiagnosis(pd); + List riskLog = riskPointService.getLogDiagnosis(pd); + + map.put("cpd", cpd); + map.put("monthlist",thismonth); + map.put("riskpd", riskpd); + map.put("lists", lists); + map.put("hdlist", hdlist); +// map.put("studypd", studypd); + map.put("riskLog",riskLog); + if(pd!=null) { + errInfo = "success"; + }else { + errInfo = "faild"; + } + map.put("result", errInfo); + return map; + } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8462dad..e0f195f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,20 +1,20 @@ spring.application.name=integrated_traffic -server.port=8093 +server.port=7082 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.0.64:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://192.168.0.26:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root -datasource.no1.password=root +datasource.no1.password=1234 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.0.64:3306/qa-traffic-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://192.168.0.26:3306/qa-traffic-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root -datasource.no2.password=root +datasource.no2.password=1234 datasource.no3.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no3.url=jdbc:mysql://192.168.0.64:3306/qa-traffic-education-org?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no3.url=jdbc:mysql://192.168.0.26:3306/qa-traffic-education-org?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no3.username=root -datasource.no3.password=root +datasource.no3.password=1234 #druid\u8FDE\u63A5\u6C60 @@ -46,7 +46,7 @@ spring.cache.ehcache.cofnig=ehcache.xml #\u914D\u7F6E\u8FD9\u53E5\u8BDD,\u63A7\u5236\u53F0\u8F93\u51FAsql\u8BED\u53E5 logging.level.com.zcloud.mapper=debug -#上传文件大小限制 +#\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236 spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-request-size=500MB @@ -91,14 +91,14 @@ customer.url=http://192.168.0.18:8997/sync/ customer.domain=yth.qhdsafety.com -#自定义线程池配置 -# 核心线程池数 +#\u81EA\u5B9A\u4E49\u7EBF\u7A0B\u6C60\u914D\u7F6E +# \u6838\u5FC3\u7EBF\u7A0B\u6C60\u6570 spring.task.execution.pool.core-size= 1 -# 最大线程池数 +# \u6700\u5927\u7EBF\u7A0B\u6C60\u6570 spring.task.execution.pool.max-size= 1 -# 任务队列的容量 +# \u4EFB\u52A1\u961F\u5217\u7684\u5BB9\u91CF spring.task.execution.pool.queue-capacity= 60 -# 非核心线程的存活时间 +# \u975E\u6838\u5FC3\u7EBF\u7A0B\u7684\u5B58\u6D3B\u65F6\u95F4 spring.task.execution.pool.keep-alive= 60 -# 线程池的前缀名称 +# \u7EBF\u7A0B\u6C60\u7684\u524D\u7F00\u540D\u79F0 spring.task.execution.thread-name-prefix= upload-archives-file-task- diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml index 012be6e..4e9039c 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml @@ -133,7 +133,7 @@ and f.PRACTITIONERTYPE = #{pd.PRACTITIONERTYPE} - and f.REPLYSTATUS = #{pd.REPLYSTATUS} + and f.REPLY = #{pd.REPLYSTATUS} and f.SIGNEDSTATUS = #{pd.SIGNEDSTATUS} From 7b0f5dfc605f88bcae4370e7e9acf4947376afd7 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Mon, 8 Apr 2024 17:30:18 +0800 Subject: [PATCH 07/44] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/comprehensive/TrafficDrivingTypeMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml index d0f7762..32187bf 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml @@ -104,7 +104,7 @@ from f left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID - left join sys_dictionaries d on d.BIANMA = f.CHECKTYPE_ID + left join sys_dictionaries d on d.BIANMA = f.CHECKTYPE_ID and d.PARENT_ID = '5ef3a19edcb2435f8db94487834bbae3' where f.ISDELETE = '0' and f.CHECKTYPE_ID = #{pd.CHECKTYPE_ID} From be0fb252b5d6110e768488118f239ed8a6b02caf Mon Sep 17 00:00:00 2001 From: xiepeng Date: Mon, 8 Apr 2024 18:01:44 +0800 Subject: [PATCH 08/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssignedManageController.java | 63 +++++++++--------- .../TrafficDrivingTypeController.java | 1 + .../TrafficSafetyActivitiesController.java | 20 +++++- .../TrafficSafetyAssessmentController.java | 13 +++- .../TrafficSafetyManualController.java | 21 +++++- ...icSafetyOccupationalHazardsController.java | 37 ++++++++++- .../TrafficSafetyProductionController.java | 42 +++++++++++- ...TrafficSafetyResponsibilityController.java | 21 +++++- .../TrafficSecurityCommitmentController.java | 14 ++-- ...SecurityManagementAgreementController.java | 9 +++ .../InspectAnnuallyController.java | 10 ++- .../OperatingVehiclesController.java | 2 +- .../scrapManage/ScrapManageController.java | 64 ++++++++----------- .../controller/system/UsersController.java | 31 +++++++++ ...rafficSafetyOccupationalHazardsMapper.java | 2 + .../TrafficSafetyProductionMapper.java | 2 + .../mapper/datasource/system/UsersMapper.java | 1 + .../TrafficDrivingTypeService.java | 1 + ...afficSafetyOccupationalHazardsService.java | 2 + .../TrafficSafetyProductionService.java | 2 + .../impl/TrafficDrivingTypeServiceImpl.java | 2 + ...cSafetyOccupationalHazardsServiceImpl.java | 5 ++ .../TrafficSafetyProductionServiceImpl.java | 5 ++ .../zcloud/service/system/UsersService.java | 1 + .../service/system/impl/UsersServiceImpl.java | 1 + .../TrafficSafetyActivitiesMapper.xml | 4 ++ .../TrafficSafetyAssessmentMapper.xml | 3 +- .../TrafficSafetyManualMapper.xml | 4 ++ ...TrafficSafetyOccupationalHazardsMapper.xml | 30 +++++++++ .../TrafficSafetyProductionMapper.xml | 18 +++++- .../TrafficSafetyResponsibilityMapper.xml | 2 + .../TrafficSecurityCommitmentMapper.xml | 5 +- ...afficSecurityManagementAgreementMapper.xml | 1 + .../OperatingVehiclesMapper.xml | 5 +- .../mybatis/datasource/system/UsersMapper.xml | 1 + 35 files changed, 343 insertions(+), 102 deletions(-) diff --git a/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java b/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java index aeaf41c..23ea01a 100644 --- a/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java +++ b/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java @@ -1,5 +1,6 @@ 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; @@ -8,12 +9,15 @@ 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") @@ -195,7 +199,6 @@ public class AssignedManageController extends BaseController { if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); page.setPd(pd); List varList = assignedManageService.list(page); //列出MajorDangerSource列表 - List vehicleList = new ArrayList<>(); map.put("varList", varList); map.put("page", page); @@ -255,40 +258,26 @@ public class AssignedManageController extends BaseController { PageData pd = new PageData(); String corpId = Jurisdiction.getCORPINFO_ID(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - List allOperatingVehicleList = operatingVehiclesService.getPulldownVehicleList(pd); // 查询出所有不包括 删除、报废的车辆 + List allOperatingVehicleList = operatingVehiclesService.getPulldownVehicleList(pd); // 查询出所有不包括 删除、报废的营运车辆 List allAssignedList = assignedManageService.assignedList(corpId); // 所有过户的车辆 - for (int i = 0; i < allAssignedList.size(); i++) { - for (int j = 0; j < allOperatingVehicleList.size(); j++) { - if(allAssignedList.get(i).get("RAW_PLATE_NUMBER").equals(allOperatingVehicleList.get(j).get("OPERATING_ID"))) { - allOperatingVehicleList.remove(j); + List varList = new ArrayList<>(); + if(!CollectionUtil.isEmpty(allAssignedList)) { + varList = allOperatingVehicleList.stream().filter(operating -> { + for (PageData assigned : allAssignedList) { + 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", allOperatingVehicleList); + map.put("varList", varList); map.put("result", errInfo); return map; } - /*@RequestMapping(value = "/getassignedfreighttrailerlist") - @ResponseBody - public Object getAssignedFreightTrailerList() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - String corpId = Jurisdiction.getCORPINFO_ID(); - List freightList = freightTrailerService.trailerList(corpId); - List 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 { @@ -297,14 +286,20 @@ public class AssignedManageController extends BaseController { String corpId = Jurisdiction.getCORPINFO_ID(); List freightList = freightTrailerService.getPulldownVehicleList(corpId); List 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("FREIGHTTRAILER_ID"))) { - freightList.remove(j); + List varList = new ArrayList<>(); + if(!CollectionUtils.isEmpty(assignedList)) { + varList = freightList.stream().filter(freight -> { + for (PageData assigned : assignedList) { + 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", freightList); + map.put("varList", varList); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java index 1b20d37..cdf8d4a 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java @@ -125,4 +125,5 @@ public class TrafficDrivingTypeController extends BaseController { map.put("result", errInfo); return map; } + } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java index df021a1..8fcca7c 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java @@ -1,5 +1,6 @@ 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; @@ -58,7 +59,8 @@ 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")); @@ -85,6 +87,13 @@ 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"))){ @@ -96,7 +105,7 @@ public class TrafficSafetyActivitiesController extends BaseController { 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")); @@ -138,6 +147,13 @@ public class TrafficSafetyActivitiesController extends BaseController { page.setPd(pd); List 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); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java index b735991..850a857 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java @@ -87,6 +87,7 @@ 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(); @@ -96,13 +97,16 @@ 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); @@ -138,6 +142,13 @@ public class TrafficSafetyAssessmentController extends BaseController { page.setPd(pd); List 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); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java index a6c92b0..ec05845 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java @@ -57,7 +57,8 @@ 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")); @@ -84,6 +85,14 @@ 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"))){ @@ -95,7 +104,8 @@ 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")); @@ -137,6 +147,13 @@ public class TrafficSafetyManualController extends BaseController { page.setPd(pd); List 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); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java index f94c8f0..13252e0 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java +++ b/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 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,8 +97,14 @@ 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"))){ @@ -155,6 +161,8 @@ 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 varList = occupationalHazardsService.listForSecurityOccupationalHazards(page); map.put("varList", varList); @@ -179,6 +187,15 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController { page.setPd(pd); List 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); @@ -218,4 +235,18 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController { map.put("result", errInfo); return map; } + + + @RequestMapping(value="/getSafetyOccupationalHazardsEdit") + @ResponseBody + public Object getSafetyOccupationalHazardsEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = occupationalHazardsService.getSafetyOccupationalHazardsEdit(pd); //根据ID读取 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java index 19a1079..c11a2e7 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java +++ b/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", "0"); + pd.put("VALIDSTATUS", "2"); } else { pd.put("VALIDSTATUS", "1"); } @@ -57,11 +57,16 @@ public class TrafficSafetyProductionController extends BaseController { 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")); 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); @@ -84,6 +89,13 @@ 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"))){ @@ -95,7 +107,8 @@ 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")); @@ -137,6 +150,15 @@ public class TrafficSafetyProductionController extends BaseController { page.setPd(pd); List 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); @@ -176,4 +198,18 @@ public class TrafficSafetyProductionController extends BaseController { map.put("result", errInfo); return map; } + + + @RequestMapping(value="/getSafetyProductionEdit") + @ResponseBody + public Object getSafetyProductionEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = safetyProductionService.getSafetyProductionEdit(pd); //根据ID读取 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java index 3c32de2..645dfae 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java +++ b/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 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,6 +93,12 @@ 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"))){ @@ -149,6 +155,8 @@ 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 varList = responseService.listForSecurityResponsibility(page); map.put("varList", varList); @@ -187,6 +195,15 @@ public class TrafficSafetyResponsibilityController extends BaseController { page.setPd(pd); List 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); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java index ea8e52c..fd92b05 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java @@ -66,14 +66,6 @@ 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 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); @@ -155,6 +147,8 @@ 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 varList = securityCommitmentService.listForSecurityCommitment(page); map.put("varList", varList); @@ -179,7 +173,9 @@ public class TrafficSecurityCommitmentController extends BaseController { page.setPd(pd); List varList = securityCommitmentService.listForSecurityCommitmentUser(page); varList.forEach(securityCommitment -> { - if(DateUtil.compareDate(DateUtil.getDay(), securityCommitment.getString("EXPIRYDATE"))) { + if(DateUtil.getDay().equals(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"); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java index be8204a..44983b7 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java @@ -140,6 +140,15 @@ public class TrafficSecurityManagementAgreementController extends BaseController page.setPd(pd); List 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); diff --git a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java index e19a148..b12d35a 100644 --- a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java +++ b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java @@ -13,6 +13,7 @@ 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; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import java.util.*; +import java.util.stream.Collectors; /** * 年检管理 @@ -157,11 +159,13 @@ public class InspectAnnuallyController extends BaseController { pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); - List varList = inspectAnnuallyService.list(page); //列出Question列表 + List varList = inspectAnnuallyService.list(page); //列出年检列表 varList.forEach(inspectAnnually -> { - if("1".equals(inspectAnnually.get("OPEAR_ISSCRAP")) || "1".equals(inspectAnnually.get("FREIGHT_ISSCRAP"))) { + boolean isScrapFlag = varList.stream().anyMatch(data -> "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 ("1".equals(inspectAnnually.get("OPEAR_ISASSIGNED")) || "1".equals(inspectAnnually.get("FREIGHT_ISASSIGNED"))) { + } else if (isAssignedFlag) { inspectAnnually.put("ARCHIVES_TYPE","1"); } }); diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index bff57f1..fdb3193 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -166,7 +166,7 @@ public class OperatingVehiclesController extends BaseController { List headstockphoto = imgfilesService.listAll(pd);//车头照片 pd.put("TYPE",121); List drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 - pd.put("TYPE",132); + pd.put("TYPE",122); List operatingcertificatephoto = imgfilesService.listAll(pd);//运营证照片 List zdepartmentPdList = new ArrayList(); diff --git a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java index 788a307..d392a7d 100644 --- a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java +++ b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java @@ -9,6 +9,8 @@ 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; @@ -17,10 +19,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; @Controller @RequestMapping("/scrapmanage") @@ -211,38 +211,24 @@ public class ScrapManageController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List operationList = operatingVehiclesService.getScrapPulldownVehicleList(pd); //列出Question列表 List scrapList = scrapManageService.scrapListAll(corpId); - for (int i = 0; i < scrapList.size(); i++) { - for (int j = 0; j < operationList.size(); j++) { - if(scrapList.get(i).get("PLATE_NUMBER").equals(operationList.get(j).get("PLATE_NUMBER"))) { - operationList.remove(j); + List varList = new ArrayList<>(); + if(!CollectionUtils.isEmpty(scrapList)) { + varList = operationList.stream().filter(operation -> { + for (PageData scrap : scrapList) { + if(StringUtils.equals(operation.getString("PLATE_NUMBER"),scrap.getString("PLATE_NUMBER"))) { + return true; + } } - } + return false; + }).collect(Collectors.toList()); + }else { + varList = operationList; } - map.put("varList", operationList); + map.put("varList", varList); map.put("result", errInfo); return map; } - /*@RequestMapping(value = "/getscrapfreighttrailerlist") - @ResponseBody - public Object getScrapFreightTrailerList() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - String corpId = Jurisdiction.getCORPINFO_ID(); - List freightList = freightTrailerService.trailerList(corpId); - List 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 { @@ -251,14 +237,20 @@ public class ScrapManageController extends BaseController { String corpId = Jurisdiction.getCORPINFO_ID(); List freightList = freightTrailerService.getScrapPulldownVehicleList(corpId); List 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); + List varList = new ArrayList<>(); + if(!CollectionUtils.isEmpty(scrapList)) { + varList = freightList.stream().filter(freight -> { + for (PageData scrap : scrapList) { + if(StringUtils.equals(freight.getString("PLATE_NUMBER"),scrap.getString("PLATE_NUMBER"))){ + return true; + } } - } + return false; + }).collect(Collectors.toList()); + }else{ + varList = freightList; } - map.put("varList", freightList); + map.put("varList", varList); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index b378fd3..5af317c 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -2984,4 +2984,35 @@ public class UsersController extends BaseController { map.put("result", errInfo); return map; } + + + + @RequestMapping("/getTrafficPenaltyUserList") + @ResponseBody + public Object getTrafficPenaltyUserList(Page page) throws Exception { + Map map = new HashMap(); + 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; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.java index 9ed5e95..e2cec12 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.java @@ -19,4 +19,6 @@ public interface TrafficSafetyOccupationalHazardsMapper { List datalistPageUser(Page page); void delete(PageData pd); + + List getSafetyOccupationalHazardsEdit(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java index 32919df..8ff4716 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java @@ -17,4 +17,6 @@ public interface TrafficSafetyProductionMapper { PageData findById(PageData pd); void delete(PageData pd); + + List getSafetyProductionEdit(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 76e5a63..4afc6ab 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -297,4 +297,5 @@ public interface UsersMapper { List userSelectPersonTypelist(PageData pd); PageData getUserByUserId(PageData pd); + } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingTypeService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingTypeService.java index f37a4ea..002327f 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingTypeService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingTypeService.java @@ -31,4 +31,5 @@ public interface TrafficDrivingTypeService { void delete(PageData pd); PageData findById(PageData pd) throws Exception; + } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyOccupationalHazardsService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyOccupationalHazardsService.java index 7a55725..8222748 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyOccupationalHazardsService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyOccupationalHazardsService.java @@ -17,4 +17,6 @@ public interface TrafficSafetyOccupationalHazardsService { List listForSafetyOccupationalHazardsUser(Page page); void delete(PageData pd); + + List getSafetyOccupationalHazardsEdit(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java index 3b7e990..cee6b02 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java @@ -15,4 +15,6 @@ public interface TrafficSafetyProductionService { PageData findById(PageData pd); void delete(PageData pd); + + List getSafetyProductionEdit(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java index fb6c024..2dbb7fd 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java @@ -62,6 +62,8 @@ public class TrafficDrivingTypeServiceImpl implements TrafficDrivingTypeService public PageData findById(PageData pd) { return trafficDrivingTypeMapper.findById(pd); } + + @Autowired private TrafficDrivingSignMapper trafficDrivingSignMapper; diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyOccupationalHazardsServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyOccupationalHazardsServiceImpl.java index c93c9e4..96579ef 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyOccupationalHazardsServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyOccupationalHazardsServiceImpl.java @@ -43,4 +43,9 @@ public class TrafficSafetyOccupationalHazardsServiceImpl implements TrafficSafet public void delete(PageData pd) { occupationalHazardsMapper.delete(pd); } + + @Override + public List getSafetyOccupationalHazardsEdit(PageData pd) { + return occupationalHazardsMapper.getSafetyOccupationalHazardsEdit(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java index 246a309..2c48fab 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java @@ -37,4 +37,9 @@ public class TrafficSafetyProductionServiceImpl implements TrafficSafetyProducti public void delete(PageData pd) { speedProductionMapper.delete(pd); } + + @Override + public List getSafetyProductionEdit(PageData pd) { + return speedProductionMapper.getSafetyProductionEdit(pd); + } } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 62f5497..4865b92 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -370,4 +370,5 @@ public interface UsersService { List userSelectPersonTypelist(PageData pd); PageData getUserByUserId(PageData pd); + } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 365c114..3059864 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -1340,4 +1340,5 @@ public class UsersServiceImpl implements UsersService { return usersMapper.getUserByUserId(pd); } + } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml index 2a26728..fcbb98e 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml @@ -96,9 +96,13 @@ OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, OPERATTIME = #{OPERATTIME}, + ACTIVITIESNAME = #{ACTIVITIESNAME}, EXPIRYDATE = #{EXPIRYDATE}, CYCLE = #{CYCLE}, ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE} + + ,VALIDSTATUS = #{VALIDSTATUS} + where ACTIVITIES_ID = #{ACTIVITIES_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml index d558d81..17cd4a5 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml +++ b/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} ,VALIDSTATUS = #{VALIDSTATUS} @@ -135,6 +135,7 @@ and f.VALIDSTATUS = #{pd.VALIDSTATUS} + ORDER BY f.OPERATTIME DESC + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml index 34c2ccd..dadd06d 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml @@ -96,6 +96,7 @@ OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, OPERATTIME = #{OPERATTIME}, + EXPIRYDATE = #{EXPIRYDATE}, ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE} where SAFETYPRODUCTION_ID = #{SAFETYPRODUCTION_ID} @@ -131,7 +132,7 @@ and f.VALIDSTATUS = #{pd.VALIDSTATUS} - ORDER BY f.CREATETIME DESC + ORDER BY f.OPERATTIME DESC + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml index 4a2e3d9..688967a 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml @@ -141,6 +141,7 @@ 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) @@ -177,6 +178,7 @@ and f.USER_ID = #{pd.USER_ID} + ORDER BY f.OPERATTIME DESC diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml index 812240b..995eecc 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml @@ -112,7 +112,7 @@ ,VALIDSTATUS = #{VALIDSTATUS} where - SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID} + SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID} @@ -149,6 +149,7 @@ 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 ) @@ -213,7 +214,7 @@ 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.VALIDSTATUS IS NOT NULL and f.SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID} and f.USER_ID = #{USER_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml index e039c98..d5b98aa 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml @@ -97,6 +97,7 @@ OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, OPERATTIME = #{OPERATTIME}, + MANAGEMENTAGREEMENTNAME = #{MANAGEMENTAGREEMENTNAME}, EXPIRYDATE = #{EXPIRYDATE}, ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE} where diff --git a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml index 78970d2..b92ba14 100644 --- a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml +++ b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml @@ -598,10 +598,11 @@ v.PLATE_NUMBER from f - INNER JOIN v_traffic v on v.ID = f.OPERATING_ID + LEFT JOIN v_traffic v on v.ID = f.OPERATING_ID where f.CORPINFO_ID = #{corpId} - and f.ISDELETE = '0' and f.ISSCRAP = '0' + AND (f.ISDELETE = '0' OR f.ISDELETE IS NULL) + AND (f.ISSCRAP = '0' OR f.ISSCRAP IS NULL) diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index ffd0c73..87ea9cd 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1838,4 +1838,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where USER_ID = #{USER_ID} + From b37c6bea6b7f7a0f2a17887ba0da29cf41c6239a Mon Sep 17 00:00:00 2001 From: wangpeng Date: Mon, 8 Apr 2024 20:12:27 +0800 Subject: [PATCH 09/44] =?UTF-8?q?=E4=BB=8E=E4=B8=9A=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=94=A8=E6=88=B7select=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/UsersController.java | 23 +++++++++++++++ .../mapper/datasource/system/UsersMapper.java | 1 + .../zcloud/service/system/UsersService.java | 2 ++ .../service/system/impl/UsersServiceImpl.java | 5 ++++ .../mybatis/datasource/system/UsersMapper.xml | 28 +++++++++++++++++++ 5 files changed, 59 insertions(+) diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 5af317c..863fc53 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -3015,4 +3015,27 @@ public class UsersController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 人员列表(select) + * + * @param + * @return + * @throws Exception + */ + @RequestMapping("/getPractitionerSelectList") + @ResponseBody + @LogAnno(menuType = "综合管理", menuServer = "特种设备", instructionsOperate = "设备管理", instructionsType = "用户列表") + public Object getPractitionerSelectList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + //page.setPd(pd); + List userList = usersService.getPractitionerSelectList(pd);//列出用户列表 + map.put("userList", userList); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 4afc6ab..09a5f6a 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -298,4 +298,5 @@ public interface UsersMapper { PageData getUserByUserId(PageData pd); + List getPractitionerSelectList(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 4865b92..2ed77ea 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -371,4 +371,6 @@ public interface UsersService { PageData getUserByUserId(PageData pd); + List getPractitionerSelectList(PageData pd) throws Exception; + } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 3059864..0eb0fba 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -1340,5 +1340,10 @@ public class UsersServiceImpl implements UsersService { return usersMapper.getUserByUserId(pd); } + @Override + public List getPractitionerSelectList(PageData pd) throws Exception { + return usersMapper.getPractitionerSelectList(pd); + } + } diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 87ea9cd..6c67a2e 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -522,6 +522,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.CORPINFO_ID = #{pd.CORPINFO_ID} + + AND c.PERSONNEL_TYPE = #{pd.PERSONNEL_TYPE} + order by d.LEVEL asc ,d.DEP_ORDER,d.DEPARTMENT_ID asc, u.SORT asc,u.USER_ID @@ -1839,4 +1842,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" USER_ID = #{USER_ID} + + From 292883e482732d8f09ae765a7217cfa068525818 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 9 Apr 2024 16:09:03 +0800 Subject: [PATCH 10/44] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E4=BD=93=E7=B3=BB=E7=AE=A1=E7=90=86=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficSafetyAssessmentController.java | 13 +------------ ...ficSafetyOccupationalHazardsController.java | 16 ---------------- .../TrafficSafetyProductionController.java | 13 +------------ .../TrafficSafetyResponsibilityController.java | 16 ---------------- .../TrafficSecurityCommitmentController.java | 17 ----------------- ...TrafficSecurityLaborContractController.java | 17 +---------------- ...icSecurityManagementStaffingController.java | 18 +----------------- .../controller/system/UsersController.java | 18 +++++++++--------- .../TrafficSafetyAssessmentMapper.xml | 3 +++ .../TrafficSafetyProductionMapper.xml | 12 +++++++++++- .../TrafficSecurityLaborContractMapper.xml | 3 +++ ...TrafficSecurityManagementStaffingMapper.xml | 5 ++++- 12 files changed, 34 insertions(+), 117 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java index 850a857..c8430ce 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java @@ -127,18 +127,7 @@ public class TrafficSafetyAssessmentController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = safetyAssessmentService.listForSafetyAssessment(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java index 13252e0..25dc00f 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyOccupationalHazardsController.java @@ -145,22 +145,6 @@ public class TrafficSafetyOccupationalHazardsController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); - String OCCUPATIONALNAME = pd.getString("OCCUPATIONALNAME"); // 关键词检索条件 - if (Tools.notEmpty(OCCUPATIONALNAME)) - pd.put("OCCUPATIONALNAME", OCCUPATIONALNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - - String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件 - if (Tools.notEmpty(ISSIGNED)) - pd.put("ISSIGNED", ISSIGNED.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java index c11a2e7..d986bc0 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java @@ -135,18 +135,7 @@ public class TrafficSafetyProductionController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = safetyProductionService.listForSafetyProductionlist(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java index 645dfae..376a9ae 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyResponsibilityController.java @@ -139,22 +139,6 @@ public class TrafficSafetyResponsibilityController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); - String RESPONSIBILITYNAME = pd.getString("RESPONSIBILITYNAME"); // 关键词检索条件 - if (Tools.notEmpty(RESPONSIBILITYNAME)) - pd.put("RESPONSIBILITYNAME", RESPONSIBILITYNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - - String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件 - if (Tools.notEmpty(ISSIGNED)) - pd.put("ISSIGNED", ISSIGNED.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java index fd92b05..7837422 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java @@ -130,23 +130,6 @@ public class TrafficSecurityCommitmentController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String COMMITMENTNAME = pd.getString("COMMITMENTNAME"); // 关键词检索条件 - if (Tools.notEmpty(COMMITMENTNAME)) - pd.put("COMMITMENTNAME", COMMITMENTNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - - String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件 - if (Tools.notEmpty(ISSIGNED)) - pd.put("ISSIGNED", ISSIGNED.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLaborContractController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLaborContractController.java index f576042..37b0342 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLaborContractController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLaborContractController.java @@ -136,22 +136,7 @@ public class TrafficSecurityLaborContractController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String CONTRACTNAME = pd.getString("CONTRACTNAME"); // 关键词检索条件 - if (Tools.notEmpty(CONTRACTNAME)) - pd.put("CONTRACTNAME", CONTRACTNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - - String ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件 - if (Tools.notEmpty(ISSIGNED)) - pd.put("ISSIGNED", ISSIGNED.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = laborContractService.listForLaborContract(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java index 60a3a52..8dfa337 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java @@ -122,23 +122,7 @@ public class TrafficSecurityManagementStaffingController extends BaseController String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - - String OPERATIONTYPE = pd.getString("OPERATIONTYPE"); // 关键词检索条件 - if (Tools.notEmpty(OPERATIONTYPE)) - pd.put("OPERATIONTYPE", OPERATIONTYPE.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = securityManagementStaffingService.listForSecurityStaffing(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 863fc53..6767590 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -827,11 +827,11 @@ public class UsersController extends BaseController { String errInfo = "success"; pd = this.getPageData(); FHLOG.save(Jurisdiction.getUsername(), "删除用户ID：" + pd.getString("USER_ID")); //记录日志 - if (!PLSUtil.removeUser(pd)) { - map.put("result", "errInfo"); //返回结果 - map.put("msg", "删除失败，请联系管理员"); //返回结果 - return map; - } +// if (!PLSUtil.removeUser(pd)) { +// map.put("result", "errInfo"); //返回结果 +// map.put("msg", "删除失败，请联系管理员"); //返回结果 +// return map; +// } usersService.deleteUser(pd); //删除用户 ueditorService.delete(pd); //删除副文本关联数据 @@ -1662,7 +1662,7 @@ public class UsersController extends BaseController { } } // 进行定位卡号同步校验 - for (PageData pageData : editUserList) { + /*for (PageData pageData : editUserList) { String msg = usersService.changeOrUpdUserCardNo(pageData); if (!msg.equals(Const.CAN_CHENG_USER)) { errorStr.append("第" + number + "行,"); @@ -1677,15 +1677,15 @@ public class UsersController extends BaseController { errorStr.append("第" + number + "行,"); errorStr.append("人员定位系统用户添加失败，请联系管理员。" + "\n"); } - } + }*/ if (Tools.isEmpty(errorStr.toString())) { for (PageData pageData : addUserList) { usersService.saveUser(pageData); } for (PageData pageData : editUserList) { - if (PLSUtil.editUser(pageData)) { +// if (PLSUtil.editUser(pageData)) { usersService.editUser(pageData); - } +// } } errorStr.append("成功导入" + addUserList.size() + "条数据!"); errorStr.append("成功修改" + editUserList.size() + "条数据!"); diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml index 17cd4a5..b56d975 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml @@ -126,6 +126,9 @@ f left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID where f.ISDELETE = '0' + + and f.OPERATINGCOMPANY = #{pd.CORPINFO_ID} + and f.SYSTEMNAME LIKE CONCAT('%', #{pd.SYSTEMNAME}, '%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml index dadd06d..8094b8a 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyProductionMapper.xml @@ -123,6 +123,9 @@ f left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID where f.ISDELETE = '0' + + and f.OPERATINGCOMPANY = #{pd.CORPINFO_ID} + and f.SYSTEMNAME LIKE CONCAT('%', #{pd.SYSTEMNAME}, '%') @@ -130,7 +133,14 @@ and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS} - and f.VALIDSTATUS = #{pd.VALIDSTATUS} + + + and f.EXPIRYDATE >= date_format(now(),'%Y-%m-%d') + + + and f.EXPIRYDATE < date_format(now(),'%Y-%m-%d') + + ORDER BY f.OPERATTIME DESC diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLaborContractMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLaborContractMapper.xml index 7c8eed2..029bc74 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLaborContractMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLaborContractMapper.xml @@ -146,6 +146,9 @@ where u.ISDELETE = '0' and u.ISMAIN != '1' and (c.VALIDSTATUS != '2' or c.VALIDSTATUS is null) + + and u.CORPINFO_ID = #{pd.CORPINFO_ID} + and c.CONTRACTNAME like CONCAT('%',#{pd.CONTRACTNAME},'%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml index 9246d2b..60257c9 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml @@ -125,8 +125,11 @@ f left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID where f.ISDELETE = '0' + + and f.OPERATINGCOMPANY = #{pd.CORPINFO_ID} + - and f.SYSTEMNAME = #{pd.SYSTEMNAME} + and f.SYSTEMNAME LIKE CONCAT(CONCAT('%', #{pd.SYSTEMNAME}),'%') and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS} From 9a53d54817c1e77ffd94cee5b33a57985d78be70 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 9 Apr 2024 19:08:24 +0800 Subject: [PATCH 11/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppTrafficSecurityNoticeController.java | 2 +- .../TrafficSecurityNoticeController.java | 137 ++++++++++++++++-- ...curityViolationRegistrationController.java | 9 +- .../TrafficSecurityNoticeMapper.java | 4 + .../TrafficSecurityReadDetailMapper.java | 2 + .../mapper/datasource/system/UsersMapper.java | 2 + .../TrafficSecurityNoticeService.java | 4 + .../TrafficSecurityReadDetailService.java | 2 + .../TrafficSecurityNoticeServiceImpl.java | 9 ++ .../impl/TrafficSecurityReadDetailImpl.java | 5 + .../zcloud/service/system/UsersService.java | 1 + .../service/system/impl/UsersServiceImpl.java | 5 +- .../TrafficSecurityNoticeMapper.xml | 45 ++++++ .../TrafficSecurityReadDetailMapper.xml | 30 ++++ ...ficSecurityViolationRegistrationMapper.xml | 6 +- .../mybatis/datasource/system/UsersMapper.xml | 18 ++- 16 files changed, 261 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java index 0af4631..5d23be6 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java @@ -108,7 +108,7 @@ public class AppTrafficSecurityNoticeController extends BaseController { * 1.获取关系信息 * 2.根据关系信息找到公告信息 */ - pd.put("USER_ID", pd.getString("loginUserId")); +// pd.put("USER_ID", pd.getString("loginUserId")); page.setPd(pd); List varList = trafficSecurityReadDetailService.listByUserId(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java index 80e874b..99818e8 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java @@ -30,6 +30,12 @@ public class TrafficSecurityNoticeController extends BaseController { @Autowired private Smb smb; + @Autowired + private UsersService usersService; + + @Autowired + private TrafficSecurityReadDetailService trafficSecurityReadDetailService; + //新增 @RequestMapping(value = "/add") @ResponseBody @@ -46,7 +52,7 @@ public class TrafficSecurityNoticeController extends BaseController { pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("NOTIFICATION_ID", notificationId); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 - pd.put("POSTSTATUS", "1"); // 发布状态 + pd.put("POSTSTATUS", "0"); // 发布状态 pd.put("SIGNEDSTATUS", "0"); // 签收状态 pd.put("ISDELETE", "0"); @@ -85,15 +91,6 @@ public class TrafficSecurityNoticeController extends BaseController { pd.put("REPLY", "0"); // 回复情况 securityNoticeService.save(pd); - String[] personIds = pd.getString("PERSON_ID").split(","); - for (String personId : personIds) { - pd.put("NOTIFICATION_ID", notificationId); - pd.put("PERSON_ID", personId.trim()); - pd.put("READDETAIL_ID", this.get32UUID()); // 主键 - pd.put("REPLYSTATUS", "0"); // 主键 - pd.put("SIGNEDSTATUS", "0"); // 主键 - securityReadDetail.save(pd); - } map.put("result", errInfo); map.put("pd", pd); return map; @@ -187,11 +184,95 @@ public class TrafficSecurityNoticeController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd = securityNoticeService.findById(pd);//根据ID读取 + String[] personIds = pd.getString("PERSON_ID").split(","); + List names = new ArrayList<>(); + List readDetail = new ArrayList<>(); + for (String personId : personIds) { + PageData pageData = new PageData(); + pageData.put("USER_ID",personId); + pageData.put("NOTIFICATION_ID",pd.getString("NOTIFICATION_ID")); + PageData pageData1 = usersService.findById(pageData); + names.add(pageData1); + Page page = new Page(); + page.setPd(pageData); + readDetail = trafficSecurityReadDetailService.listByUserIdOrNoticeId(page); + } + pd.put("readDetail",readDetail); map.put("pd", pd); + //map.put("readDetail", readDetail); + map.put("names", names); map.put("result", errInfo); return map; } + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit( + @RequestParam(value="fileList",required=false) MultipartFile file, + @RequestParam(value="videoList",required=false) MultipartFile videoFile) + throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CORPINFO_ID", Jurisdiction.getPOST_ID()); // 创建人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("POSTSTATUS", "0"); // 发布状态 + pd.put("SIGNEDSTATUS", "0"); // 签收状态 + pd.put("ISDELETE", "0"); + + String ffile = DateUtil.getDays(); + if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + 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")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + // 处理 videoFile + if (videoFile != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))) { + String videoSuffixName = videoFile.getOriginalFilename().substring(videoFile.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"mp4".equals(videoSuffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "视频文件格式不正确！"); + return map; + } + String videoFileName = this.get32UUID() + videoFile.getOriginalFilename().substring(videoFile.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(videoFile, videoFileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("VIDEO_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + videoFileName); + pd.put("VIDEO_NAME",pd.getString("CREATORNAME")); + } + + pd.put("SIGNING", "0"); // 签收情况 + pd.put("REPLY", "0"); // 回复情况 + securityNoticeService.edit(pd); + + String[] personIds = pd.getString("PERSON_ID").split(","); + for (String personId : personIds) { + //pd.put("NOTIFICATION_ID", notificationId); + pd.put("PERSON_ID", personId.trim()); + pd.put("READDETAIL_ID", this.get32UUID()); // 主键 + pd.put("REPLYSTATUS", "0"); // 主键 + pd.put("SIGNEDSTATUS", "0"); // 主键 + securityReadDetail.save(pd); + } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + /**删除 * @param * @throws Exception @@ -241,4 +322,40 @@ public class TrafficSecurityNoticeController extends BaseController { map.put("result", errInfo);//返回结果 return map; } + + @RequestMapping(value="/issueSecurityNotice") + @ResponseBody + public Object issueSecurityNotice() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + // 修改安全通知发布状态 + securityNoticeService.issueSecurityNotice(pd); + // 查询此条通知的信息，获取 推送的ID + PageData securityNotice = securityNoticeService.findById(pd); + // 把此条通知的ID 和 推送人的ID 存入到 发部表 + String[] personIds = securityNotice.getString("PERSON_ID").split(","); + for (int i = 0; i < personIds.length; i++) { + PageData issue = new PageData(); + issue.put("READDETAIL_ID", this.get32UUID()); + issue.put("NOTIFICATION_ID",securityNotice.getString("NOTIFICATION_ID")); + issue.put("TITLE",securityNotice.getString("TITLE")); + issue.put("LEVEL",securityNotice.getString("LEVEL")); + issue.put("REPLY", "0"); + issue.put("SIGNING", "0"); + issue.put("TRANSPORTATIONCOMPANY", securityNotice.getString("TRANSPORTATIONCOMPANY")); + issue.put("PERSON_ID",personIds[i]); + issue.put("PERSON", securityNotice.getString("PERSON_ID")); + issue.put("ISDELETE", "0"); + issue.put("CREATOR", Jurisdiction.getUSER_ID()); + issue.put("CREATORNAME", Jurisdiction.getUsername()); + issue.put("CREATETIME",DateUtil.date2Str(new Date())); + // 编写发布的 insert + trafficSecurityReadDetailService.save(issue); + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java index 6ed198a..208e7d5 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java @@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.comprehensive.TrafficSecurityViolationRegistrationService; +import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +24,9 @@ import java.util.Map; public class TrafficSecurityViolationRegistrationController extends BaseController { @Autowired private TrafficSecurityViolationRegistrationService violationRegistrationService; + + @Autowired + private UsersService usersService; @Autowired private Smb smb; @@ -74,8 +78,11 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll pd = this.getPageData(); String USER_ID = pd.getString("USER_ID"); // 运输企业 - if (Tools.notEmpty(USER_ID)) + if (Tools.notEmpty(USER_ID)){ + pd.put("USER_ID", USER_ID.trim()); + } + String PENALTYTIME = pd.getString("PENALTYTIME"); // 运输车辆 if (Tools.notEmpty(PENALTYTIME)) diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityNoticeMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityNoticeMapper.java index 398c88a..70f39a6 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityNoticeMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityNoticeMapper.java @@ -37,4 +37,8 @@ public interface TrafficSecurityNoticeMapper { List getAllNotifications(PageData pd); int getRedPoint(PageData pd); + + void edit(PageData pd); + + void issueSecurityNotice(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java index 3fce7a4..f06df75 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java @@ -16,4 +16,6 @@ public interface TrafficSecurityReadDetailMapper { void edit(PageData pd); void delete(PageData pd); + + List listByUserIdOrNoticeId(Page page); } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 09a5f6a..093e642 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -299,4 +299,6 @@ public interface UsersMapper { PageData getUserByUserId(PageData pd); List getPractitionerSelectList(PageData pd); + + List listUserByIds(String[] personIds); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityNoticeService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityNoticeService.java index 0f33117..3426775 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityNoticeService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityNoticeService.java @@ -22,4 +22,8 @@ public interface TrafficSecurityNoticeService { List getAllNotifications(PageData pd); public int getRedPoint(PageData pd) throws Exception; + + public void edit(PageData pd); + + public void issueSecurityNotice(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java index 9abe8fa..2692d1b 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java @@ -15,4 +15,6 @@ public interface TrafficSecurityReadDetailService { void edit(PageData pd); void delete(PageData pd); + + List listByUserIdOrNoticeId(Page page); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityNoticeServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityNoticeServiceImpl.java index e617243..cf2a161 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityNoticeServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityNoticeServiceImpl.java @@ -49,4 +49,13 @@ public class TrafficSecurityNoticeServiceImpl implements TrafficSecurityNoticeSe return securityNoticeMapper.getRedPoint(pd); } + @Override + public void edit(PageData pd) { + securityNoticeMapper.edit(pd); + } + + @Override + public void issueSecurityNotice(PageData pd) { + securityNoticeMapper.issueSecurityNotice(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java index a30a39b..d975b40 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java @@ -38,4 +38,9 @@ public class TrafficSecurityReadDetailImpl implements TrafficSecurityReadDetailS public void delete(PageData pd) { securityReadDetailMapper.delete(pd); } + + @Override + public List listByUserIdOrNoticeId(Page page) { + return securityReadDetailMapper.listByUserIdOrNoticeId(page); + } } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 2ed77ea..9da46bd 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -373,4 +373,5 @@ public interface UsersService { List getPractitionerSelectList(PageData pd) throws Exception; + List listUserByIds(String[] personIds); } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 0eb0fba..ab1e5a6 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -1345,5 +1345,8 @@ public class UsersServiceImpl implements UsersService { return usersMapper.getPractitionerSelectList(pd); } - + @Override + public List listUserByIds(String[] personIds) { + return usersMapper.listUserByIds(personIds); + } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml index 548acbc..2fc5bae 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml @@ -125,6 +125,41 @@ NOTIFICATION_ID = #{NOTIFICATION_ID} + + + update + f + set + NOTIFICATION_ID = #{NOTIFICATION_ID}, + TITLE = #{TITLE}, + LEVEL = #{LEVEL}, + REPLY = #{REPLY}, + SIGNING = #{SIGNING}, + TRANSPORTATIONCOMPANY = #{TRANSPORTATIONCOMPANY}, + PERSON_ID = #{PERSON_ID}, + PERSON = #{PERSON}, + NOTIFICATIONCONTENT = #{NOTIFICATIONCONTENT}, + ISDELETE = #{ISDELETE}, + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME}, + CREATOR = #{CREATOR}, + CREATORNAME = #{CREATORNAME}, + CREATETIME = #{CREATETIME}, + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME}, + REPLYSTATUS = #{REPLYSTATUS}, + PRACTITIONER = #{PRACTITIONER}, + PRACTITIONERTYPE = #{PRACTITIONERTYPE}, + ATTACHMENT_ROUTE = #{ATTACHMENT_ROUTE}, + ATTACHMENT_NAME = #{ATTACHMENT_NAME}, + VIDEO_ROUTE = #{VIDEO_ROUTE}, + VIDEO_NAME = #{VIDEO_NAME}, + POSTSTATUS = #{POSTSTATUS} + where + f.NOTIFICATION_ID = #{NOTIFICATION_ID} + + + + + update + f + set + POSTSTATUS = '1' + where + f.NOTIFICATION_ID = #{NOTIFICATION_ID} + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml index 4e9039c..49d5b74 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml @@ -192,5 +192,35 @@ + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml index c3aa517..ee5dee4 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml @@ -139,7 +139,7 @@ left join sys_user u on f.USER_ID = u.USER_ID where f.ISDELETE = '0' - and f.USER_ID = #{pd.USER_ID} + and u.NAME LIKE CONCAT(CONCAT('%', #{pd.USER_ID}),'%') and f.PENALTYTIME = #{pd.PENALTYTIME} @@ -148,9 +148,11 @@ diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 6c67a2e..61c9856 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1078,11 +1078,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join SYS_ROLE r on u.ROLE_ID = r.ROLE_ID left join OA_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID left join SYS_POST p on p.POST_ID=u.POST_ID - where - USER_ID in - - #{item} - + c order by d.LEVEL asc ,d.DEP_ORDER asc ,d.DEPARTMENT_ID asc, u.SORT asc,u.LAST_LOGIN desc @@ -1867,4 +1863,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.BIANMA LIKE CONCAT(CONCAT('%', #{BIANMA}),'%') + + From 78e0bccac5683826853c139d165b199b6cc6508a Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 9 Apr 2024 21:51:06 +0800 Subject: [PATCH 12/44] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9B=BF=E6=8D=A2CORPI?= =?UTF-8?q?NFO=5FID=E9=80=9A=E7=94=A8=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SecurityWaybillRegistrationController.java | 15 --------- .../TrafficDrivingCommitmentController.java | 2 +- .../TrafficDrivingTypeController.java | 2 +- .../TrafficSafetyActivitiesController.java | 26 +++++----------- .../TrafficSafetyManualController.java | 26 +++++----------- .../TrafficSafetyMeetingController.java | 20 ++++-------- ...curityAccidentInvestigationController.java | 10 ++---- ...cSecurityCustomerManagementController.java | 27 +++++++++------- ...cSecurityLocationManagementController.java | 27 ++++++++++------ ...SecurityManagementAgreementController.java | 25 +++++---------- .../TrafficSecurityNoticeController.java | 17 +++------- ...curityViolationRegistrationController.java | 18 +++-------- ...SecurityWaybillRegistrationController.java | 26 ++-------------- .../EnterpriseSafetyProductionController.java | 1 + .../EquipmentFacilityController.java | 1 + ...refightingEquipmentFacilityController.java | 1 + .../LabourEntrenchThingController.java | 1 + .../scrapManage/ScrapManageController.java | 1 + .../TaxationManageController.java | 1 + ...afficSecurityCustomerManagementMapper.java | 1 + ...afficSecurityLocationManagementMapper.java | 2 ++ ...fficSecurityWaybillRegistrationMapper.java | 2 -- ...fficSecurityCustomerManagementService.java | 2 ++ ...fficSecurityLocationManagementService.java | 2 ++ ...ficSecurityWaybillRegistrationService.java | 2 -- ...SecurityCustomerManagementServiceImpl.java | 5 +++ ...SecurityLocationManagementServiceImpl.java | 5 +++ ...ecurityManagementAgreementServiceImpl.java | 1 + ...ecurityWaybillRegistrationServiceImpl.java | 5 --- .../TrafficDrivingCommitmentMapper.xml | 2 +- .../TrafficDrivingTypeMapper.xml | 2 +- .../TrafficSafetyActivitiesMapper.xml | 10 +++--- .../TrafficSafetyManualMapper.xml | 10 +++--- .../TrafficSafetyMeetingMapper.xml | 16 +++++----- ...ficSecurityAccidentInvestigationMapper.xml | 5 ++- ...rafficSecurityCustomerManagementMapper.xml | 31 ++++++++++++++----- ...rafficSecurityLocationManagementMapper.xml | 25 ++++++++++----- ...afficSecurityManagementAgreementMapper.xml | 12 +++---- .../TrafficSecurityNoticeMapper.xml | 12 +++---- ...ficSecurityViolationRegistrationMapper.xml | 10 +++--- ...afficSecurityWaybillRegistrationMapper.xml | 19 +++--------- .../EnterpriseSafetyProductionMapper.xml | 2 +- .../EquipmentFacilityMapper.xml | 2 +- .../FirefightingEquipmentFacilityMapper.xml | 2 +- .../LabourEntrenchThingMapper.xml | 2 +- .../ReportedIncidentMapper.xml | 2 +- .../datasource/scrapManage/ScrapManage.xml | 2 +- .../taxationManage/TaxationManageMapper.xml | 2 +- 48 files changed, 193 insertions(+), 249 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java index 20fa330..d9f8bf9 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java @@ -57,21 +57,6 @@ public class AppTrafficSecurityWaybillRegistrationController extends BaseControl return map; } - @RequestMapping(value = "/forSecurityPerson") - @ResponseBody - public Object forSecurityPerson() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); - pd = trafficSecurityWaybillRegistrationService.forSecurityPerson(pd); - pd.put("PRACTITIONER", Jurisdiction.getName()); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } - /** * 查看详情 * @return diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java index f42eb73..390f67a 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java @@ -85,7 +85,7 @@ public class TrafficDrivingCommitmentController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = trafficDrivingCommitmentService.listForDrivingCommitment(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java index cdf8d4a..2bc7740 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java @@ -81,7 +81,7 @@ public class TrafficDrivingTypeController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = trafficDrivingTypeService.listForDrivingType(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java index 8fcca7c..04ea166 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java @@ -37,7 +37,7 @@ public class TrafficSafetyActivitiesController extends BaseController { String activities_Id = this.get32UUID(); pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("ACTIVITIES_ID", activities_Id); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("COMPLETIONSTATUS", "0"); @@ -61,8 +61,8 @@ public class TrafficSafetyActivitiesController extends BaseController { } //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); + 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")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -85,7 +85,7 @@ public class TrafficSafetyActivitiesController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("ISDELETE", "0"); if(!StringUtils.isEmpty(pd.getString("EXPIRYDATE")) && DateUtil.compareDate(pd.getString("EXPIRYDATE"),DateUtil.getDay())) { @@ -106,8 +106,8 @@ public class TrafficSafetyActivitiesController extends BaseController { return map; } 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); + 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")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -132,19 +132,7 @@ public class TrafficSafetyActivitiesController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 page.setPd(pd); List varList = activeService.listForSafetyActivitieslist(page); varList.forEach(active -> { diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java index ec05845..bec2e94 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java @@ -35,7 +35,7 @@ public class TrafficSafetyManualController extends BaseController { String manual_Id = this.get32UUID(); pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("MANUAL_ID", manual_Id); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("COMPLETIONSTATUS", "0"); @@ -59,8 +59,8 @@ public class TrafficSafetyManualController extends BaseController { } //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); + 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")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -83,7 +83,7 @@ public class TrafficSafetyManualController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("ISDELETE", "0"); @@ -106,8 +106,8 @@ public class TrafficSafetyManualController extends BaseController { } //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); + 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")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -132,19 +132,7 @@ public class TrafficSafetyManualController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 page.setPd(pd); List varList = safetyManualService.listForSafetyManuallist(page); varList.forEach(manual -> { diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java index bb7e4a2..a9fe0f8 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java @@ -41,7 +41,7 @@ public class TrafficSafetyMeetingController extends BaseController { pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 pd.put("SAFETY_MEETING_ID", safety_meeting_id); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("MEETING_STATUS", "0"); // 会议状态 pd.put("MEETING_PERSONS", "0"); // 参会人数 pd.put("ISDELETE", "0"); @@ -56,8 +56,8 @@ public class TrafficSafetyMeetingController extends BaseController { return map; } String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); - pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -72,8 +72,8 @@ public class TrafficSafetyMeetingController extends BaseController { return map; } String videoFileName = this.get32UUID() + videoFile.getOriginalFilename().substring(videoFile.getOriginalFilename().lastIndexOf(".")); - smb.sshSftp(videoFile, videoFileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); - pd.put("VIDEO_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + videoFileName); + smb.sshSftp(videoFile, videoFileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("VIDEO_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + videoFileName); pd.put("VIDEO_NAME",pd.getString("CREATORNAME")); } String meetingDate = pd.getString("MEETING_DATE"); @@ -117,15 +117,7 @@ public class TrafficSafetyMeetingController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String MEETING_TITLE = pd.getString("MEETING_TITLE"); // 关键词检索条件 - if (Tools.notEmpty(MEETING_TITLE)) - pd.put("MEETING_TITLE", MEETING_TITLE.trim()); - - String MEETING_TYPE = pd.getString("MEETING_TYPE"); // 关键词检索条件 - if (Tools.notEmpty(MEETING_TYPE)) - pd.put("MEETING_TYPE", MEETING_TYPE.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 page.setPd(pd); List varList = trafficSafetyMeetingService.listForSafetyMeeting(page); Date date = DateUtil.fomatDate(DateUtil.getDay()); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java index eb1e575..cb82bb1 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java @@ -42,6 +42,7 @@ public class TrafficSecurityAccidentInvestigationController extends BaseControll pd.put("INCIDENTNUMBER", this.get32UUID()); // 事故编号 pd.put("CERTIFICATIONNUMBER", this.get32UUID()); // 认定书编号 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id pd.put("DEPARTMENT", Jurisdiction.getCORPINFO_ID()); // 部门 pd.put("ISDELETE", "0"); @@ -90,14 +91,7 @@ public class TrafficSecurityAccidentInvestigationController extends BaseControll PageData pd = new PageData(); pd = this.getPageData(); - String USER_ID = pd.getString("USER_ID"); - if (Tools.notEmpty(USER_ID)) - pd.put("USER_ID", USER_ID.trim()); - - String ACCIDENTDATE = pd.getString("ACCIDENTDATE"); // 运输车辆 - if (Tools.notEmpty(ACCIDENTDATE)) - pd.put("ACCIDENTDATE", ACCIDENTDATE.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = accidentInvestigationService.listForAccidentInvestigation(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index 08d1528..49e53d7 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -40,7 +40,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController String customermanagement_id = this.get32UUID(); // 生成主键ID pd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id); // 设置客户管理ID pd.put("CUSTOMERNAME_ID", this.get32UUID()); - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 设置运输公司ID + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 设置运输公司ID pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 设置创建人ID pd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 设置创建时间 @@ -73,7 +73,6 @@ public class TrafficSecurityCustomerManagementController extends BaseController return map; } - @RequestMapping(value = "/listForSecurityCustomerManagement") @ResponseBody public Object listForSecurityCustomerManagement(Page page) throws Exception { @@ -81,15 +80,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String CUSTOMERTYPE = pd.getString("CUSTOMERTYPE"); // 关键词检索条件 - if (Tools.notEmpty(CUSTOMERTYPE)) - pd.put("CUSTOMERTYPE", CUSTOMERTYPE.trim()); - - String TRANSPORTATIONCOMPANY = pd.getString("TRANSPORTATIONCOMPANY"); // 关键词检索条件 - if (Tools.notEmpty(TRANSPORTATIONCOMPANY)) - pd.put("REPLYSTTRANSPORTATIONCOMPANYATUS", TRANSPORTATIONCOMPANY.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = customerManagementService.listForSecurityCustomerManagement(page); map.put("varList", varList); @@ -116,4 +107,18 @@ public class TrafficSecurityCustomerManagementController extends BaseController map.put("result", errInfo); return map; } + + @RequestMapping(value = "/getTrafficCustomerSelectList") + @ResponseBody + public Object getTrafficCustomerSelectList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + List varList = customerManagementService.getTrafficCustomerSelectList(pd); + map.put("varList", varList); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java index 9a6e888..daa5df5 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java @@ -34,7 +34,7 @@ public class TrafficSecurityLocationManagementController extends BaseController PageData pd = this.getPageData(); String locationmanagement_id = this.get32UUID(); - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 pd.put("LOCATIONMANAGEMENT_ID", locationmanagement_id); // 主键 @@ -57,15 +57,7 @@ public class TrafficSecurityLocationManagementController extends BaseController PageData pd = new PageData(); pd = this.getPageData(); - - String LOCATIONTYPE = pd.getString("LOCATIONTYPE"); // 关键词检索条件 - if (Tools.notEmpty(LOCATIONTYPE)) - pd.put("LOCATIONTYPE", LOCATIONTYPE.trim()); - - String TRANSPORTATIONCOMPANY = pd.getString("TRANSPORTATIONCOMPANY"); // 关键词检索条件 - if (Tools.notEmpty(TRANSPORTATIONCOMPANY)) - pd.put("REPLYSTTRANSPORTATIONCOMPANYATUS", TRANSPORTATIONCOMPANY.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = locationManagementService.listForSecurityLocationManagement(page); map.put("varList", varList); @@ -94,4 +86,19 @@ public class TrafficSecurityLocationManagementController extends BaseController return map; } + @RequestMapping(value = "/getTrafficLocationSelectList") + @ResponseBody + public Object getTrafficLocationSelectList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + List varList = locationManagementService.getTrafficLocationSelectList(pd); + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java index 44983b7..e556296 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java @@ -37,7 +37,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("MANAGEMENTAGREEMENT_ID", managementagreementId); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("COMPLETIONSTATUS", "0"); @@ -60,8 +60,8 @@ public class TrafficSecurityManagementAgreementController extends BaseController return map; } 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); + 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")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -84,7 +84,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("ISDELETE", "0"); String ffile = DateUtil.getDays(); @@ -99,8 +99,8 @@ public class TrafficSecurityManagementAgreementController extends BaseController } //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); + 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")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -125,18 +125,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = managementAgreementService.listForManagementAgreementlist(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java index 99818e8..dffaeb4 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java @@ -47,9 +47,8 @@ public class TrafficSecurityNoticeController extends BaseController { String notificationId = this.get32UUID(); pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id - pd.put("CORPINFO_ID", Jurisdiction.getPOST_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("NOTIFICATION_ID", notificationId); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("POSTSTATUS", "0"); // 发布状态 @@ -131,15 +130,7 @@ public class TrafficSecurityNoticeController extends BaseController { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - - String TITLE = pd.getString("TITLE");// 关键词检索条件 - if (Tools.notEmpty(TITLE)) - pd.put("TITLE", TITLE.trim()); - - String REPLYSTATUS = pd.getString("REPLYSTATUS");// 关键词检索条件 - if (Tools.notEmpty(REPLYSTATUS)) - pd.put("REPLYSTATUS", REPLYSTATUS.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = securityNoticeService.listForSecurityNotice(page); @@ -218,7 +209,7 @@ public class TrafficSecurityNoticeController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CORPINFO_ID", Jurisdiction.getPOST_ID()); // 创建人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("POSTSTATUS", "0"); // 发布状态 pd.put("SIGNEDSTATUS", "0"); // 签收状态 @@ -344,7 +335,7 @@ public class TrafficSecurityNoticeController extends BaseController { issue.put("LEVEL",securityNotice.getString("LEVEL")); issue.put("REPLY", "0"); issue.put("SIGNING", "0"); - issue.put("TRANSPORTATIONCOMPANY", securityNotice.getString("TRANSPORTATIONCOMPANY")); + issue.put("CORPINFO_ID", securityNotice.getString("CORPINFO_ID")); issue.put("PERSON_ID",personIds[i]); issue.put("PERSON", securityNotice.getString("PERSON_ID")); issue.put("ISDELETE", "0"); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java index 208e7d5..9d3e0d2 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java @@ -43,7 +43,7 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 pd.put("REGISTRATION_ID", registration_id); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("ISDELETE", "0"); String ffile = DateUtil.getDays(); @@ -56,8 +56,8 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll return map; } String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); - pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + 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")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -76,17 +76,7 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String USER_ID = pd.getString("USER_ID"); // 运输企业 - if (Tools.notEmpty(USER_ID)){ - - pd.put("USER_ID", USER_ID.trim()); - } - - - String PENALTYTIME = pd.getString("PENALTYTIME"); // 运输车辆 - if (Tools.notEmpty(PENALTYTIME)) - pd.put("PENALTYTIME", PENALTYTIME.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = violationRegistrationService.listForViolationRegistration(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index b765dd1..16817fa 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -39,15 +39,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String TITLE = pd.getString("TITLE"); // 关键词检索条件 - if (Tools.notEmpty(TITLE)) - pd.put("TITLE", TITLE.trim()); - - String REPLYSTATUS = pd.getString("REPLYSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(REPLYSTATUS)) - pd.put("REPLYSTATUS", REPLYSTATUS.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = trafficSecurityWaybillRegistrationService.listForSecurityWaybill(page); @@ -57,20 +49,6 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController return map; } - @RequestMapping(value = "/forSecurityPerson") - @ResponseBody - public Object forSecurityPerson() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); - pd = trafficSecurityWaybillRegistrationService.forSecurityPerson(pd); - pd.put("PRACTITIONER", Jurisdiction.getName()); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } /** * 查看详情 * @return @@ -115,7 +93,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("WAYBILLREGISTRATION_ID", waybillregistrationId); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("ISDELETE", "0"); diff --git a/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java b/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java index 752bdc1..26d1a27 100644 --- a/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java +++ b/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java @@ -124,6 +124,7 @@ public class EnterpriseSafetyProductionController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = enterpriseSafetyProductionService.list(page); //列出MajorDangerSource列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java b/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java index dbf7f48..1d38ae6 100644 --- a/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java +++ b/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java @@ -133,6 +133,7 @@ public class EquipmentFacilityController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = equipmentFacilityService.list(page); //列出MajorDangerSource列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java b/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java index 2bb032b..655aff2 100644 --- a/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java +++ b/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java @@ -130,6 +130,7 @@ public class FirefightingEquipmentFacilityController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = firefightingEquipmentFacilityService.list(page); //列出MajorDangerSource列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java b/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java index a803d36..2e1f1df 100644 --- a/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java +++ b/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java @@ -119,6 +119,7 @@ public class LabourEntrenchThingController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = labourEntrenchThingService.list(page); //列出MajorDangerSource列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java index d392a7d..a86a02d 100644 --- a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java +++ b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java @@ -149,6 +149,7 @@ public class ScrapManageController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = scrapManageService.list(page); //列出MajorDangerSource列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index 9b10a4a..40e164d 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -148,6 +148,7 @@ public class TaxationManageController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List taxationList = taxationManageService.list(page); //列出MajorDangerSource列表 taxationList.forEach(taxation -> { diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java index 629dda9..02bfd51 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java @@ -25,4 +25,5 @@ public interface TrafficSecurityCustomerManagementMapper { void delete(PageData pd); + List getTrafficCustomerSelectList(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java index 44bfb53..4bff1b4 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java @@ -23,4 +23,6 @@ public interface TrafficSecurityLocationManagementMapper { List datalistPage(Page page); void delete(PageData pd); + + List getTrafficLocationSelectList(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java index 16d168c..181c60d 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java @@ -20,8 +20,6 @@ public interface TrafficSecurityWaybillRegistrationMapper { void editStatus(PageData pd); - PageData forSecurityPerson(PageData pd); - void delete(PageData pd); /**通过id获取数据 diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java index b5d3f07..52fb4a9 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java @@ -13,4 +13,6 @@ public interface TrafficSecurityCustomerManagementService { void saveContact(PageData contactPd); void delete(PageData pd); + + List getTrafficCustomerSelectList(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java index e753bb0..8b8b9b2 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java @@ -11,4 +11,6 @@ public interface TrafficSecurityLocationManagementService { List listForSecurityLocationManagement(Page page); void delete(PageData pd); + + List getTrafficLocationSelectList(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java index 42cb149..251b572 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java @@ -10,8 +10,6 @@ public interface TrafficSecurityWaybillRegistrationService { void save(PageData pd); - PageData forSecurityPerson(PageData pd); - void delete(PageData pd); PageData findById(PageData pd); diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java index b9efa57..8c06faa 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java @@ -35,4 +35,9 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu public void delete(PageData pd) { customerManagementMapper.delete(pd); } + + @Override + public List getTrafficCustomerSelectList(PageData pd) throws Exception { + return customerManagementMapper.getTrafficCustomerSelectList(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java index 1e71aa5..6312bf9 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java @@ -27,4 +27,9 @@ public class TrafficSecurityLocationManagementServiceImpl implements TrafficSecu public void delete(PageData pd) { locationManagementMapper.delete(pd); } + + @Override + public List getTrafficLocationSelectList(PageData pd) throws Exception { + return locationManagementMapper.getTrafficLocationSelectList(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java index 680dcfa..8b7fa41 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java @@ -13,6 +13,7 @@ import java.util.List; public class TrafficSecurityManagementAgreementServiceImpl implements TrafficSecurityManagementAgreementService { @Autowired private TrafficSecurityManagementAgreementMapper managementAgreementMapper; + @Override public void save(PageData pd) { managementAgreementMapper.save(pd); diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java index 3a4a377..710638f 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java @@ -24,11 +24,6 @@ public class TrafficSecurityWaybillRegistrationServiceImpl implements TrafficSec TrafficSecurityWaybillRegistrationMapper.save(pd); } - @Override - public PageData forSecurityPerson(PageData pd) { - return TrafficSecurityWaybillRegistrationMapper.forSecurityPerson(pd); - } - @Override public void delete(PageData pd) { TrafficSecurityWaybillRegistrationMapper.delete(pd); diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml index 03bd6d6..d3fae6f 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml @@ -97,7 +97,7 @@ from f left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.INQUIRYCONTENT LIKE CONCAT(CONCAT('%', #{pd.INQUIRYCONTENT}),'%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml index 32187bf..01e09a1 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml @@ -105,7 +105,7 @@ f left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID left join sys_dictionaries d on d.BIANMA = f.CHECKTYPE_ID and d.PARENT_ID = '5ef3a19edcb2435f8db94487834bbae3' - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.CHECKTYPE_ID = #{pd.CHECKTYPE_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml index fcbb98e..2367804 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml @@ -18,7 +18,7 @@ f.COMPLETIONSTATUS, f.CYCLE, f.VALIDSTATUS, - f.OPERATINGCOMPANY, + f.CORPINFO_ID, f.EXPIRYDATE, f.ATTACHMENT_ROUTE, f.ISDELETE, @@ -40,7 +40,7 @@ COMPLETIONSTATUS, CYCLE, VALIDSTATUS, - OPERATINGCOMPANY, + CORPINFO_ID, EXPIRYDATE, ATTACHMENT_ROUTE, ISDELETE, @@ -62,7 +62,7 @@ #{COMPLETIONSTATUS}, #{CYCLE}, #{VALIDSTATUS}, - #{OPERATINGCOMPANY}, + #{CORPINFO_ID}, #{EXPIRYDATE}, #{ATTACHMENT_ROUTE}, #{ISDELETE}, @@ -126,8 +126,8 @@ i.CORP_NAME from f - left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.ACTIVITIESNAME LIKE CONCAT('%', #{pd.ACTIVITIESNAME}, '%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml index be17d96..4dc4dda 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml @@ -17,7 +17,7 @@ f.MANUALNAME, f.COMPLETIONSTATUS, f.VALIDSTATUS, - f.OPERATINGCOMPANY, + f.CORPINFO_ID, f.EXPIRYDATE, f.ATTACHMENT_ROUTE, f.ISDELETE, @@ -38,7 +38,7 @@ MANUALNAME, COMPLETIONSTATUS, VALIDSTATUS, - OPERATINGCOMPANY, + CORPINFO_ID, EXPIRYDATE, ATTACHMENT_ROUTE, ISDELETE, @@ -59,7 +59,7 @@ #{MANUALNAME}, #{COMPLETIONSTATUS}, #{VALIDSTATUS}, - #{OPERATINGCOMPANY}, + #{CORPINFO_ID}, #{EXPIRYDATE}, #{ATTACHMENT_ROUTE}, #{ISDELETE}, @@ -122,8 +122,8 @@ i.CORP_NAME from f - left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.MANUALNAME LIKE CONCAT('%', #{pd.MANUALNAME}, '%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml index 891b931..cbafe8c 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml @@ -34,7 +34,7 @@ f.OPERATOR, f.OPERATORNAME, f.OPERATTIME, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.RECORDER, f.MEETING_STATUS, f.MEETING_DATE_END, @@ -67,7 +67,7 @@ OPERATOR, OPERATORNAME, OPERATTIME, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, RECORDER, MEETING_STATUS, MEETING_DATE_END, @@ -100,7 +100,7 @@ #{OPERATOR}, #{OPERATORNAME}, #{OPERATTIME}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{RECORDER}, #{MEETING_STATUS}, #{MEETING_DATE_END}, @@ -141,8 +141,8 @@ i.CORP_NAME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.MEETING_TITLE like CONCAT('%',#{pd.MEETING_TITLE},'%') @@ -159,7 +159,7 @@ i.CORP_NAME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID left join bus_traffic_safety_meeting_recipient e on f.SAFETY_MEETING_ID = e.SAFETY_MEETING_ID where f.ISDELETE = '0' AND @@ -180,7 +180,7 @@ r.ATTENDANCE_STATUS from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID left join bus_traffic_safety_meeting_recipient r on f.SAFETY_MEETING_ID = r.SAFETY_MEETING_ID where f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID} @@ -194,7 +194,7 @@ i.CORP_NAME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID where f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml index 9890017..7cf0b63 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml @@ -56,6 +56,7 @@ f.OPERATOR, f.OPERATORNAME, f.OPERATTIME, + f.CORPINFO_ID, f.AGE, f.GENDER, f.EDUCATIONALLEVEL, @@ -111,6 +112,7 @@ OPERATOR, OPERATORNAME, OPERATTIME, + CORPINFO_ID, AGE, GENDER, EDUCATIONALLEVEL, @@ -166,6 +168,7 @@ #{OPERATOR}, #{OPERATORNAME}, #{OPERATTIME}, + #{CORPINFO_ID}, #{AGE}, #{GENDER}, #{EDUCATIONALLEVEL}, @@ -342,7 +345,7 @@ f left join bus_corp_info i on f.DEPARTMENT = i.CORPINFO_ID left join sys_user u on f.USER_ID = u.USER_ID - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.USER_ID = #{pd.USER_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml index 999f8a1..eb3bd6b 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml @@ -15,7 +15,7 @@ f.CUSTOMERMANAGEMENT_ID, f.CUSTOMERTYPE, f.CUSTOMERNAME, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.ISDELETE, f.DELETOR, f.DELETORNAME, @@ -34,7 +34,7 @@ CUSTOMERMANAGEMENT_ID, CUSTOMERTYPE, CUSTOMERNAME, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, ISDELETE, DELETOR, DELETORNAME, @@ -53,7 +53,7 @@ #{CUSTOMERMANAGEMENT_ID}, #{CUSTOMERTYPE}, #{CUSTOMERNAME}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{ISDELETE}, #{DELETOR}, #{DELETORNAME}, @@ -102,14 +102,31 @@ u.CUSTOMERADDRESS_ID from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID left join bus_traffic_customer_contact u on f.CUSTOMERMANAGEMENT_ID = u.CUSTOMERMANAGEMENT_ID - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.CUSTOMERTYPE = #{pd.CUSTOMERTYPE} - - and i.CORP_NAME = #{pd.TRANSPORTATIONCOMPANY} + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml index 027ed8b..8c25745 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml @@ -17,7 +17,7 @@ f.LOCATIONNAME, f.ADDRESSDETAILS, f.ADMINISTRATIVEREGIONS, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.ISDELETE, f.DELETOR, f.DELETORNAME, @@ -41,7 +41,7 @@ LOCATIONNAME, ADDRESSDETAILS, ADMINISTRATIVEREGIONS, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, ISDELETE, DELETOR, DELETORNAME, @@ -65,7 +65,7 @@ #{LOCATIONNAME}, #{ADDRESSDETAILS}, #{ADMINISTRATIVEREGIONS}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{ISDELETE}, #{DELETOR}, #{DELETORNAME}, @@ -113,13 +113,24 @@ i.CORP_NAME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.LOCATIONTYPE = #{pd.LOCATIONTYPE} - - and i.CORP_NAME = #{pd.TRANSPORTATIONCOMPANY} + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml index d5b98aa..e505982 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml @@ -17,7 +17,7 @@ f.MANAGEMENTAGREEMENTNAME, f.COMPLETIONSTATUS, f.VALIDSTATUS, - f.OPERATINGCOMPANY, + f.CORPINFO_ID, f.EXPIRYDATE, f.OPERATINGTYPE, f.ATTACHMENT_ROUTE, @@ -39,7 +39,7 @@ MANAGEMENTAGREEMENTNAME, COMPLETIONSTATUS, VALIDSTATUS, - OPERATINGCOMPANY, + CORPINFO_ID, EXPIRYDATE, OPERATINGTYPE, ATTACHMENT_ROUTE, @@ -61,7 +61,7 @@ #{MANAGEMENTAGREEMENTNAME}, #{COMPLETIONSTATUS}, #{VALIDSTATUS}, - #{OPERATINGCOMPANY}, + #{CORPINFO_ID}, #{EXPIRYDATE}, #{OPERATINGTYPE}, #{ATTACHMENT_ROUTE}, @@ -123,8 +123,8 @@ i.CORP_NAME from f - left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.MANAGEMENTAGREEMENTNAME LIKE CONCAT('%', #{pd.MANAGEMENTAGREEMENTNAME}, '%') @@ -142,7 +142,7 @@ i.CORP_NAME from f - left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID where f.MANAGEMENTAGREEMENT_ID = #{MANAGEMENTAGREEMENT_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml index 2fc5bae..d055cad 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml @@ -19,7 +19,7 @@ f.LEVEL, f.REPLY, f.SIGNING, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.PERSON_ID, f.PERSON, f.NOTIFICATIONCONTENT, @@ -49,7 +49,7 @@ LEVEL, REPLY, SIGNING, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, PERSON_ID, PERSON, NOTIFICATIONCONTENT, @@ -79,7 +79,7 @@ #{LEVEL}, #{REPLY}, #{SIGNING}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{PERSON_ID}, #{PERSON}, #{NOTIFICATIONCONTENT}, @@ -135,7 +135,7 @@ LEVEL = #{LEVEL}, REPLY = #{REPLY}, SIGNING = #{SIGNING}, - TRANSPORTATIONCOMPANY = #{TRANSPORTATIONCOMPANY}, + CORPINFO_ID = #{CORPINFO_ID}, PERSON_ID = #{PERSON_ID}, PERSON = #{PERSON}, NOTIFICATIONCONTENT = #{NOTIFICATIONCONTENT}, @@ -167,8 +167,8 @@ i.CORP_NAME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.TITLE like CONCAT ('%',#{pd.TITLE},'%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml index ee5dee4..2a77267 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml @@ -21,7 +21,7 @@ f.PENALTYEVENT, f.PENALTYMEASURES, f.PENALTYREGISTRANT, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.ISDELETE, f.DELETOR, f.DELETORNAME, @@ -45,7 +45,7 @@ PENALTYEVENT, PENALTYMEASURES, PENALTYREGISTRANT, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, ISDELETE, DELETOR, DELETORNAME, @@ -69,7 +69,7 @@ #{PENALTYEVENT}, #{PENALTYMEASURES}, #{PENALTYREGISTRANT}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{ISDELETE}, #{DELETOR}, #{DELETORNAME}, @@ -135,9 +135,9 @@ u.PHONE from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = 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 - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and u.NAME LIKE CONCAT(CONCAT('%', #{pd.USER_ID}),'%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml index c394ba8..89ffd26 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml @@ -40,7 +40,7 @@ f.TRUCKCART, f.EMPLOYEEPHONE, f.IDENTITYID, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.PRACTITIONERTYPE, f.PRACTITIONER, f.CONFIRMINGPHONE @@ -78,7 +78,7 @@ TRUCKCART, EMPLOYEEPHONE, IDENTITYID, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, PRACTITIONERTYPE, CONFIRMINGPHONE @@ -115,7 +115,7 @@ #{TRUCKCART}, #{EMPLOYEEPHONE}, #{IDENTITYID}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{PRACTITIONERTYPE}, #{CONFIRMINGPHONE} @@ -167,7 +167,7 @@ p.OPERATTIME AS STOPTIME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID left join sys_user u on f.PRACTITIONER = u.USER_ID left join bus_traffic_location_management b on f.ORIGIN = b.LOCATIONNAME_ID left join bus_traffic_location_management b2 on f.DESTINATION = b2.LOCATIONNAME_ID @@ -175,7 +175,7 @@ left join bus_traffic_customer_management c2 on f.CONFIRMER = c2.CUSTOMERNAME_ID left join bus_traffic_driving_sign t on t.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and t.CHECKTYPE_ID = 'status001' left join bus_traffic_driving_sign p on p.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and p.CHECKTYPE_ID = 'status003' - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.WAYBILLSTATUS = #{pd.WAYBILLSTATUS} @@ -195,15 +195,6 @@ - - select f.*, - i.CORP_NAME + i.CORP_NAME, + count(r.READDETAIL_ID) PERSON_COUNT, + COUNT(case when r.REPLY = '1' then r.READDETAIL_ID END) COUNT_REPLY, + COUNT(case when r.SIGNING = '1' then r.READDETAIL_ID END) COUNT_SIGNING from f left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + left join bus_traffic_read_detail r on r.NOTIFICATION_ID = f.NOTIFICATION_ID and r.ISDELETE = '0' where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.TITLE like CONCAT ('%',#{pd.TITLE},'%') @@ -184,6 +189,10 @@ and f.PRACTITIONER = #{pd.PRACTITIONER} + + and f.LEVEL = #{pd.RISKUNITNAME} + + group by f.NOTIFICATION_ID ORDER BY f.CREATETIME DESC diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml index 49d5b74..79de2f6 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml @@ -138,6 +138,9 @@ and f.SIGNEDSTATUS = #{pd.SIGNEDSTATUS} + @@ -193,32 +196,19 @@ - SELECT - c.*, - u.NOTIFICATIONCONTENT, - u.VIDEO_ROUTE, - u.ATTACHMENT_ROUTE, - u.REPLYSTATUS, - u.CREATETIME, - su.NAME + c.*, + su.NAME FROM - bus_traffic_read_detail c - INNER JOIN bus_traffic_comprehensivemanagement_securitynotice u ON c.NOTIFICATION_ID = u.NOTIFICATION_ID - INNER JOIN sys_user su on c.PERSON_ID = su.USER_ID - WHERE c.PERSON_ID = #{pd.USER_ID} - AND u.ISDELETE = 0 - - and c.NOTIFICATION_ID = #{pd.NOTIFICATION_ID} - - - AND ( - c.SYNOPSIS LIKE CONCAT('%', #{pd.KEYWORDS}, '%') - OR - c.CONTENT LIKE CONCAT('%', #{pd.KEYWORDS}, '%') - ) - - ORDER BY u.CREATETIME DESC + bus_traffic_read_detail c + LEFT JOIN sys_user su on c.PERSON_ID = su.USER_ID + WHERE c.ISDELETE = 0 + and + c.NOTIFICATION_ID = #{NOTIFICATION_ID} + and + c.PERSON_ID = #{PERSON_ID} + ORDER BY c.CREATETIME DESC From b1b9f69dd6fd9729952f09013487b2e0d69946d6 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Wed, 10 Apr 2024 19:55:13 +0800 Subject: [PATCH 14/44] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E9=86=92?= =?UTF-8?q?=E9=85=8D=E7=BD=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/datasource/system/UsersMapper.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 61c9856..168e881 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1078,7 +1078,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join SYS_ROLE r on u.ROLE_ID = r.ROLE_ID left join OA_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID left join SYS_POST p on p.POST_ID=u.POST_ID - c + where + USER_ID in + + #{item} + order by d.LEVEL asc ,d.DEP_ORDER asc ,d.DEPARTMENT_ID asc, u.SORT asc,u.LAST_LOGIN desc From e7f5125534a77032daf8c5ebc02b51c3946e2d61 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Thu, 11 Apr 2024 12:33:52 +0800 Subject: [PATCH 15/44] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9B=BF=E6=8D=A2CORPI?= =?UTF-8?q?NFO=5FID=E9=80=9A=E7=94=A8=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/UsersController.java | 4 +-- .../mapper/datasource/system/UsersMapper.java | 2 -- .../zcloud/service/system/UsersService.java | 1 - .../service/system/impl/UsersServiceImpl.java | 5 ---- .../mybatis/datasource/system/UsersMapper.xml | 29 +++---------------- 5 files changed, 6 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 6767590..394b35c 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -240,7 +240,7 @@ public class UsersController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //page.setPd(pd); List userList = usersService.userSelectPersonTypelist(pd);//列出用户列表 map.put("userList", userList); @@ -3031,7 +3031,7 @@ public class UsersController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - //page.setPd(pd); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List userList = usersService.getPractitionerSelectList(pd);//列出用户列表 map.put("userList", userList); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 093e642..b71dfc6 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -272,8 +272,6 @@ public interface UsersMapper { List studentlist(PageData pd); - List userSelectPersonTypelistPage(PageData pd); - /**从业人员列表 //userlistPage(Page page) * @param page * @return diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 9da46bd..05754ed 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -318,7 +318,6 @@ public interface UsersService { void setState(PageData request) throws Exception; - List userSelectPersonTypelistPage(PageData pageData); List studentlist(PageData pd) throws Exception; diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index ab1e5a6..d0c427a 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -668,11 +668,6 @@ public class UsersServiceImpl implements UsersService { usersMapper.editUser(request); } - @Override - public List userSelectPersonTypelistPage(PageData pd) { - return usersMapper.userSelectPersonTypelistPage(pd); - } - /** * 获取可以培训的人员列表 * diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 168e881..5344e4d 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1648,30 +1648,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dictionaries d on r.PERSONNEL_TYPE = d.DICTIONARIES_ID where u.ISDELETE = 0 - and d.DICTIONARIES_ID = '5ae743c76dbf496eb1b5101075b073d5' - - - - @@ -1863,7 +1842,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.PARENT_ID=#{PARENT_ID} - where u.ISDELETE = 0 and u.ISMAIN = '0' + where u.ISDELETE = 0 and u.ISMAIN = '0' and u.CORPINFO_ID = #{CORPINFO_ID} and d.BIANMA LIKE CONCAT(CONCAT('%', #{BIANMA}),'%') From bce5400d80c24562fe56e82f67d4eca384cfcf94 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Thu, 11 Apr 2024 18:27:57 +0800 Subject: [PATCH 16/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SecurityWaybillRegistrationController.java | 78 ++++++++++++++++++- ...afficSecurityCustomerManagementMapper.java | 2 + ...fficSecurityWaybillRegistrationMapper.java | 2 + ...fficSecurityCustomerManagementService.java | 2 + ...ficSecurityWaybillRegistrationService.java | 2 + ...SecurityCustomerManagementServiceImpl.java | 5 ++ ...ecurityWaybillRegistrationServiceImpl.java | 5 ++ ...rafficSecurityCustomerManagementMapper.xml | 11 +++ ...afficSecurityWaybillRegistrationMapper.xml | 56 ++++++++++++- 9 files changed, 155 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 16817fa..be0121e 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -5,7 +5,9 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.comprehensive.TrafficDrivingCommitmentService; import com.zcloud.service.comprehensive.TrafficDrivingTypeService; +import com.zcloud.service.comprehensive.TrafficSecurityCustomerManagementService; import com.zcloud.service.comprehensive.TrafficSecurityWaybillRegistrationService; +import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -16,10 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Controller @RequestMapping("/waybillregistration") @@ -32,6 +31,13 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController @Autowired private TrafficDrivingTypeService trafficDrivingTypeService; + @Autowired + private TrafficSecurityCustomerManagementService trafficSecurityCustomerManagementService; + + + @Autowired + private UsersService usersService; + @RequestMapping(value = "/listForSecurityWaybillre") @ResponseBody public Object listForSecurityWaybillRegistra(Page page) throws Exception { @@ -160,4 +166,68 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController map.put("result", errInfo);//返回结果 return map; } + + + //详情 + @RequestMapping(value="/goEdit") + @ResponseBody + public Object getSecurityWaybillRegistrationInfo() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = trafficSecurityWaybillRegistrationService.findById(pd);//根据ID读 + String[] dispatchers = pd.getString("DISPATCHER").split(","); + List names = new ArrayList<>(); + for (String dispatcher : dispatchers) { + // 通过 用户id获取用户名 + PageData user = new PageData(); + user.put("USER_ID",dispatcher.trim()); + PageData pageData1 = usersService.findById(user); + names.add(pageData1); + } + List deptList = usersService.listUserbyDep(pd); + pd.put("deptList",deptList); + pd.put("names",names); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + + @RequestMapping(value="/getPrincipalContactList") + @ResponseBody + public Object getPrincipalContactList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List principalContactList = trafficSecurityCustomerManagementService.getPrincipalContactList(pd); + map.put("pd",principalContactList); + map.put("result", errInfo); + return map; + } + + + //修改 + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + + trafficSecurityWaybillRegistrationService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + + } + } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java index 02bfd51..6218305 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java @@ -26,4 +26,6 @@ public interface TrafficSecurityCustomerManagementMapper { void delete(PageData pd); List getTrafficCustomerSelectList(PageData pd); + + List getPrincipalContactList(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java index 181c60d..c6ae7c1 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java @@ -27,4 +27,6 @@ public interface TrafficSecurityWaybillRegistrationMapper { * @throws Exception */ PageData findById(PageData pd); + + void edit(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java index 52fb4a9..e1c4845 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java @@ -15,4 +15,6 @@ public interface TrafficSecurityCustomerManagementService { void delete(PageData pd); List getTrafficCustomerSelectList(PageData pd) throws Exception; + + List getPrincipalContactList(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java index 251b572..80f7adf 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java @@ -13,4 +13,6 @@ public interface TrafficSecurityWaybillRegistrationService { void delete(PageData pd); PageData findById(PageData pd); + + void edit(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java index 8c06faa..84f6376 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java @@ -40,4 +40,9 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu public List getTrafficCustomerSelectList(PageData pd) throws Exception { return customerManagementMapper.getTrafficCustomerSelectList(pd); } + + @Override + public List getPrincipalContactList(PageData pd) { + return customerManagementMapper.getPrincipalContactList(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java index 710638f..e99a51b 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java @@ -32,4 +32,9 @@ public class TrafficSecurityWaybillRegistrationServiceImpl implements TrafficSec public PageData findById(PageData pd) { return TrafficSecurityWaybillRegistrationMapper.findById(pd); } + + @Override + public void edit(PageData pd) { + TrafficSecurityWaybillRegistrationMapper.edit(pd); + } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml index eb3bd6b..304afcc 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml @@ -129,4 +129,15 @@ and f.CUSTOMERTYPE = #{CUSTOMERTYPE} + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml index 89ffd26..a6e1b1e 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml @@ -43,7 +43,8 @@ f.CORPINFO_ID, f.PRACTITIONERTYPE, f.PRACTITIONER, - f.CONFIRMINGPHONE + f.CONFIRMINGPHONE, + f.DEPARTMENT_ID @@ -80,7 +81,8 @@ IDENTITYID, CORPINFO_ID, PRACTITIONERTYPE, - CONFIRMINGPHONE + CONFIRMINGPHONE, + DEPARTMENT_ID @@ -117,7 +119,8 @@ #{IDENTITYID}, #{CORPINFO_ID}, #{PRACTITIONERTYPE}, - #{CONFIRMINGPHONE} + #{CONFIRMINGPHONE}, + #{DEPARTMENT_ID} @@ -144,6 +147,42 @@ WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID} + + update + f + set + f.WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID}, + f.WAYBILLNUMBER = #{WAYBILLNUMBER}, + f.WAYBILLSTATUS = #{WAYBILLSTATUS}, + f.TRANSPORTVEHICLE = #{TRANSPORTVEHICLE}, + f.CLIENT = #{CLIENT}, + f.CONFIRMER = #{CONFIRMER}, + f.ORIGIN = #{ORIGIN}, + f.DESTINATION = #{DESTINATION}, + f.OPERATOR = #{OPERATOR}, + f.OPERATORNAME = #{OPERATORNAME}, + f.OPERATTIME = #{OPERATTIME}, + f.CLIENTCONTACTPERSON = #{CLIENTCONTACTPERSON}, + f.CLIENTCONTACTPHONE = #{CLIENTCONTACTPHONE}, + f.CONFIRMINGPERSON = #{CONFIRMINGPERSON}, + f.DISPATCHER = #{DISPATCHER}, + f.PRACTITIONER = #{PRACTITIONER}, + f.SHIPPINGDATE = #{SHIPPINGDATE}, + f.SHIPPINGADDRESS = #{SHIPPINGADDRESS}, + f.DESTINATIONADDRESS = #{DESTINATIONADDRESS}, + f.STARTADMINISTRATIVEAREA = #{STARTADMINISTRATIVEAREA}, + f.ENDDMINISTRATIVEAREA = #{ENDDMINISTRATIVEAREA}, + f.TRUCKCART = #{TRUCKCART}, + f.EMPLOYEEPHONE = #{EMPLOYEEPHONE}, + f.IDENTITYID = #{IDENTITYID}, + f.CORPINFO_ID = #{CORPINFO_ID}, + f.PRACTITIONERTYPE = #{PRACTITIONERTYPE}, + f.CONFIRMINGPHONE = #{CONFIRMINGPHONE}, + f.DEPARTMENT_ID = #{DEPARTMENT_ID} + where + f.WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID} + + update @@ -152,6 +191,7 @@ where WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID} + + + From da3bde14923b317adec2b33f5de852868ecb6e1a Mon Sep 17 00:00:00 2001 From: xiepeng Date: Thu, 11 Apr 2024 18:57:14 +0800 Subject: [PATCH 17/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficSecurityWaybillRegistrationController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index be0121e..f9128d4 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -104,6 +104,10 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("ISDELETE", "0"); + if("".equals(pd.getString("TRUCKCART")) || "undefinedpd".equals(pd.getString("TRUCKCART")) || StringUtils.isEmpty(pd.getString("TRUCKCART"))) { + pd.put("TRUCKCART",""); + } + Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE")); if (shippingDate != null && shippingDate.after(new Date())) { pd.put("WAYBILLSTATUS", "1"); @@ -177,6 +181,9 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController PageData pd = new PageData(); pd = this.getPageData(); 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 names = new ArrayList<>(); for (String dispatcher : dispatchers) { From a675bb1bfc143115d73a4213fe7a235b0b06e13d Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 12 Apr 2024 18:03:57 +0800 Subject: [PATCH 18/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cSecurityCustomerManagementController.java | 81 +++++++++++++++++-- ...cSecurityLocationManagementController.java | 57 +++++++++++-- ...SecurityWaybillRegistrationController.java | 4 - .../TrafficSecurityCustomerContactMapper.java | 7 ++ ...afficSecurityCustomerManagementMapper.java | 4 + ...afficSecurityLocationManagementMapper.java | 6 ++ ...fficSecurityCustomerManagementService.java | 10 +++ ...fficSecurityLocationManagementService.java | 6 ++ ...SecurityCustomerManagementServiceImpl.java | 25 ++++++ ...SecurityLocationManagementServiceImpl.java | 16 ++++ .../TrafficSecurityCustomerContactMapper.xml | 45 +++++++++++ ...rafficSecurityCustomerManagementMapper.xml | 28 ++++++- ...rafficSecurityLocationManagementMapper.xml | 50 ++++++++++++ ...afficSecurityWaybillRegistrationMapper.xml | 1 + 14 files changed, 321 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index 49e53d7..af75e43 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -11,6 +11,7 @@ import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; import org.apache.commons.lang.StringUtils; +import org.apache.tomcat.util.json.JSONParser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,10 +19,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; @Controller @RequestMapping("/securitycustomer") @@ -29,6 +28,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController @Autowired private TrafficSecurityCustomerManagementService customerManagementService; + //新增 @RequestMapping(value = "/add") @ResponseBody @@ -48,7 +48,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController customerManagementService.save(pd); - if ( pd.getString("contacts") != null && ! pd.getString("contacts").isEmpty()){ + if (pd.getString("contacts") != null && !pd.getString("contacts").isEmpty()) { List contacts = JSON.parseArray(pd.getString("contacts"), PageData.class); for (PageData contact : contacts) { PageData contactPd = new PageData(); @@ -83,20 +83,23 @@ public class TrafficSecurityCustomerManagementController extends BaseController pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = customerManagementService.listForSecurityCustomerManagement(page); + map.put("varList", varList); map.put("page", page); map.put("result", errInfo); return map; } + /** * 删除 + * * @return * @throws Exception */ - @RequestMapping(value="/delete") + @RequestMapping(value = "/delete") @ResponseBody - public Object delete() throws Exception{ - Map map = new HashMap(); + public Object delete() throws Exception { + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); @@ -121,4 +124,66 @@ public class TrafficSecurityCustomerManagementController extends BaseController map.put("result", errInfo); return map; } + + + @RequestMapping(value = "/getTrafficCustomerSelectView") + @ResponseBody + public Object getTrafficCustomerSelectView() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = customerManagementService.getTrafficCustomerSelectView(pd); //根据ID读取客户管理信息 + PageData pageData = new PageData(); + pageData.put("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID")); + List customercontactList = customerManagementService.findByCustomerManagementId(pageData); + pd.put("customercontactList", customercontactList); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + // 修改 客户管理表 + customerManagementService.edit(pd); + + PageData pd2 = new PageData(); + pd2.put("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID")); + pd2.put("DELETOR", Jurisdiction.getUSER_ID()); + pd2.put("DELETORNAME", Jurisdiction.getUsername()); + pd2.put("DELETETIME", DateUtil.date2Str(new Date())); + customerManagementService.deleteContact(pd2); + + if (pd.getString("contacts") != null && !pd.getString("contacts").isEmpty()) { + List contacts = JSON.parseArray(pd.getString("contacts"), PageData.class); + for (PageData contact : contacts) { + PageData contactPd = new PageData(); + contactPd.put("CUSTOMERCONTACT_ID", this.get32UUID()); + contactPd.put("CONTACT_ID", this.get32UUID()); + contactPd.put("CUSTOMERADDRESS_ID", this.get32UUID()); + contactPd.put("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID")); + contactPd.put("CREATOR", Jurisdiction.getUSER_ID()); // 设置创建人ID + contactPd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名 + contactPd.put("CREATETIME", DateUtil.date2Str(new Date())); // 设置创建时间 + contactPd.put("CONTACT", contact.get("CONTACT")); + contactPd.put("CONTACTPHONE", contact.get("CONTACTPHONE")); + contactPd.put("CUSTOMERADDRESS", contact.get("CUSTOMERADDRESS")); + contactPd.put("ISDELETE", "0"); // 设置删除标志 + + customerManagementService.saveContact(contactPd); + } + } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java index daa5df5..2e0c98d 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java @@ -1,5 +1,8 @@ package com.zcloud.controller.comprehensive; +import cn.hutool.db.sql.SqlBuilder; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -7,6 +10,7 @@ import com.zcloud.service.comprehensive.TrafficSecurityLocationManagementService import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -14,10 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Controller @RequestMapping("/securitylocation") @@ -25,6 +26,7 @@ public class TrafficSecurityLocationManagementController extends BaseController @Autowired private TrafficSecurityLocationManagementService locationManagementService; + //新增 @RequestMapping(value = "/add") @ResponseBody @@ -32,7 +34,6 @@ public class TrafficSecurityLocationManagementController extends BaseController Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - String locationmanagement_id = this.get32UUID(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id @@ -42,7 +43,15 @@ public class TrafficSecurityLocationManagementController extends BaseController pd.put("ADDRESSDETAILS_ID", this.get32UUID()); pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("ISDELETE", "0"); - + String[] addrIds = JSON.parseObject(pd.getString("ADMINISTRATIVEREGIONS_ID"), String[].class); + String addressId = ""; + for (String addrId : addrIds) { + addressId = addressId + addrId + ","; + } + if(addressId.endsWith(",")){ + addressId = addressId.substring(0,addressId.length() - 1); + } + pd.put("ADMINISTRATIVEREGIONS_ID", addressId); locationManagementService.save(pd); map.put("result", errInfo); map.put("pd", pd); @@ -101,4 +110,40 @@ public class TrafficSecurityLocationManagementController extends BaseController return map; } + //详情 + @RequestMapping(value="/goEdit") + @ResponseBody + public Object getTrafficLocationInfo() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd = locationManagementService.getTrafficLocationInfo(pd); // 根据id读取地点信息 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + + //修改 + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + + locationManagementService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + + } + } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index f9128d4..800ea4a 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -104,10 +104,6 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("ISDELETE", "0"); - if("".equals(pd.getString("TRUCKCART")) || "undefinedpd".equals(pd.getString("TRUCKCART")) || StringUtils.isEmpty(pd.getString("TRUCKCART"))) { - pd.put("TRUCKCART",""); - } - Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE")); if (shippingDate != null && shippingDate.after(new Date())) { pd.put("WAYBILLSTATUS", "1"); diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java index eebfbde..6d40e3e 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java @@ -3,8 +3,15 @@ package com.zcloud.mapper.datasource.comprehensive; import com.zcloud.entity.PageData; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface TrafficSecurityCustomerContactMapper { void saveContact(PageData contactPd); + List findByCustomerManagementId(PageData pd); + + void edit(PageData pd); + + void deleteContact(PageData pd2); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java index 6218305..03180be 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java @@ -28,4 +28,8 @@ public interface TrafficSecurityCustomerManagementMapper { List getTrafficCustomerSelectList(PageData pd); List getPrincipalContactList(PageData pd); + + PageData getTrafficCustomerSelectView(PageData pd); + + void edit(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java index 4bff1b4..a6dc30e 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java @@ -25,4 +25,10 @@ public interface TrafficSecurityLocationManagementMapper { void delete(PageData pd); List getTrafficLocationSelectList(PageData pd); + + PageData getTrafficLocationInfo(PageData pd); + + void edit(PageData pd); + + PageData selAddrIdByName(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java index e1c4845..ade7a9d 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java @@ -17,4 +17,14 @@ public interface TrafficSecurityCustomerManagementService { List getTrafficCustomerSelectList(PageData pd) throws Exception; List getPrincipalContactList(PageData pd); + + PageData getTrafficCustomerSelectView(PageData pd); + + List findByCustomerManagementId(PageData pageData); + + void edit(PageData pd); + + void editContactInfo(PageData contact); + + void deleteContact(PageData pd2); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java index 8b8b9b2..4a064a4 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java @@ -13,4 +13,10 @@ public interface TrafficSecurityLocationManagementService { void delete(PageData pd); List getTrafficLocationSelectList(PageData pd) throws Exception; + + PageData getTrafficLocationInfo(PageData pd); + + void edit(PageData pd); + + PageData selAddrIdByName(PageData addrName); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java index 84f6376..e2f8f78 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java @@ -45,4 +45,29 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu public List getPrincipalContactList(PageData pd) { return customerManagementMapper.getPrincipalContactList(pd); } + + @Override + public PageData getTrafficCustomerSelectView(PageData pd) { + return customerManagementMapper.getTrafficCustomerSelectView(pd); + } + + @Override + public List findByCustomerManagementId(PageData pageData) { + return customerContactMapper.findByCustomerManagementId(pageData); + } + + @Override + public void edit(PageData pd) { + customerManagementMapper.edit(pd); + } + + @Override + public void editContactInfo(PageData pd) { + customerContactMapper.edit(pd); + } + + @Override + public void deleteContact(PageData pd2) { + customerContactMapper.deleteContact(pd2); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java index 6312bf9..f45954a 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java @@ -32,4 +32,20 @@ public class TrafficSecurityLocationManagementServiceImpl implements TrafficSecu public List getTrafficLocationSelectList(PageData pd) throws Exception { return locationManagementMapper.getTrafficLocationSelectList(pd); } + + @Override + public PageData getTrafficLocationInfo(PageData pd) { + return locationManagementMapper.getTrafficLocationInfo(pd); + } + + + @Override + public void edit(PageData pd) { + locationManagementMapper.edit(pd); + } + + @Override + public PageData selAddrIdByName(PageData pd) { + return locationManagementMapper.selAddrIdByName(pd); + } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml index b16d85c..50e5720 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml @@ -85,6 +85,51 @@ ) + + update + f + set + f.CUSTOMERCONTACT_ID = #{CUSTOMERCONTACT_ID}, + f.CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID}, + f.CONTACT = #{CONTACT}, + f.CONTACTPHONE = #{CONTACTPHONE}, + f.CUSTOMERADDRESS = #{CUSTOMERADDRESS}, + f.ISDELETE = #{ISDELETE}, + f.DELETOR = #{DELETOR}, + f.DELETORNAME = #{DELETORNAME}, + f.DELETETIME = #{DELETETIME}, + f.CREATOR = #{CREATOR}, + f.CREATORNAME = #{CREATORNAME}, + f.CREATETIME = #{CREATETIME}, + f.OPERATOR = #{OPERATOR}, + f.OPERATORNAME = #{OPERATORNAME}, + f.CONTACT_ID = #{CONTACT_ID}, + f.CUSTOMERADDRESS_ID = #{CUSTOMERADDRESS_ID}, + f.OPERATTIME = #{OPERATTIME} + where + f.CUSTOMERCONTACT_ID = #{CUSTOMERCONTACT_ID} + + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID} + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml index 304afcc..7aa5ffc 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml @@ -78,6 +78,21 @@ ) + + update + f + set + f.CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID}, + f.CUSTOMERTYPE = #{CUSTOMERTYPE}, + f.CUSTOMERNAME = #{CUSTOMERNAME}, + f.DELETETIME = #{DELETETIME}, + f.OPERATOR = #{OPERATOR}, + f.OPERATORNAME = #{OPERATORNAME}, + f.OPERATTIME = #{OPERATTIME} + where + f.CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID} + + update @@ -108,6 +123,8 @@ and f.CUSTOMERTYPE = #{pd.CUSTOMERTYPE} + GROUP BY u.CUSTOMERMANAGEMENT_ID + ORDER BY f.OPERATTIME DESC @@ -124,7 +141,7 @@ f left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID left join bus_traffic_customer_contact u on f.CUSTOMERMANAGEMENT_ID = u.CUSTOMERMANAGEMENT_ID - where f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID} + where f.ISDELETE = '0' and u.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID} and f.CUSTOMERTYPE = #{CUSTOMERTYPE} @@ -140,4 +157,13 @@ btcm.ISDELETE = '0' AND btcm.CORPINFO_ID = #{CORPINFO_ID} and btcm.CUSTOMERNAME_ID = #{CLIENT_ID} + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml index 8c25745..0015ee1 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml @@ -17,6 +17,7 @@ f.LOCATIONNAME, f.ADDRESSDETAILS, f.ADMINISTRATIVEREGIONS, + f.ADMINISTRATIVEREGIONS_ID, f.CORPINFO_ID, f.ISDELETE, f.DELETOR, @@ -41,6 +42,7 @@ LOCATIONNAME, ADDRESSDETAILS, ADMINISTRATIVEREGIONS, + ADMINISTRATIVEREGIONS_ID, CORPINFO_ID, ISDELETE, DELETOR, @@ -65,6 +67,7 @@ #{LOCATIONNAME}, #{ADDRESSDETAILS}, #{ADMINISTRATIVEREGIONS}, + #{ADMINISTRATIVEREGIONS_ID}, #{CORPINFO_ID}, #{ISDELETE}, #{DELETOR}, @@ -94,6 +97,31 @@ ) + + update + f + set + f.LOCATIONMANAGEMENT_ID = #{LOCATIONMANAGEMENT_ID}, + f.LOCATIONTYPE = #{LOCATIONTYPE}, + f.LOCATIONNAME = #{LOCATIONNAME}, + f.ADDRESSDETAILS = #{ADDRESSDETAILS}, + f.ADMINISTRATIVEREGIONS = #{ADMINISTRATIVEREGIONS}, + f.ADMINISTRATIVEREGIONS_ID = #{ADMINISTRATIVEREGIONS_ID}, + f.ISDELETE = #{ISDELETE}, + f.DELETOR = #{DELETOR}, + f.DELETORNAME = #{DELETORNAME}, + f.DELETETIME = #{DELETETIME}, + f.OPERATOR = #{OPERATOR}, + f.OPERATORNAME = #{OPERATORNAME}, + f.OPERATTIME = #{OPERATTIME}, + f.LONGITUDE = #{LONGITUDE}, + f.LATITUDE = #{LATITUDE}, + f.LOCATIONNAME_ID = #{LOCATIONNAME_ID}, + f.ADDRESSDETAILS_ID = #{ADDRESSDETAILS_ID} + where + f.LOCATIONMANAGEMENT_ID = #{LOCATIONMANAGEMENT_ID} + + update @@ -118,6 +146,7 @@ and f.LOCATIONTYPE = #{pd.LOCATIONTYPE} + ORDER BY f.OPERATTIME DESC @@ -133,4 +162,25 @@ and f.LOCATIONTYPE = #{LOCATIONTYPE} + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml index a6e1b1e..e5d880f 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml @@ -233,6 +233,7 @@ f.TRANSPORTVEHICLE LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') ) + ORDER BY f.OPERATTIME DESC + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml index 7aa5ffc..235bc6c 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml @@ -93,6 +93,7 @@ f.CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID} + update diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml index e5d880f..5ddb6fd 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml @@ -162,9 +162,9 @@ f.OPERATOR = #{OPERATOR}, f.OPERATORNAME = #{OPERATORNAME}, f.OPERATTIME = #{OPERATTIME}, - f.CLIENTCONTACTPERSON = #{CLIENTCONTACTPERSON}, + f.CLIENTCONTACTPERSON = #{ENTRUST_PERSON}, f.CLIENTCONTACTPHONE = #{CLIENTCONTACTPHONE}, - f.CONFIRMINGPERSON = #{CONFIRMINGPERSON}, + f.CONFIRMINGPERSON = #{CONFIRM_PERSON}, f.DISPATCHER = #{DISPATCHER}, f.PRACTITIONER = #{PRACTITIONER}, f.SHIPPINGDATE = #{SHIPPINGDATE}, @@ -251,7 +251,11 @@ btcc.CONTACT AS ENTRUST_PERSON, btcc2.CONTACT AS CONFIRM_PERSON, b.ADDRESSDETAILS AS SHIPPING_ADDR, - b2.ADDRESSDETAILS AS DESTINATION_ADDR + b2.ADDRESSDETAILS AS DESTINATION_ADDR, + btcc.CONTACTPHONE AS ENTRUST_PHONE, + btcc2.CONTACTPHONE AS CONFIRM_PHONE, + b.ADMINISTRATIVEREGIONS AS DEPARTURE_ADDR, + b2.ADMINISTRATIVEREGIONS AS GOAL_ADDR from f left join bus_traffic_operatingvehicle e on f.TRANSPORTVEHICLE = e.PLATE_NUMBER From c3b5ed3417a31b8048c26c6ef3b8a4fd456dee8f Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 16 Apr 2024 09:46:52 +0800 Subject: [PATCH 20/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cSecurityCustomerManagementController.java | 43 +++++++++++++++---- .../TrafficSecurityCustomerContactMapper.java | 4 ++ ...fficSecurityCustomerManagementService.java | 4 ++ ...SecurityCustomerManagementServiceImpl.java | 10 +++++ .../TrafficSecurityCustomerContactMapper.xml | 22 +++++++++- 5 files changed, 74 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index 19fa184..94a626a 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -1,5 +1,6 @@ package com.zcloud.controller.comprehensive; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -157,18 +158,44 @@ public class TrafficSecurityCustomerManagementController extends BaseController pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 // 修改 客户管理表 customerManagementService.edit(pd); - - String[] customercontactIds = pd.getString("CUSTOMERCONTACT_ID").split(","); - for (String customercontactId : customercontactIds) { - List contacts = JSONObject.parseArray(pd.getString("contacts"), PageData.class); - for (PageData contact : contacts) { - if(StringUtils.equals(contact.getString("CUSTOMERCONTACT_ID"), customercontactId)) { - customerManagementService.editUserInfo(contact); - } + List contacts = JSONArray.parseArray(pd.getString("contacts"), PageData.class); + for (PageData contact : contacts) { + PageData contactInfo = customerManagementService.findByContactId(contact.getString("CUSTOMERCONTACT_ID")); + if(ObjectUtil.isEmpty(contactInfo)) { + PageData pageData = new PageData(); + pageData.put("CUSTOMERADDRESS_ID", this.get32UUID()); + pageData.put("ISDELETE", 0); + pageData.put("CUSTOMERCONTACT_ID", this.get32UUID()); + pageData.put("CREATOR", Jurisdiction.getUSER_ID()); + pageData.put("CREATORNAME", Jurisdiction.getUsername()); + pageData.put("CUSTOMERMANAGEMENT_ID",pd.getString("CUSTOMERMANAGEMENT_ID")); + pageData.put("CONTACT_ID", this.get32UUID()); + pageData.put("CREATETIME", DateUtil.date2Str(new Date())); + pageData.put("CONTACT", contact.getString("CONTACT")); + pageData.put("CUSTOMERADDRESS", contact.getString("CUSTOMERADDRESS")); + pageData.put("CONTACTPHONE", contact.getString("CONTACTPHONE")); + customerManagementService.saveContact(pageData); + }else{ + customerManagementService.editContactInfo(contact); } } map.put("result", errInfo); map.put("pd", pd); return map; } + + @RequestMapping(value = "/deleteContactInfo") + @ResponseBody + public Object deleteContactInfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + customerManagementService.deleteContactById(pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java index c737707..1eaaa44 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java @@ -16,4 +16,8 @@ public interface TrafficSecurityCustomerContactMapper { void deleteContact(PageData pd2); PageData findByContactName(PageData pd); + + PageData findByContactId(String pd); + + void deleteContactById(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java index d577c07..b895da2 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java @@ -31,4 +31,8 @@ public interface TrafficSecurityCustomerManagementService { void editUserInfo(PageData pd); PageData findByContactName(PageData pd2); + + PageData findByContactId(String pd); + + void deleteContactById(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java index 73fc72d..a52639d 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java @@ -80,4 +80,14 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu public PageData findByContactName(PageData pd) { return customerContactMapper.findByContactName(pd); } + + @Override + public PageData findByContactId(String pd) { + return customerContactMapper.findByContactId(pd); + } + + @Override + public void deleteContactById(PageData pd) { + customerContactMapper.deleteContactById(pd); + } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml index 2e4c86d..9bc2524 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml @@ -121,6 +121,17 @@ CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID} + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + CUSTOMERCONTACT_ID = #{CUSTOMERCONTACT_ID } + + + + From 6544fe97067825b17f106607046c80fe32835275 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 16 Apr 2024 11:22:38 +0800 Subject: [PATCH 21/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cSecurityCustomerManagementController.java | 49 ++++++++++++------- ...SecurityWaybillRegistrationController.java | 18 +++++++ .../TrafficSecurityCustomerContactMapper.java | 2 + ...fficSecurityCustomerManagementService.java | 2 + ...SecurityCustomerManagementServiceImpl.java | 5 ++ .../TrafficSecurityCustomerContactMapper.xml | 12 +++++ 6 files changed, 69 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index 94a626a..7a64ce9 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -14,12 +14,14 @@ import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.util.CollectionUtils; import org.apache.tomcat.util.json.JSONParser; 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.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import java.util.*; @@ -158,25 +160,34 @@ public class TrafficSecurityCustomerManagementController extends BaseController pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 // 修改 客户管理表 customerManagementService.edit(pd); - List contacts = JSONArray.parseArray(pd.getString("contacts"), PageData.class); - for (PageData contact : contacts) { - PageData contactInfo = customerManagementService.findByContactId(contact.getString("CUSTOMERCONTACT_ID")); - if(ObjectUtil.isEmpty(contactInfo)) { - PageData pageData = new PageData(); - pageData.put("CUSTOMERADDRESS_ID", this.get32UUID()); - pageData.put("ISDELETE", 0); - pageData.put("CUSTOMERCONTACT_ID", this.get32UUID()); - pageData.put("CREATOR", Jurisdiction.getUSER_ID()); - pageData.put("CREATORNAME", Jurisdiction.getUsername()); - pageData.put("CUSTOMERMANAGEMENT_ID",pd.getString("CUSTOMERMANAGEMENT_ID")); - pageData.put("CONTACT_ID", this.get32UUID()); - pageData.put("CREATETIME", DateUtil.date2Str(new Date())); - pageData.put("CONTACT", contact.getString("CONTACT")); - pageData.put("CUSTOMERADDRESS", contact.getString("CUSTOMERADDRESS")); - pageData.put("CONTACTPHONE", contact.getString("CONTACTPHONE")); - customerManagementService.saveContact(pageData); - }else{ - customerManagementService.editContactInfo(contact); + if (pd.getString("contacts") != null && !pd.getString("contacts").isEmpty()) { + List contacts = JSONArray.parseArray(pd.getString("contacts"), PageData.class); + for (PageData contact : contacts) { + PageData contactInfo = customerManagementService.findByContactId(contact.getString("CUSTOMERCONTACT_ID")); + if (ObjectUtil.isEmpty(contactInfo)) { + PageData pageData = new PageData(); + pageData.put("CUSTOMERADDRESS_ID", this.get32UUID()); + pageData.put("ISDELETE", "0"); + pageData.put("CUSTOMERCONTACT_ID", this.get32UUID()); + pageData.put("CREATOR", Jurisdiction.getUSER_ID()); + pageData.put("CREATORNAME", Jurisdiction.getUsername()); + pageData.put("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID")); + pageData.put("CONTACT_ID", this.get32UUID()); + pageData.put("CREATETIME", DateUtil.date2Str(new Date())); + pageData.put("CONTACT", contact.getString("CONTACT")); + pageData.put("CUSTOMERADDRESS", contact.getString("CUSTOMERADDRESS")); + pageData.put("CONTACTPHONE", contact.getString("CONTACTPHONE")); + customerManagementService.saveContact(pageData); + } else { + if (!StringUtils.equals(contact.getString("CONTACT"), contactInfo.getString("CONTACT")) + || !StringUtils.equals(contact.getString("CONTACTPHONE"), contactInfo.getString("CONTACTPHONE")) + || !StringUtils.equals(contact.getString("CUSTOMERADDRESS"), contactInfo.getString("CUSTOMERADDRESS"))) { + contact.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + contact.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + contact.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + customerManagementService.editContactInfo(contact); + } + } } } map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 7ad7c2d..8433e48 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -233,12 +233,30 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController if(!ObjectUtil.isEmpty(contactInfo)) { pd.put("ENTRUST_PERSON", contactInfo.getString("CONTACT_ID")); } + if(!contactInfo.getString("CONTACTPHONE").equals(pd.getString("CLIENTCONTACTPHONE"))) { + PageData entrust = new PageData(); + entrust.put("CONTACTPHONE", pd.getString("CLIENTCONTACTPHONE")); + entrust.put("CUSTOMERCONTACT_ID",contactInfo.getString("CUSTOMERCONTACT_ID")); + entrust.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + entrust.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + entrust.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + trafficSecurityCustomerManagementService.editContactPhone(entrust); + } PageData pd3 = new PageData(); pd3.put("CONTACT", pd.getString("CONFIRM_PERSON")); PageData pageData = trafficSecurityCustomerManagementService.findByContactName(pd3); if(!ObjectUtil.isEmpty(pageData)) { pd.put("CONFIRM_PERSON", pageData.getString("CONTACT_ID")); } + if(!pageData.getString("CONTACTPHONE").equals(pd.getString("CONFIRMINGPHONE"))) { + PageData entrust = new PageData(); + entrust.put("CONTACTPHONE", pd.getString("CONFIRMINGPHONE")); + entrust.put("CUSTOMERCONTACT_ID",pageData.getString("CUSTOMERCONTACT_ID")); + entrust.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + entrust.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + entrust.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + trafficSecurityCustomerManagementService.editContactPhone(entrust); + } trafficSecurityWaybillRegistrationService.edit(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java index 1eaaa44..4cab824 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java @@ -20,4 +20,6 @@ public interface TrafficSecurityCustomerContactMapper { PageData findByContactId(String pd); void deleteContactById(PageData pd); + + void editContactPhone(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java index b895da2..9c66316 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java @@ -35,4 +35,6 @@ public interface TrafficSecurityCustomerManagementService { PageData findByContactId(String pd); void deleteContactById(PageData pd); + + void editContactPhone(PageData entrust); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java index a52639d..0fa60eb 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java @@ -90,4 +90,9 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu public void deleteContactById(PageData pd) { customerContactMapper.deleteContactById(pd); } + + @Override + public void editContactPhone(PageData pd) { + customerContactMapper.editContactPhone(pd); + } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml index 9bc2524..8908fec 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml @@ -110,6 +110,18 @@ f.CUSTOMERCONTACT_ID = #{CUSTOMERCONTACT_ID} + + update + f + set + f.CONTACTPHONE = #{CONTACTPHONE}, + f.OPERATOR = #{OPERATOR}, + f.OPERATORNAME = #{OPERATORNAME}, + f.OPERATTIME = #{OPERATTIME} + where + f.CUSTOMERCONTACT_ID = #{CUSTOMERCONTACT_ID} + + update From f922966913105086db907647a695a2e1af2349e0 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 16 Apr 2024 16:20:16 +0800 Subject: [PATCH 22/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/beidou/BeidouController.java | 14 ++++ .../InspectAnnuallyController.java | 69 +++++++++++++++- .../controller/insure/InsureController.java | 79 ++++++++++++++++++- .../maintenance/MaintenanceController.java | 15 ++++ .../operations/OperationsController.java | 62 +++++++++++++++ .../TaxationManageController.java | 14 ++++ .../freighttrailer/FreightTrailerMapper.java | 1 + .../OperatingVehiclesMapper.java | 2 + .../freighttrailer/FreightTrailerService.java | 2 + .../impl/FreightTrailerServiceImpl.java | 5 ++ .../OperatingVehiclesService.java | 2 + .../impl/OperatingVehiclesServiceImpl.java | 5 ++ .../freighttrailer/FreightTrailerMapper.xml | 16 +++- .../datasource/insure/InsureMapper.xml | 3 +- .../OperatingVehiclesMapper.xml | 14 ++++ 15 files changed, 294 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zcloud/controller/beidou/BeidouController.java b/src/main/java/com/zcloud/controller/beidou/BeidouController.java index 901435a..b89ed07 100644 --- a/src/main/java/com/zcloud/controller/beidou/BeidouController.java +++ b/src/main/java/com/zcloud/controller/beidou/BeidouController.java @@ -106,6 +106,20 @@ public class BeidouController extends BaseController { operatingVehiclesService.edit(resData); } beidouService.save(pd); + PageData vehicle = new PageData(); + vehicle.put("OPERATING_ID", pd.getString("VEHICLE")); + vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData pageData = operatingVehiclesService.findById(vehicle); + if (!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) { + PageData operation = new PageData(); + operation.put("OPERATING_ID", pd.getString("VEHICLE")); + operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS")); + operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + operatingVehiclesService.editInspectVehicleowner(operation); + } map.put("pd", pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java index b12d35a..68f2e4b 100644 --- a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java +++ b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java @@ -66,6 +66,37 @@ public class InspectAnnuallyController extends BaseController { pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("VEHICLE",pd.get("PLATE_NUMBER")); inspectAnnuallyService.save(pd); + if("1".equals(pd.getString("VEHICLE_MODEL"))) { + PageData vehicle = new PageData(); + vehicle.put("OPERATING_ID", pd.getString("PLATE_NUMBER")); + vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData pageData = operatingVehiclesService.findById(vehicle); + if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) { + PageData operation = new PageData(); + operation.put("OPERATING_ID", pd.getString("PLATE_NUMBER")); + operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS")); + operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + operatingVehiclesService.editInspectVehicleowner(operation); + } + }else { + PageData traffic = new PageData(); + traffic.put("FREIGHTTRAILER_ID", pd.getString("PLATE_NUMBER")); + traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData trafficInfo = freightTrailerService.findById(traffic); + if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) { + PageData data = new PageData(); + data.put("FREIGHTTRAILER_ID", pd.getString("PLATE_NUMBER")); + data.put("CAR_OWNERS", pd.getString("CAR_OWNERS")); + data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + freightTrailerService.editInspectTreight(data); + } + } map.put("pd", pd); map.put("result", errInfo); return map; @@ -113,6 +144,38 @@ public class InspectAnnuallyController extends BaseController { pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 inspectAnnuallyService.edit(pd); + if("1".equals(pd.getString("VEHICLE_MODEL"))) { + PageData vehicle = new PageData(); + vehicle.put("OPERATING_ID", pd.getString("VEHICLE")); + vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData pageData = operatingVehiclesService.findById(vehicle); + if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) { + PageData operation = new PageData(); + operation.put("OPERATING_ID", pd.getString("VEHICLE")); + operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS")); + operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + operatingVehiclesService.editInspectVehicleowner(operation); + } + }else { + PageData traffic = new PageData(); + traffic.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE")); + traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData trafficInfo = freightTrailerService.findById(traffic); + if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) { + PageData data = new PageData(); + data.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE")); + data.put("CAR_OWNERS", pd.getString("CAR_OWNERS")); + data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + freightTrailerService.editInspectTreight(data); + } + } + map.put("pd", pd); map.put("result", errInfo); return map; @@ -163,10 +226,10 @@ public class InspectAnnuallyController extends BaseController { varList.forEach(inspectAnnually -> { boolean isScrapFlag = varList.stream().anyMatch(data -> "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"); + if (isScrapFlag) { + inspectAnnually.put("ARCHIVES_TYPE", "2"); } else if (isAssignedFlag) { - inspectAnnually.put("ARCHIVES_TYPE","1"); + inspectAnnually.put("ARCHIVES_TYPE", "1"); } }); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/insure/InsureController.java b/src/main/java/com/zcloud/controller/insure/InsureController.java index ff177dc..060f6d8 100644 --- a/src/main/java/com/zcloud/controller/insure/InsureController.java +++ b/src/main/java/com/zcloud/controller/insure/InsureController.java @@ -47,7 +47,6 @@ public class InsureController extends BaseController { * @throws Exception */ @RequestMapping(value = "/add") - // @RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR) @ResponseBody @LogAnno(menuType = "机务档案", menuServer = "保险管理", instructionsOperate = "保险管理", instructionsType = "新增") public Object add() throws Exception { @@ -61,7 +60,38 @@ public class InsureController 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("VEHICLE", pd.getString("PLATE_NUMBER")); + if("1".equals(pd.getString("VEHICLE_MODEL"))) { + PageData vehicle = new PageData(); + vehicle.put("OPERATING_ID", pd.getString("PLATE_NUMBER")); + vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData pageData = operatingVehiclesService.findById(vehicle); + if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) { + PageData operation = new PageData(); + operation.put("OPERATING_ID", pd.getString("VEHICLE")); + operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS")); + operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + operatingVehiclesService.editInspectVehicleowner(operation); + } + }else { + PageData traffic = new PageData(); + traffic.put("FREIGHTTRAILER_ID", pd.getString("PLATE_NUMBER")); + traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData trafficInfo = freightTrailerService.findById(traffic); + if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) { + PageData data = new PageData(); + data.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE")); + data.put("CAR_OWNERS", pd.getString("CAR_OWNERS")); + data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + freightTrailerService.editInspectTreight(data); + } + } insureService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -110,6 +140,37 @@ public class InsureController extends BaseController { pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 insureService.edit(pd); + if("1".equals(pd.getString("VEHICLE_MODEL"))) { + PageData vehicle = new PageData(); + vehicle.put("OPERATING_ID", pd.getString("VEHICLE")); + vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData pageData = operatingVehiclesService.findById(vehicle); + if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) { + PageData operation = new PageData(); + operation.put("OPERATING_ID", pd.getString("VEHICLE")); + operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS")); + operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + operatingVehiclesService.editInspectVehicleowner(operation); + } + }else { + PageData traffic = new PageData(); + traffic.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE")); + traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData trafficInfo = freightTrailerService.findById(traffic); + if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) { + PageData data = new PageData(); + data.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE")); + data.put("CAR_OWNERS", pd.getString("CAR_OWNERS")); + data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + freightTrailerService.editInspectTreight(data); + } + } map.put("pd", pd); map.put("result", errInfo); return map; @@ -179,7 +240,19 @@ public class InsureController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd = insureService.findById(pd); //根据ID读取 - + if("1".equals(pd.getString("VEHICLE_MODEL"))) { + PageData operation = new PageData(); + operation.put("OPERATING_ID", pd.getString("VEHICLE")); + operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData operationInfo = operatingVehiclesService.findById(operation); + pd.put("PLATE_NUMBER", operationInfo.getString("PLATE_NUMBER")); + }else { + PageData trailer = new PageData(); + trailer.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE")); + trailer.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData operationInfo = freightTrailerService.findById(trailer); + pd.put("PLATE_NUMBER", operationInfo.getString("PLATE_NUMBER")); + } pd.put("FOREIGN_KEY", pd.getString("INSURE_ID")); pd.put("TYPE",125); List insureinfoImgs = imgfilesService.listAll(pd);//保险资料图片 diff --git a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java index 7e6de49..ea06136 100644 --- a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java +++ b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java @@ -63,6 +63,21 @@ public class MaintenanceController extends BaseController { pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态 maintenanceService.save(pd); + PageData vehicle = new PageData(); + vehicle.put("OPERATING_ID", pd.getString("VEHICLE")); + vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData pageData = operatingVehiclesService.findById(vehicle); + if (!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) { + PageData operation = new PageData(); + operation.put("OPERATING_ID", pd.getString("VEHICLE")); + operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS")); + operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + operatingVehiclesService.editInspectVehicleowner(operation); + } + map.put("pd", pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/operations/OperationsController.java b/src/main/java/com/zcloud/controller/operations/OperationsController.java index 90b4c4a..24bc9d7 100644 --- a/src/main/java/com/zcloud/controller/operations/OperationsController.java +++ b/src/main/java/com/zcloud/controller/operations/OperationsController.java @@ -63,6 +63,37 @@ public class OperationsController extends BaseController { pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("VEHICLE", pd.get("PLATE_NUMBER")); operationsService.save(pd); + if("1".equals(pd.getString("VEHICLE_MODEL"))) { + PageData vehicle = new PageData(); + vehicle.put("OPERATING_ID", pd.getString("VEHICLE")); + vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData pageData = operatingVehiclesService.findById(vehicle); + if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) { + PageData operation = new PageData(); + operation.put("OPERATING_ID", pd.getString("VEHICLE")); + operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS")); + operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + operatingVehiclesService.editInspectVehicleowner(operation); + } + }else { + PageData traffic = new PageData(); + traffic.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE")); + traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData trafficInfo = freightTrailerService.findById(traffic); + if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) { + PageData data = new PageData(); + data.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE")); + data.put("CAR_OWNERS", pd.getString("CAR_OWNERS")); + data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + freightTrailerService.editInspectTreight(data); + } + } map.put("pd", pd); map.put("result", errInfo); return map; @@ -110,6 +141,37 @@ public class OperationsController extends BaseController { pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 operationsService.edit(pd); + if("1".equals(pd.getString("VEHICLE_MODEL"))) { + PageData vehicle = new PageData(); + vehicle.put("OPERATING_ID", pd.getString("VEHICLE")); + vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData pageData = operatingVehiclesService.findById(vehicle); + if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) { + PageData operation = new PageData(); + operation.put("OPERATING_ID", pd.getString("VEHICLE")); + operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS")); + operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + operatingVehiclesService.editInspectVehicleowner(operation); + } + }else { + PageData traffic = new PageData(); + traffic.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE")); + traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData trafficInfo = freightTrailerService.findById(traffic); + if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) { + PageData data = new PageData(); + data.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE")); + data.put("CAR_OWNERS", pd.getString("CAR_OWNERS")); + data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + freightTrailerService.editInspectTreight(data); + } + } map.put("pd", pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index 40e164d..2253fb6 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -70,6 +70,20 @@ public class TaxationManageController extends BaseController { } pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); taxationManageService.save(pd); + PageData traffic = new PageData(); + traffic.put("FREIGHTTRAILER_ID", pd.getString("FREIGHTTRAILER_ID")); + traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData trafficInfo = freightTrailerService.findById(traffic); + if(!org.apache.commons.lang.StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("VEHICLEOWNER"))) { + PageData data = new PageData(); + data.put("FREIGHTTRAILER_ID", pd.getString("FREIGHTTRAILER_ID")); + data.put("CAR_OWNERS", pd.getString("VEHICLEOWNER")); + data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + freightTrailerService.editInspectTreight(data); + } map.put("pd", pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java index 67e5ca1..25dc146 100644 --- a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java @@ -91,5 +91,6 @@ public interface FreightTrailerMapper { List getScrapPulldownVehicleList(String corpId); + void editInspectTreight(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java b/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java index ebbd085..5972cf9 100644 --- a/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java @@ -51,4 +51,6 @@ public interface OperatingVehiclesMapper { void setAssinedStatus(PageData operating); List getScrapPulldownVehicleList(PageData pd); + + void editInspectVehicleowner(PageData pd); } diff --git a/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java b/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java index 8b96cd5..c2451a6 100644 --- a/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java +++ b/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java @@ -90,5 +90,7 @@ public interface FreightTrailerService { void setAssinedStatus(PageData freightTrailer); List getScrapPulldownVehicleList(String corpId); + + void editInspectTreight(PageData data); } diff --git a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java index dccc616..b35911c 100644 --- a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java +++ b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java @@ -142,5 +142,10 @@ public class FreightTrailerServiceImpl implements FreightTrailerService { public List getScrapPulldownVehicleList(String corpId) { return freightTrailerMapper.getScrapPulldownVehicleList(corpId); } + + @Override + public void editInspectTreight(PageData pd) { + freightTrailerMapper.editInspectTreight(pd); + } } diff --git a/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java b/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java index 9989d7e..8f66b4c 100644 --- a/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java +++ b/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java @@ -51,4 +51,6 @@ public interface OperatingVehiclesService { void setAssinedStatus(PageData operating); List getScrapPulldownVehicleList(PageData pd); + + void editInspectVehicleowner(PageData operation); } diff --git a/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java b/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java index 9fdc98b..8d32e20 100644 --- a/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java +++ b/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java @@ -86,4 +86,9 @@ public class OperatingVehiclesServiceImpl implements OperatingVehiclesService { public List getScrapPulldownVehicleList(PageData pd) { return operatingVehiclesMapper.getScrapPulldownVehicleList(pd); } + + @Override + public void editInspectVehicleowner(PageData pd) { + operatingVehiclesMapper.editInspectVehicleowner(pd); + } } diff --git a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml index 290ea9e..a10ab95 100644 --- a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml +++ b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml @@ -394,8 +394,22 @@ CORPINFO_ID = #{CORPINFO_ID} + + update + + set + CAR_OWNERS = #{CAR_OWNERS}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + OPERATORNAME = #{OPERATORNAME} + where + FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID} + and + CORPINFO_ID = #{CORPINFO_ID} + - select *, v.ID diff --git a/src/main/resources/mybatis/datasource/insure/InsureMapper.xml b/src/main/resources/mybatis/datasource/insure/InsureMapper.xml index 3e8880e..99e2245 100644 --- a/src/main/resources/mybatis/datasource/insure/InsureMapper.xml +++ b/src/main/resources/mybatis/datasource/insure/InsureMapper.xml @@ -172,8 +172,7 @@ f.DELETEORNAME, f.DELETTIME from - - f + f where f.INSURE_ID = #{INSURE_ID} diff --git a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml index b92ba14..d4d607b 100644 --- a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml +++ b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml @@ -329,6 +329,20 @@ CORPINFO_ID = #{CORPINFO_ID} + + update + + set + VEHICLEOWNER = #{VEHICLEOWNER}, + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + OPERATING_ID = #{OPERATING_ID} + AND + CORPINFO_ID = #{CORPINFO_ID} + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml index 688967a..ec31ea5 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml @@ -153,6 +153,7 @@ and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS} + GROUP BY u.NAME ORDER BY c.OPERATTIME DESC diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml index 995eecc..5cd0b39 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml @@ -162,6 +162,8 @@ and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS} + GROUP BY u.NAME + ORDER BY c.OPERATTIME DESC diff --git a/src/main/resources/mybatis/datasource/equipmentFacility/EquipmentFacilityMapper.xml b/src/main/resources/mybatis/datasource/equipmentFacility/EquipmentFacilityMapper.xml index f66afcd..b3a6f94 100644 --- a/src/main/resources/mybatis/datasource/equipmentFacility/EquipmentFacilityMapper.xml +++ b/src/main/resources/mybatis/datasource/equipmentFacility/EquipmentFacilityMapper.xml @@ -350,6 +350,7 @@ and f.FACILITY_LOCALTION LIKE CONCAT(CONCAT('%', #{pd.FACILITY_LOCALTION}),'%') + ORDER BY f.OPERATTIME DESC diff --git a/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentPlanMapper.xml b/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentPlanMapper.xml index 136fc7b..0cb664e 100644 --- a/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentPlanMapper.xml +++ b/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentPlanMapper.xml @@ -145,7 +145,7 @@ and f.STATUS = #{pd.STATUS} - 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 @@ -164,7 +164,7 @@ ISDELETE = '1' where SAFETYINVESTMENTPLAN_ID in - + #{item} diff --git a/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentUseMapper.xml b/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentUseMapper.xml index 61edcda..f81b5d6 100644 --- a/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentUseMapper.xml +++ b/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentUseMapper.xml @@ -151,7 +151,7 @@ ISDELETE = '1' where SAFETYINVESTMENTUSE_ID in - + #{item} From aab7cc16663d2e1e3a89b4e96202a2edcf9317e6 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 23 Apr 2024 18:03:50 +0800 Subject: [PATCH 29/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficSecurityNoticeController.java | 1 - ...SecurityWaybillRegistrationController.java | 1 - .../FreighttTrailerController.java | 10 +++++ .../maintain/MaintainController.java | 2 +- .../OperatingVehiclesController.java | 8 ++-- .../operations/OperationsController.java | 45 ++++++++++--------- .../TrafficDrivingCommitmentMapper.xml | 2 +- .../TrafficDrivingTypeMapper.xml | 2 +- .../TrafficSafetyActivitiesMapper.xml | 2 +- .../TrafficSafetyManualMapper.xml | 2 +- .../FirefightingMaintainMapper.xml | 1 + .../freighttrailer/FreightTrailerMapper.xml | 2 + .../inspectAnnually/InspectAnnuallyMapper.xml | 27 +---------- 13 files changed, 48 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java index f1a8830..86fe96e 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java @@ -89,7 +89,6 @@ public class TrafficSecurityNoticeController extends BaseController { pd.put("SIGNING", "0"); // 签收情况 pd.put("REPLY", "0"); // 回复情况 securityNoticeService.save(pd); - map.put("result", errInfo); map.put("pd", pd); return map; diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 6eeb98b..a1c264d 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -50,7 +50,6 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = trafficSecurityWaybillRegistrationService.listForSecurityWaybill(page); - map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java index 678ac31..716c3a9 100644 --- a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java +++ b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java @@ -153,6 +153,16 @@ public class FreighttTrailerController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 PageData freightTrailer = freightTrailerService.findById(pd); + if(StringUtils.equals(freightTrailer.getString("ISSCRAP"), "1")) { + pd.put("ISSCRAP", "1"); + } else{ + pd.put("ISSCRAP", "0"); + } + if (StringUtils.equals(freightTrailer.getString("ISASSIGNED"), "1")) { + pd.put("ISASSIGNED", "1"); + }else{ + pd.put("ISASSIGNED", "0"); + } List taxationList = taxationManageService.taxationList(pd.getString("CORPINFO_ID")); // 更新车船税数据 List assignedList = assignedManageService.assignedList(pd.getString("CORPINFO_ID")); // 更新过户数据 for (PageData taxation : taxationList) { diff --git a/src/main/java/com/zcloud/controller/maintain/MaintainController.java b/src/main/java/com/zcloud/controller/maintain/MaintainController.java index 0a5569e..f50438d 100644 --- a/src/main/java/com/zcloud/controller/maintain/MaintainController.java +++ b/src/main/java/com/zcloud/controller/maintain/MaintainController.java @@ -48,7 +48,7 @@ public class MaintainController extends BaseController { pd.put("MAINTAIN_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())); //添加时间 maintainService.save(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index 03f37be..1658feb 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -130,7 +130,7 @@ public class OperatingVehiclesController extends BaseController { pd.put("OPERATOR", Jurisdiction.getCORPINFO_ID()); pd.put("OPERATORNAME", Jurisdiction.getName()); pd.put("OPERATTIME", DateUtil.date2Str(new Date())); - PageData operation = operatingVehiclesService.findById(pd); + /*PageData operation = operatingVehiclesService.findById(pd); List assignedList = assignedManageService.assignedList(pd.getString("CORPINFO_ID")); for (PageData assigned : assignedList) { if(operation.get("PLATE_NUMBER").equals(assigned.get("RAW_PLATE_NUMBER"))) { @@ -138,12 +138,14 @@ public class OperatingVehiclesController extends BaseController { assigned.put("RAW_OWNERS", pd.get("VEHICLEOWNER")); assignedManageService.edit(assigned); } - } + }*/ operatingVehiclesService.edit(pd); map.put("pd", pd); map.put("result", errInfo); return map; } + + /**去修改页面获取数据 * @param * @throws Exception @@ -191,9 +193,7 @@ public class OperatingVehiclesController extends BaseController { } @RequestMapping(value = "/list") - // @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR) @ResponseBody - @LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "列表") public Object list(Page page) throws Exception { Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/operations/OperationsController.java b/src/main/java/com/zcloud/controller/operations/OperationsController.java index e3ad339..f1345f1 100644 --- a/src/main/java/com/zcloud/controller/operations/OperationsController.java +++ b/src/main/java/com/zcloud/controller/operations/OperationsController.java @@ -158,7 +158,7 @@ public class OperationsController extends BaseController { List varList = operationsService.list(page); //列出Question列表 varList.stream().anyMatch(data -> { - if("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) { + if ("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) { data.put("ARCHIVES_TYPE", "2"); } else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) { data.put("ARCHIVES_TYPE", "1"); @@ -192,13 +192,15 @@ public class OperationsController extends BaseController { pd2.put("CORPINFO_ID", pd.get("CORPINFO_ID")); //企业ID page.setPd(pd2); List operationList = operationsService.list(page); - for (int i = 0; i < operationList.size(); i++) { - if(pd.get("OPERATIONS_ID").equals(operationList.get(i).get("OPERATIONS_ID"))) { - pd.put("CYCLE_NAME",operationList.get(i).get("CYCLE_NAME")); + if (!CollectionUtils.isEmpty(operationList)) { + for (int i = 0; i < operationList.size(); i++) { + if (pd.get("OPERATIONS_ID").equals(operationList.get(i).get("OPERATIONS_ID"))) { + pd.put("CYCLE_NAME", operationList.get(i).get("CYCLE_NAME")); + } } } pd.put("FOREIGN_KEY", pd.getString("OPERATIONS_ID")); - pd.put("TYPE",126); + pd.put("TYPE", 126); List operationsinfoImgs = imgfilesService.listAll(pd);//营运证资料图片 map.put("pd", pd); map.put("operationsinfoImgs", operationsinfoImgs); @@ -213,32 +215,33 @@ public class OperationsController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); - if(!StringUtils.isEmpty(pd.getString("TRAFFIC_TYPE")) && pd.getString("TRAFFIC_TYPE").equals("1")) { + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + if (!StringUtils.isEmpty(pd.getString("TRAFFIC_TYPE")) && pd.getString("TRAFFIC_TYPE").equals("1")) { // 营运车辆 List operatingList = operatingVehiclesService.operationVehicleList(pd.getString("CORPINFO_ID")); page.setPd(pd); List operationsList = operationsService.list(page); // 获取营运车辆列表中所有的运营车辆 - List operations = operationsList.stream().filter(data -> StringUtils.equals(data.getString("VEHICLE_MODEL"), "1")) + List operations = operationsList.stream() + .filter(data -> StringUtils.equals(data.getString("VEHICLE_MODEL"), "1")) .collect(Collectors.toList()); // 过滤掉营运管理列表中所有营运车辆信息 List varList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(operations)) { + if (!CollectionUtils.isEmpty(operations)) { varList = operatingList.stream().parallel() - .filter(operating -> operations.stream(). - noneMatch(operation -> StringUtils.equals(operating.getString("OPERATING_ID"), operation.getString("VEHICLE")))) + .filter(operating -> operations.stream() + .noneMatch(operation -> StringUtils.equals(operating.getString("OPERATING_ID"), operation.getString("VEHICLE")))) .collect(Collectors.toList()); - }else{ + } else { varList = operatingList; } - if(pd.containsKey("ID")){ + if (pd.containsKey("ID")) { pd.put("OPERATING_ID", pd.getString("ID")); pd.put("FOREIGN_KEY", pd.getString("OPERATING_ID")); - pd.put("TYPE",121); + pd.put("TYPE", 121); List drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 map.put("drivingLicenseImgs", drivingLicenseImgs); } @@ -249,7 +252,7 @@ public class OperationsController extends BaseController { map.put("result", errInfo); return map; } - if("2".equals(pd.getString("TRAFFIC_TYPE"))) { + if ("2".equals(pd.getString("TRAFFIC_TYPE"))) { // 货运挂车 List freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID")); page.setPd(pd); @@ -261,19 +264,19 @@ public class OperationsController extends BaseController { .collect(Collectors.toList()); List varList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(operations)) { + if (!CollectionUtils.isEmpty(operations)) { varList = freightList.stream().parallel() .filter(freight -> operations.stream() .noneMatch(operation -> StringUtils.equals(freight.getString("FREIGHTTRAILER_ID"), operation.getString("VEHICLE")))) .collect(Collectors.toList()); - }else{ + } else { varList = freightList; } - if(pd.containsKey("ID")){ + if (pd.containsKey("ID")) { pd.put("FREIGHTTRAILER_ID", pd.getString("ID")); pd.put("FOREIGN_KEY", pd.getString("FREIGHTTRAILER_ID")); - pd.put("TYPE",121); + pd.put("TYPE", 121); List drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 map.put("drivingLicenseImgs", drivingLicenseImgs); } @@ -286,9 +289,9 @@ public class OperationsController extends BaseController { } List resData = freightTrailerService.vehicleList(pd); - if(pd.containsKey("ID")){ + if (pd.containsKey("ID")) { pd.put("FOREIGN_KEY", pd.getString("ID")); - pd.put("TYPE",121); + pd.put("TYPE", 121); List drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 map.put("drivingLicenseImgs", drivingLicenseImgs); } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml index d3fae6f..e18b0e8 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml @@ -101,7 +101,7 @@ and f.INQUIRYCONTENT LIKE CONCAT(CONCAT('%', #{pd.INQUIRYCONTENT}),'%') - order by f.CREATTIME DESC + order by f.OPERATTIME DESC diff --git a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml index a10ab95..1b70e9b 100644 --- a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml +++ b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml @@ -204,6 +204,8 @@ f.APPROVED_LOAD_CAPACITY, f.VOLUME, f.NOTES, + f.ISSCRAP as ISSCRAP, + f.ISASSIGNED as ISASSIGNED, (select t.FILEPATH from bus_imgfiles t where t.TYPE = 120 and t.FOREIGN_KEY = f.FREIGHTTRAILER_ID limit 1) as TRAILER_IMG, (select t.FILEPATH from bus_imgfiles t where t.TYPE = 121 and t.FOREIGN_KEY = f.FREIGHTTRAILER_ID limit 1) as DRIVING_LICENSE_IMG, (select t.FILEPATH from bus_imgfiles t where t.TYPE = 122 and t.FOREIGN_KEY = f.FREIGHTTRAILER_ID limit 1) as OPER_CERTIFICATE_IMG, diff --git a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml index 85297d0..aa1b6e7 100644 --- a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml +++ b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml @@ -136,30 +136,7 @@ @@ -134,5 +138,7 @@ DELETETIME = #{DELETETIME} where DRIVINGCOMMITMENT_ID = #{DRIVINGCOMMITMENT_ID} + AND + CORPINFO_ID = #{CORPINFO_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml index 540849d..5fdbf0b 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml @@ -93,6 +93,8 @@ OPERATTIME = #{OPERATTIME} where DRIVINGTYPE_ID = #{DRIVINGTYPE_ID} + AND + CORPINFO_ID = #{CORPINFO_ID} @@ -119,6 +121,8 @@ f where f.DRIVINGTYPE_ID = #{DRIVINGTYPE_ID} + AND + f.CORPINFO_ID = #{CORPINFO_ID} @@ -132,6 +136,8 @@ DELETETIME = #{DELETETIME} where DRIVINGTYPE_ID = #{DRIVINGTYPE_ID} + AND + CORPINFO_ID = #{CORPINFO_ID} diff --git a/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentUseMapper.xml b/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentUseMapper.xml index f81b5d6..4b91901 100644 --- a/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentUseMapper.xml +++ b/src/main/resources/mybatis/datasource/safetyInvestment/SafetyInvestmentUseMapper.xml @@ -79,6 +79,8 @@ ISDELETE = '1' where SAFETYINVESTMENTUSE_ID = #{SAFETYINVESTMENTUSE_ID} + AND + CORPINFO_ID = #{CORPINFO_ID} @@ -99,6 +101,8 @@ SAFETYINVESTMENTUSE_ID = SAFETYINVESTMENTUSE_ID where SAFETYINVESTMENTUSE_ID = #{SAFETYINVESTMENTUSE_ID} + AND + CORPINFO_ID = #{CORPINFO_ID} @@ -117,7 +121,7 @@ from f - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and ( From 17e9aa562d0bb3668e99aab39d6ecde1f04c92d1 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 26 Apr 2024 18:02:57 +0800 Subject: [PATCH 32/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssignedManageController.java | 5 +++ .../FreighttTrailerController.java | 43 +++++++++++++------ .../OperatingVehiclesController.java | 30 ++++++++----- .../SafetyInvestmentUseController.java | 5 ++- .../scrapManage/ScrapManageController.java | 3 ++ .../TaxationManageController.java | 3 +- .../assignedManage/AssignedManageMapper.java | 2 + .../taxationManage/TaxationManageMapper.java | 2 + .../assignedManage/AssignedManageService.java | 2 + .../impl/AssignedManageServiceImpl.java | 5 +++ .../taxationManage/TaxationManageService.java | 2 + .../impl/TaxationManageServiceImpl.java | 5 +++ .../assignedManage/AssignedManageMapper.xml | 13 +++++- .../freighttrailer/FreightTrailerMapper.xml | 4 ++ .../taxationManage/TaxationManageMapper.xml | 12 ++++++ 15 files changed, 107 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java b/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java index 670ebec..eac6bee 100644 --- a/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java +++ b/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java @@ -178,6 +178,11 @@ public class AssignedManageController extends BaseController { pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd = assignedManageService.findById(pd); + if (StringUtils.equals(pd.getString("TYPE"), "2")) { + pd.put("ENGINE_NUMBER", "--"); + pd.put("POWER_TYPE", "--"); + pd.put("EMISSION_STANDARD", "--"); + } PageData pd2 = new PageData(); pd2.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); pd2.put("ID", pd.get("RAW_PLATE_NUMBER")); diff --git a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java index 716c3a9..94dc550 100644 --- a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java +++ b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java @@ -13,6 +13,7 @@ import com.zcloud.service.system.ImgFilesService; import com.zcloud.service.taxationManage.TaxationManageService; import com.zcloud.util.*; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -100,6 +101,7 @@ public class FreighttTrailerController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); if(Tools.notEmpty(pd.getString("FREIGHTTRAILER_ID"))) { PageData findPageData = freightTrailerService.findById(pd); PageData scrapAddData = new PageData(); @@ -128,6 +130,7 @@ public class FreighttTrailerController extends BaseController { pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); freightTrailerService.delete(pd); map.put("result", errInfo); //返回结果 return map; @@ -151,7 +154,7 @@ public class FreighttTrailerController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); PageData freightTrailer = freightTrailerService.findById(pd); if(StringUtils.equals(freightTrailer.getString("ISSCRAP"), "1")) { pd.put("ISSCRAP", "1"); @@ -163,20 +166,31 @@ public class FreighttTrailerController extends BaseController { }else{ pd.put("ISASSIGNED", "0"); } - List taxationList = taxationManageService.taxationList(pd.getString("CORPINFO_ID")); // 更新车船税数据 - List assignedList = assignedManageService.assignedList(pd.getString("CORPINFO_ID")); // 更新过户数据 - for (PageData taxation : taxationList) { - if(taxation.get("PLATE_NUMBER").equals(freightTrailer.get("PLATE_NUMBER"))) { - taxation.put("PLATE_NUMBER", pd.get("PLATE_NUMBER")); - taxationManageService.edit(taxation); - } + PageData trailerInfo = taxationManageService.findByTrailerId(pd); + if(!Tools.isEmpty(trailerInfo)) { + trailerInfo.put("PLATE_NUMBER",pd.getString("PLATE_NUMBER")); + trailerInfo.put("FRAMES_NUMBER", pd.getString("VIN")); + trailerInfo.put("VEHICLE_TYPE", pd.getString("TRAILER_TYPE")); + trailerInfo.put("VEHICLEOWNER", pd.getString("CAR_OWNERS")); + trailerInfo.put("CONTACT_NUMBER", pd.getString("CONTACT_PHONE")); + trailerInfo.put("FIRSTSHOW_DATE", pd.getString("INITIAL_REGISTRATION_DATE")); + taxationManageService.edit(trailerInfo); } - for (PageData assigned : assignedList) { - if(assigned.get("RAW_PLATE_NUMBER").equals(freightTrailer.get("PLATE_NUMBER"))) { - assigned.put("RAW_PLATE_NUMBER", pd.get("PLATE_NUMBER")); - assigned.put("RAW_OWNERS", pd.get("CAR_OWNERS")); - assignedManageService.edit(assigned); - } + + // 挂车 处理 更新 过户信息 + PageData vehicleInfo = new PageData(); + vehicleInfo.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + vehicleInfo.put("ID", pd.getString("FREIGHTTRAILER_ID")); + PageData trailerAssignedInfo = assignedManageService.findByRawVehicleId(vehicleInfo); + if (!Tools.isEmpty(trailerAssignedInfo)) { + trailerAssignedInfo.put("FRAMES_NUMBER", pd.getString("VIN")); + trailerAssignedInfo.put("VEHICLE_BRAND", pd.getString("TRAILER_BRAND")); + trailerAssignedInfo.put("VEHICLE_MODEL", pd.getString("TRAILER_MODEL")); + trailerAssignedInfo.put("PLATE_NUMBER", pd.getString("PLATE_NUMBER")); + trailerAssignedInfo.put("RAW_OWNERS", pd.getString("CAR_OWNERS")); + trailerAssignedInfo.put("RAW_CONTACT_NUMBER", pd.getString("CONTACT_PHONE")); + trailerAssignedInfo.put("RAW_OPERATION_CERTIFICATE", pd.getString("OPER_CERTIFICATE_NUM")); + assignedManageService.edit(trailerAssignedInfo); } freightTrailerService.edit(pd); map.put("pd", pd); @@ -395,6 +409,7 @@ public class FreighttTrailerController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd = freightTrailerService.findById(pd); //根据ID读取 pd.put("FOREIGN_KEY", pd.getString("FREIGHTTRAILER_ID")); diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index 1658feb..a5baf5c 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -42,10 +42,10 @@ public class OperatingVehiclesController extends BaseController { private ScrapManageService scrapManageService; @Autowired - private AssignedManageService assignedManageService; + private DepartmentService departmentService; @Autowired - private DepartmentService departmentService; + private AssignedManageService assignedManageService; /**新增 * @param @@ -130,16 +130,24 @@ public class OperatingVehiclesController extends BaseController { pd.put("OPERATOR", Jurisdiction.getCORPINFO_ID()); pd.put("OPERATORNAME", Jurisdiction.getName()); pd.put("OPERATTIME", DateUtil.date2Str(new Date())); - /*PageData operation = operatingVehiclesService.findById(pd); - List assignedList = assignedManageService.assignedList(pd.getString("CORPINFO_ID")); - for (PageData assigned : assignedList) { - if(operation.get("PLATE_NUMBER").equals(assigned.get("RAW_PLATE_NUMBER"))) { - assigned.put("RAW_PLATE_NUMBER", pd.get("PLATE_NUMBER")); - assigned.put("RAW_OWNERS", pd.get("VEHICLEOWNER")); - assignedManageService.edit(assigned); - } - }*/ operatingVehiclesService.edit(pd); + PageData pageData = new PageData(); + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pageData.put("ID",pd.getString("OPERATING_ID")); + PageData vehicleAssignedInfo = assignedManageService.findByRawVehicleId(pageData); + if (!Tools.isEmpty(vehicleAssignedInfo)) { + vehicleAssignedInfo.put("FRAMES_NUMBER", pd.getString("FRAMES_NUMBER")); + vehicleAssignedInfo.put("VEHICLE_BRAND", pd.getString("VEHICLE_BRAND")); + vehicleAssignedInfo.put("VEHICLE_MODEL", pd.getString("VEHICLE_MODEL")); + vehicleAssignedInfo.put("ENGINE_NUMBER", pd.getString("ENGINE_NUMBER")); + vehicleAssignedInfo.put("POWER_TYPE", pd.getString("FUEL_TYPE")); + vehicleAssignedInfo.put("EMISSION_STANDARD", pd.getString("EMISSION_STANDARD")); + vehicleAssignedInfo.put("PLATE_NUMBER", pd.getString("PLATE_NUMBER")); + vehicleAssignedInfo.put("RAW_OWNERS", pd.getString("VEHICLEOWNER")); + vehicleAssignedInfo.put("RAW_CONTACT_NUMBER", pd.getString("CONTACT_NUMBER")); + vehicleAssignedInfo.put("RAW_OPERATION_CERTIFICATE", pd.getString("OPERATING_CERTIFICATE")); + assignedManageService.edit(vehicleAssignedInfo); + } map.put("pd", pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentUseController.java b/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentUseController.java index 1b31b83..1f71082 100644 --- a/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentUseController.java +++ b/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentUseController.java @@ -46,9 +46,9 @@ public class SafetyInvestmentUseController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("SAFETYINVESTMENTUSE_ID", this.get32UUID()); //主键 - pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 + pd.put("CREATOR", Jurisdiction.getName()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 - pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATOR", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID @@ -134,6 +134,7 @@ public class SafetyInvestmentUseController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID List varList = safetyinvestmentuseService.listAll(pd); //列出SafetyInvestmentUse列表 + // 计算预提额合计 Double drawingsTotal = varList.stream(). filter(data -> StringUtils.equals(data.getString("USE_TYPE"), "1")) diff --git a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java index be853f7..2912179 100644 --- a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java +++ b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java @@ -203,6 +203,9 @@ public class ScrapManageController extends BaseController { }else { varList = operationList; } + varList.forEach(data -> { + data.put("ID",data.getString("OPERATING_ID")); + }); map.put("varList", varList); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index 5c7aeea..c8091d2 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -1,5 +1,6 @@ package com.zcloud.controller.taxationManage; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.excel.util.DateUtils; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; @@ -10,11 +11,11 @@ import com.zcloud.service.freighttrailer.FreightTrailerService; import com.zcloud.service.system.DictionariesService; import com.zcloud.service.taxationManage.TaxationManageService; import com.zcloud.util.*; -import org.apache.commons.lang3.ObjectUtils; 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; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/src/main/java/com/zcloud/mapper/datasource/assignedManage/AssignedManageMapper.java b/src/main/java/com/zcloud/mapper/datasource/assignedManage/AssignedManageMapper.java index adb5dd6..238f381 100644 --- a/src/main/java/com/zcloud/mapper/datasource/assignedManage/AssignedManageMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/assignedManage/AssignedManageMapper.java @@ -37,4 +37,6 @@ public interface AssignedManageMapper { List operationvehicleList(String corpId); List assignedList(String corpId); + + PageData findByRawVehicleId(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/taxationManage/TaxationManageMapper.java b/src/main/java/com/zcloud/mapper/datasource/taxationManage/TaxationManageMapper.java index 524861b..6ac4d1b 100644 --- a/src/main/java/com/zcloud/mapper/datasource/taxationManage/TaxationManageMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/taxationManage/TaxationManageMapper.java @@ -35,4 +35,6 @@ public interface TaxationManageMapper { List datalistPage(Page page); List taxationList(String corpId); + + PageData findByTrailerId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/assignedManage/AssignedManageService.java b/src/main/java/com/zcloud/service/assignedManage/AssignedManageService.java index a6cbeb4..4fc625c 100644 --- a/src/main/java/com/zcloud/service/assignedManage/AssignedManageService.java +++ b/src/main/java/com/zcloud/service/assignedManage/AssignedManageService.java @@ -37,4 +37,6 @@ public interface AssignedManageService { List operationVehicleList(String corpId); List assignedList(String corpId); + + PageData findByRawVehicleId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/assignedManage/impl/AssignedManageServiceImpl.java b/src/main/java/com/zcloud/service/assignedManage/impl/AssignedManageServiceImpl.java index 070d52d..eef34e9 100644 --- a/src/main/java/com/zcloud/service/assignedManage/impl/AssignedManageServiceImpl.java +++ b/src/main/java/com/zcloud/service/assignedManage/impl/AssignedManageServiceImpl.java @@ -53,4 +53,9 @@ public class AssignedManageServiceImpl implements AssignedManageService { public List assignedList(String corpId) { return assignedManageMapper.assignedList(corpId); } + + @Override + public PageData findByRawVehicleId(PageData pd) { + return assignedManageMapper.findByRawVehicleId(pd); + } } diff --git a/src/main/java/com/zcloud/service/taxationManage/TaxationManageService.java b/src/main/java/com/zcloud/service/taxationManage/TaxationManageService.java index 62116e7..d4e7079 100644 --- a/src/main/java/com/zcloud/service/taxationManage/TaxationManageService.java +++ b/src/main/java/com/zcloud/service/taxationManage/TaxationManageService.java @@ -34,4 +34,6 @@ public interface TaxationManageService { public List list(Page page); public List taxationList(String corpId) throws Exception; + + PageData findByTrailerId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/taxationManage/impl/TaxationManageServiceImpl.java b/src/main/java/com/zcloud/service/taxationManage/impl/TaxationManageServiceImpl.java index 740ae05..4e9f6cd 100644 --- a/src/main/java/com/zcloud/service/taxationManage/impl/TaxationManageServiceImpl.java +++ b/src/main/java/com/zcloud/service/taxationManage/impl/TaxationManageServiceImpl.java @@ -48,4 +48,9 @@ public class TaxationManageServiceImpl implements TaxationManageService { public List taxationList(String corpId) throws Exception { return taxationManageMapper.taxationList(corpId); } + + @Override + public PageData findByTrailerId(PageData pd) { + return taxationManageMapper.findByTrailerId(pd); + } } diff --git a/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml b/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml index 9b3c26b..0e8477c 100644 --- a/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml +++ b/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml @@ -237,9 +237,11 @@ + + diff --git a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml index 1b70e9b..fa63cca 100644 --- a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml +++ b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml @@ -140,6 +140,8 @@ ISSCRAP = '1' where FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID} + AND + CORPINFO_ID = #{CORPINFO_ID} @@ -220,6 +222,8 @@ inner join bus_corp_info b on f.CORPINFO_ID = b.CORPINFO_ID where f.FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID} + AND + f.CORPINFO_ID = #{CORPINFO_ID} + (SELECT GROUP_CONCAT(dic.NAME SEPARATOR ',') from SYS_DICTIONARIES dic + where dic.PARENT_ID = '0b62f92b0b624aab8e89a77304a64d5e' + and dic.BIANMA like '%TRAFFIC_EMPLOYMENT_DRIVE%' + and FIND_IN_SET(dic.DICTIONARIES_ID,f.PERSONNEL_TYPE)) as PERSONNEL_TYPE_NAME from f left join SYS_DICTIONARIES s on s.DICTIONARIES_ID = f.SEX @@ -176,7 +179,7 @@ left join SYS_DICTIONARIES d on d.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION left join SYS_DICTIONARIES_CORP du on du.DICTIONARIES_ID = f.DUTIES left join SYS_DICTIONARIES_CORP w on w.DICTIONARIES_ID = f.TYPE_OF_WORK - left join SYS_DICTIONARIES pt on pt.DICTIONARIES_ID = f.PERSONNEL_TYPE + left join SYS_DICTIONARIES_CORP ti on ti.DICTIONARIES_ID = f.TITLE where f.USER_ID = #{USER_ID} @@ -366,4 +369,18 @@ where USER_ID = #{USER_ID} + + + insert into sys_userinfo_personnel_type + ( + ID,USER_ID,PERSONNEL_TYPE + ) values ( + #{ID},#{USER_ID},#{PERSONNEL_TYPE} + ) + + + + delete from sys_userinfo_personnel_type where USER_ID = #{USER_ID} + + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 5344e4d..08ac69f 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1690,7 +1690,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,info.DUTIES ,info.TITLE ,info.ENTRY_DATE - ,dic.`NAME` as PERSONNEL_TYPE_NAME + + ,(SELECT GROUP_CONCAT(dic.NAME SEPARATOR ',') from SYS_DICTIONARIES dic + where dic.PARENT_ID = '0b62f92b0b624aab8e89a77304a64d5e' + and dic.BIANMA like '%TRAFFIC_EMPLOYMENT_DRIVE%' + and FIND_IN_SET(dic.DICTIONARIES_ID,info.PERSONNEL_TYPE)) as PERSONNEL_TYPE_NAME ,uc.USER_CORP_ID ,uc.APPLY_TYPE ,uc.APPLY_STATUS @@ -1701,7 +1705,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join BUS_SHIFTWORKRULES sw on sw.SHIFTWORKRULES_ID = u.SHIFTDUTYONE left join BUS_SHIFTWORKRULES swr on swr.SHIFTWORKRULES_ID = u.SHIFTDUTYTWO left join SYS_USERINFO info on info.USER_ID = u.USER_ID - left join SYS_DICTIONARIES dic on dic.DICTIONARIES_ID = info.PERSONNEL_TYPE + left join ( SELECT t1.USER_CORP_ID, t1.CORPINFO_ID, t1.USER_ID, t1.APPLY_TYPE, t1.APPLY_STATUS, t1.ISDELETE FROM SYS_USER_CORP t1 From 7d88371eb229faa94af1b1a75671a5f23f76eae3 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Mon, 29 Apr 2024 17:54:21 +0800 Subject: [PATCH 35/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/beidou/BeidouController.java | 23 +++++++------ .../InspectAnnuallyController.java | 19 +++++++++-- .../controller/insure/InsureController.java | 25 +++++++++++++++ .../maintenance/MaintenanceController.java | 15 ++++++++- .../operations/OperationsController.java | 14 ++++++++ .../TaxationManageController.java | 15 ++++++--- .../datasource/beidou/BeidouMapper.xml | 21 +++++------- .../inspectAnnually/InspectAnnuallyMapper.xml | 14 ++++---- .../datasource/insure/InsureMapper.xml | 15 +++++---- .../maintenance/MaintenanceMapper.xml | 21 +++++------- .../operations/OperationsMapper.xml | 32 ++++++------------- 11 files changed, 136 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/zcloud/controller/beidou/BeidouController.java b/src/main/java/com/zcloud/controller/beidou/BeidouController.java index 56f2c47..295ccb7 100644 --- a/src/main/java/com/zcloud/controller/beidou/BeidouController.java +++ b/src/main/java/com/zcloud/controller/beidou/BeidouController.java @@ -104,6 +104,13 @@ public class BeidouController extends BaseController { } operatingVehiclesService.edit(resData); } + if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + pd.put("REVERT", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + pd.put("REVERT", 0); + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + pd.put("REVERT", 1); + } beidouService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -165,6 +172,13 @@ public class BeidouController extends BaseController { } operatingVehiclesService.edit(resData); } + if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + pd.put("REVERT", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + pd.put("REVERT", 0); + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + pd.put("REVERT", 1); + } beidouService.edit(pd); map.put("pd", pd); map.put("result", errInfo); @@ -213,7 +227,6 @@ public class BeidouController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = beidouService.list(page); //列出Question列表 - varList.stream().anyMatch(data -> { if ("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) { data.put("ARCHIVES_TYPE", "1"); @@ -222,14 +235,6 @@ public class BeidouController extends BaseController { } 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); diff --git a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java index bbefd73..b1acf22 100644 --- a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java +++ b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java @@ -67,6 +67,13 @@ public class InspectAnnuallyController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("VEHICLE", pd.get("PLATE_NUMBER")); + if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + pd.put("REVERT", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + pd.put("REVERT", 0); + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + pd.put("REVERT", 1); + } inspectAnnuallyService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -114,6 +121,13 @@ public class InspectAnnuallyController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + pd.put("REVERT", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + pd.put("REVERT", 0); + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + pd.put("REVERT", 1); + } inspectAnnuallyService.edit(pd); map.put("pd", pd); map.put("result", errInfo); @@ -198,10 +212,9 @@ public class InspectAnnuallyController extends BaseController { vehicle.put("OPERATING_ID", pd.get("VEHICLE")); vehicle.put("CORPINFO_ID", pd.get("CORPINFO_ID")); PageData pageData = operatingVehiclesService.findById(vehicle); - BeanUtil.copyProperties(pageData,pd); - /*pd.put("VEHICLE_BRAND", pageData.get("VEHICLE_BRAND"));*/ + pd.put("VEHICLE_BRAND", pageData.get("VEHICLE_BRAND")); pd.put("VEHICLE_TYPE", pageData.get("VEHICLE_MODEL")); - /*pd.put("PLATE_NUMBER", pageData.get("PLATE_NUMBER"));*/ + pd.put("PLATE_NUMBER", pageData.get("PLATE_NUMBER")); } else { vehicle.put("FREIGHTTRAILER_ID", pd.get("VEHICLE")); vehicle.put("CORPINFO_ID", pd.get("CORPINFO_ID")); diff --git a/src/main/java/com/zcloud/controller/insure/InsureController.java b/src/main/java/com/zcloud/controller/insure/InsureController.java index f19bac0..99fdb58 100644 --- a/src/main/java/com/zcloud/controller/insure/InsureController.java +++ b/src/main/java/com/zcloud/controller/insure/InsureController.java @@ -62,6 +62,13 @@ public class InsureController extends BaseController { pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("VEHICLE", pd.getString("PLATE_NUMBER")); + if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + pd.put("REVERT", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + pd.put("REVERT", 0); + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + pd.put("REVERT", 1); + } insureService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -110,6 +117,13 @@ public class InsureController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + pd.put("REVERT", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + pd.put("REVERT", 0); + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + pd.put("REVERT", 1); + } insureService.edit(pd); map.put("pd", pd); map.put("result", errInfo); @@ -158,6 +172,17 @@ public class InsureController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = insureService.list(page); //列出Question列表 + // 到期状态 + varList.stream().forEach(data -> { + if(DateUtil.compareDate(data.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),data.getString("REMINDER_DATE"))) { + data.put("DUE_DATE_TYPE", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),data.getString("DUE_DATE"))) { + data.put("DUE_DATE_TYPE", 0); + } else if (DateUtil.compareDate(data.getString("DUE_DATE"),DateUtil.getDay())) { + data.put("DUE_DATE_TYPE", 1); + } + }); + map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java index d9f3407..8b6ac26 100644 --- a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java +++ b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java @@ -61,6 +61,13 @@ public class MaintenanceController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态 + if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + pd.put("REVERT", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + pd.put("REVERT", 0); + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + pd.put("REVERT", 1); + } maintenanceService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -108,6 +115,13 @@ public class MaintenanceController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + pd.put("REVERT", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + pd.put("REVERT", 0); + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + pd.put("REVERT", 1); + } maintenanceService.edit(pd); map.put("pd", pd); map.put("result", errInfo); @@ -156,7 +170,6 @@ public class MaintenanceController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = maintenanceService.list(page); //列出Question列表 - varList.stream().anyMatch(data -> { if ("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) { data.put("ARCHIVES_TYPE", "2"); diff --git a/src/main/java/com/zcloud/controller/operations/OperationsController.java b/src/main/java/com/zcloud/controller/operations/OperationsController.java index 77c9177..7daf26e 100644 --- a/src/main/java/com/zcloud/controller/operations/OperationsController.java +++ b/src/main/java/com/zcloud/controller/operations/OperationsController.java @@ -61,6 +61,13 @@ public class OperationsController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("VEHICLE", pd.get("PLATE_NUMBER")); + if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + pd.put("REVERT", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + pd.put("REVERT", 0); + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + pd.put("REVERT", 1); + } operationsService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -108,6 +115,13 @@ public class OperationsController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + pd.put("REVERT", 2); + } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + pd.put("REVERT", 0); + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + pd.put("REVERT", 1); + } operationsService.edit(pd); map.put("pd", pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index c8091d2..d6657a9 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -57,10 +57,13 @@ public class TaxationManageController extends BaseController { pd.put("ARCHIVES_TYPE", "0"); //档案状态 if ("".equals(pd.getString("EXPIRE_STATUS"))) { String expireDate = pd.getString("EXPIRE_DATE"); + String ReminderData = pd.getString("REMINDER_DATA"); String day = DateUtil.getDay(); - if (DateUtil.compareDate(expireDate, day)) { + if (DateUtil.compareDate(expireDate, day) && DateUtil.compareDate(day, ReminderData)) { + pd.put("EXPIRE_STATUS", "2"); + } else if (DateUtil.compareDate(expireDate, day)) { pd.put("EXPIRE_STATUS", "1"); - } else { + } else if (DateUtil.compareDate(day, expireDate)) { pd.put("EXPIRE_STATUS", "0"); } } @@ -110,11 +113,13 @@ public class TaxationManageController extends BaseController { pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 String expireDate = pd.getString("EXPIRE_DATE"); + String ReminderData = pd.getString("REMINDER_DATA"); String day = DateUtil.getDay(); - boolean flag = DateUtil.compareDate(expireDate, day); - if (flag) { + if (DateUtil.compareDate(expireDate, day) && DateUtil.compareDate(day, ReminderData)) { + pd.put("EXPIRE_STATUS", "2"); + } else if (DateUtil.compareDate(expireDate, day)) { pd.put("EXPIRE_STATUS", "1"); - } else { + } else if (DateUtil.compareDate(day, expireDate)) { pd.put("EXPIRE_STATUS", "0"); } taxationManageService.edit(pd); diff --git a/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml b/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml index 4e17bc9..2ae86bb 100644 --- a/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml +++ b/src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml @@ -53,7 +53,8 @@ DELETEOR, DELETEORNAME, DELETTIME, - ARCHIVES_TYPE + ARCHIVES_TYPE, + REVERT @@ -101,7 +102,8 @@ #{DELETEOR}, #{DELETEORNAME}, #{DELETTIME}, - #{ARCHIVES_TYPE} + #{ARCHIVES_TYPE}, + #{REVERT} @@ -152,7 +154,8 @@ OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, OPERATTIME = #{OPERATTIME}, - ARCHIVES_TYPE = #{ARCHIVES_TYPE} + ARCHIVES_TYPE = #{ARCHIVES_TYPE}, + REVERT = #{REVERT} where BEIDOU_ID = #{BEIDOU_ID} @@ -265,7 +268,6 @@ diff --git a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml index aa1b6e7..7f0346a 100644 --- a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml +++ b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml @@ -33,7 +33,8 @@ ISDELETE, CREATOR, CREATORNAME, - CREATTIME + CREATTIME, + REVERT @@ -61,7 +62,8 @@ #{ISDELETE}, #{CREATOR}, #{CREATORNAME}, - #{CREATTIME} + #{CREATTIME}, + #{REVERT} @@ -113,7 +115,8 @@ ARCHIVES_TYPE = #{ARCHIVES_TYPE}, OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, - OPERATTIME = #{OPERATTIME} + OPERATTIME = #{OPERATTIME}, + REVERT = #{REVERT} where INSPECTANNUALLY_ID = #{INSPECTANNUALLY_ID} @@ -160,7 +163,6 @@ select b.NAME, f.*, - case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, v1.PLATE_NUMBER, o.ISSCRAP AS OPEAR_ISSCRAP, btmf.ISSCRAP AS FREIGHT_ISSCRAP, @@ -191,8 +193,8 @@ and f.REMINDER_STATUS = #{pd.REMINDER_STATUS} - - and case when f.DUE_DATE < NOW() then 0 else 1 end = #{pd.DUE_DATE_TYPE} + + and f.REVERT = #{pd.REVERT} ORDER BY f.OPERATTIME DESC diff --git a/src/main/resources/mybatis/datasource/insure/InsureMapper.xml b/src/main/resources/mybatis/datasource/insure/InsureMapper.xml index df3e443..f9b57f4 100644 --- a/src/main/resources/mybatis/datasource/insure/InsureMapper.xml +++ b/src/main/resources/mybatis/datasource/insure/InsureMapper.xml @@ -34,7 +34,8 @@ ISDELETE, CREATOR, CREATORNAME, - CREATTIME + CREATTIME, + REVERT @@ -63,7 +64,8 @@ #{ISDELETE}, #{CREATOR}, #{CREATORNAME}, - #{CREATTIME} + #{CREATTIME}, + #{REVERT} @@ -116,7 +118,8 @@ NOTES = #{NOTES}, OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, - OPERATTIME = #{OPERATTIME} + OPERATTIME = #{OPERATTIME}, + REVERT = #{REVERT} where INSURE_ID = #{INSURE_ID} @@ -190,7 +193,7 @@ select f.*, DATE_FORMAT(f.PROCESSING_DATE,'%Y') as PROCESSING_DATE_YEAR, - case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, + /*case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE,*/ v1.PLATE_NUMBER from @@ -223,8 +226,8 @@ and v1.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%') - - and case when f.DUE_DATE < NOW() then 0 else 1 end = #{pd.DUE_DATE_TYPE} + + and f.REVERT = #{pd.REVERT} ORDER BY f.CREATTIME DESC diff --git a/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml b/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml index bb37554..c1afe36 100644 --- a/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml +++ b/src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml @@ -52,7 +52,8 @@ DELETEOR, DELETEORNAME, DELETTIME, - ARCHIVES_TYPE + ARCHIVES_TYPE, + REVERT @@ -99,7 +100,8 @@ #{DELETEOR}, #{DELETEORNAME}, #{DELETTIME}, - #{ARCHIVES_TYPE} + #{ARCHIVES_TYPE}, + #{REVERT} @@ -151,7 +153,8 @@ OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, OPERATTIME = #{OPERATTIME}, - ARCHIVES_TYPE = #{ARCHIVES_TYPE} + ARCHIVES_TYPE = #{ARCHIVES_TYPE}, + REVERT = #{REVERT} where MAINTENANCE_ID = #{MAINTENANCE_ID} @@ -224,7 +227,6 @@ diff --git a/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml b/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml index 5e12bff..788e496 100644 --- a/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml +++ b/src/main/resources/mybatis/datasource/operations/OperationsMapper.xml @@ -49,7 +49,8 @@ DELETEOR, DELETEORNAME, DELETTIME, - ARCHIVES_TYPE + ARCHIVES_TYPE, + REVERT @@ -93,7 +94,8 @@ #{DELETEOR}, #{DELETEORNAME}, #{DELETTIME}, - #{ARCHIVES_TYPE} + #{ARCHIVES_TYPE}, + #{REVERT} @@ -141,7 +143,8 @@ NOTES = #{NOTES}, OPERATOR = #{OPERATOR}, OPERATORNAME = #{OPERATORNAME}, - OPERATTIME = #{OPERATTIME} + OPERATTIME = #{OPERATTIME}, + REVERT = #{REVERT} where OPERATIONS_ID = #{OPERATIONS_ID} @@ -250,15 +253,8 @@ and v1.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%') - - -- 添加条件：只有当当前时间（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 + + and f.REVERT = #{pd.REVERT} ORDER BY f.CREATTIME DESC @@ -267,7 +263,6 @@ select b.NAME AS CYCLE_NAME, f.*, - case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, v1.PLATE_NUMBER, v1.TRAFFIC_TYPE, o.ISSCRAP AS OPEAR_ISSCRAP, @@ -302,15 +297,8 @@ and v1.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%') - - -- 添加条件：只有当当前时间（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 case when f.DUE_DATE < NOW() then 0 else 1 end = #{pd.DUE_DATE_TYPE} + + and f.REVERT = #{pd.REVERT} ORDER BY f.CREATTIME DESC From aaceba5f07f87570d32a1b0df82c175d4210e6d9 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 30 Apr 2024 17:54:04 +0800 Subject: [PATCH 36/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OperatingVehiclesController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index e6a5bef..bcce02b 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -13,6 +13,7 @@ import com.zcloud.service.system.ImgFilesService; import com.zcloud.util.*; import net.sf.json.JSONArray; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -27,6 +28,7 @@ import org.springframework.web.servlet.ModelAndView; import java.io.File; import java.util.*; +import java.util.stream.Collectors; @Controller @RequestMapping("/operatingvehicles") @@ -215,6 +217,15 @@ public class OperatingVehiclesController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = operatingVehiclesService.list(page); //列出Question列表 + + List info = new ArrayList<>(); + varList.stream().parallel() + .forEach(data -> { + if (!DateUtil.compareDate(data.getString("CREATTIME").substring(0, data.getString("CREATTIME").indexOf(" ")), DateUtil.getDay())) { + info.add(data); + } + }); + map.put("varList", varList); map.put("page", page); map.put("result", errInfo); From b4f2f2645cc6c8932a926d02d00170c9c9869c0e Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 30 Apr 2024 17:54:21 +0800 Subject: [PATCH 37/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operatingvehicles/OperatingVehiclesController.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index bcce02b..8157205 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -218,14 +218,6 @@ public class OperatingVehiclesController extends BaseController { page.setPd(pd); List varList = operatingVehiclesService.list(page); //列出Question列表 - List info = new ArrayList<>(); - varList.stream().parallel() - .forEach(data -> { - if (!DateUtil.compareDate(data.getString("CREATTIME").substring(0, data.getString("CREATTIME").indexOf(" ")), DateUtil.getDay())) { - info.add(data); - } - }); - map.put("varList", varList); map.put("page", page); map.put("result", errInfo); From eca9838520a855223e5b30a4385635350d26c253 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Mon, 6 May 2024 17:43:45 +0800 Subject: [PATCH 38/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E8=BD=A6=E8=BE=86=E5=92=8C=E8=B4=A7=E8=BF=90=E6=8C=82?= =?UTF-8?q?=E8=BD=A6=E7=9A=84=E9=83=A8=E9=97=A8=E6=98=BE=E7=A4=BAID=20?= =?UTF-8?q?=E4=BA=8B=E6=95=85=E7=9A=84=E4=BA=BA=E5=91=98=E6=98=BE=E7=A4=BA?= =?UTF-8?q?ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operatingvehicles/OperatingVehiclesController.java | 1 - .../TrafficSecurityAccidentInvestigationMapper.xml | 4 +++- .../datasource/freighttrailer/FreightTrailerMapper.xml | 4 +++- .../operatingvehicles/OperatingVehiclesMapper.xml | 8 ++++++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index 8157205..45aacfa 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -217,7 +217,6 @@ public class OperatingVehiclesController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = operatingVehiclesService.list(page); //列出Question列表 - map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml index 7cf0b63..93ee696 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml @@ -361,10 +361,12 @@ diff --git a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml index fa63cca..be26cf2 100644 --- a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml +++ b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml @@ -216,10 +216,12 @@ f.CREATORNAME, f.CREATTIME, f.ISDELETE, - b.COMPANY_AREA + b.COMPANY_AREA, + dep.NAME AS DEPARTMENTNAME from f inner join bus_corp_info b on f.CORPINFO_ID = b.CORPINFO_ID + LEFT JOIN oa_department dep ON dep.DEPARTMENT_ID = f.BELONGING_DEPT where f.FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID} AND diff --git a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml index d4d607b..31639e8 100644 --- a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml +++ b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml @@ -298,9 +298,11 @@ select - + , + dep.NAME AS DEPARTMENTNAME from f + inner join oa_department dep on dep.DEPARTMENT_ID = f.BELONGING_DEPARTMENT where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%') From dfcd274dd19b28af61ee02fb245dd36559fcf4f8 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 7 May 2024 16:17:37 +0800 Subject: [PATCH 39/44] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 99 +++++++++++++++++ src/main/resources/application.properties | 101 +----------------- 2 files changed, 100 insertions(+), 100 deletions(-) create mode 100644 src/main/resources/application-dev.properties diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 0000000..dcdb007 --- /dev/null +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,99 @@ + +datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver +datasource.no1.url=jdbc:mysql://192.168.0.69:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.username=root +datasource.no1.password=root +datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver +datasource.no2.url=jdbc:mysql://192.168.0.69:3306/qa-traffic-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.username=root +datasource.no2.password=root +datasource.no3.driver-class-name: com.mysql.cj.jdbc.Driver +datasource.no3.url=jdbc:mysql://192.168.0.69:3306/qa-traffic-education-org?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no3.username=root +datasource.no3.password=root + +#druid\u8FDE\u63A5\u6C60 +spring.datasource.type: com.alibaba.druid.pool.DruidDataSource +#\u6700\u5927\u6D3B\u8DC3\u6570 +spring.datasource.maxActive: 20 +#\u521D\u59CB\u5316\u6570\u91CF +spring.datasource.initialSize: 1 +#\u6700\u5927\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u65F6\u95F4 +spring.datasource.maxWait: 60000 +#\u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5PSCache\u7684\u5927\u5C0F +spring.datasource.poolPreparedStatements: true +spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20 +#\u901A\u8FC7connectionProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55 +#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.minIdle: 1 +spring.datasource.timeBetweenEvictionRunsMillis: 60000 +spring.datasource.minEvictableIdleTimeMillis: 300000 +spring.datasource.validationQuery: select 1 from dual +spring.datasource.testWhileIdle: true +spring.datasource.testOnBorrow: false +spring.datasource.testOnReturn: false +#\u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u5C06\u65E0\u6CD5\u7EDF\u8BA1,'wall'\u7528\u4E8E\u9632\u706B\u5899 +filters: stat, wall, log4j + +#\u7F13\u5B58\u914D\u7F6E\u6587\u4EF6\u4F4D\u7F6E +spring.cache.ehcache.cofnig=ehcache.xml + +#\u914D\u7F6E\u8FD9\u53E5\u8BDD,\u63A7\u5236\u53F0\u8F93\u51FAsql\u8BED\u53E5 +logging.level.com.zcloud.mapper=debug + +#\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236 +spring.servlet.multipart.max-file-size=500MB +spring.servlet.multipart.max-request-size=500MB + +#activiti\u6A21\u578B\u68C0\u6D4B +spring.activiti.check-process-definitions=false + +#Mq\u914D\u7F6E +rocketmq.consumer.group2=edu-admin-edit +rocketmq.consumer.group1=edu-admin-add +rocketmq.name-server=192.168.0.31:9876 +rocketmq.producer.group=libmiddle +rocketmq.producer.send-message-timeout=3000 +rocketmq.producer.compress-message-body-threshold=4096 +rocketmq.producer.max-message-size=4194304 +rocketmq.producer.retry-times-when-send-failed=3 +rocketmq.producer.retry-next-server=true +rocketmq.producer.retry-times-when-send-async-failed=3 +## topic \u524D\u7F00 + +mq.topic.info=info +mq.topic.eightWork=eightWork_traffic +mq.group.info=scheduled_tasks +mq.group.eightWork=scheduled_tasks_eightWork + +#\u5B57\u7B26 +spring.servlet.encoding.charset=UTF-8 +spring.servlet.encoding.force=true +spring.servlet.encoding.enabled=true +# \u5173\u95EDspringboot\u542F\u52A8\u65F6\u7684banner +spring.main.banner-mode=off +#jar\u5305\u90E8\u7F72\u65F6\u53BB\u6389\u6CE8\u91CA +#web.upload-path=h:/ +#web.front-path=h:/ +#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path} +config.basicInfo.id=011de03c1d0a412ca78e2e5d4637ea81 +config.basic.url=http://192.168.0.7:8082/zcouldProperty + +customer.id=LAZ-20221129-3 +customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2 +#\u5F00\u53D1 +customer.url=http://192.168.0.18:8997/sync/ +customer.domain=yth.qhdsafety.com + + +#\u81EA\u5B9A\u4E49\u7EBF\u7A0B\u6C60\u914D\u7F6E +# \u6838\u5FC3\u7EBF\u7A0B\u6C60\u6570 +spring.task.execution.pool.core-size= 1 +# \u6700\u5927\u7EBF\u7A0B\u6C60\u6570 +spring.task.execution.pool.max-size= 1 +# \u4EFB\u52A1\u961F\u5217\u7684\u5BB9\u91CF +spring.task.execution.pool.queue-capacity= 60 +# \u975E\u6838\u5FC3\u7EBF\u7A0B\u7684\u5B58\u6D3B\u65F6\u95F4 +spring.task.execution.pool.keep-alive= 60 +# \u7EBF\u7A0B\u6C60\u7684\u524D\u7F00\u540D\u79F0 +spring.task.execution.thread-name-prefix= upload-archives-file-task- diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e0f195f..5ddfde6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,104 +1,5 @@ spring.application.name=integrated_traffic server.port=7082 -datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.0.26:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no1.username=root -datasource.no1.password=1234 - -datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.0.26:3306/qa-traffic-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no2.username=root -datasource.no2.password=1234 - -datasource.no3.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no3.url=jdbc:mysql://192.168.0.26:3306/qa-traffic-education-org?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no3.username=root -datasource.no3.password=1234 - - -#druid\u8FDE\u63A5\u6C60 -spring.datasource.type: com.alibaba.druid.pool.DruidDataSource -#\u6700\u5927\u6D3B\u8DC3\u6570 -spring.datasource.maxActive: 20 -#\u521D\u59CB\u5316\u6570\u91CF -spring.datasource.initialSize: 1 -#\u6700\u5927\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u65F6\u95F4 -spring.datasource.maxWait: 60000 -#\u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5PSCache\u7684\u5927\u5C0F -spring.datasource.poolPreparedStatements: true -spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20 -#\u901A\u8FC7connectionProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55 -#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 -spring.datasource.minIdle: 1 -spring.datasource.timeBetweenEvictionRunsMillis: 60000 -spring.datasource.minEvictableIdleTimeMillis: 300000 -spring.datasource.validationQuery: select 1 from dual -spring.datasource.testWhileIdle: true -spring.datasource.testOnBorrow: false -spring.datasource.testOnReturn: false -#\u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u5C06\u65E0\u6CD5\u7EDF\u8BA1,'wall'\u7528\u4E8E\u9632\u706B\u5899 -filters: stat, wall, log4j - -#\u7F13\u5B58\u914D\u7F6E\u6587\u4EF6\u4F4D\u7F6E -spring.cache.ehcache.cofnig=ehcache.xml - -#\u914D\u7F6E\u8FD9\u53E5\u8BDD,\u63A7\u5236\u53F0\u8F93\u51FAsql\u8BED\u53E5 -logging.level.com.zcloud.mapper=debug - -#\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236 -spring.servlet.multipart.max-file-size=500MB -spring.servlet.multipart.max-request-size=500MB - -#activiti\u6A21\u578B\u68C0\u6D4B -spring.activiti.check-process-definitions=false - -#Mq\u914D\u7F6E -rocketmq.consumer.group2=edu-admin-edit -rocketmq.consumer.group1=edu-admin-add -rocketmq.name-server=192.168.0.31:9876 -rocketmq.producer.group=libmiddle -rocketmq.producer.send-message-timeout=3000 -rocketmq.producer.compress-message-body-threshold=4096 -rocketmq.producer.max-message-size=4194304 -rocketmq.producer.retry-times-when-send-failed=3 -rocketmq.producer.retry-next-server=true -rocketmq.producer.retry-times-when-send-async-failed=3 -## topic \u524D\u7F00 - -mq.topic.info=info -mq.topic.eightWork=eightWork_traffic -mq.group.info=scheduled_tasks -mq.group.eightWork=scheduled_tasks_eightWork - -#\u5B57\u7B26 -spring.servlet.encoding.charset=UTF-8 -spring.servlet.encoding.force=true -spring.servlet.encoding.enabled=true -# \u5173\u95EDspringboot\u542F\u52A8\u65F6\u7684banner -spring.main.banner-mode=off -#jar\u5305\u90E8\u7F72\u65F6\u53BB\u6389\u6CE8\u91CA -#web.upload-path=h:/ -#web.front-path=h:/ -#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path} -config.basicInfo.id=011de03c1d0a412ca78e2e5d4637ea81 -config.basic.url=http://192.168.0.7:8082/zcouldProperty - -customer.id=LAZ-20221129-3 -customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2 #\u5F00\u53D1 -customer.url=http://192.168.0.18:8997/sync/ -customer.domain=yth.qhdsafety.com - - -#\u81EA\u5B9A\u4E49\u7EBF\u7A0B\u6C60\u914D\u7F6E -# \u6838\u5FC3\u7EBF\u7A0B\u6C60\u6570 -spring.task.execution.pool.core-size= 1 -# \u6700\u5927\u7EBF\u7A0B\u6C60\u6570 -spring.task.execution.pool.max-size= 1 -# \u4EFB\u52A1\u961F\u5217\u7684\u5BB9\u91CF -spring.task.execution.pool.queue-capacity= 60 -# \u975E\u6838\u5FC3\u7EBF\u7A0B\u7684\u5B58\u6D3B\u65F6\u95F4 -spring.task.execution.pool.keep-alive= 60 -# \u7EBF\u7A0B\u6C60\u7684\u524D\u7F00\u540D\u79F0 -spring.task.execution.thread-name-prefix= upload-archives-file-task- +spring.profiles.active=dev From 691cbf33c5bb497d7adf6acb66ff6320a22a3b93 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 7 May 2024 18:03:06 +0800 Subject: [PATCH 40/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E8=BF=90=E5=8D=95=20=E5=88=A0=E9=99=A4=E5=A7=94?= =?UTF-8?q?=E6=89=98=E6=96=B9=20=E7=A1=AE=E8=AE=A4=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficDrivingCommitmentController.java | 7 +++- ...cSecurityCustomerManagementController.java | 4 ++ ...cSecurityLocationManagementController.java | 14 +++++++ ...SecurityWaybillRegistrationController.java | 37 ++----------------- ...fficSecurityWaybillRegistrationMapper.java | 2 + ...ficSecurityWaybillRegistrationService.java | 2 + ...ecurityWaybillRegistrationServiceImpl.java | 5 +++ .../TrafficSecurityCustomerContactMapper.xml | 2 +- ...rafficSecurityCustomerManagementMapper.xml | 4 +- ...rafficSecurityLocationManagementMapper.xml | 4 +- ...afficSecurityWaybillRegistrationMapper.xml | 13 +++++++ 11 files changed, 54 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java index bdb5852..195050f 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java @@ -6,7 +6,7 @@ import com.zcloud.entity.PageData; import com.zcloud.logs.LogAnno; import com.zcloud.service.comprehensive.TrafficDrivingCommitmentService; import com.zcloud.util.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.crypto.hash.SimpleHash; import org.springframework.beans.factory.annotation.Autowired; @@ -90,6 +90,11 @@ public class TrafficDrivingCommitmentController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = trafficDrivingCommitmentService.listForDrivingCommitment(page); + varList.stream().forEach(data -> { + if(StringUtils.equals(data.getString("INQUIRYCONCLUSION"), "正常")) { + data.put("INQUIRYCONCLUSION", "1"); + } + }); map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index f81fcc6..edef176 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -9,6 +9,7 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.comprehensive.TrafficSecurityCustomerManagementService; import com.zcloud.service.comprehensive.TrafficSecurityNoticeService; +import com.zcloud.service.comprehensive.TrafficSecurityWaybillRegistrationService; import com.zcloud.util.Const; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; @@ -34,6 +35,9 @@ public class TrafficSecurityCustomerManagementController extends BaseController @Autowired private TrafficSecurityCustomerManagementService customerManagementService; + @Autowired + private TrafficSecurityWaybillRegistrationService trafficSecurityWaybillRegistrationService; + //新增 @RequestMapping(value = "/add") diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java index 1b684ca..9bd15cd 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java @@ -8,6 +8,7 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.comprehensive.TrafficSecurityCustomerManagementService; import com.zcloud.service.comprehensive.TrafficSecurityLocationManagementService; +import com.zcloud.service.comprehensive.TrafficSecurityWaybillRegistrationService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; @@ -28,6 +29,9 @@ public class TrafficSecurityLocationManagementController extends BaseController @Autowired private TrafficSecurityLocationManagementService locationManagementService; + @Autowired + private TrafficSecurityWaybillRegistrationService trafficSecurityWaybillRegistrationService; + //新增 @RequestMapping(value = "/add") @ResponseBody @@ -91,6 +95,16 @@ public class TrafficSecurityLocationManagementController extends BaseController pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + /*PageData locationInfo = locationManagementService.getTrafficLocationInfo(pd); + PageData pageData = new PageData(); + pageData.put("ORIGIN", locationInfo.getString("LOCATIONNAME_ID")); + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List pageDataList = trafficSecurityWaybillRegistrationService.getWaybillRegistrationInfo(pageData); + pageDataList.stream() + .forEach(data -> { + data.put("ORIGIN", ""); + trafficSecurityWaybillRegistrationService.edit(data); + });*/ locationManagementService.delete(pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 59cc637..b868051 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -186,7 +186,9 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController PageData pd = new PageData(); pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - pd = trafficSecurityWaybillRegistrationService.findById(pd);//根据ID读 + pd = trafficSecurityWaybillRegistrationService.findById(pd);//根据ID读= + pd.put("ENTRUST_PERSON", pd.getString("CLIENTCONTACTPERSON")); + pd.put("CONFIRM_PERSON", pd.getString("CONFIRMINGPERSON")); List dispatchers = Arrays.stream(pd.getString("DISPATCHER").split(",")).collect(Collectors.toList()); List names = new ArrayList<>(); dispatchers.forEach(data -> { @@ -231,43 +233,10 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 - - PageData pd2 = new PageData(); - pd2.put("CONTACT", pd.getString("ENTRUST_PERSON")); - PageData contactInfo = trafficSecurityCustomerManagementService.findByContactName(pd2); - if (!ObjectUtil.isEmpty(contactInfo)) { - pd.put("ENTRUST_PERSON", contactInfo.getString("CONTACT_ID")); - if (!contactInfo.getString("CONTACTPHONE").equals(pd.getString("CLIENTCONTACTPHONE"))) { - PageData entrust = new PageData(); - entrust.put("CONTACTPHONE", pd.getString("CLIENTCONTACTPHONE")); - entrust.put("CUSTOMERCONTACT_ID", contactInfo.getString("CUSTOMERCONTACT_ID")); - entrust.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id - entrust.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 - entrust.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 - trafficSecurityCustomerManagementService.editContactPhone(entrust); - } - } - PageData pd3 = new PageData(); - pd3.put("CONTACT", pd.getString("CONFIRM_PERSON")); - PageData pageData = trafficSecurityCustomerManagementService.findByContactName(pd3); - if (!ObjectUtil.isEmpty(pageData)) { - pd.put("CONFIRM_PERSON", pageData.getString("CONTACT_ID")); - if (!pd.getString("CONFIRMINGPHONE").equals(pageData.getString("CONTACTPHONE"))) { - PageData entrust = new PageData(); - entrust.put("CONTACTPHONE", pd.getString("CONFIRMINGPHONE")); - entrust.put("CUSTOMERCONTACT_ID", pageData.getString("CUSTOMERCONTACT_ID")); - entrust.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id - entrust.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 - entrust.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 - trafficSecurityCustomerManagementService.editContactPhone(entrust); - } - } trafficSecurityWaybillRegistrationService.edit(pd); - map.put("result", errInfo); map.put("pd", pd); return map; diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java index c6ae7c1..edd67b0 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java @@ -29,4 +29,6 @@ public interface TrafficSecurityWaybillRegistrationMapper { PageData findById(PageData pd); void edit(PageData pd); + + List getWaybillRegistrationInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java index 80f7adf..8ec2e86 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java @@ -15,4 +15,6 @@ public interface TrafficSecurityWaybillRegistrationService { PageData findById(PageData pd); void edit(PageData pd); + + List getWaybillRegistrationInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java index e99a51b..b8e993e 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java @@ -37,4 +37,9 @@ public class TrafficSecurityWaybillRegistrationServiceImpl implements TrafficSec public void edit(PageData pd) { TrafficSecurityWaybillRegistrationMapper.edit(pd); } + + @Override + public List getWaybillRegistrationInfo(PageData pd) { + return TrafficSecurityWaybillRegistrationMapper.getWaybillRegistrationInfo(pd); + } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml index 8908fec..d03dea4 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml @@ -162,7 +162,7 @@ where f.CONTACT = #{CONTACT} AND - f.ISDELETE = 0 + f.ISDELETE = '0' diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml index 6e951fb..cb8e8cb 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml @@ -277,6 +277,19 @@ f.CORPINFO_ID = #{CORPINFO_ID} + From da30f04dbed1e91e8979f51e3ba6e88119446c6b Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 8 May 2024 17:57:23 +0800 Subject: [PATCH 41/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E8=BF=90=E5=8D=95=20=E6=B7=BB=E5=8A=A0=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20=E5=88=A0=E9=99=A4=E5=88=A4=E6=96=AD=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E7=9A=84=E6=96=B0=E5=A2=9E=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E5=AD=98=E5=9C=A8=E7=9A=84=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=20=E5=9C=B0=E7=82=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E6=96=B0=E5=A2=9E=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E8=81=94=E7=B3=BB=E4=BA=BA=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cSecurityCustomerManagementController.java | 40 ++++++++++++++----- ...cSecurityLocationManagementController.java | 22 +++++----- ...SecurityWaybillRegistrationController.java | 27 ++++++++++++- .../TrafficSecurityCustomerContactMapper.java | 2 + ...fficSecurityCustomerManagementService.java | 2 +- ...SecurityCustomerManagementServiceImpl.java | 4 +- .../TrafficSecurityCustomerContactMapper.xml | 13 +++++- ...afficSecurityWaybillRegistrationMapper.xml | 6 ++- 8 files changed, 91 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index edef176..df88e60 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -17,6 +17,7 @@ import com.zcloud.util.Tools; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.util.CollectionUtils; import org.apache.tomcat.util.json.JSONParser; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,7 +47,6 @@ public class TrafficSecurityCustomerManagementController extends BaseController Map map = new HashMap<>(); String errInfo = "success"; PageData pd = this.getPageData(); // 获取页面提交的数据 - String customermanagement_id = this.get32UUID(); // 生成主键ID pd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id); // 设置客户管理ID pd.put("CUSTOMERNAME_ID", this.get32UUID()); @@ -55,9 +55,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController pd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 设置创建时间 pd.put("ISDELETE", "0"); // 设置删除标志 - customerManagementService.save(pd); - if (pd.getString("contacts") != null && !pd.getString("contacts").isEmpty()) { List contacts = JSON.parseArray(pd.getString("contacts"), PageData.class); for (PageData contact : contacts) { @@ -73,7 +71,6 @@ public class TrafficSecurityCustomerManagementController extends BaseController contactPd.put("CONTACTPHONE", contact.get("CONTACTPHONE")); contactPd.put("CUSTOMERADDRESS", contact.get("CUSTOMERADDRESS")); contactPd.put("ISDELETE", "0"); // 设置删除标志 - customerManagementService.saveContact(contactPd); } } @@ -93,7 +90,6 @@ public class TrafficSecurityCustomerManagementController extends BaseController pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = customerManagementService.listForSecurityCustomerManagement(page); - map.put("varList", varList); map.put("page", page); map.put("result", errInfo); @@ -108,7 +104,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete() throws Exception { + public Object delete(Page page) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -117,6 +113,21 @@ public class TrafficSecurityCustomerManagementController extends BaseController pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + // 获取当前客户下的所有联系人 + List customers = customerManagementService.findByCustomerManagementId(pd); + // 获取所有订单 + PageData pageData = new PageData(); + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + page.setPd(pageData); + List waybillRegistrations = trafficSecurityWaybillRegistrationService.listForSecurityWaybill(page); + for (PageData customer : customers) { + if(waybillRegistrations.stream() + .filter(waybillRegistration -> waybillRegistration.containsValue(customer.getString("CONTACT_ID"))).findAny().isPresent()) { + map.put("pd", "1"); + map.put("result", errInfo); + return map; + } + } customerManagementService.delete(pd); map.put("result", errInfo); return map; @@ -162,7 +173,6 @@ public class TrafficSecurityCustomerManagementController extends BaseController Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 @@ -180,9 +190,9 @@ public class TrafficSecurityCustomerManagementController extends BaseController pageData.put("CUSTOMERCONTACT_ID", this.get32UUID()); pageData.put("CREATOR", Jurisdiction.getUSER_ID()); pageData.put("CREATORNAME", Jurisdiction.getName()); - pageData.put("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID")); pageData.put("CONTACT_ID", this.get32UUID()); pageData.put("CREATETIME", DateUtil.date2Str(new Date())); + pageData.put("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID")); pageData.put("CONTACT", contact.getString("CONTACT")); pageData.put("CUSTOMERADDRESS", contact.getString("CUSTOMERADDRESS")); pageData.put("CONTACTPHONE", contact.getString("CONTACTPHONE")); @@ -206,7 +216,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController @RequestMapping(value = "/deleteContactInfo") @ResponseBody - public Object deleteContactInfo() throws Exception { + public Object deleteContactInfo(Page page) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -215,6 +225,18 @@ public class TrafficSecurityCustomerManagementController extends BaseController pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData contact = customerManagementService.findByContactId(pd.getString("CUSTOMERCONTACT_ID")); + String contactId = contact.getString("CONTACT_ID"); + PageData pageData = new PageData(); + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + page.setPd(pageData); + List orderList = trafficSecurityWaybillRegistrationService.listForSecurityWaybill(page); + if (orderList.stream().parallel() + .filter(order -> order.containsValue(contactId)).findAny().isPresent()) { + map.put("pd", "1"); + map.put("result", errInfo); + return map; + } customerManagementService.deleteContactById(pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java index 9bd15cd..ae851b0 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java @@ -86,7 +86,7 @@ public class TrafficSecurityLocationManagementController extends BaseController */ @RequestMapping(value="/delete") @ResponseBody - public Object delete() throws Exception{ + public Object delete(Page page) throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -95,16 +95,20 @@ public class TrafficSecurityLocationManagementController extends BaseController pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - /*PageData locationInfo = locationManagementService.getTrafficLocationInfo(pd); + PageData locationInfo = locationManagementService.getTrafficLocationInfo(pd); + // 获取地点Id + String locationId = locationInfo.getString("LOCATIONNAME_ID"); + // 获取所有运单 PageData pageData = new PageData(); - pageData.put("ORIGIN", locationInfo.getString("LOCATIONNAME_ID")); pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - List pageDataList = trafficSecurityWaybillRegistrationService.getWaybillRegistrationInfo(pageData); - pageDataList.stream() - .forEach(data -> { - data.put("ORIGIN", ""); - trafficSecurityWaybillRegistrationService.edit(data); - });*/ + page.setPd(pageData); + List waybillRegistrationList = trafficSecurityWaybillRegistrationService.listForSecurityWaybill(page); + // 判断所有运单中是否有此地点 + if(waybillRegistrationList.stream().parallel().filter(data -> data.containsValue(locationId)).findAny().isPresent()) { + map.put("pd", "1"); + map.put("result", errInfo); + return map; + } locationManagementService.delete(pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index b868051..309fdc0 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -12,6 +12,7 @@ import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; +import org.jose4j.lang.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -186,7 +187,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController PageData pd = new PageData(); pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - pd = trafficSecurityWaybillRegistrationService.findById(pd);//根据ID读= + pd = trafficSecurityWaybillRegistrationService.findById(pd);//根据ID读 pd.put("ENTRUST_PERSON", pd.getString("CLIENTCONTACTPERSON")); pd.put("CONFIRM_PERSON", pd.getString("CONFIRMINGPERSON")); List dispatchers = Arrays.stream(pd.getString("DISPATCHER").split(",")).collect(Collectors.toList()); @@ -236,11 +237,33 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + PageData pd2 = new PageData(); + // 修改委托方手机号 + if(!StringUtils.isEmpty(pd.getString("ENTRUST_PERSON"))) { + pd2.put("CONTACT_ID",pd.getString("ENTRUST_PERSON")); + PageData client = trafficSecurityCustomerManagementService.findContactByContactId(pd2); + if(!ObjectUtil.isEmpty(client)) { + if(!StringUtils.equals(client.getString("CONTACTPHONE"), pd.getString("CLIENTCONTACTPHONE"))) { + client.put("CONTACTPHONE",pd.getString("CLIENTCONTACTPHONE")); + trafficSecurityCustomerManagementService.editContactInfo(client); + } + } + } + // 修改确认方手机号 + if(!StringUtils.isEmpty(pd.getString("CONFIRM_PERSON"))) { + pd2.put("CONTACT_ID", pd.getString("CONFIRM_PERSON")); + PageData confirmed = trafficSecurityCustomerManagementService.findContactByContactId(pd2); + if(!ObjectUtil.isEmpty(confirmed)) { + if(!StringUtils.equals(confirmed.getString("CONTACTPHONE"), pd.getString("CONFIRMINGPHONE"))) { + confirmed.put("CONTACTPHONE",pd.getString("CONFIRMINGPHONE")); + trafficSecurityCustomerManagementService.editContactInfo(confirmed); + } + } + } trafficSecurityWaybillRegistrationService.edit(pd); map.put("result", errInfo); map.put("pd", pd); return map; - } } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java index 4cab824..8262786 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java @@ -22,4 +22,6 @@ public interface TrafficSecurityCustomerContactMapper { void deleteContactById(PageData pd); void editContactPhone(PageData pd); + + PageData findContactByContactId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java index 9c66316..cf1e130 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java @@ -36,5 +36,5 @@ public interface TrafficSecurityCustomerManagementService { void deleteContactById(PageData pd); - void editContactPhone(PageData entrust); + PageData findContactByContactId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java index 0fa60eb..2c70b15 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java @@ -92,7 +92,7 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu } @Override - public void editContactPhone(PageData pd) { - customerContactMapper.editContactPhone(pd); + public PageData findContactByContactId(PageData pd) { + return customerContactMapper.findContactByContactId(pd); } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml index d03dea4..f6ef835 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml @@ -141,7 +141,7 @@ DELETOR = #{DELETOR}, DELETETIME = #{DELETETIME} where - CUSTOMERCONTACT_ID = #{CUSTOMERCONTACT_ID } + CUSTOMERCONTACT_ID = #{CUSTOMERCONTACT_ID} + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml index cb8e8cb..32ac66a 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml @@ -257,7 +257,10 @@ btcc.CONTACTPHONE AS ENTRUST_PHONE, btcc2.CONTACTPHONE AS CONFIRM_PHONE, b.ADMINISTRATIVEREGIONS AS DEPARTURE_ADDR, - b2.ADMINISTRATIVEREGIONS AS GOAL_ADDR + b2.ADMINISTRATIVEREGIONS AS GOAL_ADDR, + oa.NAME AS DEPARTMENTNAME, + btcc.CONTACT AS ENTRUSTPERSON, + btcc2.CONTACT AS CONFIRMPERSON from f left join bus_traffic_operatingvehicle e on f.TRANSPORTVEHICLE = e.PLATE_NUMBER @@ -271,6 +274,7 @@ left join bus_traffic_customer_management c2 on f.CONFIRMER = c2.CUSTOMERNAME_ID left join bus_traffic_customer_contact btcc on btcc.CONTACT_ID = f.CLIENTCONTACTPERSON left join bus_traffic_customer_contact btcc2 on btcc2.CONTACT_ID = f.CONFIRMINGPERSON + left join oa_department oa on oa.DEPARTMENT_ID = f.DEPARTMENT_ID where f.WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID} AND From 956430467021135c2302c063097b9c06bfd7f26e Mon Sep 17 00:00:00 2001 From: xiepeng Date: Thu, 9 May 2024 18:08:34 +0800 Subject: [PATCH 42/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppTrafficCommitentItemController.java | 68 ++++++++++++ .../AppTrafficDrivingTypeController.java | 20 ++++ ...cSecurityCustomerManagementController.java | 2 +- ...cSecurityLocationManagementController.java | 2 - ...SecurityWaybillRegistrationController.java | 2 +- .../controller/insure/InsureController.java | 66 +++++------ .../TrafficCommitentItemMapper.java | 24 ++++ .../TrafficCommitentItemService.java | 17 +++ .../impl/TrafficCommitentItemServiceImpl.java | 72 ++++++++++++ .../TrafficCommitentItemMapper.xml | 105 ++++++++++++++++++ 10 files changed, 336 insertions(+), 42 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/comprehensive/AppTrafficCommitentItemController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficCommitentItemMapper.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficCommitentItemService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficCommitentItemServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficCommitentItemMapper.xml diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficCommitentItemController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficCommitentItemController.java new file mode 100644 index 0000000..2801c12 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficCommitentItemController.java @@ -0,0 +1,68 @@ +package com.zcloud.controller.comprehensive; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.comprehensive.TrafficCommitentItemService; +import com.zcloud.service.comprehensive.TrafficDrivingItemService; +import com.zcloud.service.comprehensive.TrafficDrivingSignService; +import com.zcloud.service.comprehensive.TrafficSecurityWaybillRegistrationService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Smb; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; + +import java.util.*; + +@Controller +@RequestMapping("/app/commitentitem") +public class AppTrafficCommitentItemController extends BaseController { + + @Autowired + private TrafficCommitentItemService trafficCommitentItemService; + + @Autowired + private Smb smb; + + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @ResponseBody + @Transactional + public Object add(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List fileList = new ArrayList(); + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + fileList.add(request.getFile("file" + i)); + } + pd.put("DRIVING_SIGN_ID", this.get32UUID()); + pd.put("ISDELETE", "0"); //是否删除 + pd.put("CREATORNAME", pd.getString("USER_NAME")); + pd.put("CREATOR", pd.getString("USER_ID")); + pd.put("CREATTIME", DateUtil.date2Str(new Date())); + pd.put("OPERATOR", pd.getString("USER_ID")); + pd.put("OPERATORNAME", pd.getString("USER_NAME")); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + pd.put("PRACTITIONER", pd.getString("USER_ID")); + trafficCommitentItemService.save(pd, fileList.toArray(new MultipartFile[fileList.size()])); + + map.put("pd",pd); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficDrivingTypeController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficDrivingTypeController.java index 53fc410..b6eb652 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficDrivingTypeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficDrivingTypeController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.comprehensive; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.comprehensive.TrafficDrivingCommitmentService; import com.zcloud.service.comprehensive.TrafficDrivingTypeService; import com.zcloud.util.Const; import com.zcloud.util.DateUtil; @@ -29,6 +30,9 @@ public class AppTrafficDrivingTypeController extends BaseController { @Autowired private Smb smb; + @Autowired + private TrafficDrivingCommitmentService trafficDrivingCommitmentService; + /**新增 @@ -99,6 +103,22 @@ public class AppTrafficDrivingTypeController extends BaseController { return map; } + @RequestMapping(value = "/safetycommitment") + @ResponseBody + public Object safetycommitment(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + page.setPd(pd); + List varList = trafficDrivingCommitmentService.listForDrivingCommitment(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping("/saveFile") @ResponseBody public Object saveFile(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index df88e60..f9c3ec5 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -121,7 +121,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController page.setPd(pageData); List waybillRegistrations = trafficSecurityWaybillRegistrationService.listForSecurityWaybill(page); for (PageData customer : customers) { - if(waybillRegistrations.stream() + if (waybillRegistrations.stream() .filter(waybillRegistration -> waybillRegistration.containsValue(customer.getString("CONTACT_ID"))).findAny().isPresent()) { map.put("pd", "1"); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java index ae851b0..fe050dd 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java @@ -152,13 +152,11 @@ public class TrafficSecurityLocationManagementController extends BaseController Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); locationManagementService.edit(pd); - map.put("result", errInfo); map.put("pd", pd); return map; diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 309fdc0..0415806 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -113,7 +113,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController if (shippingDate != null && shippingDate.after(new Date())) { pd.put("WAYBILLSTATUS", "1"); } else { - pd.put("WAYBILLSTATUS", "0"); + pd.put("WAYBILLSTATUS", "3"); } trafficSecurityWaybillRegistrationService.save(pd); diff --git a/src/main/java/com/zcloud/controller/insure/InsureController.java b/src/main/java/com/zcloud/controller/insure/InsureController.java index 99fdb58..7ef9fa3 100644 --- a/src/main/java/com/zcloud/controller/insure/InsureController.java +++ b/src/main/java/com/zcloud/controller/insure/InsureController.java @@ -1,6 +1,7 @@ package com.zcloud.controller.insure; import cn.hutool.core.collection.CollectionUtil; +import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -62,11 +63,11 @@ public class InsureController extends BaseController { pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("VEHICLE", pd.getString("PLATE_NUMBER")); - if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + if (DateUtil.compareDate(pd.getString("DUE_DATE"), DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(), pd.getString("REMINDER_DATE"))) { pd.put("REVERT", 2); - } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + } else if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("DUE_DATE"))) { pd.put("REVERT", 0); - } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"), DateUtil.getDay())) { pd.put("REVERT", 1); } insureService.save(pd); @@ -117,11 +118,11 @@ public class InsureController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - if(DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),pd.getString("REMINDER_DATE"))) { + if (DateUtil.compareDate(pd.getString("DUE_DATE"), DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(), pd.getString("REMINDER_DATE"))) { pd.put("REVERT", 2); - } else if (DateUtil.compareDate(DateUtil.getDay(),pd.getString("DUE_DATE"))) { + } else if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("DUE_DATE"))) { pd.put("REVERT", 0); - } else if (DateUtil.compareDate(pd.getString("DUE_DATE"),DateUtil.getDay())) { + } else if (DateUtil.compareDate(pd.getString("DUE_DATE"), DateUtil.getDay())) { pd.put("REVERT", 1); } insureService.edit(pd); @@ -174,11 +175,11 @@ public class InsureController extends BaseController { List varList = insureService.list(page); //列出Question列表 // 到期状态 varList.stream().forEach(data -> { - if(DateUtil.compareDate(data.getString("DUE_DATE"),DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(),data.getString("REMINDER_DATE"))) { + if (DateUtil.compareDate(data.getString("DUE_DATE"), DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(), data.getString("REMINDER_DATE"))) { data.put("DUE_DATE_TYPE", 2); - } else if (DateUtil.compareDate(DateUtil.getDay(),data.getString("DUE_DATE"))) { + } else if (DateUtil.compareDate(DateUtil.getDay(), data.getString("DUE_DATE"))) { data.put("DUE_DATE_TYPE", 0); - } else if (DateUtil.compareDate(data.getString("DUE_DATE"),DateUtil.getDay())) { + } else if (DateUtil.compareDate(data.getString("DUE_DATE"), DateUtil.getDay())) { data.put("DUE_DATE_TYPE", 1); } }); @@ -244,23 +245,17 @@ public class InsureController extends BaseController { List operatingList = operatingVehiclesService.operationVehicleList(pd.getString("CORPINFO_ID")); page.setPd(pd); List insAnnually = insureService.list(page); - + List id = new ArrayList<>(); // 获取保险列表中所有的营运车辆 - List insures = insAnnually.stream() - .filter(data -> StringUtils.equals(data.getString("VEHICLE_MODEL"), "1")) - .collect(Collectors.toList()); + insAnnually.stream().filter(data -> StringUtils.equals(data.getString("VEHICLE_MODEL"), "1")).collect(Collectors.toList()) + .stream().parallel().collect(Collectors.groupingBy(data -> data.getString("VEHICLE"))).forEach((key, value) -> { + if (value.size() == 3) { + id.add(key); + } + }); - // 过滤掉保险列表中所有的营运车辆 - List varList = new ArrayList<>(); - - if (!CollectionUtils.isEmpty(insures)) { - varList = operatingList.stream().parallel() - .filter(operating -> insures.stream() - .noneMatch(ins -> StringUtils.equals(operating.getString("OPERATING_ID"), ins.getString("VEHICLE")))) - .collect(Collectors.toList()); - } else { - varList = operatingList; - } + List varList = operatingList.stream().filter(operating -> id.stream() + .noneMatch(data -> StringUtils.equals(operating.getString("OPERATING_ID"), data))).collect(Collectors.toList()); if (pd.containsKey("ID")) { pd.put("OPERATING_ID", pd.getString("ID")); @@ -281,21 +276,16 @@ public class InsureController extends BaseController { List freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID")); page.setPd(pd); List insureList = insureService.list(page); - + List id = new ArrayList<>(); // 获取保险列表中所有挂车信息 - List insures = insureList.stream().filter(data -> StringUtils.equals(data.getString("VEHICLE_MODEL"), "2")) - .collect(Collectors.toList()); - - // 过滤掉保险列表中所有已存在的挂车 - List varList = new ArrayList<>(); - if (!CollectionUtils.isEmpty(insures)) { - varList = freightList.stream().parallel() - .filter(freight -> insures.stream() - .noneMatch(ins -> StringUtils.equals(freight.getString("FREIGHTTRAILER_ID"), ins.getString("VEHICLE")))) - .collect(Collectors.toList()); - } else { - varList = freightList; - } + insureList.stream().filter(data -> StringUtils.equals(data.getString("VEHICLE_MODEL"), "2")).collect(Collectors.toList()) + .stream().collect(Collectors.groupingBy(data -> data.getString("VEHICLE"))).forEach((key, value) -> { + if (value.size() == 3) { + id.add(key); + } + }); + List varList = freightList.stream().filter(freight -> id.stream() + .noneMatch(data -> StringUtils.equals(freight.getString("FREIGHTTRAILER_ID"), data))).collect(Collectors.toList()); if (pd.containsKey("ID")) { pd.put("FREIGHTTRAILER_ID", pd.getString("ID")); diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficCommitentItemMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficCommitentItemMapper.java new file mode 100644 index 0000000..106635d --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficCommitentItemMapper.java @@ -0,0 +1,24 @@ +package com.zcloud.mapper.datasource.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TrafficCommitentItemMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficCommitentItemService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficCommitentItemService.java new file mode 100644 index 0000000..884de5b --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficCommitentItemService.java @@ -0,0 +1,17 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +public interface TrafficCommitentItemService { + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd, MultipartFile[] files)throws Exception; + + +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficCommitentItemServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficCommitentItemServiceImpl.java new file mode 100644 index 0000000..05f7ae9 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficCommitentItemServiceImpl.java @@ -0,0 +1,72 @@ +package com.zcloud.service.comprehensive.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficCommitentItemMapper; +import com.zcloud.mapper.datasource.comprehensive.TrafficDrivingItemMapper; +import com.zcloud.mapper.datasource.comprehensive.TrafficDrivingSignMapper; +import com.zcloud.service.comprehensive.TrafficCommitentItemService; +import com.zcloud.service.comprehensive.TrafficDrivingItemService; +import com.zcloud.util.Const; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Smb; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class TrafficCommitentItemServiceImpl implements TrafficCommitentItemService { + + @Autowired + private TrafficCommitentItemMapper trafficCommitentItemMapper; + + @Autowired + private TrafficDrivingSignMapper trafficDrivingSignMapper; + + @Autowired + private com.zcloud.mapper.datasource.comprehensive.TrafficSecurityWaybillRegistrationMapper TrafficSecurityWaybillRegistrationMapper; + + @Autowired + private Smb smb; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd, MultipartFile[] files)throws Exception{ + List filePaths = new ArrayList<>(); + for (int i = 0; i < files.length; i++) { + //保存签名文件 + String ffile = DateUtil.getDays(); + String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + filePaths.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + pd.put("SIGN_TIME", pd.getString("SIGNTIME")); + pd.put("SIGN_PATH", String.join(",",filePaths)); + trafficDrivingSignMapper.save(pd); + TrafficSecurityWaybillRegistrationMapper.editStatus(pd); + if (pd.get("checklist") != null && !pd.get("checklist").equals("")) { //安全措施确认步骤 + List list = (List) JSON.parse(pd.get("checklist").toString()); + for (JSONObject json : list) { + PageData checklist = new PageData(); + checklist.put("DRIVING_SIGN_ID",pd.get("DRIVING_SIGN_ID")); + checklist.put("DRIVINGTYPE_ID",json.get("DRIVINGCOMMITMENT_ID")); + checklist.put("REMARK", json.get("REMARK")); + checklist.put("STATUS", json.get("ISNORMAL")); + checklist.put("OPERATTIME", json.get("OPERATTIME")); + checklist.put("OPERATORNAME", json.get("OPERATORNAME")); + checklist.put("OPERATOR", json.get("OPERATOR")); + checklist.put("ISDELETE", json.get("ISDELETE")); + checklist.put("COMMITMENT_ITEM_ID", UuidUtil.get32UUID()); + trafficCommitentItemMapper.save(checklist); + } + } + } +} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficCommitentItemMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficCommitentItemMapper.xml new file mode 100644 index 0000000..b1e016e --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficCommitentItemMapper.xml @@ -0,0 +1,105 @@ + + + + + + BUS_TRAFFIC_COMMITMENT_ITEM + + + + + SYS_DICTIONARIES + + + + + f.COMMITMENT_ITEM_ID, + f.DRIVING_SIGN_ID, + f.DRIVINGTYPE_ID, + f.STATUS, + f.REMARK, + f.CREATOR, + f.CREATORNAME, + f.CREATTIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.ISDELETE + + + + + COMMITMENT_ITEM_ID, + DRIVING_SIGN_ID, + DRIVINGTYPE_ID, + STATUS, + REMARK, + CREATOR, + CREATORNAME, + CREATTIME, + OPERATOR, + OPERATORNAME, + OPERATTIME, + DELETOR, + DELETORNAME, + DELETETIME, + ISDELETE + + + + + #{COMMITMENT_ITEM_ID}, + #{DRIVING_SIGN_ID}, + #{DRIVINGTYPE_ID}, + #{STATUS}, + #{REMARK}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + update + + set + COMMITMENT_ITEM_ID = #{COMMITMENT_ITEM_ID}, + DRIVING_SIGN_ID = #{DRIVING_SIGN_ID}, + DRIVINGTYPE_ID = #{DRIVINGTYPE_ID}, + STATUS = #{STATUS}, + REMARK = #{REMARK}, + CREATOR = #{CREATOR}, + CREATORNAME = #{CREATORNAME}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME}, + DELETOR = #{DELETOR}, + DELETORNAME = #{DELETORNAME}, + DELETETIME = #{DELETETIME}, + ISDELETE = #{ISDELETE} + where + COMMITMENT_ITEM_ID = #{COMMITMENT_ITEM_ID} + + + From 5c93557bc91d6508b262a70b3a4bbb4b171bc464 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 10 May 2024 17:52:26 +0800 Subject: [PATCH 43/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E8=A1=8C?= =?UTF-8?q?=E8=BD=A6=E4=B8=89=E6=A3=80=20=E6=B7=BB=E5=8A=A0=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=89=BF=E8=AF=BA=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppTrafficSecurityNoticeController.java | 2 +- ...SecurityWaybillRegistrationController.java | 13 ++++++++++++ ...SecurityWaybillRegistrationController.java | 21 +++++++++++++------ .../controller/insure/InsureController.java | 1 + .../TrafficDrivingSignMapper.java | 2 ++ .../TrafficDrivingSignService.java | 2 ++ .../impl/TrafficDrivingSignServiceImpl.java | 5 +++++ .../impl/TrafficDrivingTypeServiceImpl.java | 9 +++++++- .../TrafficDrivingCommitmentMapper.xml | 2 +- .../TrafficDrivingSignMapper.xml | 15 +++++++++++++ 10 files changed, 63 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java index 6c27ad2..5085afb 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java @@ -47,7 +47,7 @@ public class AppTrafficSecurityNoticeController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd.put("DELETOR", Jurisdiction.getUSER_ID()); //删除人id + pd.put("DELETOR", Jurisdiction.getCORPINFO_ID()); //删除人id pd.put("DELETORNAME", Jurisdiction.getUsername()); //删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date())); //删除时间 securityNoticeService.delete(pd); diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java index d9f8bf9..617d537 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java @@ -4,11 +4,13 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.comprehensive.TrafficDrivingCommitmentService; +import com.zcloud.service.comprehensive.TrafficDrivingSignService; import com.zcloud.service.comprehensive.TrafficDrivingTypeService; import com.zcloud.service.comprehensive.TrafficSecurityWaybillRegistrationService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,6 +32,9 @@ public class AppTrafficSecurityWaybillRegistrationController extends BaseControl @Autowired private TrafficDrivingTypeService trafficDrivingTypeService; + @Autowired + private TrafficDrivingSignService trafficDrivingSignService; + @RequestMapping(value = "/listForSecurityWaybillre") @ResponseBody @@ -69,6 +74,14 @@ public class AppTrafficSecurityWaybillRegistrationController extends BaseControl String errInfo = "success"; PageData pd = this.getPageData(); List commitmentList = trafficDrivingCommitmentService.getDrivingCommitment(pd); + List list = trafficDrivingSignService.findWaybillRegistrationId(pd); + for (PageData pageData : commitmentList) { + for (PageData data : list) { + if(StringUtils.equals(pageData.getString("DRIVINGCOMMITMENT_ID"), data.getString("DRIVINGTYPE_ID"))) { + pageData.put("STATUS", data.getString("STATUS")); + } + } + } try { pd = trafficDrivingTypeService.infoCategory(pd); //根据ID读取 // if(pd.getString("OPERATOR")) diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 0415806..08f12d8 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -1,13 +1,11 @@ package com.zcloud.controller.comprehensive; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.comprehensive.TrafficDrivingCommitmentService; -import com.zcloud.service.comprehensive.TrafficDrivingTypeService; -import com.zcloud.service.comprehensive.TrafficSecurityCustomerManagementService; -import com.zcloud.service.comprehensive.TrafficSecurityWaybillRegistrationService; +import com.zcloud.service.comprehensive.*; import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import org.apache.commons.lang.ObjectUtils; @@ -38,6 +36,9 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController @Autowired private TrafficSecurityCustomerManagementService trafficSecurityCustomerManagementService; + @Autowired + private TrafficDrivingSignService trafficDrivingSignService; + @Autowired private UsersService usersService; @@ -71,7 +72,15 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController String errInfo = "success"; PageData pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - List commitmentList = trafficDrivingCommitmentService.getDrivingCommitment(pd); + List varList = trafficDrivingCommitmentService.getDrivingCommitment(pd); + List list = trafficDrivingSignService.findWaybillRegistrationId(pd); + for (PageData pageData : varList) { + for (PageData data : list) { + if(StringUtils.equals(pageData.getString("DRIVINGCOMMITMENT_ID"), data.getString("DRIVINGTYPE_ID"))) { + pageData.put("STATUS", data.getString("STATUS")); + } + } + } try { pd = trafficDrivingTypeService.infoCategory(pd); //根据ID读取 // if(pd.getString("OPERATOR")) @@ -87,7 +96,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController map.put("result", errInfo); map.put("msg", "数据获取失败"); } - map.put("commitmentList", commitmentList); + map.put("commitmentList", varList); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/insure/InsureController.java b/src/main/java/com/zcloud/controller/insure/InsureController.java index 7ef9fa3..f51502a 100644 --- a/src/main/java/com/zcloud/controller/insure/InsureController.java +++ b/src/main/java/com/zcloud/controller/insure/InsureController.java @@ -33,6 +33,7 @@ public class InsureController extends BaseController { @Autowired private InsureService insureService; + @Autowired private ImgFilesService imgfilesService; diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficDrivingSignMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficDrivingSignMapper.java index 5193d96..f3f6c0d 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficDrivingSignMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficDrivingSignMapper.java @@ -45,4 +45,6 @@ public interface TrafficDrivingSignMapper { * @throws Exception */ PageData findById(PageData pd); + + List findWaybillRegistrationId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingSignService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingSignService.java index 1aa2704..db3c900 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingSignService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficDrivingSignService.java @@ -31,4 +31,6 @@ public interface TrafficDrivingSignService { void delete(PageData pd); PageData findById(PageData pd) throws Exception; + + List findWaybillRegistrationId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingSignServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingSignServiceImpl.java index 34fbd85..b7e21ae 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingSignServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingSignServiceImpl.java @@ -62,4 +62,9 @@ public class TrafficDrivingSignServiceImpl implements TrafficDrivingSignService public PageData findById(PageData pd) { return trafficDrivingSignMapper.findById(pd); } + + @Override + public List findWaybillRegistrationId(PageData pd) { + return trafficDrivingSignMapper.findWaybillRegistrationId(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java index 2dbb7fd..e083778 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingTypeServiceImpl.java @@ -5,6 +5,7 @@ import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.comprehensive.TrafficDrivingSignMapper; import com.zcloud.mapper.datasource.comprehensive.TrafficDrivingTypeMapper; import com.zcloud.service.comprehensive.TrafficDrivingTypeService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,6 +13,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; @Service public class TrafficDrivingTypeServiceImpl implements TrafficDrivingTypeService { @@ -76,6 +79,7 @@ public class TrafficDrivingTypeServiceImpl implements TrafficDrivingTypeService PageData cpd = TrafficSecurityWaybillRegistrationMapper.findById(pd); // 根据ID读取 List varOList = trafficDrivingTypeMapper.findListbyDetail(pd); List vList = trafficDrivingTypeMapper.findCategory(pd); + List varItemList = trafficDrivingTypeMapper.findListbyItem(pd); List pd1Children = new ArrayList<>(); @@ -97,7 +101,10 @@ public class TrafficDrivingTypeServiceImpl implements TrafficDrivingTypeService pd1.put("pd1Children",pd1Children); } - cpd.put("varList", vList); + List list1 = vList.stream().parallel().filter(data -> !StringUtils.equals(data.getString("CHECKTYPE_ID"), "status000")).collect(Collectors.toList()); + List list2 = vList.stream().parallel().filter(data -> StringUtils.equals(data.getString("CHECKTYPE_ID"), "status000")).collect(Collectors.toList()); + cpd.put("varList", list1); + cpd.put("varList2", list2); return cpd; } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml index 097ed9f..6166847 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml @@ -113,7 +113,7 @@ from f left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID} order by f.OPERATTIME DESC diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingSignMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingSignMapper.xml index d49d5c5..1df7cf1 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingSignMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingSignMapper.xml @@ -162,4 +162,19 @@ where DRIVING_SIGN_ID = #{DRIVING_SIGN_ID} + + From 63dc4bb253251b9508a8f80f7316872912870011 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Sat, 11 May 2024 18:00:17 +0800 Subject: [PATCH 44/44] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E8=A1=8C?= =?UTF-8?q?=E8=BD=A6=E4=B8=89=E6=A3=80=20=E7=8A=B6=E6=80=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E6=9C=BA=E5=8A=A1=E6=A1=A3=E6=A1=88=20=E7=9A=84?= =?UTF-8?q?=E5=88=B0=E6=9C=9F=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/beidou/BeidouController.java | 39 ++++++++++++ .../AppTrafficSecurityNoticeController.java | 4 +- ...SecurityWaybillRegistrationController.java | 2 +- .../InspectAnnuallyController.java | 59 +++++++++++++++---- .../controller/insure/InsureController.java | 43 +++++++++++++- .../maintenance/MaintenanceController.java | 40 +++++++++++++ .../operations/OperationsController.java | 40 +++++++++++++ 7 files changed, 212 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zcloud/controller/beidou/BeidouController.java b/src/main/java/com/zcloud/controller/beidou/BeidouController.java index 295ccb7..d768dcb 100644 --- a/src/main/java/com/zcloud/controller/beidou/BeidouController.java +++ b/src/main/java/com/zcloud/controller/beidou/BeidouController.java @@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -235,6 +237,43 @@ public class BeidouController extends BaseController { } return false; }); + varList.forEach(data -> { + Date dueDate = DateUtil.fomatDate(data.getString("DUE_DATE")); + Date reminderDate = DateUtil.fomatDate(data.getString("REMINDER_DATE")); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String toDay = sdf.format(new Date()); + Date date = null; + try { + date = sdf.parse(toDay); + } catch (ParseException e) { + throw new RuntimeException(e); + } + // 已到期 + if(dueDate.before(date)) { + data.put("REVERT", "0"); + try { + beidouService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + // 即将到期 + } else if ((dueDate.after(date) || dueDate.equals(date)) && (reminderDate.before(date) || reminderDate.equals(date))) { + data.put("REVERT", "2"); + try { + beidouService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + // 未到期 + }else{ + data.put("REVERT", "1"); + try { + beidouService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }); map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java index 5085afb..6cd798a 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java @@ -47,8 +47,8 @@ public class AppTrafficSecurityNoticeController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd.put("DELETOR", Jurisdiction.getCORPINFO_ID()); //删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername()); //删除人姓名 + pd.put("DELETOR", pd.getString("USER_ID")); //删除人id + pd.put("DELETORNAME", pd.getString("USERNAME")); //删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date())); //删除时间 securityNoticeService.delete(pd); map.put("result", errInfo); //返回结果 diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java index 617d537..7d6f1b2 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java @@ -122,7 +122,7 @@ public class AppTrafficSecurityWaybillRegistrationController extends BaseControl if (shippingDate != null && shippingDate.after(new Date())) { pd.put("WAYBILLSTATUS", "1"); } else { - pd.put("WAYBILLSTATUS", "0"); + pd.put("WAYBILLSTATUS", "3"); } trafficSecurityWaybillRegistrationService.save(pd); diff --git a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java index b1acf22..47bf071 100644 --- a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java +++ b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java @@ -1,6 +1,7 @@ package com.zcloud.controller.inspectAnnually; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.excel.util.DateUtils; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -21,6 +22,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import javax.xml.crypto.Data; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -176,21 +180,56 @@ public class InspectAnnuallyController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = inspectAnnuallyService.list(page); //列出年检列表 - varList.stream().anyMatch(InspectAnnuallyController::vehicleType); + varList.stream().anyMatch(data -> { + if ("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) { + data.put("ARCHIVES_TYPE", "2"); + } else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) { + data.put("ARCHIVES_TYPE", "1"); + } + return false; + }); + varList.forEach(data -> { + Date dueDate = DateUtil.fomatDate(data.getString("DUE_DATE")); + Date reminderDate = DateUtil.fomatDate(data.getString("REMINDER_DATE")); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String toDay = sdf.format(new Date()); + Date date = null; + try { + date = sdf.parse(toDay); + } catch (ParseException e) { + throw new RuntimeException(e); + } + // 已到期 + if(dueDate.before(date)) { + data.put("REVERT", "0"); + try { + inspectAnnuallyService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + // 即将到期 + } else if ((dueDate.after(date) || dueDate.equals(date)) && (reminderDate.before(date) || reminderDate.equals(date))) { + data.put("REVERT", "2"); + try { + inspectAnnuallyService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + // 未到期 + }else{ + data.put("REVERT", "1"); + try { + inspectAnnuallyService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }); map.put("varList", varList); map.put("page", page); map.put("result", errInfo); return map; } - private static boolean vehicleType (PageData data) { - if ("1".equals(data.getString("OPEAR_ISSCRAP")) || "1".equals(data.getString("FREIGHT_ISSCRAP"))) { - data.put("ARCHIVES_TYPE", "2"); - } else if ("1".equals(data.getString("OPEAR_ISASSIGNED")) || "1".equals(data.getString("FREIGHT_ISASSIGNED"))) { - data.put("ARCHIVES_TYPE", "1"); - } - return false; - } - /** * 去修改页面获取数据 * diff --git a/src/main/java/com/zcloud/controller/insure/InsureController.java b/src/main/java/com/zcloud/controller/insure/InsureController.java index f51502a..9f59996 100644 --- a/src/main/java/com/zcloud/controller/insure/InsureController.java +++ b/src/main/java/com/zcloud/controller/insure/InsureController.java @@ -20,6 +20,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -175,7 +177,44 @@ public class InsureController extends BaseController { page.setPd(pd); List varList = insureService.list(page); //列出Question列表 // 到期状态 - varList.stream().forEach(data -> { + varList.forEach(data -> { + Date dueDate = DateUtil.fomatDate(data.getString("DUE_DATE")); + Date reminderDate = DateUtil.fomatDate(data.getString("REMINDER_DATE")); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String toDay = sdf.format(new Date()); + Date date = null; + try { + date = sdf.parse(toDay); + } catch (ParseException e) { + throw new RuntimeException(e); + } + // 已到期 + if(dueDate.before(date)) { + data.put("REVERT", "0"); + try { + insureService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + // 即将到期 + } else if ((dueDate.after(date) || dueDate.equals(date)) && (reminderDate.before(date) || reminderDate.equals(date))) { + data.put("REVERT", "2"); + try { + insureService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + // 未到期 + }else{ + data.put("REVERT", "1"); + try { + insureService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }); + /*varList.stream().forEach(data -> { if (DateUtil.compareDate(data.getString("DUE_DATE"), DateUtil.getDay()) && DateUtil.compareDate(DateUtil.getDay(), data.getString("REMINDER_DATE"))) { data.put("DUE_DATE_TYPE", 2); } else if (DateUtil.compareDate(DateUtil.getDay(), data.getString("DUE_DATE"))) { @@ -183,7 +222,7 @@ public class InsureController extends BaseController { } else if (DateUtil.compareDate(data.getString("DUE_DATE"), DateUtil.getDay())) { data.put("DUE_DATE_TYPE", 1); } - }); + });*/ map.put("varList", varList); map.put("page", page); diff --git a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java index 8b6ac26..69c4868 100644 --- a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java +++ b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java @@ -17,6 +17,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -181,6 +183,44 @@ public class MaintenanceController extends BaseController { return false; }); + varList.forEach(data -> { + Date dueDate = DateUtil.fomatDate(data.getString("DUE_DATE")); + Date reminderDate = DateUtil.fomatDate(data.getString("REMINDER_DATE")); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String toDay = sdf.format(new Date()); + Date date = null; + try { + date = sdf.parse(toDay); + } catch (ParseException e) { + throw new RuntimeException(e); + } + // 已到期 + if(dueDate.before(date)) { + data.put("REVERT", "0"); + try { + maintenanceService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + // 即将到期 + } else if ((dueDate.after(date) || dueDate.equals(date)) && (reminderDate.before(date) || reminderDate.equals(date))) { + data.put("REVERT", "2"); + try { + maintenanceService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + // 未到期 + }else{ + data.put("REVERT", "1"); + try { + maintenanceService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }); + map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/operations/OperationsController.java b/src/main/java/com/zcloud/controller/operations/OperationsController.java index 7daf26e..4e25fa9 100644 --- a/src/main/java/com/zcloud/controller/operations/OperationsController.java +++ b/src/main/java/com/zcloud/controller/operations/OperationsController.java @@ -17,6 +17,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -180,6 +182,44 @@ public class OperationsController extends BaseController { return false; }); + varList.forEach(data -> { + Date dueDate = DateUtil.fomatDate(data.getString("DUE_DATE")); + Date reminderDate = DateUtil.fomatDate(data.getString("REMINDER_DATE")); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String toDay = sdf.format(new Date()); + Date date = null; + try { + date = sdf.parse(toDay); + } catch (ParseException e) { + throw new RuntimeException(e); + } + // 已到期 + if(dueDate.before(date)) { + data.put("REVERT", "0"); + try { + operationsService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + // 即将到期 + } else if ((dueDate.after(date) || dueDate.equals(date)) && (reminderDate.before(date) || reminderDate.equals(date))) { + data.put("REVERT", "2"); + try { + operationsService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + // 未到期 + }else{ + data.put("REVERT", "1"); + try { + operationsService.edit(data); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }); + map.put("varList", varList); map.put("page", page); map.put("result", errInfo);