From c654259f6e3a1d35b7e1a3c0281d2743a6516a0a Mon Sep 17 00:00:00 2001 From: Ledo Date: Mon, 27 Jan 2025 09:10:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B7=9F=E8=B8=AA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/dal/mysql/processdesign/ProcessDesignMapper.java | 2 +- .../mes/module/heli/dal/mysql/track/TrackMapper.java | 8 +------- .../mes/module/heli/service/track/TrackServiceImpl.java | 4 +++- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java index 952bfe8..c58bec6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java @@ -46,7 +46,7 @@ public interface ProcessDesignMapper extends BaseMapperX { .leftJoin("system_users u5 on u5.id = b.three_dim_owner") .leftJoin("(select progress,process_design_id,blueprint_link FROM pro_process_design_progress where id in (select max(id) FROM pro_process_design_progress GROUP BY process_design_id) ) z on z.process_design_id = t.id") .disableSubLogicDel(); - if(reqVO.getPgType() == 0){ + if(reqVO.getPgType()!=null && reqVO.getPgType() == 0){ query.orderByAsc(ProjectOrderDO::getCode); }else { query.orderByDesc(ProjectOrderDO::getCode); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/track/TrackMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/track/TrackMapper.java index 18c609e..2cd429e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/track/TrackMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/track/TrackMapper.java @@ -49,18 +49,12 @@ public interface TrackMapper extends BaseMapperX { .leftJoin(PlanSubDO.class,"ps",PlanSubDO::getProjectSubId,ProjectOrderSubDO::getId) .leftJoin(PlanDO.class,"pl",PlanDO::getId,PlanSubDO::getProjectPlanId) .leftJoin(DeliverOrderSubDO.class,"dos",DeliverOrderSubDO::getSaleOrderSubId,ProjectOrderSubDO::getId) - .eq(DeliverOrderSubDO::getCategory,"DELIVER_LIST") +// .ne(DeliverOrderSubDO::getCategory,"OTHER_LIST") .selectSum(DeliverOrderSubDO::getAmount,"totalReportAmount")//总共发货数量 -// .leftJoin(AdminUserDO.class,"u",AdminUserDO::getId,TaskDispatchDetailDO::getOwner) -// .leftJoin(ProcessBomDO.class,"pb",ProcessBomDO::getProjectSubId,TaskDispatchDO::getProjectSubId) -// .ne(ProcessBomDO::getBomStatus,3) -// .selectSum(TaskReportDO::getAmount,"totalReportAmount").selectSum(TaskReportDO::getWorkTime,"totalWorkTime") .eq(ProjectOrderDO::getOrderStatus,32) //已启动 .ne(ProjectOrderDO::getDeliveryStatus,3) //不为全部发货 .orderByDesc(ProjectOrderDO::getProjectEndTime) - .isNotNull(DeliverOrderSubDO::getSaleOrderSubId) .groupBy(ProjectOrderSubDO::getId); -// .getSelectDistinct(); if (reqVO.getProjectCode()!=null&&!reqVO.getProjectCode().trim().equals("")){ query.like(ProjectOrderDO::getCode,reqVO.getProjectCode()); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/track/TrackServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/track/TrackServiceImpl.java index bef0d96..f8ed706 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/track/TrackServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/track/TrackServiceImpl.java @@ -106,7 +106,9 @@ public class TrackServiceImpl implements TrackService { for (ProjectOrderSubDO to : list) { // 计算两个时间之间的天数差异 long daysBetween = ChronoUnit.DAYS.between(currentTime, to.getProjectEndTime()); - + if(to.getTotalReportAmount() == null){ + to.setTotalReportAmount(0); + } // 四舍五入到最接近的整数 BigDecimal daysDifference = BigDecimal.valueOf(daysBetween).setScale(0, RoundingMode.HALF_UP); TrackDO trackDO = new TrackDO();