From 0010505e18c0f9ab7271befb09e4f933109c6706 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Wed, 7 Jan 2026 16:36:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=A6=E8=BE=86=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=A8=A1=E5=9D=97=E4=B8=8B=E8=BD=BD=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DispatchCarController.java | 49 +------- .../entity/CarNeedPlanExport3Vo.java | 36 ++++-- .../backstage/entity/CarNeedPlanVo.java | 18 +++ .../service/DispatchCarServiceImpl.java | 35 ++---- .../business/backstage/DispatchCarMapper.xml | 107 +++++++++++------- 5 files changed, 124 insertions(+), 121 deletions(-) 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 451a5b1..34c1cd0 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,6 +1,5 @@ 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; @@ -37,23 +36,17 @@ 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()); - ; + List list = service.getProStatisticsList(dto.getData());; return new PageInfo<>(list); } /** * 导出 - * - * @param response - * @param dto */ @PostMapping("export") public void export(HttpServletResponse response, @RequestBody DispatchCarVo dto) { @@ -65,12 +58,8 @@ public class DispatchCarController { } } - /** * 工程统计查询 - * - * @param dto - * @return */ @PostMapping("getProStatisticsDetails") @DecryptAndVerify(decryptedClass = DispatchCarVo.class) @@ -80,16 +69,12 @@ public class DispatchCarController { /** * 查询需求计划集合-按照工程 - * - * @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()); - ; + List list = service.getNeedPlanList(dto.getData());; return new PageInfo<>(list); } @@ -101,9 +86,6 @@ public class DispatchCarController { /** * 导出 工程需求计划 - * - * @param response - * @param dto */ @PostMapping("export2") public void export2(HttpServletResponse response, @RequestBody CarNeedPlanVo dto) { @@ -128,9 +110,6 @@ public class DispatchCarController { /** * 供应商重新分配 * 计划下拉选 - * - * @param dto - * @return */ @PostMapping("getPlanList") @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) @@ -142,9 +121,6 @@ public class DispatchCarController { /** * 供应商分配 * 前查询-需求计划申请明细 - * - * @param dto - * @return */ @PostMapping("getPlanDetails") @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) @@ -157,9 +133,6 @@ public class DispatchCarController { * 添加供应商 分配 * (重新分配) * type 1 火车 2 type=2吊车 - * - * @param dto - * @return */ @PostMapping("addPlanSupInfo") @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) @@ -169,9 +142,6 @@ public class DispatchCarController { /** * 查询待审核-批次 - * - * @param dto - * @return */ @PostMapping("getAuditList") @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) @@ -181,9 +151,6 @@ public class DispatchCarController { /** * 车辆配送审核 - * - * @param dto - * @return */ @PostMapping("dispatchAudit") @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) @@ -193,9 +160,6 @@ public class DispatchCarController { /** * 查询计划修改记录 - * - * @param dto - * @return */ @PostMapping("getUpdateList") @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) @@ -205,9 +169,6 @@ public class DispatchCarController { /** * 查询计划修改记录 - * - * @param dto - * @return */ @PostMapping("getRecordList") @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) @@ -217,9 +178,6 @@ public class DispatchCarController { /** * 查询计划修改记录 - * - * @param dto - * @return */ @PostMapping("getRecordDetailsList") @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) @@ -229,9 +187,6 @@ public class DispatchCarController { /** * 删除派车分配数据 - * - * @param dto - * @return */ @PostMapping("deleteData") @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanExport3Vo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanExport3Vo.java index 002f8ab..0ec1271 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanExport3Vo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanExport3Vo.java @@ -20,6 +20,7 @@ public class CarNeedPlanExport3Vo extends ParentVo { * 主键 */ private String id; + /** * 合同id */ @@ -27,21 +28,21 @@ public class CarNeedPlanExport3Vo extends ParentVo { /** * 计划编号 */ - @Excel(name = "需求计划编号", width = 10.0, orderNum = "2") + @Excel(name = "需求计划编号", width = 16.0, orderNum = "2") private String code; /** * 类型 1车辆 2吊车 */ private int type; - @Excel(name = "车辆类型", width = 10.0, orderNum = "1") + @Excel(name = "车辆类型", width = 12.0, orderNum = "15") private String typeName; /** * 申请人 */ - @Excel(name = "申请人", width = 10.0, orderNum = "4") + @Excel(name = "申请人", width = 12.0, orderNum = "4") private String userName; - @Excel(name = "申请时间", width = 10.0, orderNum = "5") + @Excel(name = "申请时间", width = 12.0, orderNum = "5") private String appLyTime; /** * 工程id @@ -50,6 +51,7 @@ public class CarNeedPlanExport3Vo extends ParentVo { /** * 工程名称 */ + @Excel(name = "工程名称", width = 26, orderNum = "1") private String proName; /** @@ -115,9 +117,6 @@ public class CarNeedPlanExport3Vo extends ParentVo { @Excel(name = "待派车数量", width = 10.0, orderNum = "9") private int noDispatchNum; - /** - * 删除的类型id - */ private String delIds; private List recordList; @@ -130,13 +129,32 @@ public class CarNeedPlanExport3Vo extends ParentVo { /** * 供应商名称 */ - @Excel(name = "已指派供应商", width = 10.0, orderNum = "10") + @Excel(name = "已指派供应商", width = 20.0, orderNum = "10") private String supName; /** * 发货日期 */ - @Excel(name = "最新派车日期", width = 10.0, orderNum = "11") + @Excel(name = "最新派车日期", width = 16.0, orderNum = "11") private String dispatchDay; + + + /** + * 派车备注 + */ + @Excel(name = "派车备注", width = 30, orderNum = "14") + private String outRemark; + + /** + * 派车车辆牌号 + */ + @Excel(name = "派车车牌号", width = 14, orderNum = "13") + private String outCarNo; + + /** + * 派车型号 + */ + @Excel(name = "派车车型", width = 20, orderNum = "12") + private String outCarModel; /** * 是否发车 */ diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java index cf9be7c..ab23276 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java @@ -167,6 +167,24 @@ public class CarNeedPlanVo extends ParentVo { */ private String outTime; + /** + * 派车备注 + */ + @Excel(name = "派车备注", width = 20, orderNum = "11") + private String outRemark; + + /** + * 派车车辆牌号 + */ + @Excel(name = "派车车牌号", width = 10, orderNum = "10") + private String outCarNo; + + /** + * 派车型号 + */ + @Excel(name = "派车车型", width = 20, orderNum = "9") + private String outCarModel; + private String carLength; private String carWidth; private String carHeight; 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 1d6be1e..dfa792f 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,5 @@ 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; @@ -10,7 +9,6 @@ import com.bonus.gzcar.business.system.service.AuditRecordService; import com.bonus.gzcar.business.system.service.FileUploadService; import com.bonus.gzcar.business.utils.ListHelpUtil; import com.bonus.gzcar.manager.common.util.DateTimeHelper; -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; @@ -18,13 +16,11 @@ 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; -import tk.mybatis.mapper.genid.GenId; import java.math.BigDecimal; import java.math.RoundingMode; @@ -42,8 +38,10 @@ public class DispatchCarServiceImpl implements DispatchCarService { @Autowired private DispatchCarMapper mapper; + @Autowired private AuditRecordService recordService; + @Autowired private FileUploadService uploadService; @@ -82,9 +80,6 @@ public class DispatchCarServiceImpl implements DispatchCarService { /** * 查询 - * - * @param data - * @return */ @Override public ServerResponse getProStatisticsDetails(DispatchCarVo data) { @@ -180,9 +175,6 @@ public class DispatchCarServiceImpl implements DispatchCarService { /** * 查询 计划 车辆详情 - * - * @param data - * @return */ @Override public ServerResponse getPlanDetails(CarNeedPlanVo data) { @@ -197,9 +189,6 @@ public class DispatchCarServiceImpl implements DispatchCarService { /** * 供应商 数据信息 - * - * @param data - * @return */ @Override public ServerResponse addPlanSupInfo(CarNeedPlanVo data) { @@ -261,7 +250,10 @@ public class DispatchCarServiceImpl implements DispatchCarService { public ServerResponse dispatchAudit(CarPlanOutVo data) { try { SelfUserEntity loginUser = UserUtil.getLoginUser(); - String roleName = loginUser.getRoleName(); + String roleName = null; + if (loginUser != null) { + roleName = loginUser.getRoleName(); + } String status = data.getStatus(); // 前端传入：2=驳回，其它=通过 String remark = data.getRemark(); CarNeedPlanVo carNeedPlanVo = mapper.getPlanInfo(data); @@ -327,8 +319,7 @@ public class DispatchCarServiceImpl implements DispatchCarService { } private boolean isSecondLevelApprover(String roleName) { - return "雷治明".equals(roleName) || "黄廉飞".equals(roleName) - || "刘晓".equals(roleName) || "张杰".equals(roleName); + return "雷治明".equals(roleName) || "黄廉飞".equals(roleName) || "刘晓".equals(roleName) || "张杰".equals(roleName); } private boolean isThirdLevelApprover(String roleName) { @@ -336,10 +327,6 @@ public class DispatchCarServiceImpl implements DispatchCarService { } - /** - * @param data - * @return - */ @Override public ServerResponse getAuditList(CarPlanOutVo data) { try { @@ -353,9 +340,6 @@ public class DispatchCarServiceImpl implements DispatchCarService { /** * 查询批次修改记录 - * - * @param data - * @return */ @Override public ServerResponse getUpdateList(CarPlanOutVo data) { @@ -370,9 +354,6 @@ public class DispatchCarServiceImpl implements DispatchCarService { /** * 修改记录查询 - * - * @param data - * @return */ @Override public ServerResponse getRecordList(CarPlanOutVo data) { @@ -421,7 +402,7 @@ public class DispatchCarServiceImpl implements DispatchCarService { try { //查询是否有派车录入数据 List list = mapper.getData(data); - if (list.size() > 0) { + if (!list.isEmpty()) { res = "已存在派车录入数据,不可删除派车分配数据"; throw new RuntimeException(""); } diff --git a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml index fcfbf97..aaa13ee 100644 --- a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml @@ -7,18 +7,23 @@ replace into car_plan_apply_sup( apply_id,sup_id ,contract_id)values (#{id},#{supId},#{contractId}) + delete from car_plan_out where apply_id=#{id} + delete from car_plan_out_details where apply_id=#{id} + delete from car_plan_out_record where apply_id=#{id} + delete from car_plan_out_details_record where apply_id=#{id} + select cpa.pro_id proId,pro.`name` proName ,count(1) planNum , @@ -67,6 +75,7 @@ ORDER BY cpa.create_time desc + + + + + + + + + + + + + - select cpod.id, cpod.out_id outId, cpod.apply_id planId, cpod. model_id modelId, cpod.plan_type, cpod.contract_id contractId, cpod.sup_id supId, cpod.car_id carId,cpod.goods_name goodsName, cpod.gls, @@ -256,8 +285,8 @@ LEFT JOIN car_contract_type cct on cct.model_id=cpd.model_id and cct.sup_id=cpas.sup_id and cpas.contract_id=cct.contract_id where cpod.rel_id=#{id} - select distinct cpd.id, cpd.apply_id planId ,cpd.model_id modelId,cpd.need_day needDay,cpd.need_num needNum, cpd.remark,cpd.plan_type planType,cmti.type,cmti.name,cmti.model ,cmti.unit,cpas.sup_id supId, cct.is_out_set isOutSet,cct.is_driver_set isDriverSet,cpas.contract_id contractId,cpd.model_id modelId @@ -268,11 +297,13 @@ LEFT JOIN car_contract_type cct on cct.model_id=cpd.model_id and cct.sup_id=cpas.sup_id and cpas.contract_id=cct.contract_id where cpod.rel_id=#{id} + +