From 1d133a37c9e18b8d369880588122b06590d10c37 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 3 Apr 2024 17:56:58 +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 --- .../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