From ee5aac2ff3be3fd060f5aa502329bc6b886607ed Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 02 四月 2024 18:22:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1 --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java index ebd3268..19e00a0 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java @@ -738,7 +738,7 @@ ApplyChange update = new ApplyChange(); update.setEditDate(new Date()); update.setEditor(model.getCreator()); - update.setStatus(Constants.ApplyChangeStatus.COMPANY_SIGN.getKey()); + update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey()); update.setCheckDate(update.getEditDate()); update.setCheckInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟"); update.setCheckUserId(model.getCreator()); @@ -1989,6 +1989,7 @@ @Override public List<InsuranceApply> findListByDTO(InsuranceApplyQueryDTO model) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(InsuranceApply.class); queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName); -- Gitblit v1.9.3