From d639f5703b7d1cb6f919e729bbb54c395d0a39e8 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 19 May 2023 16:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/qs/serve/common/model/dto/R.java | 6 +- .../bms/controller/BmsChannelController.java | 2 +- .../bms/controller/BmsSupplierController.java | 11 +-- .../my/BmsSupplierContactsMyController.java | 8 +-- .../my/BmsSupplierMyController.java | 72 +++++++++++++++---- .../bms/service/BmsSupplierService.java | 2 + .../service/impl/BmsRegionServiceImpl.java | 7 +- .../impl/BmsSupplierApplicationService.java | 27 +++++++ .../service/impl/BmsSupplierServiceImpl.java | 5 ++ .../his/service/HisUserSupplierService.java | 7 +- .../impl/HisUserSupplierServiceImpl.java | 46 ++++++------ .../service/TbsBudgetApplicationService.java | 2 +- .../service/impl/TbsBudgetServiceImpl.java | 2 + .../mapper/bms/BmsSupplierChannelMapper.xml | 2 +- .../mapper/his/HisUserSupplierMapper.xml | 45 ------------ 15 files changed, 148 insertions(+), 96 deletions(-) diff --git a/src/main/java/com/qs/serve/common/model/dto/R.java b/src/main/java/com/qs/serve/common/model/dto/R.java index 14f3a14a..23ba1fff 100644 --- a/src/main/java/com/qs/serve/common/model/dto/R.java +++ b/src/main/java/com/qs/serve/common/model/dto/R.java @@ -148,6 +148,10 @@ public class R implements Serializable { } public static R> byPageHelperList(List data){ + return R.ok(buildPageHelperList(data)); + } + + public static PageVo buildPageHelperList(List data){ PageVo pageVo = new PageVo<>(); PageInfo pageInfo = new PageInfo<>(data); pageVo.setPageSize(pageInfo.getPageSize()); @@ -155,7 +159,7 @@ public class R implements Serializable { pageVo.setTotal(pageInfo.getTotal()); pageVo.setList(data); pageVo.setTotalPage(new Long(pageInfo.getPages())); - return R.ok(pageVo); + return pageVo; } public static R> byEmptyList(){ diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java index a57a36b9..6881591f 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java @@ -138,7 +138,7 @@ public class BmsChannelController { public R deleteById(@PathVariable("id") Long id){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsActivityChannel::getChannelId,id); - if(activityChannelService.count()>0){ + if(activityChannelService.count(lqw)>0){ return R.error("活动含当前渠道，删除失败"); } 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 3d45995d..4bbc7dcc 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 @@ -2,6 +2,7 @@ package com.qs.serve.modules.bms.controller; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.qs.serve.common.framework.redis.RedisService; import com.qs.serve.common.model.annotation.SysLog; @@ -109,12 +110,14 @@ public class BmsSupplierController { List userIds = sysPostUserService.listByChildIds(userId); userIds.add(userId); HisUserSupplier userSupplier = param.toHisUserSupplier(null,null); - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(userSupplier); - lqw.in(HisUserSupplier::getUserId,userIds); - lqw.ne(HisUserSupplier::getSupplierId,0); + QueryWrapper lqw = new QueryWrapper<>(userSupplier); + lqw.select("distinct his_user_supplier.supplier_id"); + lqw.lambda().in(HisUserSupplier::getUserId,userIds) + .ne(HisUserSupplier::getSupplierId,0); PageHelper.startPage(param.getPageNum(),param.getPageSize()); List list = hisUserSupplierService.list(lqw); - List supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList()); + List supplierIds = list.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList()); + List supplierList = bmsSupplierService.listByIds(supplierIds); return R.byPageHelperList(list,supplierList); } PageHelper.startPage(param.getPageNum(),param.getPageSize()); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierContactsMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierContactsMyController.java index eecc5365..7fc0c9cf 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierContactsMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierContactsMyController.java @@ -40,6 +40,7 @@ public class BmsSupplierContactsMyController { private final HisUserSupplierService hisUserSupplierService; private BmsSupplierContactsService bmsSupplierContactsService; + private BmsSupplierService bmsSupplierService; /** @@ -49,11 +50,8 @@ public class BmsSupplierContactsMyController { */ @GetMapping("/page") public R> getPage(BmsSupplierContactsSo param){ - - List list = hisUserSupplierService.selectSupplier(null,false); - List supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList()); - List supplierIds = supplierList.stream().map(a->a.getId()).distinct().collect(Collectors.toList()); - + List hisUserSuppliers = hisUserSupplierService.selectHisSupplier(null,false); + List supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList()); PageUtil.startPage(); BmsSupplierContacts query = CopierUtil.copy(param,new BmsSupplierContacts()); LambdaQueryWrapper contactsLambdaQueryWrapper = new LambdaQueryWrapper<>(query); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java index a43ef17a..6c71bc4e 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java @@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; -import com.qs.serve.common.util.AuthContextUtils; -import com.qs.serve.common.util.CopierUtil; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.TreeUtil; +import com.qs.serve.common.util.*; +import com.qs.serve.modules.bms.entity.BmsRegion; +import com.qs.serve.modules.bms.entity.BmsRegion2; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo; +import com.qs.serve.modules.bms.service.BmsRegion2Service; +import com.qs.serve.modules.bms.service.BmsRegionService; import com.qs.serve.modules.bms.service.BmsSupplierService; import com.qs.serve.modules.his.entity.HisUserSupplier; import com.qs.serve.modules.his.service.HisUserSupplierService; @@ -39,6 +40,8 @@ import java.util.stream.Collectors; @RequestMapping("/my/supplier") public class BmsSupplierMyController { + private BmsRegionService bmsRegionService; + private BmsRegion2Service bmsRegion2Service; private final BmsSupplierService bmsSupplierService; private final HisUserSupplierService hisUserSupplierService; private SysPostUserService postUserService; @@ -50,9 +53,9 @@ public class BmsSupplierMyController { */ @GetMapping("/page") public R> getPage(BmsSupplier param){ - List list = hisUserSupplierService.selectSupplier(param,true); - List supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList()); - return R.byPageHelperList(list,supplierList); + PageVo pageVo = hisUserSupplierService.selectPageSupplier(param); + initSupplierList(pageVo.getList()); + return R.ok(pageVo); } /** @@ -65,9 +68,9 @@ public class BmsSupplierMyController { List childIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId()); param.setSelectUserIds(childIds); param.setSelectUserIdsFlag(true); - List list = hisUserSupplierService.selectSupplier(param,true); - List supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList()); - return R.byPageHelperList(list,supplierList); + PageVo pageVo = hisUserSupplierService.selectPageSupplier(param); + initSupplierList(pageVo.getList()); + return R.ok(pageVo); } /** @@ -81,9 +84,52 @@ public class BmsSupplierMyController { childIds.add(AuthContextUtils.getSysUserId()); param.setSelectUserIds(childIds); param.setSelectUserIdsFlag(true); - List list = hisUserSupplierService.selectSupplier(param,true); - List supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList()); - return R.byPageHelperList(list,supplierList); + PageVo pageVo = hisUserSupplierService.selectPageSupplier(param); + initSupplierList(pageVo.getList()); + return R.ok(pageVo); + } + + + + /** + * 显示关联 + * @param list + */ + private void initSupplierList(List list){ + for (BmsSupplier supplier : list) { + String regionId = null; + if(StringUtils.isNotEmpty(supplier.getRegionFourthly())){ + regionId = supplier.getRegionFourthly(); + }else if(StringUtils.isNotEmpty(supplier.getRegionThird())){ + regionId = supplier.getRegionThird(); + }else if (StringUtils.isNotEmpty(supplier.getRegionSecond())){ + regionId = supplier.getRegionSecond(); + }else if (StringUtils.isNotEmpty(supplier.getRegionFirst())){ + regionId = supplier.getRegionFirst(); + } + if(regionId!=null){ + BmsRegion region = bmsRegionService.getById(regionId); + if(region!=null){ + supplier.setRegionLabel(region.getName()); + } + } + String region2Id = null; + if(StringUtils.isNotEmpty(supplier.getRegion2Fourthly())){ + region2Id = supplier.getRegion2Fourthly(); + }else if(StringUtils.isNotEmpty(supplier.getRegion2Third())){ + region2Id = supplier.getRegion2Third(); + }else if (StringUtils.isNotEmpty(supplier.getRegion2Second())){ + region2Id = supplier.getRegion2Second(); + }else if (StringUtils.isNotEmpty(supplier.getRegion2First())){ + region2Id = supplier.getRegion2First(); + } + if(region2Id!=null){ + BmsRegion2 region = bmsRegion2Service.getById(region2Id); + if(region!=null){ + supplier.setRegion2Label(region.getName()); + } + } + } } } diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierService.java index acd526bd..aaeddd74 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierService.java @@ -30,6 +30,8 @@ public interface BmsSupplierService extends IService { List listByRegion2Id(String regionId); + List listByRegionIds(List regionIds,Integer level); + void editBatch(BmsSupplierBatchBo param); void flashParentId(); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java index 732e7c61..0bc9b668 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java @@ -39,7 +39,7 @@ public class BmsRegionServiceImpl extends ServiceImpl private SysUserService sysUserService; private BmsChannelPointMapper bmsChannelPointMapper; private BmsFactoryService bmsFactoryService; - private HisUserChannelPointService hisUserChannelPointService; + private BmsSupplierApplicationService bmsSupplierApplicationService; @Override public boolean saveBmsRegion(BmsRegion param){ @@ -60,8 +60,11 @@ public class BmsRegionServiceImpl extends ServiceImpl if(!ori.getName().equals(param.getName())||changePid) { BmsRegion parentRegion = this.updatePathByPid(param.getId()); if(changePid){ + /*停用的逻辑 hisUserChannelPointService.removeRegion(2,ori.getPathIds()); - hisUserChannelPointService.flushRegion(2,parentRegion.getPathIds()); + hisUserChannelPointService.flushRegion(2,parentRegion.getPathIds());*/ + //todo 更新客户 + //bmsSupplierApplicationService.listByRegionIds() } } return b; diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java index 6fd4bd0a..3c7c80d7 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java @@ -7,6 +7,8 @@ import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion2; +import com.qs.serve.modules.bms.entity.BmsSupplier; +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.tbs.common.TbsCenterType; @@ -47,6 +49,7 @@ public class BmsSupplierApplicationService { private TbsBudgetConditionMapper budgetConditionMapper; private TbsScheduleItemBudgetMapper scheduleItemBudgetMapper; private TbsActivityMapper activityMapper; + private BmsSupplierMapper bmsSupplierMapper; /** * 客户更新区域时，预算政策统计 @@ -297,4 +300,28 @@ public class BmsSupplierApplicationService { } } + public List listByRegionIds(List regionIds, Integer level) { + if(regionIds.size()>0){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + if(level.equals(1)){ + lqw.and( + aa->aa.in(BmsSupplier::getRegionFirst,regionIds) + .or().in(BmsSupplier::getRegion2First,regionIds) + ); + }else if(level.equals(2)){ + lqw.and( + aa->aa.in(BmsSupplier::getRegionSecond,regionIds) + .or().in(BmsSupplier::getRegion2Second,regionIds) + ); + }else if(level.equals(3)){ + lqw.and( + aa->aa.in(BmsSupplier::getRegionThird,regionIds) + .or().in(BmsSupplier::getRegion2Third,regionIds) + ); + } + return bmsSupplierMapper.selectList(lqw); + } + return new ArrayList<>(); + } + } 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 16852523..0430a965 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 @@ -168,6 +168,11 @@ public class BmsSupplierServiceImpl extends ServiceImpl listByRegionIds(List regionIds, Integer level) { + return supplierApplicationService.listByRegionIds(regionIds, level); + } + @Override public void editBatch(BmsSupplierBatchBo batchBo) { for (BmsSupplierBatchBo.BmsSupplierDto param : batchBo.getSupplierList()) { 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 bb7c67d7..ca206934 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,6 +1,7 @@ package com.qs.serve.modules.his.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.his.entity.HisUserSupplier; @@ -13,7 +14,11 @@ import java.util.List; */ public interface HisUserSupplierService extends IService { - List selectSupplier(BmsSupplier param,boolean usePage); + List selectHisSupplier(BmsSupplier param,boolean usePage); + + List selectListSupplier(BmsSupplier param); + + PageVo selectPageSupplier(BmsSupplier param); boolean initByUserId(String userId,boolean hasCheck); 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 5a00a9b7..45da1c1d 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 @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.PageUtil; @@ -43,7 +45,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl selectSupplier(BmsSupplier param, boolean usePage) { + public List selectHisSupplier(BmsSupplier param, boolean usePage) { if(param==null){ param = new BmsSupplier(); } @@ -61,15 +63,32 @@ public class HisUserSupplierServiceImpl extends ServiceImpl(); } HisUserSupplier userSupplier = param.toHisUserSupplier(null,null); - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(userSupplier); - lqw.in(HisUserSupplier::getUserId,userIds); - lqw.ne(HisUserSupplier::getSupplierId,0); + QueryWrapper lqw = new QueryWrapper<>(userSupplier); + lqw.select("distinct his_user_supplier.supplier_id"); + lqw.lambda().in(HisUserSupplier::getUserId,userIds) + .ne(HisUserSupplier::getSupplierId,0); if(usePage){ PageUtil.startPage(); } return this.list(lqw); } + @Override + public List selectListSupplier(BmsSupplier param) { + List hisUserSuppliers = selectHisSupplier(param,false); + List supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList()); + List supplierList = bmsSupplierService.listByIds(supplierIds); + return supplierList; + } + + @Override + public PageVo selectPageSupplier(BmsSupplier param) { + List hisUserSuppliers = selectHisSupplier(param,true); + List supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList()); + List supplierList = bmsSupplierService.listByIds(supplierIds); + return R.buildPageHelperList(supplierList); + } + @Override public boolean checkInit(String userId) { LambdaQueryWrapper lqwExist = new LambdaQueryWrapper<>(); @@ -159,24 +178,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl userSuppliers,Integer type,List regionIds,Integer level,String userId){ if(regionIds.size()>0){ - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - if(level.equals(1)){ - lqw.and( - aa->aa.in(BmsSupplier::getRegionFirst,regionIds) - .or().in(BmsSupplier::getRegion2First,regionIds) - ); - }else if(level.equals(2)){ - lqw.and( - aa->aa.in(BmsSupplier::getRegionSecond,regionIds) - .or().in(BmsSupplier::getRegion2Second,regionIds) - ); - }else if(level.equals(3)){ - lqw.and( - aa->aa.in(BmsSupplier::getRegionThird,regionIds) - .or().in(BmsSupplier::getRegion2Third,regionIds) - ); - } - List supplierList = bmsSupplierService.list(lqw); + List supplierList = bmsSupplierService.listByRegionIds(regionIds,level); for (BmsSupplier supplier : supplierList) { HisUserSupplier userSupplier = supplier.toHisUserSupplier(userId,type); userSuppliers.add(userSupplier); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 87760e57..8dcf0c7d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -529,7 +529,7 @@ public class TbsBudgetApplicationService { lastAmount = BigDecimal.ZERO; } //判断是否够用 - if(budgetAmount.subtract(lastAmount).subtract(totalUsed).compareTo(goodsAmount)>0){ + if(budgetAmount.subtract(lastAmount).subtract(totalUsed).compareTo(goodsAmount)>-1){ activityCostItem.setBudgetId(itemBudget.getBudgetId()); activityCostItem.setScheduleId(itemBudget.getScheduleId()); activityCostItem.setScheduleItemId(itemBudget.getScheduleItemId()); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index 0f3cd44e..6012d62a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -95,6 +95,8 @@ public class TbsBudgetServiceImpl extends ServiceImpl // if(sameCondition){ // Assert.throwEx("已存在相同条件预算"); // } + budget.setBudgetCode(budgetBo.getBudgetCode()); + budget.setSubjectId(budgetBo.getSubjectId()); BmsSubject subject = null; if(budget.getSubjectId()!=0L){ subject = subjectService.getById(budgetBo.getSubjectId()); diff --git a/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml b/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml index 387ca466..a06d8674 100644 --- a/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml @@ -56,7 +56,7 @@ and `bms_channel`.`channel_name` LIKE CONCAT('%',#{query.channelName},'%') and `bms_channel`.`channel_code` LIKE CONCAT('%',#{query.channelCode},'%') - and `bms_channel`.`channel_type` = #{query.channelType} + and `bms_channel`.`channel_type` = #{query.channelType} and `bms_supplier`.`name` LIKE CONCAT('%',#{query.supplierName},'%') and `bms_supplier`.`code` LIKE CONCAT('%',#{query.supplierCode},'%') diff --git a/src/main/resources/mapper/his/HisUserSupplierMapper.xml b/src/main/resources/mapper/his/HisUserSupplierMapper.xml index e332e674..2761df1c 100644 --- a/src/main/resources/mapper/his/HisUserSupplierMapper.xml +++ b/src/main/resources/mapper/his/HisUserSupplierMapper.xml @@ -4,28 +4,6 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - @@ -33,27 +11,6 @@ - - his_user_supplier.`id`, - his_user_supplier.`user_id`, - his_user_supplier.`supplier_id`, - his_user_supplier.`supplier_name`, - his_user_supplier.`supplier_code`, - his_user_supplier.`type`, - his_user_supplier.`region_id`, - his_user_supplier.`sale_region_first`, - his_user_supplier.`sale_region_second`, - his_user_supplier.`sale_region_third`, - his_user_supplier.`sale_region_fourthly`, - his_user_supplier.`master_flag`, - his_user_supplier.`create_time`, - his_user_supplier.`biz_region_first`, - his_user_supplier.`biz_region_second`, - his_user_supplier.`biz_region_third`, - his_user_supplier.`biz_region_fourthly`, - his_user_supplier.`tenant_id`, - his_user_supplier.`cost_flag` -