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