From 2c6d54af7f5923281e01fa09f09f4371a29caec0 Mon Sep 17 00:00:00 2001 From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com> Date: Thu, 29 Aug 2024 16:50:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/pusong/business/batch/CalSalaryBatch.java | 2 +- .../business/service/impl/PsApproverRecordServiceImpl.java | 2 +- .../business/service/impl/PsContractInfoServiceImpl.java | 2 +- .../pusong/business/service/impl/PsCustomInfoServiceImpl.java | 4 ++-- .../com/pusong/business/service/impl/PsTaskServiceImpl.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/batch/CalSalaryBatch.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/batch/CalSalaryBatch.java index 9b8c672..f1a070d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/batch/CalSalaryBatch.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/batch/CalSalaryBatch.java @@ -101,7 +101,7 @@ public class CalSalaryBatch { Long userId = user.getUserId(); //默认员工仅有一个岗位 log.info("查询员工岗位{}",userId); - SysUserPost post = sysUserPostMapper.selectOne(new LambdaQueryWrapper().eq(SysUserPost::getUserId, userId)); + SysUserPost post = sysUserPostMapper.selectOne(new LambdaQueryWrapper().eq(SysUserPost::getUserId, userId).last("limit 1")); if(post == null){continue;} log.info("查询员工岗位{}",post.getPostId()); //服务列表 diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsApproverRecordServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsApproverRecordServiceImpl.java index 24b3982..f7928a2 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsApproverRecordServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsApproverRecordServiceImpl.java @@ -129,7 +129,7 @@ public class PsApproverRecordServiceImpl implements IPsApproverRecordService { .eq(StringUtils.isNotBlank(businessId), PsApproverRecord::getBusinessId, businessId) .eq(StringUtils.isNotBlank(contractCode), PsApproverRecord::getContractCode, contractCode) .in(CollectionUtils.isNotEmpty(businessTypes), PsApproverRecord::getBusinessType, businessTypes) - .orderByDesc(PsApproverRecord::getApplyDate)); + .orderByDesc(PsApproverRecord::getApplyDate).last("limit 1")); return record!=null&&StringUtils.equals(ApproverStatusEnum.FAIL.getCode(),record.getApproverStatus()) ?record.getApproverDesc():null; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java index 0c22fc9..56dc523 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java @@ -660,7 +660,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { PsContractInfo add =null; //插入或修改合同 log.info("校验合同查询入参：{}",bo.getCustomId()); - List infos = this.queryByCode(bo.getCustomId(),null,ContractStatusEnum.INIT.getCode());//todo 状态查询 + List infos = this.queryByCode(bo.getCustomId(),null,ContractStatusEnum.INIT.getCode()); log.info("校验合同查询结果：{}",infos == null?null: infos.size() ); //校验：暂存的合同不止一个，暂存的合同并且不是传入的合同-》报错（暂存的合同只能有一个） if (CollectionUtils.isNotEmpty(infos) ) { diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java index f23d0b7..41eb0ed 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java @@ -332,7 +332,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { public Boolean insertPiceByBo(List bos) { List adds = MapstructUtils.convert(bos, PsCustomPrice.class); PsCustomPrice price = priceMapper.selectOne(new QueryWrapper().select("max(price_batch) price_batch") - .lambda().eq(PsCustomPrice::getDelFlag, 0).eq(PsCustomPrice::getCustomId, bos.get(0).getCustomId())); + .lambda().eq(PsCustomPrice::getDelFlag, 0).eq(PsCustomPrice::getCustomId, bos.get(0).getCustomId()).last("limit 1")); adds.forEach(add->{ add.setPriceBatch((price != null && price.getPriceBatch() != null) ? price.getPriceBatch() + 1 : 1); }); @@ -384,7 +384,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { } //免费工单审批 list.getRecords().forEach(item->{ - item.setFreeFailDesc(approverRecordService.getLastFail(item.getId()+"",null,List.of(ApproverTypeEnum.PAY.getCode()))); + item.setFreeFailDesc(approverRecordService.getLastFail(item.getId()+"",null,List.of(ApproverTypeEnum.FREE.getCode()))); }); return TableDataInfo.build(list); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java index 0e5e4b5..7fd1a07 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java @@ -161,7 +161,7 @@ public class PsTaskServiceImpl implements IPsTaskService { Long customId ; Long companyId ; if(mainTask == null){ - PsContractInfo con = contractInfoMapper.selectOne(Wrappers.lambdaQuery().eq(PsContractInfo::getContractCode, id)); + PsContractInfo con = contractInfoMapper.selectOne(Wrappers.lambdaQuery().eq(PsContractInfo::getContractCode, id).last("limit 1")); customId = con.getCustomId(); companyId = con.getCompanyId(); }else{