From f0a71827afecc0cd914abaabe506c4f31bb0aa2d Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Tue, 13 Jan 2026 13:36:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E5=88=86=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=92=8C=E5=AE=8F=E6=BA=90=E5=88=86=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E9=83=A8=E9=97=A8id=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/biz/constant/GlobalConstants.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java index 4b5b67e2..a9a1b43f 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java @@ -580,4 +580,15 @@ public class GlobalConstants { */ public static final List roleList = Arrays.asList("cly", "库管员", "wxy"); + /** + * Long 101L 机具（物流）分公司部门id + */ + public static final Long LONG_JJ = 101L; + + + /** + * Long 309L 安徽宏源电力建设有限公司部门id + */ + public static final Long LONG_HY = 309L; + } From c5dced169bd5026337a5ae249d9addfea224874f Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Tue, 13 Jan 2026 13:39:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E4=B9=A6=E6=94=B6?= =?UTF-8?q?=E8=B4=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/settlement/SltAgreementInfoMapper.xml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml index 29b1407e..549a9e70 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml @@ -2366,10 +2366,8 @@ ( sad.slt_type = 1, sad.money, 0 ) AS leaseCost, IF ( sad.slt_type = 2, sad.money, 0 ) AS loseCost, - IF - ( sad.slt_type = 3, sad.money, 0 ) AS repairCost, - IF - ( sad.slt_type = 4, sad.money, 0 ) AS scrapCost, + IF(sad.slt_type = 3 AND (sad.is_charge = 1 ), sad.money, 0) AS repairCost, + IF(sad.slt_type = 4 AND (sad.is_charge = 1 ), sad.money, 0) AS scrapCost, 0 AS aqLeaseCost, 0 AS aqLoseCost, 0 AS aqRepairCost, @@ -2381,7 +2379,7 @@ saa.agreement_id = #{agreementId} AND saa.settlement_type = 1 GROUP BY - sad.id UNION + sad.id UNION ALL SELECT saa.agreement_id AS agreementId, saa.create_time AS createTime, @@ -2393,10 +2391,8 @@ ( sad.slt_type = 1, sad.money, 0 ) AS aqLeaseCost, IF ( sad.slt_type = 2, sad.money, 0 ) AS aqLoseCost, - IF - ( sad.slt_type = 3, sad.money, 0 ) AS aqRepairCost, - IF - ( sad.slt_type = 4, sad.money, 0 ) AS aqScrapCost + IF(sad.slt_type = 3 AND (sad.is_charge = 1 ), sad.money, 0) AS aqRepairCost, + IF(sad.slt_type = 4 AND (sad.is_charge = 1 ), sad.money, 0) AS aqScrapCost FROM slt_agreement_apply saa LEFT JOIN slt_agreement_details sad ON saa.id = sad.apply_id From f194030741ec99eb9e3d65897c6e19df83e2baf1 Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Tue, 13 Jan 2026 15:19:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?jsk=20=20=E9=A9=B3=E5=9B=9E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E5=BE=85=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E8=AE=BE=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/service/impl/PurchaseCheckInfoServiceImpl.java | 2 +- .../src/main/resources/mapper/material/basic/BmReportMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 2fdd4732..e52a6990 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -880,7 +880,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { // 会签成功，对配置的流程进行处理 configSignOrgSet.remove(loginUserDeptId); // 如果loginUserDeptId包含库管一班、库管二班、库管三班或修试二班的任意一个组织id，那么库管班就算审核通过 - if (loginUserDeptId == 106L || loginUserDeptId == 334L || loginUserDeptId == 335L || loginUserDeptId == 336L) { + if (loginUserDeptId == 106L ||loginUserDeptId == 312L || loginUserDeptId == 334L || loginUserDeptId == 335L || loginUserDeptId == 336L) { // 库管班审核通过，放行进行验收流程 System.out.println("ONE会签成功,放行进行验收流程!"); } else { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml index b6a0bed1..32fe5f2d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pcd.check_time as passTime, pcd.input_time as inputTime, a.creator as inputUser, - IFNULL(pcd.check_num, 0) - IFNULL(pcd.input_num, 0) as pendingInputNum, + case when pcd.status in (12,13,14) then 0 else IFNULL(pcd.check_num, 0) - IFNULL(pcd.input_num, 0) end as pendingInputNum, tt.`code` as inputCode, mt1.manage_type as manageType FROM