From 93d3133e1411e84b0671614466933bb9d6aea5c3 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Mon, 20 Jan 2025 18:19:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=8A=20=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9=E3=80=81=E6=8E=92=E5=BA=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CarBalanceController.java | 5 ++++ .../controller/CarStatisticsController.java | 5 ++++ .../controller/SupDispatchCarController.java | 14 +++++++--- .../backstage/entity/CarBalanceExport4Vo.java | 14 +++++----- .../entity/CarNeedPlanExport1Vo.java | 3 ++- .../service/DispatchCarServiceImpl.java | 27 ++++++++++++++----- .../business/backstage/CarBalanceMapper.xml | 8 +++--- .../business/backstage/CarNeedPlanMapper.xml | 1 + .../business/backstage/CarPlanAuditMapper.xml | 3 ++- .../backstage/CarStatisticsMapper.xml | 1 + .../business/backstage/DispatchCarMapper.xml | 24 +++++++++++++---- .../backstage/SupDispatchCarMapper.xml | 5 +++- 12 files changed, 84 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarBalanceController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarBalanceController.java index aaa9cea..34e78ae 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarBalanceController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarBalanceController.java @@ -122,6 +122,11 @@ public class CarBalanceController { if("未付".equals(exp.getStatus())){ exp.setPayMoney("未付"); } + if("1".equals(exp.getType())){ + exp.setType("车辆"); + }else{ + exp.setType("吊车"); + } exp.setXh(num[0]); num[0]++; export.add(exp); diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarStatisticsController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarStatisticsController.java index 120d340..fcd0071 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarStatisticsController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarStatisticsController.java @@ -1,9 +1,11 @@ package com.bonus.gzcar.business.backstage.controller; +import cn.afterturn.easypoi.cache.manager.IFileLoader; import com.bonus.gzcar.business.backstage.entity.*; import com.bonus.gzcar.business.backstage.service.CarStatisticsService; import com.bonus.gzcar.business.utils.ExportExcelUtil; import com.bonus.gzcar.manager.annotation.DecryptAndVerify; +import com.bonus.gzcar.manager.common.util.StringHelper; import com.bonus.gzcar.manager.core.entity.EncryptedReq; import com.bonus.gzcar.manager.webResult.ServerResponse; import com.github.pagehelper.PageHelper; @@ -60,6 +62,9 @@ public class CarStatisticsController { list.forEach(vo->{ CarBalanceExport1Vo exp=new CarBalanceExport1Vo(); BeanUtils.copyProperties(vo,exp); + if(StringHelper.isEmpty(exp.getFkTime())){ + exp.setFkTime("--"); + } exp.setXh(num[0]); num[0]++; export.add(exp); diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java index 366f747..b1ecafd 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java @@ -5,7 +5,9 @@ import com.bonus.gzcar.business.backstage.entity.*; import com.bonus.gzcar.business.backstage.service.DispatchCarService; import com.bonus.gzcar.business.backstage.service.SupDispatchCarService; import com.bonus.gzcar.business.utils.ExportExcelUtil; +import com.bonus.gzcar.business.utils.ListHelpUtil; import com.bonus.gzcar.manager.annotation.DecryptAndVerify; +import com.bonus.gzcar.manager.common.util.StringHelper; import com.bonus.gzcar.manager.common.util.UserUtil; import com.bonus.gzcar.manager.core.entity.EncryptedReq; import com.bonus.gzcar.manager.webResult.ServerResponse; @@ -61,14 +63,19 @@ public class SupDispatchCarController { @PostMapping("export") public void export(HttpServletResponse response, @RequestBody CarNeedPlanVo dto) { try { + String userId= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId().toString(); + dto.setCreator(userId);dto.setUserId(userId); List list = service.getPlanListBySup(dto); List exportVos=new ArrayList(); final int[] num = {1}; list.forEach(vo->{ SupCarNeedPlanExportVo copy=new SupCarNeedPlanExportVo(); BeanUtils.copyProperties(vo,copy); - vo.setXh(num[0]); + copy.setXh(num[0]); num[0]++; + if(StringHelper.isEmpty(copy.getDispatchDay())){ + copy.setDispatchDay("-"); + } exportVos.add(copy); }); ExportExcelUtil.export(response,"派车录入", SupCarNeedPlanExportVo.class,exportVos); @@ -173,13 +180,14 @@ public class SupDispatchCarController { list.forEach(vo->{ CarNeedPlanExport1Vo exp=new CarNeedPlanExport1Vo(); BeanUtils.copyProperties(vo,exp); - if("0".equals(exp.getFileNum())){ + + if(ListHelpUtil.isNotEmpty(exp.getFileList())){ exp.setFileNum("已上传"); }else{ exp.setFileNum("待上传"); } exp.setStatusName("已派车"); - vo.setXh(num[0]); + exp.setXh(num[0]); num[0]++; exportList.add(exp); }); diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarBalanceExport4Vo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarBalanceExport4Vo.java index 0897376..ee2c84b 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarBalanceExport4Vo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarBalanceExport4Vo.java @@ -18,7 +18,7 @@ public class CarBalanceExport4Vo extends ParentVo { /** * 供应商名称 */ - @Excel(name = "供应商名称", width = 10.0, orderNum = "1") + @Excel(name = "供应商名称", width = 10.0, orderNum = "2") private String supName; /** * 合同状态 @@ -36,18 +36,18 @@ public class CarBalanceExport4Vo extends ParentVo { /** * 车辆数量 */ - @Excel(name = "用车数量", width = 10.0, orderNum = "3") + @Excel(name = "用车数量", width = 10.0, orderNum = "4") private int carNum; /** * 租赁金额（元） */ - @Excel(name = "应付金额(元)", width = 10.0, orderNum = "4") + @Excel(name = "应付金额(元)", width = 10.0, orderNum = "5") private String money; /** * 已付金额（元） */ - @Excel(name = "已付金额(元)", width = 10.0, orderNum = "5") + @Excel(name = "已付金额(元)", width = 10.0, orderNum = "6") private String payMoney; /** * 待付金额（元） @@ -74,15 +74,17 @@ public class CarBalanceExport4Vo extends ParentVo { /** * 计划编码 */ - @Excel(name = "需求计划编号", width = 10.0, orderNum = "6") + @Excel(name = "需求计划编号", width = 10.0, orderNum = "3") private String code; /** * 吊车类型 */ + @Excel(name = "类型", width = 10.0, orderNum = "1") private String type; /** * 工程名称 */ + @Excel(name = "工程名称", width = 10.0, orderNum = "7") private String proName; /** * 是否是本年度 @@ -91,7 +93,7 @@ public class CarBalanceExport4Vo extends ParentVo { /** * 工程数量 */ - @Excel(name = "工程名称", width = 10.0, orderNum = "2") + private String porNum; /** * 分公司名称 diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanExport1Vo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanExport1Vo.java index 7e14170..5eaf00a 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanExport1Vo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanExport1Vo.java @@ -99,7 +99,7 @@ public class CarNeedPlanExport1Vo extends ParentVo { /** * 计划数量 */ - @Excel(name = "派车数量", width = 10.0, orderNum = "6") + private int carNum; /** * 用车数量 @@ -108,6 +108,7 @@ public class CarNeedPlanExport1Vo extends ParentVo { /** * 已派车数量 */ + @Excel(name = "派车数量", width = 10.0, orderNum = "6") private int dispatchNum; /** * 待派车数量 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 c724df2..413050e 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 @@ -18,6 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import tk.mybatis.mapper.genid.GenId; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -81,8 +83,12 @@ public class DispatchCarServiceImpl implements DispatchCarService{ try{ DispatchCarVo vo=mapper.getProStatisticsDetails(data); if(vo!=null){ - Integer ypcNum=mapper.getProTypeNum(1,vo.getProId()); - Integer dpcNum=mapper.getProTypeNum(2,vo.getProId()); + 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; } @@ -90,14 +96,23 @@ public class DispatchCarServiceImpl implements DispatchCarService{ dpcNum=0; } - map.put("dpcNum",ypcNum); - map.put("ypcNum",dpcNum); + 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("dpcRatio",dpcNum/vo.getPlanNum()); - map.put("ypcRatio",ypcNum/vo.getPlanNum()); + + BigDecimal bd1 = new BigDecimal(dpcNum); + BigDecimal bd0 = new BigDecimal(100); + BigDecimal bd2 = new BigDecimal(ypcNum); + BigDecimal bd3 = new BigDecimal(vo.getPlanNum()); + // 设置小数点保留两位，并进行四舍五入 + 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"); diff --git a/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml b/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml index fe5c2fd..abd7471 100644 --- a/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml @@ -118,9 +118,10 @@ where cpo.sup_id=#{supId} and cpo.status=1 and ( - cpa.`code` like concat('%',#{keyWord},'%') or - pro.name like concat('%',#{keyWord},'%') or - cs.name like concat('%',#{keyWord},'%') + cpa.`code` like concat('%',#{keyWord},'%') or + pro.name like concat('%',#{keyWord},'%') or + cs.name like concat('%',#{keyWord},'%') or + if(cpo.type=1,'运输车辆','吊车') like concat('%',#{keyWord},'%') ) @@ -132,6 +133,7 @@ GROUP BY cpo.apply_id + order by cpo.create_time desc \ No newline at end of file