From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 333 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 276 insertions(+), 57 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 e8a4fdb..03f2ada 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
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -7,12 +8,11 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.InsuranceMapper;
-import com.doumee.dao.business.SolutionWorktypeMapper;
-import com.doumee.dao.business.SolutionsMapper;
-import com.doumee.dao.business.WorktypeMapper;
+import com.doumee.dao.business.*;
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;
@@ -24,12 +24,11 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
/**
* 淇濋櫓鏂规淇℃伅琛⊿ervice瀹炵幇
@@ -40,25 +39,53 @@
public class SolutionsServiceImpl implements SolutionsService {
@Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private MultifileMapper multifileMapper;
+ @Autowired
private SolutionsMapper solutionsMapper;
+ @Autowired
+ private SolutionsJoinMapper solutionsJoinMapper;
@Autowired
private WorktypeMapper worktypeMapper;
@Autowired
private SolutionWorktypeJoinMapper solutionWorktypeJoinMapper;
@Autowired
private InsuranceMapper insuranceMapper;
+ @Autowired
+ private CompanySolutionMapper companySolutionMapper;
+ @Autowired
+ private DuSolutionMapper duSolutionMapper;
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(Solutions solutions) {
LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
initCreateParam(solutions);//宸ョ鏁版嵁鏈夋晥鎬ф楠岋紝鍘婚櫎绌虹櫧琛屾暟鎹�
+
+ if(solutionsMapper.selectCount(new QueryWrapper<Solutions>().lambda()
+ .eq(Solutions::getName,solutions.getName())
+ .eq(Solutions::getIsdeleted,Constants.ZERO)
+ .eq(Solutions::getDataType,Constants.ZERO)
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"淇濋櫓鏂规鍚嶇О宸插瓨鍦�");
+ }
+ solutions.setCanAdd(Constants.formatIntegerNum(solutions.getCanAdd()));
+ solutions.setCanReduce(Constants.formatIntegerNum(solutions.getCanReduce()));
+ solutions.setCanChangeUnit(Constants.formatIntegerNum(solutions.getCanChangeUnit()));
+ solutions.setAddValidDays(Constants.formatIntegerNum(solutions.getAddValidDays()));
+ solutions.setDelValidDays(Constants.formatIntegerNum(solutions.getDelValidDays()));
solutions.setIsdeleted(Constants.ZERO);
solutions.setCreator(user.getId());
solutions.setCreateDate(new Date());
solutions.setVersion(UUID.randomUUID().toString());//鐗堟湰鍙�
solutions.setDataType(Constants.ZERO);
solutions.setStatus(Constants.ZERO);
+ //2024骞�6鏈�17鏃�15:56:18 浠呮敮鎸佹浛鎹㈡ā寮忎笅锛屾壒澧炴棩鏈� 绛変簬 鎵瑰噺鏃ユ湡
+ if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)){
+ solutions.setAddValidDays(solutions.getDelValidDays());
+ }
solutionsMapper.insert(solutions);//鍩虹鐗堟湰
//濡傛灉鏈夊伐绉嶏紝鍒欎骇鐢熶竴涓柊鐨勬湁鏁堝巻鍙茬増鏈� ~
@@ -70,6 +97,22 @@
solutionsMapper.insert(newModel);
dealWorkType(solutions,newModel,solutions.getWorktypeIdList(),true);
+ if(Constants.equalsObject(solutions.getType(),Constants.ONE) ){
+ if (solutions.getFanganFile()==null || StringUtils.isBlank(solutions.getFanganFile().getFileurl())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犳柟妗堢‘璁や功锛�");
+ }
+
+ Multifile file = solutions.getFanganFile();
+ file.setIsdeleted(Constants.ZERO);
+ file.setCreateDate(new Date());
+ file.setCreator(user.getId());
+ file.setObjId(solutions.getId());
+ file.setObjType(Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey());
+ file.setType(Constants.formatIntegerNum(file.getType()));
+ multifileMapper.insert(file);
+ file.setObjId(newModel.getId());
+ multifileMapper.insert(file);
+ }
return solutions.getId();
}
@@ -80,7 +123,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ヤ繚闄╁叕鍙镐俊鎭笉瀛樺湪锛岃灏濊瘯鍒锋柊椤甸潰閲嶈瘯~" );
}
if( !Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ヤ繚闄╁叕鍙稿凡琚紝璇峰皾璇曞埛鏂伴〉闈㈤噸璇晘" );
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ヤ繚闄╁叕鍙稿凡琚鐢紝璇峰皾璇曞埛鏂伴〉闈㈤噸璇晘" );
}
List<Worktype> worktypeList = worktypeMapper.selectList(new QueryWrapper<Worktype>().lambda()
.eq(Worktype::getInsuranceId,solutions.getInsuranceId())
@@ -118,15 +161,18 @@
||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()
+ ||Constants.formatIntegerNum( solutions.getMinAge()) >Constants.formatIntegerNum(solutions.getMaxAge())
|| Constants.formatBigdecimal(solutions.getPrice()).compareTo(new BigDecimal(0)) !=1
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
+ if(!(Constants.equalsInteger(solutions.getInsureCycleUnit(),Constants.ZERO)
+ ||Constants.equalsInteger(solutions.getInsureCycleUnit(),solutions.getInsureCycleUnit()))){
+ solutions.setDelOnlyReplace(Constants.ZERO);
+ }
}
@Override
@@ -149,6 +195,7 @@
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void updateById(Solutions solutions) {
LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
Solutions model = findById(solutions.getId());
@@ -158,15 +205,39 @@
}
//鏁版嵁鏈夋晥鎬ф牎楠�
initCreateParam(solutions);
-
+ solutions.setType(null);//涓嶆敮鎸佷慨鏀规姇淇濇柟妗�
+ if(solutionsMapper.selectCount(new QueryWrapper<Solutions>().lambda()
+ .eq(Solutions::getName,solutions.getName())
+ .eq(Solutions::getIsdeleted,Constants.ZERO)
+ .eq(Solutions::getDataType,Constants.ZERO)
+ .ne(Solutions::getId,solutions.getId())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"淇濋櫓鏂规鍚嶇О宸插瓨鍦�");
+ }
solutions.setEditor(user.getId());
solutions.setVersion(UUID.randomUUID().toString());
solutions.setEditDate(new Date());
+
+ //2024骞�6鏈�17鏃�15:56:18 浠呮敮鎸佹浛鎹㈡ā寮忎笅锛屾壒澧炴棩鏈� 绛変簬 鎵瑰噺鏃ユ湡
+ if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)){
+ solutions.setAddValidDays(solutions.getDelValidDays());
+ }
solutionsMapper.updateById(solutions);
+
+ Solutions oldVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>()
+ .lambda()
+ .eq(Solutions::getBaseId,solutions.getId())
+ .eq(Solutions::getDataType,Constants.TWO)
+ .last("limit 1")
+ );
+
+ if(Objects.isNull(oldVersion)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍘嗗彶鐗堟湰鏁版嵁");
+ }
//濡傛灉淇敼锛屽垯浜х敓涓�涓柊鐨勫巻鍙茬増鏈� ~
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());
@@ -179,14 +250,57 @@
.lambda()
.eq(SolutionWorktype::getSolutionId,solutions.getId())
);
+ if(Constants.equalsObject(model.getType(),Constants.ONE) ){
+ if (solutions.getFanganFile()!=null && StringUtils.isNotBlank(solutions.getFanganFile().getFileurl())){
+
+ multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+ .set(Multifile::getIsdeleted,Constants.ONE)
+ .set(Multifile::getEditDate,solutions.getEditDate())
+ .set(Multifile::getEditor,solutions.getEditor())
+ .eq(Multifile::getObjId,solutions.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey()));
+
+ Multifile file = solutions.getFanganFile();
+ file.setIsdeleted(Constants.ZERO);
+ file.setCreateDate(solutions.getEditDate());
+ file.setCreator(solutions.getEditor());
+ file.setObjId(solutions.getId());
+ file.setObjType(Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey());
+ file.setType(Constants.formatIntegerNum(file.getType()));
+ multifileMapper.insert(file);
+ file.setObjId(newModel.getId());
+ multifileMapper.insert(file);
+ }
+ }
+
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)
+ .set(StringUtils.isNotBlank(solutions.getSignKeyword()),Solutions::getSignKeyword,solutions.getSignKeyword())
);
- //澶勭悊宸ヤ綔淇℃伅锛屾柊澧炴渶鏂扮殑锛屽悓鏃朵骇鐢熷巻鍙茬増鏈�
+ //澶勭悊宸ョ淇℃伅锛屾柊澧炴渶鏂扮殑锛屽悓鏃朵骇鐢熷巻鍙茬増鏈�
dealWorkType(solutions,newModel,solutions.getWorktypeIdList(),false);
+
+ //鏇存柊company_solution 浣跨敤鏂扮増鏈殑鏁版嵁
+ companySolutionMapper.update(null,
+ new UpdateWrapper<CompanySolution>()
+ .lambda()
+ .eq(CompanySolution::getStatus,Constants.ZERO)
+ .set(CompanySolution::getSolutionId,newModel.getId())
+ .eq(CompanySolution::getSolutionBaseId,solutions.getId())
+ );
+ //鏇存柊 du_solution 浣跨敤鏂扮増鏈殑鏁版嵁
+ duSolutionMapper.update(null,
+ new UpdateWrapper<DuSolution>()
+ .lambda()
+ .eq(DuSolution::getIsdeleted, Constants.ZERO)
+ .eq(DuSolution::getStatus, Constants.ONE)
+ .set(DuSolution::getSolutionId,newModel.getId())
+ .eq(DuSolution::getSolutionId,oldVersion.getId()));
}
@Override
@@ -225,7 +339,14 @@
}
@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.selectAs(Company::getName,Solutions::getShopName);
+ queryWrapper.leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Solutions::getShopId);
+ 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 );
}
@@ -238,6 +359,16 @@
wrapper.orderByAsc(SolutionWorktype::getSortnum);
List<SolutionWorktype> worktypeList = solutionWorktypeJoinMapper.selectJoinList(SolutionWorktype.class,wrapper);
model.setWorktypeList(worktypeList);
+ Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,model.getId())
+ .eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .last("limit 1"));
+ if(f!=null && StringUtils.isNotBlank(f.getFileurl())){
+ String url = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode()+f.getFileurl();
+ f.setFileurlFull(url);
+ model.setFanganFile(f);//鏂规纭涔�
+ }
return model;
}
@@ -249,115 +380,137 @@
@Override
public List<Solutions> findList(Solutions solutions) {
+ LoginUserInfo user = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
solutions.setIsdeleted(Constants.ZERO);
+ solutions.setStatus(Constants.ZERO);
+ if(solutions.getDataType() == null){
+ solutions.setDataType(Constants.TWO);
+ }
QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
+ if(Constants.equalsObject(user.getType(),Constants.TWO)){
+ //濡傛灉鏄垹闄�
+// wrapper.lambda().exists("select c.id from company_solution c left join solutions d on c.solution_id=d.id where c.isdeleted=0 and d.base_id=solutions.base_id and c.shop_id="+user.getCompanyId());//璁剧疆鏃犳晥璁块棶
+ wrapper.apply("((solutions.type=0 and exists(select cs.id from company_solution cs left join solutions s on cs.solution_id=s.id where cs.isdeleted=0 and s.base_id=solutions.base_id and cs.shop_id="+user.getCompanyId()+")) or (" +
+ "solutions.type=1 and solutions.shop_id="+user.getCompanyId()+"))") ;
+ }
return solutionsMapper.selectList(wrapper);
}
@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.selectAs(Company::getName,Solutions::getShopName);
+ queryWrapper.leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Solutions::getShopId);
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(user.getType().equals(Constants.ONE)){
+ queryWrapper.exists(("select 1 from company_solution b where b.isdeleted=0 and b.company_id="+user.getCompanyId()+" and b.SOLUTION_BASE_ID = t.id"));
+ }
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.lambda().eq(Solutions::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(Solutions::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(Solutions::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(Solutions::getSortnum, pageWrap.getModel().getSortnum());
}
if (pageWrap.getModel().getInsuranceId() != null) {
- queryWrapper.lambda().eq(Solutions::getInsuranceId, pageWrap.getModel().getInsuranceId());
+ queryWrapper.eq(Solutions::getInsuranceId, pageWrap.getModel().getInsuranceId());
}
if (pageWrap.getModel().getValidType() != null) {
- queryWrapper.lambda().eq(Solutions::getValidType, pageWrap.getModel().getValidType());
+ queryWrapper.eq(Solutions::getValidType, pageWrap.getModel().getValidType());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Solutions::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(Solutions::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getMinAge() != null) {
- queryWrapper.lambda().eq(Solutions::getMinAge, pageWrap.getModel().getMinAge());
+ queryWrapper.eq(Solutions::getMinAge, pageWrap.getModel().getMinAge());
}
if (pageWrap.getModel().getMaxAge() != null) {
- queryWrapper.lambda().eq(Solutions::getMaxAge, pageWrap.getModel().getMaxAge());
+ queryWrapper.eq(Solutions::getMaxAge, pageWrap.getModel().getMaxAge());
}
if (pageWrap.getModel().getPrice() != null) {
- queryWrapper.lambda().eq(Solutions::getPrice, pageWrap.getModel().getPrice());
+ queryWrapper.eq(Solutions::getPrice, pageWrap.getModel().getPrice());
}
if (pageWrap.getModel().getTimeUnit() != null) {
- queryWrapper.lambda().eq(Solutions::getTimeUnit, pageWrap.getModel().getTimeUnit());
+ queryWrapper.eq(Solutions::getTimeUnit, pageWrap.getModel().getTimeUnit());
}
if (pageWrap.getModel().getInsureCycle() != null) {
- queryWrapper.lambda().eq(Solutions::getInsureCycle, pageWrap.getModel().getInsureCycle());
+ queryWrapper.eq(Solutions::getInsureCycle, pageWrap.getModel().getInsureCycle());
}
if (pageWrap.getModel().getInsureCycleUnit() != null) {
- queryWrapper.lambda().eq(Solutions::getInsureCycleUnit, pageWrap.getModel().getInsureCycleUnit());
+ queryWrapper.eq(Solutions::getInsureCycleUnit, pageWrap.getModel().getInsureCycleUnit());
}
if (pageWrap.getModel().getPriceCycleUnit() != null) {
- queryWrapper.lambda().eq(Solutions::getPriceCycleUnit, pageWrap.getModel().getPriceCycleUnit());
+ queryWrapper.eq(Solutions::getPriceCycleUnit, pageWrap.getModel().getPriceCycleUnit());
}
if (pageWrap.getModel().getSingleWorktype() != null) {
- queryWrapper.lambda().eq(Solutions::getSingleWorktype, pageWrap.getModel().getSingleWorktype());
+ queryWrapper.eq(Solutions::getSingleWorktype, pageWrap.getModel().getSingleWorktype());
}
if (pageWrap.getModel().getEmail() != null) {
- queryWrapper.lambda().eq(Solutions::getEmail, pageWrap.getModel().getEmail());
+ queryWrapper.eq(Solutions::getEmail, pageWrap.getModel().getEmail());
}
if (pageWrap.getModel().getSpecialAgreement() != null) {
- queryWrapper.lambda().eq(Solutions::getSpecialAgreement, pageWrap.getModel().getSpecialAgreement());
+ queryWrapper.eq(Solutions::getSpecialAgreement, pageWrap.getModel().getSpecialAgreement());
}
if (pageWrap.getModel().getSpecialInfo() != null) {
- queryWrapper.lambda().eq(Solutions::getSpecialInfo, pageWrap.getModel().getSpecialInfo());
+ queryWrapper.eq(Solutions::getSpecialInfo, pageWrap.getModel().getSpecialInfo());
}
if (pageWrap.getModel().getOrtherInfo() != null) {
- queryWrapper.lambda().eq(Solutions::getOrtherInfo, pageWrap.getModel().getOrtherInfo());
+ queryWrapper.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());
+ queryWrapper.eq(Solutions::getVersion, pageWrap.getModel().getVersion());
}
if (pageWrap.getModel().getDataType() != null) {
- queryWrapper.lambda().eq(Solutions::getDataType, pageWrap.getModel().getDataType());
+ queryWrapper.eq(Solutions::getDataType, pageWrap.getModel().getDataType());
}
if (pageWrap.getModel().getBaseId() != null) {
- queryWrapper.lambda().eq(Solutions::getBaseId, pageWrap.getModel().getBaseId());
+ 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());
- }
- }
- return PageData.from(solutionsMapper.selectPage(page, queryWrapper));
+ queryWrapper.orderByDesc(Solutions::getCreateDate);
+// 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) {
@@ -388,9 +541,75 @@
return PageData.from(solutionsMapper.selectPage(page, queryWrapper));
}
+
+ @Override
+ public List<Solutions> findListForCompany(Integer dataType) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ List<Solutions> solutionsList = solutionsJoinMapper.selectJoinList(Solutions.class,new MPJLambdaWrapper<Solutions>()
+ .selectAll(Solutions.class)
+ .leftJoin(CompanySolution.class,CompanySolution::getSolutionId,Solutions::getId)
+ .leftJoin(Company.class,Company::getId,CompanySolution::getCompanyId)
+ .leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId)
+ .eq(Solutions::getIsdeleted,Constants.ZERO)
+ .eq(Solutions::getStatus,Constants.ZERO)
+ .eq(Solutions::getDataType,dataType)
+ .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+ .eq(CompanySolution::getCompanyId,user.getCompanyId())
+ .eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Company::getStatus,Constants.ZERO)
+ .eq(Insurance::getIsdeleted,Constants.ZERO)
+ .eq(Insurance::getStatus,Constants.ZERO)
+ .orderByDesc(Solutions::getCreateDate)
+ );
+ return solutionsList;
+ }
+
+ /**
+ * 鏍规嵁鍘嗗彶鐗堟湰鏌ヨ褰撳墠鏈�鏂板惎鐢ㄧ増鏈�
+ * @param solutionId
+ * @return
+ */
+ @Override
+ public Solutions getNewVersion(Integer solutionId){
+ Solutions solutions = solutionsMapper.selectById(solutionId);
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍘嗗彶鏂规淇℃伅");
+ }
+ if(solutions.getDataType().equals(Constants.TWO)){
+ return solutions;
+ }
+ Solutions newVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda()
+ .eq(Solutions::getIsdeleted,Constants.ZERO)
+ .eq(Solutions::getDataType,Constants.TWO)
+ .eq(Solutions::getBaseId,solutions.getBaseId())
+ .last("limit 1")
+ );
+ if(Objects.isNull(newVersion)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈�鏂扮増鏈暟鎹�");
+ }
+ return newVersion;
+ }
+
+
@Override
public long count(Solutions solutions) {
QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
return solutionsMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public BigDecimal testSolutionAddMoney(Integer id, BigDecimal fee, Date start,Date end,Date newDate,Date newEndTime){
+ return Constants.addFee(solutionsMapper.selectById(id),fee,start,end,newDate,newEndTime);
+ }
+
+ @Override
+ public BigDecimal testSolutionReduceMoney(Integer id, BigDecimal fee, Date start,Date end,Date reduceStartTime,Date reduceEndTime){
+ return Constants.reduceFee(solutionsMapper.selectById(id),fee,start,end,reduceStartTime,reduceEndTime);
+ }
+
+ @Override
+ public BigDecimal testSolutionProduceMoney(Integer id, BigDecimal fee, Date start,Date end,Date produceStart){
+ return Constants.produceFee(solutionsMapper.selectById(id),fee,start,end,produceStart);
+ }
}
--
Gitblit v1.9.3