diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java index 6f79c32ba..e3ad3f8e9 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java @@ -232,6 +232,15 @@ public interface RabbitConstant { /****************自提扫描信息处理 start *************************/ + /****************推送安装平台 start *************************/ + + String PUSH_INSTALL_PLATFORM_QUEUE = "push_install_platform_queue" + ModuleNameConstant.DEVAUTH; + String PUSH_INSTALL_PLATFORM_EXCHANGE = "push_install_platform_exchange" + ModuleNameConstant.DEVAUTH; + String PUSH_INSTALL_PLATFORM_ROUTING = "push_install_platform_routing" + ModuleNameConstant.DEVAUTH; + + /****************推送安装平台 start *************************/ + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/RabbitMqConfiguration.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/RabbitMqConfiguration.java index ca6870abe..48e36f18d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/RabbitMqConfiguration.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/RabbitMqConfiguration.java @@ -206,14 +206,30 @@ public class RabbitMqConfiguration { return new Queue(RabbitConstant.SELF_PICKUP_SCAN_QUEUE, true); } @Bean + public Queue pushInstallPlatformQueue() { + return new Queue(RabbitConstant.PUSH_INSTALL_PLATFORM_QUEUE, true); + } + @Bean public CustomExchange selfPickupScanExchange() { Map args = Maps.newHashMap(); args.put("x-delayed-type", "direct"); return new CustomExchange(RabbitConstant.SELF_PICKUP_SCAN_EXCHANGE, "x-delayed-message", true, false, args); } + + @Bean + public CustomExchange pushInstallPlatformExchange() { + Map args = Maps.newHashMap(); + args.put("x-delayed-type", "direct"); + return new CustomExchange(RabbitConstant.PUSH_INSTALL_PLATFORM_EXCHANGE, "x-delayed-message", true, false, args); + } @Bean public Binding selfPickupScanBinding(Queue selfPickupScanQueue, CustomExchange selfPickupScanExchange) { return BindingBuilder.bind(selfPickupScanQueue).to(selfPickupScanExchange).with(RabbitConstant.SELF_PICKUP_SCAN_ROUTING).noargs(); } + @Bean + public Binding pushStallPlatform(Queue pushInstallPlatformQueue, CustomExchange pushInstallPlatformExchange) { + return BindingBuilder.bind(pushInstallPlatformQueue).to(pushInstallPlatformExchange).with(RabbitConstant.PUSH_INSTALL_PLATFORM_ROUTING).noargs(); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index aa202a059..c824133ac 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -187,7 +187,7 @@ and ldbl.pick_up_plate like concat('%',#{param.vehicleName},'%') - and lddl.consignee like concat('%',#{param.driverName},'%') + and ldbl.consignee like concat('%',#{param.driverName},'%') and ldbls.scan_user like concat('%',#{param.scanUser},'%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 0af797fd5..e2864e061 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -3143,6 +3143,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { pushInstallDTO.setOrder(orderList); pushInstallDTO.setOrder_detail(orderDetailList); log.info(">>>>>>>>>>>>>>安装推送整理数据",JSONObject.toJSON(pushInstallDTO)); + String jsonString = JSONObject.toJSONString(pushInstallDTO); + rabbitTemplate.convertAndSend(RabbitConstant.PUSH_INSTALL_PLATFORM_EXCHANGE, RabbitConstant.PUSH_INSTALL_PLATFORM_ROUTING, jsonString); + } private void handlePushFactoryOrderIds(List orderIds, String s, BasicdataWarehouseEntity warehouse, BladeUser user) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 23f5f6c6d..4f7ce2b75 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -650,7 +650,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda() .eq(DistributionStockupInfoEntity::getReservationId, reservationId) + .ne(DistributionStockupInfoEntity::getStockStatus, "4") ); if (ObjectUtils.isNotNull(one) && "3".equals(one.getStockUpType())) { diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java index bdb422962..045b4ddd7 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java @@ -167,124 +167,124 @@ public interface WarehouseIndexMapper { * @param indexDTO * @return */ - Integer findSignforDataByDay(@Param("param")IndexDTO indexDTO); + String findSignforDataByDay(@Param("param")IndexDTO indexDTO); /** * 查询当月签收数量 * @param indexDTO * @return */ - Integer findSignforDataByMonth(@Param("param")IndexDTO indexDTO); + String findSignforDataByMonth(@Param("param")IndexDTO indexDTO); /** * 查询前天未签收件数 * @param indexDTO * @return */ - Integer findUnSignforDataByDay(@Param("param")IndexDTO indexDTO); + String findUnSignforDataByDay(@Param("param")IndexDTO indexDTO); /** * 查询当月未签收件数 * @param indexDTO * @return */ - Integer findUnSignforDataByMonth(@Param("param")IndexDTO indexDTO); + String findUnSignforDataByMonth(@Param("param")IndexDTO indexDTO); /** * 查询当天文员复核数 * @param indexDTO * @return */ - Integer findClerkSignforNumByDay(@Param("param")IndexDTO indexDTO); + String findClerkSignforNumByDay(@Param("param")IndexDTO indexDTO); /** * 查询当月文员复核数 * @param indexDTO * @return */ - Integer findClerkSignforNumByMonth(@Param("param")IndexDTO indexDTO); + String findClerkSignforNumByMonth(@Param("param")IndexDTO indexDTO); /** * 查询当天计划数 * @param indexDTO * @return */ - Integer findPlanNumByDay(@Param("param")IndexDTO indexDTO); + String findPlanNumByDay(@Param("param")IndexDTO indexDTO); /** * 查询当月文员计划数 * @param indexDTO * @return */ - Integer findPlanNumByMonth(@Param("param")IndexDTO indexDTO); + String findPlanNumByMonth(@Param("param")IndexDTO indexDTO); /** * 查询当天文员复核超时数 * @param indexDTO * @return */ - Integer findClerkOverTimeNumByDay(@Param("param")IndexDTO indexDTO); + String findClerkOverTimeNumByDay(@Param("param")IndexDTO indexDTO); /** * 查询当月文员复核超时数 * @param indexDTO * @return */ - Integer findClerkOverTimeNumByMonth(@Param("param")IndexDTO indexDTO); + String findClerkOverTimeNumByMonth(@Param("param")IndexDTO indexDTO); /** * 查询自提签收包件数 * @param indexDTO * @return */ - Integer findBillLadingSignforByDay(@Param("param")IndexDTO indexDTO); + String findBillLadingSignforByDay(@Param("param")IndexDTO indexDTO); /** * 查询当月自提签收包件数 * @param indexDTO * @return */ - Integer findBillLadingSignforByMonth(@Param("param")IndexDTO indexDTO); + String findBillLadingSignforByMonth(@Param("param")IndexDTO indexDTO); /** * 查询当天自提未签收数 * @param indexDTO * @return */ - Integer findBillLadingUnSignforByDay(@Param("param")IndexDTO indexDTO); + String findBillLadingUnSignforByDay(@Param("param")IndexDTO indexDTO); /** * 查询当月自提未签收数 * @param indexDTO * @return */ - Integer findBillLadingUnSignforByMonth(@Param("param")IndexDTO indexDTO); + String findBillLadingUnSignforByMonth(@Param("param")IndexDTO indexDTO); /** * 查询当天自提复核数 * @param indexDTO * @return */ - Integer findBillLadingSignForNumByDay(@Param("param")IndexDTO indexDTO); + String findBillLadingSignForNumByDay(@Param("param")IndexDTO indexDTO); /** * 查询当天签收超时数 * @param indexDTO * @return */ - Integer findBillLadingOverTimeNumByDay(@Param("param")IndexDTO indexDTO); + String findBillLadingOverTimeNumByDay(@Param("param")IndexDTO indexDTO); /** * 查询当月签收数 * @param indexDTO * @return */ - Integer findBillLadingSignForNumByMonth(@Param("param")IndexDTO indexDTO); + String findBillLadingSignForNumByMonth(@Param("param")IndexDTO indexDTO); /** * 查询当月计划自提总数 * @param indexDTO * @return */ - Integer findBillLadingPlanNumByDay(@Param("param")IndexDTO indexDTO); + String findBillLadingPlanNumByDay(@Param("param")IndexDTO indexDTO); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml index 9ee4451fc..2c2a9f932 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml @@ -542,7 +542,7 @@ - SELECT (( SELECT @@ -579,7 +579,7 @@ )) AS num - SELECT ( SELECT @@ -599,7 +599,7 @@ ) AS num - SELECT ( SELECT @@ -621,11 +621,10 @@ ) - + SELECT - IFNULL( sum( quantity ), 0 ) + IFNULL( sum( quantity ), 0 ) AS num FROM logpm_distribution_reservation_package AS ldrp LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id @@ -641,9 +640,8 @@ - ) - SELECT count( 1 ) FROM @@ -663,7 +661,7 @@ - SELECT count( 1 ) FROM @@ -683,7 +681,7 @@ - SELECT count( 1 ) FROM @@ -700,7 +698,7 @@ - SELECT count( 1 ) FROM @@ -717,7 +715,7 @@ - SELECT count(1) AS num FROM @@ -738,7 +736,7 @@ - SELECT count(1) AS num FROM @@ -759,7 +757,7 @@ - SELECT count( 1 ) AS num FROM @@ -779,7 +777,7 @@ - SELECT count( 1 ) AS num FROM @@ -798,7 +796,7 @@ - SELECT count( 1 ) FROM @@ -816,7 +814,7 @@ - SELECT count( 1 ) AS num FROM @@ -835,7 +833,7 @@ - SELECT count(1) AS num FROM @@ -853,7 +851,7 @@ - SELECT count(1) AS num FROM @@ -871,7 +869,7 @@ - SELECT count(1) AS num FROM @@ -888,7 +886,7 @@ - SELECT count(1) AS num FROM diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java index 856fa08ef..e54cab3e4 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java @@ -15,6 +15,7 @@ import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.math.MathContext; import java.text.SimpleDateFormat; import java.util.*; @@ -319,70 +320,73 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { IndexSignforDataVO indexSignforDayDataVO = new IndexSignforDataVO(); indexSignforDayDataVO.setType(1); //查询当天签收数据 - Integer daySignforNum = warehouseIndexMapper.findSignforDataByDay(indexDTO); + String daySignforNum = warehouseIndexMapper.findSignforDataByDay(indexDTO); indexSignforDayDataVO.setSignNum(daySignforNum); //查询当天未签收件数 - Integer dayUnSignforNum = warehouseIndexMapper.findUnSignforDataByDay(indexDTO); + String dayUnSignforNum = warehouseIndexMapper.findUnSignforDataByDay(indexDTO); indexSignforDayDataVO.setUnSignNum(dayUnSignforNum); //计算签收率 - if (daySignforNum > 0 && (daySignforNum + dayUnSignforNum) > 0) { - Double daySignforScale = (double) (daySignforNum / (daySignforNum + dayUnSignforNum) * 100); - indexSignforDayDataVO.setSignScale(daySignforScale); - } else { - indexSignforDayDataVO.setSignScale(0.00); + if (!"0".equals(daySignforNum) && !"0".equals(dayUnSignforNum) ) { + BigDecimal bd1 = new BigDecimal(daySignforNum); + BigDecimal bd2 = new BigDecimal(dayUnSignforNum); + BigDecimal divide = bd1.divide(bd1.add(bd2),4,BigDecimal.ROUND_HALF_EVEN); + String signScale = divide.toString(); + indexSignforDayDataVO.setSignScale(signScale); } //查询当天文员复核数 - Integer dayClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByDay(indexDTO); + String dayClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByDay(indexDTO); indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum); //查询当天计划数 - Integer dayPlanByday = warehouseIndexMapper.findPlanNumByDay(indexDTO); + String dayPlanByday = warehouseIndexMapper.findPlanNumByDay(indexDTO); //计算文员签收率 - if (dayClerkSignforNum > 0 && (dayPlanByday + dayClerkSignforNum) > 0) { - Double dayClerkSignforScale = (double) (dayClerkSignforNum / (dayPlanByday + dayClerkSignforNum)); - indexSignforDayDataVO.setClerkSignforScale(dayClerkSignforScale); - } else { - indexSignforDayDataVO.setClerkSignforScale(0.00); - + if (!"0".equals(dayClerkSignforNum) && !"0".equals(dayPlanByday)) { + BigDecimal bd1 = new BigDecimal(dayClerkSignforNum); + BigDecimal bd2 = new BigDecimal(dayPlanByday); + BigDecimal multiply = bd1.divide(bd1.add(bd2),4,BigDecimal.ROUND_CEILING); + String signScale = multiply.toString(); + indexSignforDayDataVO.setClerkSignforScale(signScale); } //文员超时复核数 - Integer dayClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByDay(indexDTO); + String dayClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByDay(indexDTO); indexSignforDayDataVO.setClerkOverTimeSignfoNum(dayClerkOverTimeSignfoNum); indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum); list.add(indexSignforDayDataVO); IndexSignforDataVO indexSignforMonthDataVO = new IndexSignforDataVO(); indexSignforMonthDataVO.setType(2); //查询当月签收数据 - Integer monthSignforNum = warehouseIndexMapper.findSignforDataByMonth(indexDTO); + String monthSignforNum = warehouseIndexMapper.findSignforDataByMonth(indexDTO); indexSignforMonthDataVO.setSignNum(monthSignforNum); //查询当月未签收数据 - Integer monthUnSignforNum = warehouseIndexMapper.findUnSignforDataByMonth(indexDTO); + String monthUnSignforNum = warehouseIndexMapper.findUnSignforDataByMonth(indexDTO); indexSignforMonthDataVO.setUnSignNum(monthUnSignforNum); //计算签收率 - if (monthSignforNum > 0 && (monthUnSignforNum + monthSignforNum) > 0) { - Double monthSignforScale = (double) (monthSignforNum / (monthUnSignforNum + monthSignforNum)); - indexSignforMonthDataVO.setSignScale(monthSignforScale); - } else { - indexSignforMonthDataVO.setSignScale(0.00); + if (!"0".equals(monthSignforNum) &&!"0".equals(monthUnSignforNum)) { + BigDecimal bd1 = new BigDecimal(monthSignforNum); + BigDecimal bd2 = new BigDecimal(monthUnSignforNum); + BigDecimal multiply = bd1.divide(bd1.add(bd2),4, BigDecimal.ROUND_CEILING); + String signScale = multiply.toString(); + indexSignforMonthDataVO.setSignScale(signScale); } //查询当月文员复核数 - Integer monthClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByMonth(indexDTO); + String monthClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByMonth(indexDTO); indexSignforMonthDataVO.setClerkSignNum(monthClerkSignforNum); - Integer monthPlanByday = warehouseIndexMapper.findPlanNumByMonth(indexDTO); - if (monthClerkSignforNum > 0 && (monthPlanByday + monthClerkSignforNum) > 0) { - Double monthClerkSignforScale = (double) (monthClerkSignforNum / (monthPlanByday + monthClerkSignforNum)); - indexSignforMonthDataVO.setClerkSignforScale(monthClerkSignforScale); - } else { - indexSignforMonthDataVO.setClerkSignforScale(0.00); + String monthPlan = warehouseIndexMapper.findPlanNumByMonth(indexDTO); + if (!"0".equals(monthClerkSignforNum) &&!"0".equals(monthPlan)) { + BigDecimal bd1 = new BigDecimal(monthClerkSignforNum); + BigDecimal bd2 = new BigDecimal(monthPlan); + BigDecimal multiply = bd1.divide(bd1.add(bd2),4, BigDecimal.ROUND_CEILING); + String signScale = multiply.toString(); + indexSignforMonthDataVO.setClerkSignforScale(signScale); } //查询当月文员复核 - Integer monthClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByMonth(indexDTO); + String monthClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByMonth(indexDTO); indexSignforMonthDataVO.setClerkOverTimeSignfoNum(monthClerkOverTimeSignfoNum); - if (monthClerkOverTimeSignfoNum > 0 && monthPlanByday > 0) { - Double monthClerkOverTimeScale = (double) (monthClerkOverTimeSignfoNum / monthPlanByday); - indexSignforMonthDataVO.setClerkOverTimeScale(monthClerkOverTimeScale); - - } else { - indexSignforMonthDataVO.setClerkOverTimeScale(0.00); + if (!"0".equals(monthClerkOverTimeSignfoNum) && !"0".equals(monthPlan)) { + BigDecimal bd1 = new BigDecimal(monthClerkOverTimeSignfoNum); + BigDecimal bd2 = new BigDecimal(monthPlan); + BigDecimal multiply = bd1.divide(bd1.add(bd2),4, BigDecimal.ROUND_CEILING); + String signScale = multiply.toString(); + indexSignforMonthDataVO.setClerkOverTimeScale(signScale); } list.add(indexSignforMonthDataVO); @@ -391,24 +395,25 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { IndexSignforDataVO indexBillLadingSignforDayDataVO = new IndexSignforDataVO(); indexBillLadingSignforDayDataVO.setType(3); //查询自提签收包件信息 - Integer dayBillLadingSignfor = warehouseIndexMapper.findBillLadingSignforByDay(indexDTO); + String dayBillLadingSignfor = warehouseIndexMapper.findBillLadingSignforByDay(indexDTO); indexBillLadingSignforDayDataVO.setSignNum(dayBillLadingSignfor); //查询自提未签收树 - Integer dayBillLadingUnSignfor = warehouseIndexMapper.findBillLadingUnSignforByDay(indexDTO); + String dayBillLadingUnSignfor = warehouseIndexMapper.findBillLadingUnSignforByDay(indexDTO); indexBillLadingSignforDayDataVO.setUnSignNum(dayBillLadingUnSignfor); //计算当天的签收率 - if (dayBillLadingSignfor > 0 && (dayBillLadingSignfor + dayBillLadingUnSignfor) > 0) { - Double dayBillLadingSignforScale = (double) (dayBillLadingSignfor / (dayBillLadingSignfor + dayBillLadingUnSignfor)); - indexBillLadingSignforDayDataVO.setClerkSignforScale(dayBillLadingSignforScale); - } else { - indexBillLadingSignforDayDataVO.setClerkSignforScale(0.00); + if (!"0".equals(dayBillLadingSignfor) &&!"0".equals(dayBillLadingUnSignfor) ) { + BigDecimal bd1 = new BigDecimal(dayBillLadingSignfor); + BigDecimal bd2 = new BigDecimal(dayBillLadingUnSignfor); + BigDecimal multiply = bd1.divide(bd1.add(bd2),4, BigDecimal.ROUND_CEILING); + String signScale = multiply.toString(); + indexBillLadingSignforDayDataVO.setClerkSignforScale(signScale); } //查询当天文员复核数 - Integer dayBillLadingSignforNum = warehouseIndexMapper.findBillLadingSignForNumByDay(indexDTO); + String dayBillLadingSignforNum = warehouseIndexMapper.findBillLadingSignForNumByDay(indexDTO); indexBillLadingSignforDayDataVO.setClerkSignNum(dayBillLadingSignforNum); //查询当天签收超时数 - Integer dayBillLadingverTimeNum = warehouseIndexMapper.findBillLadingOverTimeNumByDay(indexDTO); + String dayBillLadingverTimeNum = warehouseIndexMapper.findBillLadingOverTimeNumByDay(indexDTO); indexBillLadingSignforDayDataVO.setClerkOverTimeSignfoNum(dayBillLadingverTimeNum); list.add(indexBillLadingSignforDayDataVO); @@ -417,37 +422,37 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { indexBillLadingSignforMonthDataVO.setType(4); //查询自提当月签收情况 - Integer monthBillLadingSignfor = warehouseIndexMapper.findBillLadingSignforByMonth(indexDTO); + String monthBillLadingSignfor = warehouseIndexMapper.findBillLadingSignforByMonth(indexDTO); indexBillLadingSignforMonthDataVO.setSignNum(monthBillLadingSignfor); //查询自提当月未签数量 - Integer monthBillLadingUnSignfor = warehouseIndexMapper.findBillLadingUnSignforByMonth(indexDTO); - indexBillLadingSignforMonthDataVO.setUnSignNum(monthBillLadingSignfor); + String monthBillLadingUnSignfor = warehouseIndexMapper.findBillLadingUnSignforByMonth(indexDTO); + indexBillLadingSignforMonthDataVO.setUnSignNum(monthBillLadingUnSignfor); //计算当月的签收率 - if (monthBillLadingSignfor > 0 && (monthBillLadingSignfor + monthBillLadingUnSignfor) > 0) { - Double monthBillLadingSignforScale = (double) (monthBillLadingSignfor / (monthBillLadingSignfor + monthBillLadingUnSignfor)); - indexBillLadingSignforMonthDataVO.setSignScale(monthBillLadingSignforScale); - } else { - indexBillLadingSignforMonthDataVO.setSignScale(0.00); + if ( !"0".equals(monthBillLadingSignfor) && !"0".equals(monthBillLadingUnSignfor) ) { + BigDecimal bd1 = new BigDecimal(monthBillLadingSignfor); + BigDecimal bd2 = new BigDecimal(monthBillLadingUnSignfor); + BigDecimal multiply = bd1.divide(bd1.add(bd2),4, BigDecimal.ROUND_CEILING); + String signScale = multiply.toString(); + indexBillLadingSignforMonthDataVO.setSignScale(signScale); } //查询当月文员签收数 - Integer monthBillLadingSignforNum = warehouseIndexMapper.findBillLadingSignForNumByMonth(indexDTO); + String monthBillLadingSignforNum = warehouseIndexMapper.findBillLadingSignForNumByMonth(indexDTO); indexBillLadingSignforMonthDataVO.setClerkSignNum(monthBillLadingSignforNum); //查询当月文员超时签收数 - Integer monthBillLadingOverTimeNum = warehouseIndexMapper.findBillLadingOverTimeNumByDay(indexDTO); + String monthBillLadingOverTimeNum = warehouseIndexMapper.findBillLadingOverTimeNumByDay(indexDTO); indexBillLadingSignforMonthDataVO.setClerkOverTimeSignfoNum(monthBillLadingOverTimeNum); //查询当月计划总数 - Integer monthBillLadingPlanNum = warehouseIndexMapper.findBillLadingPlanNumByDay(indexDTO); - if (monthBillLadingOverTimeNum > 0 && monthBillLadingPlanNum > 0) { + String monthBillLadingPlanNum = warehouseIndexMapper.findBillLadingPlanNumByDay(indexDTO); + if (!"0".equals(monthBillLadingOverTimeNum) && !"0".equals(monthBillLadingPlanNum) ) { //计算当月的超时签收率 - Double monthBillLadingClerkOverTimeSignfoNum = (double) (monthBillLadingOverTimeNum / monthBillLadingPlanNum); - indexBillLadingSignforMonthDataVO.setClerkOverTimeScale(monthBillLadingClerkOverTimeSignfoNum); - } else { - indexBillLadingSignforMonthDataVO.setClerkSignforScale(0.00); + BigDecimal bd1 = new BigDecimal(monthBillLadingOverTimeNum); + BigDecimal bd2 = new BigDecimal(monthBillLadingPlanNum); + BigDecimal multiply = bd1.divide(bd1.add(bd2),1, BigDecimal.ROUND_CEILING); + String signScale = multiply.toString(); + indexBillLadingSignforMonthDataVO.setClerkOverTimeScale(signScale); } list.add(indexBillLadingSignforMonthDataVO); - - return list; } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java index 0b606fd4b..bc3582b5e 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java @@ -11,21 +11,21 @@ public class IndexSignforDataVO implements Serializable { //类型 private Integer type; //签收数 - private Integer signNum; + private String signNum; //未签收数 - private Integer UnSignNum; + private String UnSignNum; //文员超时为复核数 - private Integer clerkOverTimeSignfoNum; + private String clerkOverTimeSignfoNum; //文员超时为复核数 - private Double clerkOverTimeScale; + private String clerkOverTimeScale; //签收率 - private Double signScale; + private String signScale; //复核率 - private Double ClerkSignforScale; + private String ClerkSignforScale; //复核数 - private Integer clerkSignNum; + private String clerkSignNum;