From f6b0e262db2af5ca2e5ed76f95e746c1dd3c58e3 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 01 二月 2024 15:17:47 +0800 Subject: [PATCH] 开发业务接口 --- server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 218 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 146 insertions(+), 72 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java index 0715696..faa93b4 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java @@ -12,7 +12,9 @@ import com.doumee.dao.business.SolutionsMapper; import com.doumee.dao.business.WorktypeMapper; import com.doumee.dao.business.join.SolutionWorktypeJoinMapper; +import com.doumee.dao.business.join.SolutionsJoinMapper; import com.doumee.dao.business.model.*; +import com.doumee.service.business.CompanyService; import com.doumee.service.business.SolutionsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -29,6 +31,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.UUID; /** @@ -41,6 +44,8 @@ @Autowired private SolutionsMapper solutionsMapper; + @Autowired + private SolutionsJoinMapper solutionsJoinMapper; @Autowired private WorktypeMapper worktypeMapper; @Autowired @@ -118,7 +123,7 @@ ||solutions.getWorktypeIdList().size()==0 ||Constants.formatIntegerNum(solutions.getMaxAge()) < 0 ||Constants.formatIntegerNum(solutions.getMinAge()) < 0 - ||Constants.formatIntegerNum(solutions.getPriceCycleUnit()) < 0 +// ||Constants.formatIntegerNum(solutions.getPriceCycleUnit()) < 0 ||Constants.formatIntegerNum(solutions.getInsureCycle()) < 0 ||Constants.formatIntegerNum(solutions.getInsureCycleUnit()) < 0 || solutions.getMinAge() >solutions.getMaxAge() @@ -166,7 +171,7 @@ //濡傛灉淇敼锛屽垯浜х敓涓�涓柊鐨勫巻鍙茬増鏈� ~ Solutions newModel = new Solutions(); - BeanUtils.copyProperties(model,newModel); + BeanUtils.copyProperties( findById(solutions.getId()),newModel); newModel.setId(null); newModel.setVersion(solutions.getVersion()); newModel.setCreateDate(new Date()); @@ -181,6 +186,7 @@ ); solutionsMapper.update(null,new UpdateWrapper<Solutions>() .lambda() + .ne(Solutions::getId,newModel.getId()) .eq(Solutions::getBaseId,solutions.getId()) .eq(Solutions::getDataType,Constants.TWO) .set(Solutions::getDataType,Constants.ONE) @@ -225,7 +231,12 @@ } @Override public Solutions findById(Integer id) { - Solutions model = solutionsMapper.selectById(id); + MPJLambdaWrapper<Solutions> queryWrapper = new MPJLambdaWrapper<>(); + queryWrapper.selectAll(Solutions.class); + queryWrapper.selectAs(Insurance::getName,Solutions::getInsuranceName); + queryWrapper.leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId); + queryWrapper.eq(Solutions::getId,id); + Solutions model = solutionsJoinMapper.selectJoinOne(Solutions.class,queryWrapper); if(model == null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.DATA_EMPTY ); } @@ -250,6 +261,9 @@ @Override public List<Solutions> findList(Solutions solutions) { solutions.setIsdeleted(Constants.ZERO); + if(solutions.getDataType() == null){ + solutions.setDataType(Constants.TWO); + } QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions); return solutionsMapper.selectList(wrapper); } @@ -257,35 +271,127 @@ @Override public PageData<Solutions> findPage(PageWrap<Solutions> pageWrap) { IPage<Solutions> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); - QueryWrapper<Solutions> queryWrapper = new QueryWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); pageWrap.getModel().setDataType(Constants.ZERO);//鍙�夋嫨鍩鸿〃鏁版嵁 pageWrap.getModel().setIsdeleted(Constants.ZERO); + MPJLambdaWrapper<Solutions> queryWrapper = new MPJLambdaWrapper<>(); + Utils.MP.blankToNull(pageWrap.getModel()); + queryWrapper.selectAll(Solutions.class); + queryWrapper.selectAs(Insurance::getName,Solutions::getInsuranceName); + queryWrapper.leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId); + if (pageWrap.getModel().getId() != null) { - queryWrapper.lambda().eq(Solutions::getId, pageWrap.getModel().getId()); + queryWrapper.eq(Solutions::getId, pageWrap.getModel().getId()); } if (pageWrap.getModel().getCreator() != null) { - queryWrapper.lambda().eq(Solutions::getCreator, pageWrap.getModel().getCreator()); + queryWrapper.eq(Solutions::getCreator, pageWrap.getModel().getCreator()); } if (pageWrap.getModel().getCreateDate() != null) { - queryWrapper.lambda().ge(Solutions::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate())); - queryWrapper.lambda().le(Solutions::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate())); + queryWrapper.ge(Solutions::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate())); + queryWrapper.le(Solutions::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate())); } if (pageWrap.getModel().getEditor() != null) { - queryWrapper.lambda().eq(Solutions::getEditor, pageWrap.getModel().getEditor()); + queryWrapper.eq(Solutions::getEditor, pageWrap.getModel().getEditor()); } if (pageWrap.getModel().getEditDate() != null) { - queryWrapper.lambda().ge(Solutions::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate())); - queryWrapper.lambda().le(Solutions::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate())); + queryWrapper.ge(Solutions::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate())); + queryWrapper.le(Solutions::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate())); } if (pageWrap.getModel().getIsdeleted() != null) { - queryWrapper.lambda().eq(Solutions::getIsdeleted, pageWrap.getModel().getIsdeleted()); + queryWrapper.eq(Solutions::getIsdeleted, pageWrap.getModel().getIsdeleted()); } if (pageWrap.getModel().getName() != null) { - queryWrapper.lambda().like(Solutions::getName, pageWrap.getModel().getName()); + queryWrapper.like(Solutions::getName, pageWrap.getModel().getName()); } if (pageWrap.getModel().getRemark() != null) { - queryWrapper.lambda().eq(Solutions::getRemark, pageWrap.getModel().getRemark()); + queryWrapper.eq(Solutions::getRemark, pageWrap.getModel().getRemark()); + } + if (pageWrap.getModel().getStatus() != null) { + queryWrapper.eq(Solutions::getStatus, pageWrap.getModel().getStatus()); + } + if (pageWrap.getModel().getSortnum() != null) { + queryWrapper.eq(Solutions::getSortnum, pageWrap.getModel().getSortnum()); + } + if (pageWrap.getModel().getInsuranceId() != null) { + queryWrapper.eq(Solutions::getInsuranceId, pageWrap.getModel().getInsuranceId()); + } + if (pageWrap.getModel().getValidType() != null) { + queryWrapper.eq(Solutions::getValidType, pageWrap.getModel().getValidType()); + } + if (pageWrap.getModel().getType() != null) { + queryWrapper.eq(Solutions::getType, pageWrap.getModel().getType()); + } + if (pageWrap.getModel().getMinAge() != null) { + queryWrapper.eq(Solutions::getMinAge, pageWrap.getModel().getMinAge()); + } + if (pageWrap.getModel().getMaxAge() != null) { + queryWrapper.eq(Solutions::getMaxAge, pageWrap.getModel().getMaxAge()); + } + if (pageWrap.getModel().getPrice() != null) { + queryWrapper.eq(Solutions::getPrice, pageWrap.getModel().getPrice()); + } + if (pageWrap.getModel().getTimeUnit() != null) { + queryWrapper.eq(Solutions::getTimeUnit, pageWrap.getModel().getTimeUnit()); + } + if (pageWrap.getModel().getInsureCycle() != null) { + queryWrapper.eq(Solutions::getInsureCycle, pageWrap.getModel().getInsureCycle()); + } + if (pageWrap.getModel().getInsureCycleUnit() != null) { + queryWrapper.eq(Solutions::getInsureCycleUnit, pageWrap.getModel().getInsureCycleUnit()); + } + if (pageWrap.getModel().getPriceCycleUnit() != null) { + queryWrapper.eq(Solutions::getPriceCycleUnit, pageWrap.getModel().getPriceCycleUnit()); + } + if (pageWrap.getModel().getSingleWorktype() != null) { + queryWrapper.eq(Solutions::getSingleWorktype, pageWrap.getModel().getSingleWorktype()); + } + if (pageWrap.getModel().getEmail() != null) { + queryWrapper.eq(Solutions::getEmail, pageWrap.getModel().getEmail()); + } + if (pageWrap.getModel().getSpecialAgreement() != null) { + queryWrapper.eq(Solutions::getSpecialAgreement, pageWrap.getModel().getSpecialAgreement()); + } + if (pageWrap.getModel().getSpecialInfo() != null) { + queryWrapper.eq(Solutions::getSpecialInfo, pageWrap.getModel().getSpecialInfo()); + } + if (pageWrap.getModel().getOrtherInfo() != null) { + queryWrapper.eq(Solutions::getOrtherInfo, pageWrap.getModel().getOrtherInfo()); + } + if (pageWrap.getModel().getSolutionBaseId() != null) { + queryWrapper.eq(Solutions::getSolutionBaseId, pageWrap.getModel().getSolutionBaseId()); + } + if (pageWrap.getModel().getVersion() != null) { + queryWrapper.eq(Solutions::getVersion, pageWrap.getModel().getVersion()); + } + if (pageWrap.getModel().getDataType() != null) { + queryWrapper.eq(Solutions::getDataType, pageWrap.getModel().getDataType()); + } + if (pageWrap.getModel().getBaseId() != null) { + queryWrapper.eq(Solutions::getBaseId, pageWrap.getModel().getBaseId()); + } + for(PageWrap.SortData sortData: pageWrap.getSorts()) { + if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { + queryWrapper.orderByDesc(sortData.getProperty()); + } else { + queryWrapper.orderByAsc(sortData.getProperty()); + } + } + PageData<Solutions> pageData = PageData.from(solutionsJoinMapper.selectJoinPage(page,Solutions.class, queryWrapper)); + + return pageData; + } + @Override + public PageData<Solutions> findPageCom(PageWrap<Solutions> pageWrap) { + IPage<Solutions> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); + QueryWrapper<Solutions> queryWrapper = new QueryWrapper<>(); + Utils.MP.blankToNull(pageWrap.getModel()); + pageWrap.getModel().setDataType(Constants.ZERO);//鍙�夋嫨鍩鸿〃鏁版嵁 + pageWrap.getModel().setStatus(Constants.ZERO); + pageWrap.getModel().setIsdeleted(Constants.ZERO); + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.exists(("select b.id from company_solution b where b.isdeleted=0 and b.company_id="+user.getCompanyId()+" and b.SOLUTION_BASE_ID = solutions.id")); + if (pageWrap.getModel().getName() != null) { + queryWrapper.lambda().like(Solutions::getName, pageWrap.getModel().getName()); } if (pageWrap.getModel().getStatus() != null) { queryWrapper.lambda().eq(Solutions::getStatus, pageWrap.getModel().getStatus()); @@ -296,73 +402,41 @@ if (pageWrap.getModel().getInsuranceId() != null) { queryWrapper.lambda().eq(Solutions::getInsuranceId, pageWrap.getModel().getInsuranceId()); } - if (pageWrap.getModel().getValidType() != null) { - queryWrapper.lambda().eq(Solutions::getValidType, pageWrap.getModel().getValidType()); - } - if (pageWrap.getModel().getType() != null) { - queryWrapper.lambda().eq(Solutions::getType, pageWrap.getModel().getType()); - } - if (pageWrap.getModel().getMinAge() != null) { - queryWrapper.lambda().eq(Solutions::getMinAge, pageWrap.getModel().getMinAge()); - } - if (pageWrap.getModel().getMaxAge() != null) { - queryWrapper.lambda().eq(Solutions::getMaxAge, pageWrap.getModel().getMaxAge()); - } - if (pageWrap.getModel().getPrice() != null) { - queryWrapper.lambda().eq(Solutions::getPrice, pageWrap.getModel().getPrice()); - } - if (pageWrap.getModel().getTimeUnit() != null) { - queryWrapper.lambda().eq(Solutions::getTimeUnit, pageWrap.getModel().getTimeUnit()); - } - if (pageWrap.getModel().getInsureCycle() != null) { - queryWrapper.lambda().eq(Solutions::getInsureCycle, pageWrap.getModel().getInsureCycle()); - } - if (pageWrap.getModel().getInsureCycleUnit() != null) { - queryWrapper.lambda().eq(Solutions::getInsureCycleUnit, pageWrap.getModel().getInsureCycleUnit()); - } - if (pageWrap.getModel().getPriceCycleUnit() != null) { - queryWrapper.lambda().eq(Solutions::getPriceCycleUnit, pageWrap.getModel().getPriceCycleUnit()); - } - if (pageWrap.getModel().getSingleWorktype() != null) { - queryWrapper.lambda().eq(Solutions::getSingleWorktype, pageWrap.getModel().getSingleWorktype()); - } - if (pageWrap.getModel().getEmail() != null) { - queryWrapper.lambda().eq(Solutions::getEmail, pageWrap.getModel().getEmail()); - } - if (pageWrap.getModel().getSpecialAgreement() != null) { - queryWrapper.lambda().eq(Solutions::getSpecialAgreement, pageWrap.getModel().getSpecialAgreement()); - } - if (pageWrap.getModel().getSpecialInfo() != null) { - queryWrapper.lambda().eq(Solutions::getSpecialInfo, pageWrap.getModel().getSpecialInfo()); - } - if (pageWrap.getModel().getOrtherInfo() != null) { - queryWrapper.lambda().eq(Solutions::getOrtherInfo, pageWrap.getModel().getOrtherInfo()); - } - if (pageWrap.getModel().getSolutionBaseId() != null) { - queryWrapper.lambda().eq(Solutions::getSolutionBaseId, pageWrap.getModel().getSolutionBaseId()); - } - if (pageWrap.getModel().getVersion() != null) { - queryWrapper.lambda().eq(Solutions::getVersion, pageWrap.getModel().getVersion()); - } - if (pageWrap.getModel().getDataType() != null) { - queryWrapper.lambda().eq(Solutions::getDataType, pageWrap.getModel().getDataType()); - } if (pageWrap.getModel().getBaseId() != null) { queryWrapper.lambda().eq(Solutions::getBaseId, pageWrap.getModel().getBaseId()); } - for(PageWrap.SortData sortData: pageWrap.getSorts()) { - if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { - queryWrapper.orderByDesc(sortData.getProperty()); - } else { - queryWrapper.orderByAsc(sortData.getProperty()); - } - } + queryWrapper.lambda().orderByAsc(Solutions::getInsuranceId); return PageData.from(solutionsMapper.selectPage(page, queryWrapper)); } + + + @Override + public List<Solutions> findListForCompany() { + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + List<Solutions> solutionsList = solutionsJoinMapper.selectJoinList(Solutions.class,new MPJLambdaWrapper<Solutions>() + .selectAll(Solutions.class) + .leftJoin(CompanySolution.class,CompanySolution::getSolutionBaseId,Solutions::getId) + .eq(Solutions::getIsdeleted,Constants.ZERO) + .eq(Solutions::getDataType,Constants.TWO) + .eq(CompanySolution::getIsdeleted,Constants.ZERO) + .eq(CompanySolution::getCompanyId,user.getCompanyId()) + .orderByAsc(Solutions::getSortnum) + ); + return solutionsList; + } + + + + + + @Override public long count(Solutions solutions) { QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions); return solutionsMapper.selectCount(wrapper); } + + + } -- Gitblit v1.9.3