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}