From 8a7797cf8ba37fa1beec625209a6964a3668b994 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 23 一月 2024 18:18:33 +0800 Subject: [PATCH] 111 --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 61 ++++++++++++++++++++++++++++++ 1 files changed, 60 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 3e0c4ff..636d0e5 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 @@ -551,6 +551,10 @@ queryWrapper.selectAll(InsuranceApply.class); queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName); queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName); + queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney"); + queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast "); + queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId); + queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId); queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO); //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹� if(loginUserInfo.getType().equals(Constants.ONE)){ @@ -577,7 +581,9 @@ if (pageWrap.getModel().getCreateTimeE() != null) { queryWrapper.le(InsuranceApply::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateTimeE())); } - + if (pageWrap.getModel().getType() != null) { + queryWrapper.eq(Solutions::getType, pageWrap.getModel().getType()); + } if (pageWrap.getModel().getCode() != null) { queryWrapper.eq(InsuranceApply::getCode, pageWrap.getModel().getCode()); } @@ -596,6 +602,59 @@ } + @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); + queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName); + queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney "); + queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast "); + queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId); + queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId); + queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO); + //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹� + if(loginUserInfo.getType().equals(Constants.ONE)){ + queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId()); + } + if (model.getSolutionId() != null) { + queryWrapper.eq(InsuranceApply::getSolutionId, model.getSolutionId()); + } + if (model.getEndTimeS() != null) { + queryWrapper.ge(InsuranceApply::getEndTime, Utils.Date.getStart(model.getEndTimeS())); + } + if (model.getEndTimeE() != null) { + queryWrapper.le(InsuranceApply::getEndTime, Utils.Date.getEnd(model.getEndTimeE())); + } + if (model.getStartTimeS() != null) { + queryWrapper.ge(InsuranceApply::getStartTime, Utils.Date.getStart(model.getStartTimeS())); + } + if (model.getStartTimeE() != null) { + queryWrapper.le(InsuranceApply::getStartTime, Utils.Date.getEnd(model.getStartTimeE())); + } + if (model.getCreateTimeS() != null) { + queryWrapper.ge(InsuranceApply::getCreateDate, Utils.Date.getStart(model.getCreateTimeS())); + } + if (model.getCreateTimeE() != null) { + queryWrapper.le(InsuranceApply::getCreateDate, Utils.Date.getEnd(model.getCreateTimeE())); + } + if (model.getType() != null) { + queryWrapper.eq(Solutions::getType, model.getType()); + } + if (model.getCode() != null) { + queryWrapper.eq(InsuranceApply::getCode, model.getCode()); + } + if (model.getStatus() != null) { + queryWrapper.eq(InsuranceApply::getStatus, model.getStatus()); + } + if (CollectionUtils.isNotEmpty(model.getIds())) { + queryWrapper.in(InsuranceApply::getId, model.getIds()); + } + List<InsuranceApply> list = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class, queryWrapper); + return list; + } + @Override public long count(InsuranceApply insuranceApply) { -- Gitblit v1.9.3