bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
liang.chao 2024-03-01 16:03:29 +08:00
parent 3c778be029
commit 738706a03c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -477,7 +477,7 @@ public class TmTaskServiceImpl implements TmTaskService {
int result = 0; int result = 0;
int taskId = 0; int taskId = 0;
int num = 0; int num = 0;
Integer companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue(); Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
if (StringUtils.isNotNull(record)) { if (StringUtils.isNotNull(record)) {
// 先审核任务表 // 先审核任务表
result += tmTaskMapper.updateTmTaskAuditStatus(record); result += tmTaskMapper.updateTmTaskAuditStatus(record);
@ -486,7 +486,7 @@ public class TmTaskServiceImpl implements TmTaskService {
// 再审核领料任务信息表 // 再审核领料任务信息表
List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList(); List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList();
if (CollUtil.isNotEmpty(leaseApplyInfoList)) { if (CollUtil.isNotEmpty(leaseApplyInfoList)) {
List<LeaseApplyInfo> applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId)).collect(Collectors.toList()); List<LeaseApplyInfo> applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId.intValue())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(applyInfoList)) { if (CollUtil.isNotEmpty(applyInfoList)) {
for (LeaseApplyInfo leaseApplyInfo : applyInfoList) { for (LeaseApplyInfo leaseApplyInfo : applyInfoList) {
taskId = leaseApplyInfo.getTaskId(); taskId = leaseApplyInfo.getTaskId();
@ -514,7 +514,7 @@ public class TmTaskServiceImpl implements TmTaskService {
// 再审核领料任务详情表 // 再审核领料任务详情表
List<LeaseApplyDetails> leaseApplyDetails = record.getLeaseApplyDetails(); List<LeaseApplyDetails> leaseApplyDetails = record.getLeaseApplyDetails();
if (CollUtil.isNotEmpty(leaseApplyDetails)) { if (CollUtil.isNotEmpty(leaseApplyDetails)) {
List<LeaseApplyDetails> collect = leaseApplyDetails.stream().filter(d -> d.getCompanyId().equals(companyId)).collect(Collectors.toList()); List<LeaseApplyDetails> collect = leaseApplyDetails.stream().filter(d -> d.getCompanyId().equals(companyId.intValue())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(collect)) { if (CollUtil.isNotEmpty(collect)) {
for (LeaseApplyDetails details : collect) { for (LeaseApplyDetails details : collect) {
if (StringUtils.isNotNull(details)) { if (StringUtils.isNotNull(details)) {
@ -527,7 +527,7 @@ public class TmTaskServiceImpl implements TmTaskService {
// 再审核领料任务信息表 // 再审核领料任务信息表
List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList(); List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList();
if (CollUtil.isNotEmpty(leaseApplyInfoList)) { if (CollUtil.isNotEmpty(leaseApplyInfoList)) {
List<LeaseApplyInfo> applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId)).collect(Collectors.toList()); List<LeaseApplyInfo> applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId.intValue())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(applyInfoList)) { if (CollUtil.isNotEmpty(applyInfoList)) {
for (LeaseApplyInfo leaseApplyInfo : applyInfoList) { for (LeaseApplyInfo leaseApplyInfo : applyInfoList) {
taskId = leaseApplyInfo.getTaskId(); taskId = leaseApplyInfo.getTaskId();
@ -555,7 +555,7 @@ public class TmTaskServiceImpl implements TmTaskService {
// 再审核领料任务详情表 // 再审核领料任务详情表
List<LeaseApplyDetails> leaseApplyDetails = record.getLeaseApplyDetails(); List<LeaseApplyDetails> leaseApplyDetails = record.getLeaseApplyDetails();
if (CollUtil.isNotEmpty(leaseApplyDetails)) { if (CollUtil.isNotEmpty(leaseApplyDetails)) {
List<LeaseApplyDetails> collect = leaseApplyDetails.stream().filter(d -> d.getCompanyId().equals(companyId)).collect(Collectors.toList()); List<LeaseApplyDetails> collect = leaseApplyDetails.stream().filter(d -> d.getCompanyId().equals(companyId.intValue())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(collect)) { if (CollUtil.isNotEmpty(collect)) {
for (LeaseApplyDetails details : collect) { for (LeaseApplyDetails details : collect) {
if (StringUtils.isNotNull(details)) { if (StringUtils.isNotNull(details)) {