From a5e07e6b75f4ff20d87ee59550b67cdf60b22f27 Mon Sep 17 00:00:00 2001 From: jiang Date: Wed, 9 Jul 2025 18:58:45 +0800 Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CarPlanAuditController.java | 47 ++- .../controller/DispatchCarController.java | 76 +++-- .../backstage/mapper/CarPlanAuditMapper.java | 1 + .../backstage/mapper/DispatchCarMapper.java | 32 ++- .../service/CarPlanAuditService.java | 3 + .../service/CarPlanAuditServiceImpl.java | 13 + .../backstage/service/DispatchCarService.java | 2 + .../service/DispatchCarServiceImpl.java | 267 ++++++++++-------- .../business/backstage/CarPlanAuditMapper.xml | 24 ++ .../business/backstage/DispatchCarMapper.xml | 33 +++ 10 files changed, 331 insertions(+), 167 deletions(-) diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarPlanAuditController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarPlanAuditController.java index cf776d2..8af7ae8 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarPlanAuditController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarPlanAuditController.java @@ -5,6 +5,7 @@ import com.bonus.gzcar.business.backstage.service.CarPlanAuditService; import com.bonus.gzcar.business.utils.ExportExcelUtil; import com.bonus.gzcar.manager.annotation.DecryptAndVerify; import com.bonus.gzcar.manager.core.entity.EncryptedReq; +import com.bonus.gzcar.manager.webResult.AjaxResult; import com.bonus.gzcar.manager.webResult.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -33,19 +34,27 @@ public class CarPlanAuditController { /** * 查询车辆审核记录集合 + * * @param dto * @return */ @GetMapping("getCarAuditList") @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) public PageInfo getCarAuditList(EncryptedReq dto) { - PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); - List list = service.getCarAuditList(dto.getData());; + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List list = service.getCarAuditList(dto.getData()); + ; return new PageInfo<>(list); } + @GetMapping("getCarAuditById/{id}") + public AjaxResult getCarAuditById(@PathVariable String id) { + return service.getCarAuditById(id); + } + /** * 导出需求计划 + * * @param * @param * @param @@ -54,24 +63,26 @@ public class CarPlanAuditController { public void export(HttpServletResponse response, @RequestBody CarNeedPlanVo dto) { try { List list = service.getCarAuditList(dto); - List exportVos=new ArrayList(); + List exportVos = new ArrayList(); final int[] num = {1}; - list.forEach(vo->{ - CarNeedPlanExportVo copy=new CarNeedPlanExportVo(); - BeanUtils.copyProperties(vo,copy); - copy.setSubTime(vo.getCreateTime()); - vo.setXh(num[0]); - num[0]++; - exportVos.add(copy); - }); + list.forEach(vo -> { + CarNeedPlanExportVo copy = new CarNeedPlanExportVo(); + BeanUtils.copyProperties(vo, copy); + copy.setSubTime(vo.getCreateTime()); + vo.setXh(num[0]); + num[0]++; + exportVos.add(copy); + }); - ExportExcelUtil.export(response,"需求计划审核", CarNeedPlanExportVo.class,exportVos); + ExportExcelUtil.export(response, "需求计划审核", CarNeedPlanExportVo.class, exportVos); } catch (Exception e) { log.error(e.toString(), e); } } + /** * 车辆审核详情 + * * @param dto * @return */ @@ -80,20 +91,25 @@ public class CarPlanAuditController { public ServerResponse getCarAuditDetails(EncryptedReq dto) { return service.getCarAuditDetails(dto.getData()); } + /** * 查询车辆 申请 明细 查询 + * * @param dto * @return */ @GetMapping("getCapPlanDetailList") @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) public PageInfo getCapPlanDetailList(EncryptedReq dto) { - PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); - List list = service.getCapPlanDetailList(dto.getData());; + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List list = service.getCapPlanDetailList(dto.getData()); + ; return new PageInfo<>(list); } + /** * 导出需求计划-详情 + * * @param * @param * @param @@ -102,7 +118,7 @@ public class CarPlanAuditController { public void exportDetails(HttpServletResponse response, @RequestBody CarNeedPlanVo dto) { try { List list = service.getCapPlanDetailList(dto); - ExportExcelUtil.export(response,"申请明细", CarNeedPlanDetailVo.class,list); + ExportExcelUtil.export(response, "申请明细", CarNeedPlanDetailVo.class, list); } catch (Exception e) { log.error(e.toString(), e); } @@ -110,6 +126,7 @@ public class CarPlanAuditController { /** * 车辆审核 + * * @param dto * @return */ diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/DispatchCarController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/DispatchCarController.java index 6e08c88..451a5b1 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/DispatchCarController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/DispatchCarController.java @@ -1,10 +1,12 @@ package com.bonus.gzcar.business.backstage.controller; +import cn.hutool.core.util.ObjectUtil; import com.bonus.gzcar.business.backstage.entity.*; import com.bonus.gzcar.business.backstage.service.DispatchCarService; import com.bonus.gzcar.business.utils.ExportExcelUtil; import com.bonus.gzcar.manager.annotation.DecryptAndVerify; import com.bonus.gzcar.manager.core.entity.EncryptedReq; +import com.bonus.gzcar.manager.webResult.AjaxResult; import com.bonus.gzcar.manager.webResult.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -34,19 +36,22 @@ public class DispatchCarController { /** * 分页查询工程统计信息 + * * @param dto * @return */ @GetMapping("getProStatisticsList") @DecryptAndVerify(decryptedClass = DispatchCarVo.class) public PageInfo getProStatisticsList(EncryptedReq dto) { - PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); - List list = service.getProStatisticsList(dto.getData());; + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List list = service.getProStatisticsList(dto.getData()); + ; return new PageInfo<>(list); } /** * 导出 + * * @param response * @param dto */ @@ -54,7 +59,7 @@ public class DispatchCarController { public void export(HttpServletResponse response, @RequestBody DispatchCarVo dto) { try { List list = service.getProStatisticsList(dto); - ExportExcelUtil.export(response,"派车管理", DispatchCarVo.class,list); + ExportExcelUtil.export(response, "派车管理", DispatchCarVo.class, list); } catch (Exception e) { log.error(e.toString(), e); } @@ -62,31 +67,41 @@ public class DispatchCarController { /** - * 工程统计查询 + * 工程统计查询 + * * @param dto * @return */ @PostMapping("getProStatisticsDetails") @DecryptAndVerify(decryptedClass = DispatchCarVo.class) public ServerResponse getProStatisticsDetails(EncryptedReq dto) { - return service.getProStatisticsDetails(dto.getData()); + return service.getProStatisticsDetails(dto.getData()); } /** * 查询需求计划集合-按照工程 + * * @param dto * @return */ @GetMapping("getNeedPlanList") @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) public PageInfo getNeedPlanList(EncryptedReq dto) { - PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); - List list = service.getNeedPlanList(dto.getData());; + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List list = service.getNeedPlanList(dto.getData()); + ; return new PageInfo<>(list); } + + @GetMapping("getNeedPlanById/{id}") + public AjaxResult getNeedPlanById(@PathVariable String id) { + return service.getNeedPlanById(id); + } + /** * 导出 工程需求计划 + * * @param response * @param dto */ @@ -94,63 +109,67 @@ public class DispatchCarController { public void export2(HttpServletResponse response, @RequestBody CarNeedPlanVo dto) { try { List list = service.getNeedPlanList(dto); - List export=new ArrayList<>(); + List export = new ArrayList<>(); final int[] num = {1}; - list.forEach(vo->{ - CarNeedPlanExport3Vo exp=new CarNeedPlanExport3Vo(); - BeanUtils.copyProperties(vo,exp); + list.forEach(vo -> { + CarNeedPlanExport3Vo exp = new CarNeedPlanExport3Vo(); + BeanUtils.copyProperties(vo, exp); exp.setXh(num[0]); num[0]++; export.add(exp); }); - ExportExcelUtil.export(response,"工程详情", CarNeedPlanExport3Vo.class,export); + ExportExcelUtil.export(response, "工程详情", CarNeedPlanExport3Vo.class, export); } catch (Exception e) { log.error(e.toString(), e); } } /** - * 供应商重新分配 - * 计划下拉选 + * 供应商重新分配 + * 计划下拉选 + * * @param dto * @return */ @PostMapping("getPlanList") @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) public ServerResponse getPlanList(EncryptedReq dto) { - return service.getPlanList(dto.getData()); + return service.getPlanList(dto.getData()); } /** - * 供应商分配 - * 前查询-需求计划申请明细 + * 供应商分配 + * 前查询-需求计划申请明细 + * * @param dto * @return */ @PostMapping("getPlanDetails") @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) public ServerResponse getPlanDetails(EncryptedReq dto) { - return service.getPlanDetails(dto.getData()); + return service.getPlanDetails(dto.getData()); } /** * 添加 计划 * 添加供应商 分配 * (重新分配) - * type 1 火车 2 type=2吊车 + * type 1 火车 2 type=2吊车 + * * @param dto * @return */ @PostMapping("addPlanSupInfo") @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) public ServerResponse addPlanSupInfo(EncryptedReq dto) { - return service.addPlanSupInfo(dto.getData()); + return service.addPlanSupInfo(dto.getData()); } /** * 查询待审核-批次 + * * @param dto * @return */ @@ -162,6 +181,7 @@ public class DispatchCarController { /** * 车辆配送审核 + * * @param dto * @return */ @@ -173,44 +193,50 @@ public class DispatchCarController { /** * 查询计划修改记录 + * * @param dto * @return */ @PostMapping("getUpdateList") @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) public ServerResponse getUpdateList(EncryptedReq dto) { - return service.getUpdateList(dto.getData()); + return service.getUpdateList(dto.getData()); } + /** * 查询计划修改记录 + * * @param dto * @return */ @PostMapping("getRecordList") @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) public ServerResponse getRecordList(EncryptedReq dto) { - return service.getRecordList(dto.getData()); + return service.getRecordList(dto.getData()); } + /** * 查询计划修改记录 + * * @param dto * @return */ @PostMapping("getRecordDetailsList") @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) public ServerResponse getRecordDetailsList(EncryptedReq dto) { - return service.getRecordDetailsList(dto.getData()); + return service.getRecordDetailsList(dto.getData()); } /** - * 删除派车分配数据 + * 删除派车分配数据 + * * @param dto * @return */ @PostMapping("deleteData") @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) public ServerResponse deleteData(EncryptedReq dto) { - return service.deleteData(dto.getData()); + return service.deleteData(dto.getData()); } } diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarPlanAuditMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarPlanAuditMapper.java index b302f69..7d76909 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarPlanAuditMapper.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarPlanAuditMapper.java @@ -21,6 +21,7 @@ public interface CarPlanAuditMapper { */ List getCarAuditList(CarNeedPlanVo data); + CarNeedPlanVo getCarAuditById (String id); /** * 查看审核详情 * @param data diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/DispatchCarMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/DispatchCarMapper.java index 1032669..a2d6bc5 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/DispatchCarMapper.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/DispatchCarMapper.java @@ -8,6 +8,7 @@ import java.util.List; /** * 派车管理 接口层 + * * @author 黑子 */ @Repository @@ -15,15 +16,17 @@ public interface DispatchCarMapper { /** * 查询工程 统计 + * * @param data * @return */ List getProStatisticsList(DispatchCarVo data); - Integer getProTypeNum(@Param("type") int type,@Param("proId")String proId); + Integer getProTypeNum(@Param("type") int type, @Param("proId") String proId); /** * 查询最后一次发货 + * * @param proId * @return */ @@ -31,6 +34,7 @@ public interface DispatchCarMapper { /** * 工程统计查询 + * * @param data * @return */ @@ -38,13 +42,18 @@ public interface DispatchCarMapper { /** * 查询 + * * @param data * @return */ List getNeedPlanList(CarNeedPlanVo data); + + CarNeedPlanVo getNeedPlanById(String id); + /** * 查询 计划结合 + * * @param data * @return */ @@ -52,6 +61,7 @@ public interface DispatchCarMapper { /** * 查询供应商 分配计划信息 + * * @param data * @return */ @@ -61,6 +71,7 @@ public interface DispatchCarMapper { /** * 验证 供应商 是否存在合同及 车辆型号 + * * @param data * @return */ @@ -68,6 +79,7 @@ public interface DispatchCarMapper { /** * 查询待审核 + * * @param data * @return */ @@ -75,12 +87,14 @@ public interface DispatchCarMapper { /** * 修改审核状态 + * * @param vo */ - int updateDispatchData(CarPlanOutVo vo); + int updateDispatchData(CarPlanOutVo vo); /** * 查询计划派车信息 + * * @param data * @return */ @@ -88,6 +102,7 @@ public interface DispatchCarMapper { /** * 查询 本次审核的数据 + * * @param data * @return */ @@ -95,6 +110,7 @@ public interface DispatchCarMapper { /** * 更新计划数据 + * * @param carNeedPlanVo */ void updateCarPlanInfo(CarNeedPlanVo carNeedPlanVo); @@ -103,6 +119,7 @@ public interface DispatchCarMapper { /** * 查询批次修改记录数据 + * * @param data * @return */ @@ -110,6 +127,7 @@ public interface DispatchCarMapper { /** * 查询修改记录详情 + * * @param data * @return */ @@ -117,6 +135,7 @@ public interface DispatchCarMapper { /** * 修改记录详情查询 + * * @param data * @return */ @@ -124,6 +143,7 @@ public interface DispatchCarMapper { /** * 计划查询 + * * @param data * @return */ @@ -131,6 +151,7 @@ public interface DispatchCarMapper { /** * 校验 + * * @param id * @return */ @@ -138,17 +159,18 @@ public interface DispatchCarMapper { /** * 查询 + * * @param data * @return */ int getPlanDispayNum(CarNeedPlanVo data); - CarNeedPlanVo getSupPlanData(CarNeedPlanVo data); /** * 删除历史发货的 + * * @param data */ void deleteOutData(CarNeedPlanVo data); @@ -161,12 +183,14 @@ public interface DispatchCarMapper { /** * 修改计划状态 + * * @param data */ void updatePlanData(CarNeedPlanVo data); /** * 查询审核记录 + * * @param data * @return */ @@ -174,12 +198,14 @@ public interface DispatchCarMapper { /** * 查询数据 + * * @param data */ List getData(CarPlanOutVo data); /** * 删除数据 + * * @param data * @return */ diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditService.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditService.java index 1c27d8f..4d930d5 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditService.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditService.java @@ -3,6 +3,7 @@ package com.bonus.gzcar.business.backstage.service; import com.bonus.gzcar.business.backstage.entity.AuditInfoDataVo; import com.bonus.gzcar.business.backstage.entity.CarNeedPlanDetailVo; import com.bonus.gzcar.business.backstage.entity.CarNeedPlanVo; +import com.bonus.gzcar.manager.webResult.AjaxResult; import com.bonus.gzcar.manager.webResult.ServerResponse; import java.util.List; @@ -18,6 +19,8 @@ public interface CarPlanAuditService { */ List getCarAuditList(CarNeedPlanVo data); + AjaxResult getCarAuditById (String id); + /** * 查看车辆 审核详情 * @param data diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java index 02157f7..acd171b 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.gzcar.business.backstage.service; +import cn.hutool.core.util.ObjectUtil; import com.bonus.gzcar.business.backstage.entity.*; import com.bonus.gzcar.business.backstage.mapper.CarPlanAuditMapper; import com.bonus.gzcar.business.system.entity.AuditRecordVo; @@ -7,6 +8,7 @@ import com.bonus.gzcar.business.system.service.AuditRecordService; import com.bonus.gzcar.business.system.service.SysAuditService; import com.bonus.gzcar.business.utils.ListHelpUtil; import com.bonus.gzcar.manager.common.util.UserUtil; +import com.bonus.gzcar.manager.webResult.AjaxResult; import com.bonus.gzcar.manager.webResult.ServerResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -43,6 +45,17 @@ public class CarPlanAuditServiceImpl implements CarPlanAuditService{ return new ArrayList(); } + @Override + public AjaxResult getCarAuditById(String id) { + try { + CarNeedPlanVo carAuditById = mapper.getCarAuditById(id); + return ObjectUtil.isNotEmpty(carAuditById)?AjaxResult.success(carAuditById):AjaxResult.error(); + } catch (Exception e) { + log.error(e.toString()); + return AjaxResult.error(); + } + } + /** * 审核详情查看 * @param data diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarService.java b/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarService.java index c76105b..8c5d96a 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarService.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarService.java @@ -3,6 +3,7 @@ package com.bonus.gzcar.business.backstage.service; import com.bonus.gzcar.business.backstage.entity.CarNeedPlanVo; import com.bonus.gzcar.business.backstage.entity.CarPlanOutVo; import com.bonus.gzcar.business.backstage.entity.DispatchCarVo; +import com.bonus.gzcar.manager.webResult.AjaxResult; import com.bonus.gzcar.manager.webResult.ServerResponse; import java.util.List; @@ -33,6 +34,7 @@ public interface DispatchCarService { */ List getNeedPlanList(CarNeedPlanVo data); + AjaxResult getNeedPlanById(String id); /** * 查询计划集合 * @param data diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java index 76fbb59..bac22e1 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.gzcar.business.backstage.service; import cn.afterturn.easypoi.cache.manager.IFileLoader; +import cn.hutool.core.util.ObjectUtil; import com.bonus.gzcar.business.backstage.entity.*; import com.bonus.gzcar.business.backstage.mapper.DispatchCarMapper; import com.bonus.gzcar.business.system.entity.AuditRecordVo; @@ -13,10 +14,13 @@ import com.bonus.gzcar.manager.common.util.RedisService; import com.bonus.gzcar.manager.common.util.StringHelper; import com.bonus.gzcar.manager.common.util.UserUtil; import com.bonus.gzcar.manager.security.entity.SelfUserEntity; +import com.bonus.gzcar.manager.webResult.AjaxResult; import com.bonus.gzcar.manager.webResult.ServerResponse; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -34,7 +38,7 @@ import java.util.Map; */ @Service @Slf4j -public class DispatchCarServiceImpl implements DispatchCarService{ +public class DispatchCarServiceImpl implements DispatchCarService { @Autowired private DispatchCarMapper mapper; @@ -45,67 +49,68 @@ public class DispatchCarServiceImpl implements DispatchCarService{ @Override public List getProStatisticsList(DispatchCarVo data) { - List list=new ArrayList<>(); - try{ - list=mapper.getProStatisticsList(data); + List list = new ArrayList<>(); + try { + list = mapper.getProStatisticsList(data); final int[] num = {1}; - list.forEach(vo->{ + list.forEach(vo -> { vo.setXh(num[0]); num[0]++; - Integer ypcNum=mapper.getProTypeNum(1,vo.getProId()); - Integer dpcNum=mapper.getProTypeNum(2,vo.getProId()); - if(ypcNum==null){ - ypcNum=0; + Integer ypcNum = mapper.getProTypeNum(1, vo.getProId()); + Integer dpcNum = mapper.getProTypeNum(2, vo.getProId()); + if (ypcNum == null) { + ypcNum = 0; } - if(dpcNum==null){ - dpcNum=0; + if (dpcNum == null) { + dpcNum = 0; } - String lastDay=mapper.getLastDay(vo.getProId()); - if(StringHelper.isNotEmpty(lastDay)){ + String lastDay = mapper.getLastDay(vo.getProId()); + if (StringHelper.isNotEmpty(lastDay)) { vo.setLastDay(lastDay); - }else{ + } else { vo.setLastDay("-"); } vo.setYpcNum(ypcNum); vo.setDpcNum(dpcNum); }); - }catch (Exception e){ - log.error(e.toString(),e); + } catch (Exception e) { + log.error(e.toString(), e); } return list; } /** * 查询 + * * @param data * @return */ @Override public ServerResponse getProStatisticsDetails(DispatchCarVo data) { - Map map= Maps.newHashMap(); - try{ - DispatchCarVo vo=mapper.getProStatisticsDetails(data); - if(vo!=null){ - String proId=""; - if(data!=null){ - proId=data.getProId(); + Map map = Maps.newHashMap(); + try { + DispatchCarVo vo = mapper.getProStatisticsDetails(data); + if (vo != null) { + String proId = ""; + if (data != null) { + proId = data.getProId(); } - Integer ypcNum=mapper.getProTypeNum(1,proId); - Integer dpcNum=mapper.getProTypeNum(2,proId); - if(ypcNum==null){ - ypcNum=0; + Integer ypcNum = mapper.getProTypeNum(1, proId); + Integer dpcNum = mapper.getProTypeNum(2, proId); + if (ypcNum == null) { + ypcNum = 0; } - if(dpcNum==null){ - dpcNum=0; + if (dpcNum == null) { + dpcNum = 0; } - map.put("dpcNum",dpcNum); - map.put("ypcNum",ypcNum); - map.put("planNum",vo.getPlanNum()); - map.put("needNum",vo.getNeedNum()); - map.put("dispatchNum",vo.getDispatchNum()); - map.put("noDispatchNum",vo.getNoDispatchNum()); + map.put("dpcNum", dpcNum); + map.put("ypcNum", ypcNum); + map.put("planNum", vo.getPlanNum()); + map.put("needNum", vo.getNeedNum()); + map.put("dispatchNum", vo.getDispatchNum()); + map.put("noDispatchNum", vo.getNoDispatchNum()); BigDecimal bd1 = new BigDecimal(dpcNum); BigDecimal bd0 = new BigDecimal(100); @@ -115,124 +120,137 @@ public class DispatchCarServiceImpl implements DispatchCarService{ BigDecimal result = bd1.divide(bd3, 2, RoundingMode.HALF_UP).multiply(bd0); BigDecimal result2 = bd2.divide(bd3, 2, RoundingMode.HALF_UP).multiply(bd0); - map.put("dpcRatio",result); - map.put("ypcRatio",result2); - }else{ - map.put("dpcRatio","0"); - map.put("ypcRatio","0"); - map.put("planNum","0"); - map.put("dpcNum","0"); - map.put("ypcNum","0"); - map.put("needNum","0"); - map.put("dispatchNum","0"); - map.put("noDispatchNum","0"); + map.put("dpcRatio", result); + map.put("ypcRatio", result2); + } else { + map.put("dpcRatio", "0"); + map.put("ypcRatio", "0"); + map.put("planNum", "0"); + map.put("dpcNum", "0"); + map.put("ypcNum", "0"); + map.put("needNum", "0"); + map.put("dispatchNum", "0"); + map.put("noDispatchNum", "0"); } - }catch (Exception e){ - map.put("planNum","0"); - map.put("dpcNum","0"); - map.put("dpcRatio","0"); - map.put("ypcRatio","0"); - map.put("ypcNum","0"); - map.put("needNum","0"); - map.put("dispatchNum","0"); - map.put("noDispatchNum","0"); - log.error(e.toString(),e); + } catch (Exception e) { + map.put("planNum", "0"); + map.put("dpcNum", "0"); + map.put("dpcRatio", "0"); + map.put("ypcRatio", "0"); + map.put("ypcNum", "0"); + map.put("needNum", "0"); + map.put("dispatchNum", "0"); + map.put("noDispatchNum", "0"); + log.error(e.toString(), e); } return ServerResponse.createSuccess(map); } @Override public List getNeedPlanList(CarNeedPlanVo data) { - try{ + try { return mapper.getNeedPlanList(data); - }catch (Exception e){ - log.error(e.toString(),e); + } catch (Exception e) { + log.error(e.toString(), e); } return new ArrayList<>(); } + @Override + public AjaxResult getNeedPlanById(String id) { + try { + CarNeedPlanVo needPlanById = mapper.getNeedPlanById(id); + return ObjectUtil.isNotEmpty(needPlanById) ? AjaxResult.success(needPlanById) : AjaxResult.error(); + } catch (Exception e) { + log.error(e.toString(), e); + return AjaxResult.error(); + } + } + @Override public ServerResponse getPlanList(CarNeedPlanVo data) { - List list=new ArrayList<>(); - try{ - list= mapper.getPlanList(data); - }catch (Exception e){ - log.error(e.toString(),e); + List list = new ArrayList<>(); + try { + list = mapper.getPlanList(data); + } catch (Exception e) { + log.error(e.toString(), e); } return ServerResponse.createSuccess(list); } /** * 查询 计划 车辆详情 + * * @param data * @return */ @Override public ServerResponse getPlanDetails(CarNeedPlanVo data) { - List list=new ArrayList<>(); - try{ - list= mapper.getPlanDetails(data); - }catch (Exception e){ - log.error(e.toString(),e); + List list = new ArrayList<>(); + try { + list = mapper.getPlanDetails(data); + } catch (Exception e) { + log.error(e.toString(), e); } return ServerResponse.createSuccess(list); } /** * 供应商 数据信息 + * * @param data * @return */ @Override public ServerResponse addPlanSupInfo(CarNeedPlanVo data) { - try{ - if(data.getType()==0){ + try { + if (data.getType() == 0) { return ServerResponse.createErroe("吊车类型不能为空"); } - if(StringHelper.isEmpty(data.getContractId())){ + if (StringHelper.isEmpty(data.getContractId())) { return ServerResponse.createErroe("未上传合同id"); } - if(StringHelper.isEmpty(data.getSupName())){ + if (StringHelper.isEmpty(data.getSupName())) { return ServerResponse.createErroe("供应商名称不能为空"); } - Integer jsNum=mapper.validateSltNum(data.getId()); - if(jsNum!=null && jsNum>0){ - return ServerResponse.createErroe("该计划已被结算,不允许修改"); + Integer jsNum = mapper.validateSltNum(data.getId()); + if (jsNum != null && jsNum > 0) { + return ServerResponse.createErroe("该计划已被结算,不允许修改"); } - int dispatNum=mapper.getPlanDispayNum(data); - if( dispatNum>0){ - return ServerResponse.createErroe("该计划已派车、不允许重新分配"); + int dispatNum = mapper.getPlanDispayNum(data); + if (dispatNum > 0) { + return ServerResponse.createErroe("该计划已派车、不允许重新分配"); } //吊车需要验证 供应商合同型号 - if(2==data.getType()){ - List detailVos=mapper.getContractSupInfo(data); - if(ListHelpUtil.isNotEmpty(detailVos)){ - CarNeedPlanDetailVo vo=detailVos.get(0); - return ServerResponse.createErroe("供应商:"+data.getSupName()+"在合同中无"+vo.getName()+"-"+vo.getModel()+"车辆型号"); + if (2 == data.getType()) { + List detailVos = mapper.getContractSupInfo(data); + if (ListHelpUtil.isNotEmpty(detailVos)) { + CarNeedPlanDetailVo vo = detailVos.get(0); + return ServerResponse.createErroe("供应商:" + data.getSupName() + "在合同中无" + vo.getName() + "-" + vo.getModel() + "车辆型号"); } } - CarNeedPlanVo hisData=mapper.getSupPlanData(data); - if(hisData!=null){ - String supId=hisData.getSupId(); - String contractId=hisData.getContractId(); - if(!supId.equals(data.getSupId()) || !contractId.equals(data.getContractId())){ + CarNeedPlanVo hisData = mapper.getSupPlanData(data); + if (hisData != null) { + String supId = hisData.getSupId(); + String contractId = hisData.getContractId(); + if (!supId.equals(data.getSupId()) || !contractId.equals(data.getContractId())) { deleteData(data); mapper.updatePlanData(data); } } - int num= mapper.addPlanSupInfo(data); - if(num>0){ + int num = mapper.addPlanSupInfo(data); + if (num > 0) { return ServerResponse.createBySuccessMsg("分配成功"); } - }catch (Exception e){ - log.error(e.toString(),e); + } catch (Exception e) { + log.error(e.toString(), e); } return ServerResponse.createErroe("分配失败"); } - public void deleteData(CarNeedPlanVo data){ + public void deleteData(CarNeedPlanVo data) { mapper.deleteOutData(data); mapper.deleteOutDetails(data); mapper.deleteOutDataRecord(data); @@ -319,81 +337,82 @@ public class DispatchCarServiceImpl implements DispatchCarService{ } - - /** * @param data * @return */ @Override public ServerResponse getAuditList(CarPlanOutVo data) { - try{ - List list=mapper.getAuditListNew(data); - return ServerResponse.createSuccess(list); - }catch (Exception e){ - log.error(e.toString(),e); + try { + List list = mapper.getAuditListNew(data); + return ServerResponse.createSuccess(list); + } catch (Exception e) { + log.error(e.toString(), e); } return null; } /** * 查询批次修改记录 + * * @param data * @return */ @Override public ServerResponse getUpdateList(CarPlanOutVo data) { - try{ - List list=mapper.getUpdateList(data); - return ServerResponse.createSuccess(list); - }catch (Exception e){ - log.error(e.toString(),e); + try { + List list = mapper.getUpdateList(data); + return ServerResponse.createSuccess(list); + } catch (Exception e) { + log.error(e.toString(), e); } return null; } /** * 修改记录查询 + * * @param data * @return */ @Override public ServerResponse getRecordList(CarPlanOutVo data) { - List list=new ArrayList<>(); + List list = new ArrayList<>(); try { - list=mapper.getDispatchCarListData(data); - }catch (Exception e){ + list = mapper.getDispatchCarListData(data); + } catch (Exception e) { log.error(e.toString()); } return ServerResponse.createSuccess(list); } + @Override public ServerResponse getRecordDetailsList(CarPlanOutVo data) { - try{ - CarPlanOutVo vo=mapper.getDispatchCarData(data); - if(vo!=null){ - List fileList=uploadService.getFileList(vo.getOutId(),"car_plan_out",""); + try { + CarPlanOutVo vo = mapper.getDispatchCarData(data); + if (vo != null) { + List fileList = uploadService.getFileList(vo.getOutId(), "car_plan_out", ""); vo.setFileList(fileList); - List list=mapper.getDispatchCarDetailsList(data); - for (CarPlanOutVoDetailsVo detailsVo:list){ - List fileList2=uploadService.getFileList(detailsVo.getDetailsId(),"car_plan_out_details",""); + List list = mapper.getDispatchCarDetailsList(data); + for (CarPlanOutVoDetailsVo detailsVo : list) { + List fileList2 = uploadService.getFileList(detailsVo.getDetailsId(), "car_plan_out_details", ""); detailsVo.setFileList(fileList2); - List carImage=uploadService.getFileList(detailsVo.getCarId(),"car_supplier_info",""); + List carImage = uploadService.getFileList(detailsVo.getCarId(), "car_supplier_info", ""); detailsVo.setCarImage(carImage); - List driverUserImage=uploadService.getFileList(detailsVo.getDriverUserId(),"car_driver_info",""); + List driverUserImage = uploadService.getFileList(detailsVo.getDriverUserId(), "car_driver_info", ""); detailsVo.setDriverUserImage(driverUserImage); - List operaImage=uploadService.getFileList(detailsVo.getOperaUserId(),"car_driver_info",""); + List operaImage = uploadService.getFileList(detailsVo.getOperaUserId(), "car_driver_info", ""); detailsVo.setOperaImage(operaImage); } - List record= recordService.getRecordList("out-"+data.getOutId()); + List record = recordService.getRecordList("out-" + data.getOutId()); vo.setRecordList(record); vo.setDetailsVoList(list); } - return ServerResponse.createSuccess("查询成功",vo); - }catch (Exception e){ - log.error(e.toString(),e); + return ServerResponse.createSuccess("查询成功", vo); + } catch (Exception e) { + log.error(e.toString(), e); } - return ServerResponse.createSuccess("查询失败",new CarPlanOutVo()); + return ServerResponse.createSuccess("查询失败", new CarPlanOutVo()); } @Override diff --git a/src/main/resources/mappers/business/backstage/CarPlanAuditMapper.xml b/src/main/resources/mappers/business/backstage/CarPlanAuditMapper.xml index c11d9a2..7ceed33 100644 --- a/src/main/resources/mappers/business/backstage/CarPlanAuditMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarPlanAuditMapper.xml @@ -47,6 +47,30 @@ ORDER BY cpa.create_time desc + + + + +