From fc24c9d57650d768806c97fa460544ce0c2f9e66 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Thu, 25 Sep 2025 17:44:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=B0=E8=B4=A6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=9C=BA=E5=85=B7=E5=88=86=E5=8C=85=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E5=9C=A8=E7=94=A8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/MaterialRetainedEquipmentInfo.java | 2 ++ .../impl/MaterialMachineServiceImpl.java | 19 +++++++++++++++++-- .../material/clz/MaterialMachineMapper.xml | 8 +++++--- .../UseMaintenanceWarningMapper.xml | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java index 2b81f1ea..c6ca131b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java @@ -248,6 +248,8 @@ public class MaterialRetainedEquipmentInfo { private String unitValue; + private String unitType; + @ApiModelProperty(value = "报告编码") private String reportCode; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java index ee066c23..3cbbbeec 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java @@ -859,15 +859,30 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { List recordList = materialMachineMapper.getRetainInfoList(bean); if (CollectionUtils.isNotEmpty(recordList)) { inCountNum = recordList.stream() - .filter(item -> "0".equals(item.getUnitValue())) + .filter(item -> "0".equals(item.getUnitValue()) && !"32".equals(item.getUnitType())) .map(MaterialRetainedEquipmentInfo::getAllNum) .reduce(BigDecimal::add) .orElse(BigDecimal.ZERO); inRopeNum = recordList.stream() - .filter(item -> "1".equals(item.getUnitValue())) + .filter(item -> "1".equals(item.getUnitValue()) && !"32".equals(item.getUnitType()) ) .map(MaterialRetainedEquipmentInfo::getAllNum) .reduce(BigDecimal::add) .orElse(BigDecimal.ZERO); + + + useCountNum = recordList.stream() + .filter(item -> "0".equals(item.getUnitValue()) && "32".equals(item.getUnitType())) + .map(MaterialRetainedEquipmentInfo::getAllNum) + .reduce(BigDecimal::add) + .orElse(BigDecimal.ZERO); + + useRopeNum = recordList.stream() + .filter(item -> "1".equals(item.getUnitValue()) && "32".equals(item.getUnitType())) + .map(MaterialRetainedEquipmentInfo::getAllNum) + .reduce(BigDecimal::add) + .orElse(BigDecimal.ZERO); + + // 获取到recordList中externalId不为null且去重的总数（转换为Integer类型） info.setProNum((int) recordList.stream() .map(MaterialRetainedEquipmentInfo::getProName) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index a997bf21..922f6cca 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -1311,8 +1311,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ELSE '数量' END manageType, - '站内库存' AS teamName, - '/' AS subUnitName, + subquery1.teamName AS teamName, + subquery1.unitType as unitType, + IF( subquery1.unitType= 32,"机具分包领用",'/' )AS subUnitName, mt.unit_value AS unitValue, CASE mt.jiju_type WHEN 2 THEN @@ -1339,7 +1340,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bu.bzz_idcard AS idCard, df.project_dept AS proCenter, sd.dept_name AS departName, - '站内库存' AS teamName + bu.type_id AS unitType, + if(bu.type_id=32,bu.unit_name,'站内库存' ) AS teamName FROM slt_agreement_info sai LEFT JOIN ma_type mt ON mt.type_id = sai.type_id diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml index 85df4d5f..dd9037be 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml @@ -34,7 +34,7 @@ WHERE mm.ma_status='2' and sai.is_slt = 0 and mt2.type_id not in (6032,6008,6270,6012,6761) - and bp.external_id is not null + and bp.pro_name is not null AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH) and (