From f922966913105086db907647a695a2e1af2349e0 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 16 Apr 2024 16:20:16 +0800 Subject: [PATCH] =?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} + +