diff --git a/pom.xml b/pom.xml index 778ecc67..27c79bf9 100644 --- a/pom.xml +++ b/pom.xml @@ -27,9 +27,65 @@ 3.5.2 true 4.2.0 + D:\workspace-main\JiaShiLi\jsl-questionnaire-base\src\main\resources\lib\ + + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + 3.2.0 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.8.5 + + + org.glassfish.hk2 + hk2-api + 3.0.1 + + + javax.inject + javax.inject + 1 + + + + + + com.seeyon + seeyon + 1.0 + system + ${lib.dir}/seeyon-ctp-core.jar + + + com.jsersey + jsersey-client + 1.0 + system + ${lib.dir}/jersey-client.jar + + + com.jsersey + jsersey-common + 1.0 + system + ${lib.dir}/jersey-common.jar + + + com.jsersey + jsersey-guava + 1.0 + system + ${lib.dir}/jersey-guava.jar + + + cn.hutool hutool-all diff --git a/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java b/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java index 312544d2..00f2e14b 100644 --- a/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java +++ b/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java @@ -5,6 +5,7 @@ import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.HttpCode; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DuplicateKeyException; +import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotWritableException; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.BadCredentialsException; @@ -91,6 +92,13 @@ public class UnifiedExceptionHandler { return R.error("限制重复数据，请联系管理员"); } + @ExceptionHandler(value = HttpMessageNotReadableException.class) + @ResponseBody + public R handleHttpMessageNotReadableException(HttpMessageNotReadableException e) { + e.printStackTrace(); + return R.error("请求参数无法解析"); + } + @ExceptionHandler({ SQLIntegrityConstraintViolationException.class, }) diff --git a/src/main/java/com/qs/serve/common/util/SeeYonUtil.java b/src/main/java/com/qs/serve/common/util/SeeYonUtil.java new file mode 100644 index 00000000..3e7f83ba --- /dev/null +++ b/src/main/java/com/qs/serve/common/util/SeeYonUtil.java @@ -0,0 +1,49 @@ +package com.qs.serve.common.util; + +import com.alibaba.fastjson.JSON; +import com.seeyon.client.CTPRestClient; +import com.seeyon.client.CTPServiceClientManager; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; + +import java.util.HashMap; +import java.util.Map; + +/** + * @Author JcYen + * @Date 2021/5/21 + */ +@Slf4j +@Configuration +public class SeeYonUtil { + + public static String restUrl = "http://192.168.10.7"; + + public static String userName = "kenpbtz"; + + public static String password = "66da74b2-f141-4b01-ae58-ac6ce4cfcc47"; + + /** + * 致远客户端 + * 文献：http://open.seeyon.com/book/ctp/restjie-kou/restjie-kou-java-ke-hu-duan.html + * @return + */ + public static CTPRestClient getRestClient() { + CTPServiceClientManager clientManager = CTPServiceClientManager.getInstance(restUrl); + CTPRestClient client = null; + try { + client = clientManager.getRestClient(); + //登录校验,成功返回true,失败返回false,此过程并会把验证通过获取的token保存在缓存中 + //再请求访问其他资源时会自动把token放入请求header中。 + client.authenticate(userName, password); + } catch (Exception e) { + log.error("致远客户端获取异常：{}",e.getMessage(),e); + } + return client; + } + +} diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index 7e545b13..fdf6af2f 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -12,6 +12,7 @@ import com.qs.serve.modules.bms.entity.*; import com.qs.serve.modules.bms.entity.bo.BmsRegionBatchBo; import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo; import com.qs.serve.modules.bms.service.*; +import com.qs.serve.modules.his.service.HisUserSupplierService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.Cacheable; @@ -42,6 +43,7 @@ public class BmsRegionController { private BmsFactoryService bmsFactoryService; private BmsChannelPointService bmsChannelPointService; private BmsRegionUserService bmsRegionUserService; + private HisUserSupplierService hisUserSupplierService; /** * 列表 @@ -255,6 +257,8 @@ public class BmsRegionController { } } bmsRegionService.flushAllLevel(false); + //清空临时表 + hisUserSupplierService.cleanTable(); return R.ok(); } @@ -292,6 +296,8 @@ public class BmsRegionController { //删除商品限制 bmsRuleRegionService.removeByRegionId(Long.parseLong(id)); boolean result = bmsRegionService.removeById(id); + //清空临时表 + hisUserSupplierService.cleanTable(); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 35ccb3ef..b1cd0dab 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -15,6 +15,7 @@ import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.bms.service.BmsRegion2Service; import com.qs.serve.modules.bms.service.BmsRegionService; +import com.qs.serve.modules.his.entity.HisUserSupplier; import com.qs.serve.modules.his.service.HisUserSupplierService; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam; @@ -59,10 +60,6 @@ public class BmsSupplierController { @GetMapping("/list") @PreAuthorize("hasRole('bms:supplier:query')") public R> getList(BmsSupplier param){ - if(param.getLoadByCurrent()!=null&¶m.getLoadByCurrent().equals(1)){ - //hisUserSupplierService.list() - return R.ok(); - } String userId = param.getUserId(); param.setCurrUserId(userId); List list = bmsSupplierService.selectSupplierList(param); @@ -87,6 +84,17 @@ public class BmsSupplierController { @GetMapping("/page") @PreAuthorize("hasRole('bms:supplier:query')") public R> getPage(BmsSupplier param){ + if(param.getLoadByCurrent()!=null&¶m.getLoadByCurrent().equals(1)){ + String userId = AuthContextUtils.getSysUserId(); + //初始化 + hisUserSupplierService.initByUserId(userId,false); + HisUserSupplier userSupplier = param.toHisUserSupplier(userId,null); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(userSupplier); + PageUtil.startPage(); + List list = hisUserSupplierService.list(lqw); + List supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList()); + return R.byPageHelperList(list,supplierList); + } PageUtil.startPage(); List list = bmsSupplierService.selectSupplierList(param); initSupplierList(list); @@ -155,6 +163,8 @@ public class BmsSupplierController { bmsSupplierService.updateById(supplierParam); } initSupplierOtherInfo(supplierIds); + //清空临时表 + hisUserSupplierService.cleanTable(); return R.ok(); } @@ -174,6 +184,8 @@ public class BmsSupplierController { bmsSupplier.setOtherUserIds(param.getUserIds()==null?new String[]{}:uids.toArray(new String[uids.size()])); bmsSupplierService.updateById(bmsSupplier); initSupplierOtherInfo(Arrays.asList(supplier.getId())); + //清空临时表 + hisUserSupplierService.cleanTable(); return R.ok(); } @@ -208,6 +220,8 @@ public class BmsSupplierController { } } initSupplierOtherInfo(supplierIds); + //清空临时表 + hisUserSupplierService.cleanTable(); return R.ok(); } @@ -238,6 +252,8 @@ public class BmsSupplierController { bmsSupplierService.updateById(supplier1); } initSupplierOtherInfo(Arrays.asList(supplier.getId())); + //清空临时表 + hisUserSupplierService.cleanTable(); return R.ok(); } @@ -398,6 +414,8 @@ public class BmsSupplierController { @PreAuthorize("hasRole('bms:supplier:insert')") public R save(@RequestBody @Valid BmsSupplierBo param){ bmsSupplierService.edit(param); + //清空临时表 + hisUserSupplierService.cleanTable(); return R.ok(); } @@ -414,6 +432,8 @@ public class BmsSupplierController { return R.error("含有子公司客户无法删除"); } bmsSupplierService.removeById(id); + //清空临时表 + hisUserSupplierService.cleanTable(); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java index 1f2983d9..8dc464d2 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler; +import com.qs.serve.modules.his.entity.HisUserSupplier; import com.qs.serve.modules.sys.entity.dto.SysUserVo; import lombok.Data; import org.apache.ibatis.type.JdbcType; @@ -42,6 +43,9 @@ public class BmsSupplier implements Serializable { /** 三级区域ID */ private String regionThird; + /** 四级区域ID */ + private String regionFourthly; + /** 最子级区域ID */ private String regionLast; @@ -54,6 +58,9 @@ public class BmsSupplier implements Serializable { /** 行政三级区域ID */ private String region2Third; + /** 行政四级区域ID */ + private String region2Fourthly; + /** 行政最子级区域ID */ private String region2Last; @@ -177,5 +184,25 @@ public class BmsSupplier implements Serializable { @TableField(exist = false) private Integer loadByCurrent; + public HisUserSupplier toHisUserSupplier(String userId,Integer type){ + HisUserSupplier userSupplier = new HisUserSupplier(); + userSupplier.setUserId(userId); + if(this.getUserId()!=null){ + userSupplier.setSupplierId(Long.parseLong(this.getId())); + } + userSupplier.setSupplierName(this.getName()); + userSupplier.setSupplierCode(this.getCode()); + userSupplier.setSaleRegionFirst(this.getRegionFirst()); + userSupplier.setSaleRegionSecond(this.getRegionSecond()); + userSupplier.setSaleRegionThird(this.getRegionThird()); + userSupplier.setSaleRegionFourthly(this.getRegionFourthly()); + userSupplier.setBizRegionFirst(this.getRegion2First()); + userSupplier.setBizRegionSecond(this.getRegion2Second()); + userSupplier.setBizRegionThird(this.getRegion2Third()); + userSupplier.setBizRegionFourthly(this.getRegion2Fourthly()); + userSupplier.setType(type); + return userSupplier; + } + } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java index 6b57711a..d43d6995 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java @@ -81,10 +81,19 @@ public class BmsSupplierServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(BmsSupplier::getCode,code); - lqw.eq(BmsSupplier::getBelong,belong); + if(belong!=null){ + lqw.eq(BmsSupplier::getBelong,belong); + } return this.getOne(lqw,false); } + @Override + public BmsSupplier getByName(String String) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(BmsSupplier::getName,String); + return this.getOne(lqw,true); + } + @Override public List listChild(String pid) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); @@ -98,7 +107,8 @@ public class BmsSupplierServiceImpl extends ServiceImpl w.eq(BmsSupplier::getRegionFirst,regionId) .or().eq(BmsSupplier::getRegionSecond,regionId) - .or().eq(BmsSupplier::getRegionThird,regionId)); + .or().eq(BmsSupplier::getRegionThird,regionId)) + .or().eq(BmsSupplier::getRegionFourthly,regionId); return this.list(lqw); } @@ -108,7 +118,8 @@ public class BmsSupplierServiceImpl extends ServiceImpl w.eq(BmsSupplier::getRegion2First,regionId) .or().eq(BmsSupplier::getRegion2Second,regionId) - .or().eq(BmsSupplier::getRegion2Third,regionId)); + .or().eq(BmsSupplier::getRegion2Third,regionId) + .or().eq(BmsSupplier::getRegion2Fourthly,regionId)); return this.list(lqw); } @@ -159,22 +170,33 @@ public class BmsSupplierServiceImpl extends ServiceImpl childList = regionService.listChild(regionId); + //判断是否有子级节点 + if(childList.size()>0){ + Assert.throwEx("请选择最后一级销售区域"); } - supplier.setRegionLast(regionId); - supplier.setRegionFirst(region2.getPid()); - supplier.setRegionSecond(region2.getId()); - supplier.setRegionThird(region1.getId()); + BmsRegion currentRegion = regionService.getById(regionId); + String[] regionIds = currentRegion.getPathIds().split("_"); + for (int i = 0; i < regionIds.length; i++) { + if(i==0){ + supplier.setRegionFirst(regionIds[i]); + }else if(i==1){ + supplier.setRegionSecond(regionIds[i]); + }else if(i==2){ + supplier.setRegionThird(regionIds[i]); + }else if(i==3){ + supplier.setRegionFourthly(regionIds[i]); + } + } + supplier.setRegionLast(currentRegion.getId()); } /** @@ -183,22 +205,33 @@ public class BmsSupplierServiceImpl extends ServiceImpl childList = region2Service.listChild(regionId); + //判断是否有子级节点 + if(childList.size()>0){ + Assert.throwEx("请选择最后一级销售区域"); + } + BmsRegion2 currentRegion = region2Service.getById(regionId); + String[] regionIds = currentRegion.getPathIds().split("_"); + for (int i = 0; i < regionIds.length; i++) { + if(i==0){ + supplier.setRegion2First(regionIds[i]); + }else if(i==1){ + supplier.setRegion2Second(regionIds[i]); + }else if(i==2){ + supplier.setRegion2Third(regionIds[i]); + }else if(i==3){ + supplier.setRegion2Fourthly(regionIds[i]); + } } - supplier.setRegion2Last(regionId); - supplier.setRegion2First(region2.getPid()); - supplier.setRegion2Second(region2.getId()); - supplier.setRegion2Third(region1.getId()); + supplier.setRegionLast(currentRegion.getId()); } } diff --git a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java index 93247e30..3c3a9880 100644 --- a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java +++ b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.qs.serve.modules.bms.entity.BmsSupplier; import lombok.Data; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; @@ -97,5 +98,21 @@ public class HisUserSupplier implements Serializable { @Length(max = 32,message = "行政区域4长度不能超过32字") private String bizRegionFourthly; + public BmsSupplier toSupplier(){ + BmsSupplier bmsSupplier = new BmsSupplier(); + bmsSupplier.setId(this.getSupplierId()+""); + bmsSupplier.setName(this.getSupplierName()); + bmsSupplier.setCode(this.getSupplierCode()); + bmsSupplier.setRegionFirst(this.getSaleRegionFirst()); + bmsSupplier.setRegionSecond(this.getSaleRegionSecond()); + bmsSupplier.setRegionThird(this.getSaleRegionThird()); + bmsSupplier.setRegionFourthly(this.getSaleRegionFourthly()); + bmsSupplier.setRegion2First(this.getBizRegionFirst()); + bmsSupplier.setRegion2Second(this.getBizRegionSecond()); + bmsSupplier.setRegion2Third(this.getBizRegionThird()); + bmsSupplier.setRegionFourthly(this.getBizRegionFourthly()); + return bmsSupplier; + } + } diff --git a/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java b/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java index cc5dfec2..d7f00875 100644 --- a/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java +++ b/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java @@ -1,10 +1,11 @@ package com.qs.serve.modules.his.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.his.entity.HisUserSupplier; import java.io.Serializable; - +import java.util.List; /** * 供应商负责人 服务接口 * @author YenHex @@ -12,12 +13,17 @@ import java.io.Serializable; */ public interface HisUserSupplierService extends IService { + /** * 初始化 * @param userId * @return */ - boolean initByUserId(String userId); + boolean initByUserId(String userId,boolean hasCheck); + + boolean checkInit(String userId); + + /** * 删除 diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java index b290399c..f471031e 100644 --- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java @@ -38,31 +38,30 @@ public class HisUserSupplierServiceImpl extends ServiceImpl lqwExist = new LambdaQueryWrapper<>(); lqwExist.eq(HisUserSupplier::getUserId,userId); long count = this.count(lqwExist); if(count>0L){ return true; } + return false; + } + + @Override + public boolean initByUserId(String userId,boolean hasCheck) { + if(!hasCheck){ + boolean checkInit = this.checkInit(userId); + if(checkInit){ + return true; + } + } BmsSupplier param = new BmsSupplier(); param.setCurrUserId(userId); List list = bmsSupplierService.selectSupplierList(param); List userSuppliers = new ArrayList<>(); for (BmsSupplier supplier : list) { - HisUserSupplier userSupplier = new HisUserSupplier(); - userSupplier.setUserId(userId); - userSupplier.setSupplierId(Long.parseLong(supplier.getId())); - userSupplier.setSupplierCode(supplier.getCode()); - userSupplier.setSupplierName(supplier.getName()); - userSupplier.setType(3); - userSupplier.setMasterFlag(supplier.getMasterFlag()); - userSupplier.setSaleRegionFirst(supplier.getRegionFirst()); - userSupplier.setSaleRegionSecond(supplier.getRegionSecond()); - userSupplier.setSaleRegionThird(supplier.getRegionThird()); - userSupplier.setBizRegionFirst(supplier.getRegion2First()); - userSupplier.setBizRegionSecond(supplier.getRegion2Second()); - userSupplier.setBizRegionThird(supplier.getRegion2Third()); + HisUserSupplier userSupplier = supplier.toHisUserSupplier(userId,3); userSuppliers.add(userSupplier); } LambdaQueryWrapper regionUserLqw = new LambdaQueryWrapper<>(); @@ -75,12 +74,11 @@ public class HisUserSupplierServiceImpl extends ServiceImpl0){ List saleRegions = saleRegionService.listByIds(regionSaleIds); Map> saleRegionsMap = saleRegions.stream().collect(Collectors.groupingBy(BmsRegion::getLevel)); - List regionIds01 = saleRegionsMap.get(1).stream().map(BmsRegion::getId).collect(Collectors.toList()); - List regionIds02 = saleRegionsMap.get(2).stream().map(BmsRegion::getId).collect(Collectors.toList()); - List regionIds03 = saleRegionsMap.get(3).stream().map(BmsRegion::getId).collect(Collectors.toList()); - toHisUserSupplier(userSuppliers,regionIds01,1,userId); - toHisUserSupplier(userSuppliers,regionIds02,2,userId); - toHisUserSupplier(userSuppliers,regionIds03,3,userId); + for (Integer level : saleRegionsMap.keySet()) { + List saleRegionListByLevel = saleRegionsMap.get(level); + List regionIds = saleRegionListByLevel.stream().map(BmsRegion::getId).collect(Collectors.toList()); + toHisUserSupplier(userSuppliers,0,regionIds,3,userId); + } } List regionBizIds = regionUsers.stream() .filter(a->a.getType().equals(1)) @@ -89,12 +87,11 @@ public class HisUserSupplierServiceImpl extends ServiceImpl0){ List bizRegions = bizRegionService.listByIds(regionBizIds); Map> saleRegionsMap = bizRegions.stream().collect(Collectors.groupingBy(BmsRegion2::getLevel)); - List regionIds01 = saleRegionsMap.get(1).stream().map(BmsRegion2::getId).collect(Collectors.toList()); - List regionIds02 = saleRegionsMap.get(2).stream().map(BmsRegion2::getId).collect(Collectors.toList()); - List regionIds03 = saleRegionsMap.get(3).stream().map(BmsRegion2::getId).collect(Collectors.toList()); - toHisUserSupplier(userSuppliers,regionIds01,1,userId); - toHisUserSupplier(userSuppliers,regionIds02,2,userId); - toHisUserSupplier(userSuppliers,regionIds03,3,userId); + for (Integer level : saleRegionsMap.keySet()) { + List region2List = saleRegionsMap.get(level); + List region2Ids = region2List.stream().map(BmsRegion2::getId).collect(Collectors.toList()); + toHisUserSupplier(userSuppliers,1,region2Ids,1,userId); + } } if(userSuppliers.size()>0){ this.saveBatch(userSuppliers); @@ -108,7 +105,8 @@ public class HisUserSupplierServiceImpl extends ServiceImpl userSuppliers,List regionIds,Integer level,String userId){ + + private void toHisUserSupplier(List userSuppliers,Integer type,List regionIds,Integer level,String userId){ if(regionIds.size()>0){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if(level.equals(1)){ @@ -120,11 +118,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl supplierList = bmsSupplierService.list(lqw); for (BmsSupplier supplier : supplierList) { - HisUserSupplier userSupplier = new HisUserSupplier(); - userSupplier.setUserId(userId); - userSupplier.setSupplierId(Long.parseLong(supplier.getId())); - userSupplier.setType(0); - userSupplier.setMasterFlag(supplier.getMasterFlag()); + HisUserSupplier userSupplier = supplier.toHisUserSupplier(userId,type); userSuppliers.add(userSupplier); } } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index ef5d96f1..1efc3cb4 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -58,6 +58,17 @@ public class TbsActivityController { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); PageUtil.startPage(); List list = tbsActivityService.list(lqw); + for (TbsActivity activity : list) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("activity_id",activity.getId()); + List goodsList = activityGoodsService.list(qw); + if(goodsList.size()>0){ + activity.setGoodsType(goodsList.get(0).getTargetType()); + } + activity.setGoodsList(goodsList); + List activitySubjects = activitySubjectService.list(qw); + activity.setSubjectCenterList(activitySubjects); + } return R.ok(list); } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java index dc725b45..68e2cbc6 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java @@ -31,6 +31,9 @@ public class TbsActivity implements Serializable { @TableId(type = IdType.AUTO) private Long id; + /** 编码 */ + private String activityCode; + /** 费用申请id */ @NotNull(message = "费用申请id不能为空") private Long costApplyId; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityVo.java index 2bac0383..5bb569e6 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsActivityVo.java @@ -28,6 +28,9 @@ public class TbsActivityVo implements Serializable { /** id */ private Long id; + /** 编码 */ + private String activityCode; + /** 费用申请id */ private Long costApplyId; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index e2a4ee8e..11467108 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -76,7 +76,7 @@ public class TbsActivityServiceImpl extends ServiceImpl