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] =?UTF-8?q?jsk=20=20=E9=A9=B3=E5=9B=9E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E5=BE=85=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=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