diff --git a/pom.xml b/pom.xml index 0eef9df..68fa21e 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,11 @@ + + org.springframework.boot + spring-boot-starter-security + + org.apache.commons @@ -54,6 +59,11 @@ uboot-core 2.4.1-zyhy-SNAPSHOT + + com.chinaunicom.mall.ebtp + uboot-common + 2.4.1-zyhy-SNAPSHOT + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java index 98ef532..59a2305 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java @@ -16,7 +16,7 @@ public interface AnnualreviewTaskConstant { /** * 进行中 */ - public static final Long IN_PROGRESS = 1L; + public static final String IN_PROGRESS = "1L"; /** * 已完成 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java index 5ed57cc..1994d52 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java @@ -33,6 +33,10 @@ public interface CoscoCategoryConstant { * 是否加入 */ public static final Long ISTRUE = 1L; + /** + * 未加入 + */ + public static final Long ISNOTTRUE = 0L; /** * 建库方式 online.线上 */ @@ -53,6 +57,10 @@ public interface CoscoCategoryConstant { * 最高级 0 */ public static final String LEVEL_TOP = "0"; + /** + * 顶级0L + */ + public static final Long CATEGORY_LEVEL_TOP = 0L; /** * * 类型(0.分类、1.品类) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java index 135198b..00d5dbc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java @@ -23,7 +23,7 @@ public class UserController { @GetMapping("/getUserList") public BaseResponse getUserList(SelectUserVo vo) { - return BaseResponse.success(userService.getUser(vo.getUserIds())); + return BaseResponse.success(userService.getUser(vo)); } @GetMapping("/getDeptList") diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java index 37f97e3..910d921 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java @@ -1,5 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import org.springframework.stereotype.Service; @@ -23,16 +24,15 @@ public class UserService { } - public List getUser(List userIds) { + public List getUser(SelectUserVo vo) { List userList = new ArrayList<>(); Map map = new HashMap<>(); - if(userIds!=null){ - for (String userId : userIds) { + if(vo.getUserIds()!=null){ + for (String userId : vo.getUserIds()) { map.put(userId,userId); } } - - for (int i = 1; i <= 10; i++) { + for (int i = 1; i <= 32; i++) { UserVo user = new UserVo(); user.setUserId("U" + String.format("%03d", i)); // U001 ~ U010 user.setUserName("用户" + i); @@ -44,6 +44,14 @@ public class UserService { } userList.add(user); } + + if(vo.getPageNumber()!=null && vo.getPageSize()!=null){ + int pageNum = vo.getPageNumber(); + int pageSize = vo.getPageSize(); + int start = (pageNum - 1) * pageSize; + int end = Math.min(start + pageSize, userList.size()); + return userList.subList(start, end); + } return userList; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/SelectUserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/SelectUserVo.java index cf6c021..011f8c8 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/SelectUserVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/SelectUserVo.java @@ -7,4 +7,7 @@ import java.util.List; @Data public class SelectUserVo { private List userIds; + + private Integer pageNumber; + private Integer pageSize; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskSupplierMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskSupplierMapper.java index 9456245..2d4d1ce 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskSupplierMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskSupplierMapper.java @@ -91,4 +91,11 @@ public interface CoscoAnnualreviewTaskSupplierMapper { * @return */ IPage getSupplierAnnualReviewStatistics(IPage p, SupplierAnnualReviewStatisticsVo vo); + + /** + * 导出年审列表 + * @param vo + * @return + */ + List getSupplierAnnualReviewStatisticsList(SupplierAnnualReviewStatisticsVo vo); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml index c330dce..467cda2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml @@ -228,13 +228,10 @@ FROM cosco_annualreview_task cat - and cat.annualreview_theme = #{vo.annualreviewTheme} + and cat.annualreview_theme like concat('%',#{vo.annualreviewTheme},'%') - - and cat.start_time = #{vo.startTime} - - - and cat.end_time = #{vo.endTime} + + and cat.start_time between #{vo.startTime} and #{vo.endTime} and cat.status = #{vo.status} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml index e61673f..6731ae3 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml @@ -51,7 +51,7 @@ cosco_annualreview_task_supplier cats join cosco_annualreview_task cat on cats.annualreview_task_id = cat.id JOIN cosco_supplier_base csb ON cats.supplier_id = csb.id - left join cosco_category cc on cc.id = csb.category_id + left join cosco_category cc on cc.id = cat.category_id where cats.del_flag='normal' and csb.name like concat('%',#{vo.name},'%') @@ -62,6 +62,9 @@ and cats.review_result=#{vo.reviewResult} + + and cats.last_update_time between #{vo.startTime} and #{vo.endTime} + select @@ -204,6 +208,43 @@ cosco_annualreview_task_supplier cats join cosco_supplier_base csb on cats.supplier_id=csb.id join cosco_annualreview_task cat on cat.id = cats.annualreview_task_id + + cats.del_flag = 'normal' + + and csb.name like concat('%',#{supplierName},'%') + + + and cat.annualreview_year = #{annualreviewYear} + + and review_result is not null + + + order by cats.create_time desc + + + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java index ab357ad..a0f045b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java @@ -47,6 +47,10 @@ public class CoscoAnnualreviewTemplate extends BaseEntity { * 品类id(cosco_category表主键) */ private String categoryId; + /** + * 创建单位 + */ + private String deptId; /** * 是否启用(0.草稿、1.启用、2.禁用) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java index fa187d6..49a14cd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java @@ -7,6 +7,7 @@ import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserService; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.*; @@ -62,6 +63,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS vo.setAnnualreviewTheme(coscoAnnualreviewTask.getAnnualreviewTheme()); vo.setTemplateId(coscoAnnualreviewTask.getTemplateId()); vo.setStartTime(coscoAnnualreviewTask.getStartTime()); + vo.setAnnualreviewYear(coscoAnnualreviewTask.getAnnualreviewYear()); vo.setEndTime(coscoAnnualreviewTask.getEndTime()); vo.setCategoryId(coscoAnnualreviewTask.getCategoryId()); vo.setCategoryLimitation(coscoAnnualreviewTask.getCategoryLimitation()); @@ -76,7 +78,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS //获取供应商用户信息 List coscoAnnualreviewTaskSupplierUsers = coscoAnnualreviewTaskSupplierUserMapper.selectCoscoAnnualreviewTaskSupplierUserList(coscoAnnualreviewTaskSupplierUser); //获取用户信息 - List user1 = userService.getUser(new ArrayList<>()); + List user1 = userService.getUser(new SelectUserVo()); //获取已使用的用户信息 Map userIdMap = coscoAnnualreviewTaskSupplierUsers.stream() .collect(Collectors. @@ -106,7 +108,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS blackSupplierVos.forEach(blackSupplierVo -> { List taskUserVos = new ArrayList<>(); List strings = suppMap.get(blackSupplierVo.getSupplierId()); - if(strings.size()>0){ + if(!strings.isEmpty()){ for (String userId : strings) { TaskUserVo uVo=new TaskUserVo(); UserVo userVo = userMap.get(userId); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java index b44c936..e9d2d9f 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java @@ -3,9 +3,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskSupplierUserMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewScoring; +import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTask; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplierUser; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskSupplierUserService; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualAddScoreVo; @@ -35,6 +38,8 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua @Autowired private CoscoSupplierBaseMapper coscoSupplierBaseMapper; @Autowired + private CoscoAnnualreviewTaskMapper coscoAnnualreviewTaskMapper; + @Autowired private CoscoAnnualreviewScoringMapper coscoAnnualreviewScoringMapper; /** @@ -45,10 +50,21 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua */ @Override public AnnualreviewTaskSupplierUserInfoVo selectCoscoAnnualreviewTaskSupplierUserById(String id) { + //获取人员信息 CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser = coscoAnnualreviewTaskSupplierUserMapper.selectCoscoAnnualreviewTaskSupplierUserById(id); + //获取供应商信息 BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoAnnualreviewTaskSupplierUser.getSupplierId()); + //获取任务信息 + CoscoAnnualreviewTask coscoAnnualreviewTask = coscoAnnualreviewTaskMapper.selectCoscoAnnualreviewTaskById(coscoAnnualreviewTaskSupplierUser.getAnnualreviewTaskId()); + //返回封装 AnnualreviewTaskSupplierUserInfoVo vo = new AnnualreviewTaskSupplierUserInfoVo(); + vo.setId(id); vo.setName(baseCategoryNameVo.getName()); + vo.setDeptName(SupplierUserConstant.CREATE_DEPT); + vo.setThemName(coscoAnnualreviewTask.getAnnualreviewTheme()); + vo.setReviewerName(SupplierUserConstant.USER_NAME); + vo.setStartTime(coscoAnnualreviewTask.getStartTime()); + vo.setEndTime(coscoAnnualreviewTask.getEndTime()); vo.setCategory(baseCategoryNameVo.getCategoryName()); vo.setTaskIndicatorVo(coscoAnnualreviewScoringMapper.selectIndList(id)); return vo; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java index 7157827..761ca1c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.Date; @Data public class AnnualreviewTaskSupplierListVo implements Serializable { @@ -42,6 +43,12 @@ public class AnnualreviewTaskSupplierListVo implements Serializable { private String deptId; + /** + * 审查开始时间 + */ + private Date startTime; + private Date endTime; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java index 1b47d75..357f208 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java @@ -1,13 +1,17 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; import java.util.List; @Data public class AnnualreviewTaskSupplierUserInfoVo implements Serializable { + + private String id; /** * 供应商 */ @@ -16,6 +20,31 @@ public class AnnualreviewTaskSupplierUserInfoVo implements Serializable { * 供应品类 */ private String category; + + /** + * 审查主题 + */ + private String themName; + /** + * 所属部门 + */ + private String deptName; + /** + * 审查人 + */ + private String reviewerName; + /** + * 开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startTime; + /** + * 结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endTime; + + /** * 打分项集合 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/CoscoBlacklistSupplierMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/CoscoBlacklistSupplierMapper.java index 2c529ea..cdf3354 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/CoscoBlacklistSupplierMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/CoscoBlacklistSupplierMapper.java @@ -63,4 +63,11 @@ public interface CoscoBlacklistSupplierMapper { * @return 结果 */ public int deleteCoscoBlacklistSupplierByBlacklistIds(String[] blacklistIds); + + /** + * 查询供应商加入黑名单数量 + * @param supplierId + * @return + */ + int countBySupplierId(String supplierId); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml index 8b473e9..ee33cb7 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml @@ -214,6 +214,7 @@ '发起单位' as unitName, cb.create_time as createTime, cb.approve_status as approveStatus, + cb.restore_approve_status as restoreApproveStatus, case when cb.approve_status is null then '未开始' when cb.approve_status = 0 then '进行中' @@ -232,7 +233,7 @@ + - - where blacklist_id = #{blacklistId} + + where blacklist_id = #{blacklistId} - + insert into cosco_blacklist_supplier - blacklist_id, - supplier_id, + blacklist_id, + supplier_id, - #{blacklistId}, - #{supplierId}, + #{blacklistId}, + #{supplierId}, @@ -46,18 +50,20 @@ ( #{item.blacklistId}, #{item.supplierId}) - + update cosco_blacklist_supplier - supplier_id = - #{supplierId}, - + supplier_id = + #{supplierId}, + where blacklist_id = #{blacklistId} - update cosco_blacklist_supplier set del_flag = 2 + update cosco_blacklist_supplier + set del_flag = 2 where blacklist_id = #{blacklistId} @@ -67,4 +73,12 @@ #{blacklistId} + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistSupplierService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistSupplierService.java index d1fac47..b2605ae 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistSupplierService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistSupplierService.java @@ -64,4 +64,11 @@ public interface ICoscoBlacklistSupplierService { * @param listVo */ void batchInsert(AddBlackListVo listVo); + + /** + * 根据供应商id查询 + * @param supplierId + * @return + */ + int countBySupplierId(String supplierId); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java index 90829b0..45abdb9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.dao.CoscoBlacklistMapper; @@ -91,10 +92,10 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { @Transactional(rollbackFor = Exception.class) public int insertCoscoBlacklist(AddBlackListVo listVo) { listVo.setCreateTime(new Date()); - listVo.setCreateBy("admin"); + listVo.setCreateBy(SupplierUserConstant.USER_NAME); listVo.setLastUpdateTime(LocalDateTime.now()); listVo.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES); - listVo.setDeptId("1"); + listVo.setDeptId(SupplierUserConstant.DEPT_ID); listVo.setId(PropertyUtils.getSnowflakeId()); coscoBlacklistMapper.insertCoscoBlacklist(listVo); //添加供应商 @@ -229,27 +230,23 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())) { CoscoBlacklistSupplier coscoBlacklistSupplier = new CoscoBlacklistSupplier(); coscoBlacklistSupplier.setBlacklistId(coscoBlacklist.getId()); - List coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier); + List coscoBlacklistSuppliers = + coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier); //获取添加时限 DictProject dictProject = new DictProject(); dictProject.setParentCode(EvaluateTaskConstant.INDICATOR_TYPE_ND); coscoBlacklistSuppliers.forEach(cosupplier -> { //判断黑名单 if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) { + int count =coscoBlacklistSupplierService.countBySupplierId(cosupplier.getSupplierId()); CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); - coscoSupplierBase.setId(cosupplier.getSupplierId()); - coscoSupplierBase.setBlacklistStatus(CoscoCategoryConstant.ISTRUE); - coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); - } - //判断灰名单 - if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) { - CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); - coscoSupplierBase.setId(cosupplier.getSupplierId()); - coscoSupplierBase.setGreylistStatus(CoscoCategoryConstant.ISTRUE); - coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + if(count==0){ + coscoSupplierBase.setId(cosupplier.getSupplierId()); + coscoSupplierBase.setBlacklistStatus(CoscoCategoryConstant.ISNOTTRUE); + coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + } } }); - } coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistSupplierServiceImpl.java index c0ca74d..5ddd8cc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistSupplierServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistSupplierServiceImpl.java @@ -99,4 +99,9 @@ public class CoscoBlacklistSupplierServiceImpl implements ICoscoBlacklistSupplie }); coscoBlacklistSupplierMapper.batchCoscoBlacklistSupplier(list); } + + @Override + public int countBySupplierId(String supplierId) { + return coscoBlacklistSupplierMapper.countBySupplierId(supplierId); + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java index 8e5b031..402fc55 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java @@ -40,6 +40,11 @@ public class BlackListVo implements Serializable { */ private String approveStatusName; + /** + * 恢复状态 + */ + private Integer restoreApproveStatus; + /** * 主题信息（包含供应商名称和名单类型） */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryLibraryContainMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryLibraryContainMapper.java index f48b8d2..867d67f 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryLibraryContainMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryLibraryContainMapper.java @@ -82,4 +82,11 @@ public interface CoscoCategoryLibraryContainMapper extends IBaseMapper selectCoscoCateGoryIdByLibraryId(String libraryId); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryMapper.java index cf700d5..4d7dec9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryMapper.java @@ -65,5 +65,10 @@ public interface CoscoCategoryMapper extends IBaseMapper { IPage selectMyPage(IPage p,@Param("coscoCategory") CoscoCategoryVO coscoCategory); + /** + * 根据品类id获取全部名称 + * @param id + * @return + */ String selectCategoryNameById(String id); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml index 3829081..81382e5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml @@ -108,4 +108,11 @@ and category_id = #{categoryId} + + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml index 37c1e6e..1126c82 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml @@ -50,6 +50,7 @@ select cclsa.id, ccl.name, ccl.area, + ccl.id as libraryId, '张三' as applyUser , ccl.create_time as applyTime, cclsa.approve_status as approveStatus @@ -206,6 +207,12 @@ and ccl.name like concat('%',#{vo.name},'%') + + and ccl.area = #{vo.area} + + + and cclsa.approveStatus = #{vo.approveStatus} + GROUP BY cclsa.id diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml index 0e328e9..17ed38d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml @@ -101,16 +101,11 @@ coscoCategoryLibraryContain); + + /** + * 获取品类名称 + * @param libraryId + * @return + */ + List selectCoscoCateGoryIdByLibraryId(String libraryId); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java index 2598bdc..7484054 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java @@ -154,6 +154,16 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl selectCoscoCateGoryIdByLibraryId(String libraryId) { + return coscoCategoryLibraryContainMapper.selectCoscoCateGoryIdByLibraryId(libraryId); + } + /** * 递归构建树形结构 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java index eb067de..afd2914 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java @@ -8,6 +8,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarAttachmentsMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrary; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService; @@ -41,6 +42,8 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl strings = coscoCategoryLibraryContainService.selectCoscoCateGoryIdByLibraryId(id); + StringBuilder sb = new StringBuilder(); + for (String s : strings) { + String categoryName = coscoCategoryMapper.selectCategoryNameById(s); + if (sb.length() > 0) { + sb.append(","); + } + if(categoryName!=null){ + sb.append(categoryName); + } + } + vo.setCategoryName(sb.toString()); coscoCategoryLibrarAttachmentsMapper.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id); //获取添加品类 vo.setCategoryIds(coscoCategoryLibraryContainService.selectByLibraryId(id)); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java index c94d6dd..73d260a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java @@ -6,7 +6,10 @@ import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCoscoCategoryLibrarySupplierApplyVo; @@ -31,6 +34,10 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp private CoscoCategoryLibrarySupplierApplyMapper coscoCategoryLibrarySupplierApplyMapper; @Autowired private ICoscoCategoryLibrarySupplierService coscoCategoryLibrarySupplierService; + @Autowired + private ICoscoCategoryLibraryContainService coscoCategoryLibraryContainService; + @Autowired + private CoscoCategoryMapper coscoCategoryMapper; /** * 查询品类库_品类库入库供应商申请单 @@ -42,7 +49,15 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp public ListCoscoCategoryLibrarySupplierApplyVo selectCoscoCategoryLibrarySupplierApplyById(String id) { ListCoscoCategoryLibrarySupplierApplyVo vo = coscoCategoryLibrarySupplierApplyMapper.selectCoscoCategoryLibrarySupplierApplyById(id); //获取添加的供应商 - + List strings = coscoCategoryLibraryContainService.selectCoscoCateGoryIdByLibraryId(vo.getLibraryId()); + StringBuilder sb = new StringBuilder(); + for (String s : strings) { + if (sb.length() > 0) { + sb.append(","); + } + sb.append(coscoCategoryMapper.selectCategoryNameById(s)); + } + vo.setCategoryName(sb.toString()); vo.setCoscoCategoryLibrarySupplierVos(coscoCategoryLibrarySupplierService.selectSupplierByApplyId(id)); return vo; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryDetailVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryDetailVo.java index 1127c11..bbc1773 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryDetailVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryDetailVo.java @@ -13,6 +13,10 @@ import java.util.List; public class CoscoCategoryLibraryDetailVo extends CoscoCategoryLibrary { private String deptName; + + private String createByName="测试人员"; + + private String categoryName; /** * 品类id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java index e01f8d0..7e141b2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java @@ -17,6 +17,18 @@ public class ListCoscoCategoryLibrarySupplierApplyVo implements Serializable { * 品类库 */ private String name; + /** + * 部门名称 + */ + private String deptName="部门"; + /** + * 品类名称 + */ + private String categoryName; + /** + * 品类id + */ + private String libraryId; /** * 地域 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskSupplierMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskSupplierMapper.java index 6fdd9e9..852e6b3 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskSupplierMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskSupplierMapper.java @@ -106,4 +106,6 @@ public interface CoscoEvaluateTaskSupplierMapper { * @return */ List exportList(CoscoEvaluateTaskSupplier taskListVo); + + List getSupplierEvaluateStatisticsList(SupplierEvaluateStatisticsVo vo); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml index ee4c787..45f1516 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml @@ -122,14 +122,14 @@ select cet.id as taskId, case when cetad.status = 1 and cetad2.status is null then 1 else 2 end as division from cosco_evaluate_task cet - join cosco_evaluate_task_assign_dept cetad + join cosco_evaluate_task_assign_dept cetad on cet.id = cetad.evaluate_task_id and cetad.parent_dept_id = #{parentDeptId} and cetad.status = 1 left join cosco_evaluate_task_assign_dept cetad2 on cet.id = cetad2.evaluate_task_id and cetad2.parent_dept_id = #{deptId} - cet.id in ( + cet.id in ( #{item} @@ -353,10 +353,10 @@ cet.dept_id as deptId, cet.approve_status as approveStatus, case - when cet.approve_status = 0 then '审批中' - when cet.approve_status = 1 then '通过' - when cet.approve_status = 2 then '驳回' - else '未审批' end as approveName, + when cet.approve_status = 0 then '审批中' + when cet.approve_status = 1 then '通过' + when cet.approve_status = 2 then '驳回' + else '未审批' end as approveName, case when cet.status = 0 then '待评价' when cet.status = 1 then '评价中' @@ -376,6 +376,9 @@ and cet.status=#{vo.status} + + and cet.start_time between #{vo.startTime} and #{vo.endTime} + group by id @@ -407,6 +410,10 @@ and cet.status=#{vo.status} + + and (cet.start_time >= #{vo.startTime} and cet.end_time <= #{vo.endTime}) + + order by cet.create_time desc diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml index 7959296..acdb78a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml @@ -79,6 +79,7 @@ and cets.last_update_time = #{lastUpdateTime} + @@ -122,6 +123,12 @@ and cets.last_update_time = #{vo.lastUpdateTime} + + and csb.name like concat('%',#{vo.supplierName},'%') + + + and cets.level_name = #{vo.levelName} + @@ -289,6 +296,15 @@ LEFT JOIN cosco_supplier_base csb ON cets.supplier_id = csb.id and csb.del_flag='normal' and cetsu.del_flag = 'normal' + + and (csb.name like concat('%',#{vo.name},'%') or cet.evaluate_theme like concat('%',#{vo.name},'%')) + + + and cets.start_time between #{vo.startTime} and #{vo.endTime} + + + and cets.status = #{vo.status} + and cetsu.user_id= #{vo.userId} and cet.id= #{vo.taskId} and cets.supplier_id= #{vo.supplierId} @@ -302,6 +318,44 @@ where evaluate_task_id = #{taskId} + + + + + + select + csb.name supplierName, + case when csb.supplier_type = 'ovs' then '境外' + when csb.supplier_type = 'ovs' then '境内' + else '境内' end as area , + csb.id, + '退出单位' as accessUnit, + '退出部门' as accessDept, + cse.create_by as applyUser, + cse.update_time as applyTime, + (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' ) + from cosco_supplierexit_supplier_category cssc + join cosco_category cc + ON cc.id = cssc.category_id + where cssc.supplier_id=csb.id and cssc.supplierexit_id=cse.id) as categoryName + from cosco_supplierexit cse + join cosco_supplierexit_supplier css + on cse.id= css.supplierexit_id + join cosco_supplier_base csb on csb.id=css.supplier_id + where cse.approve_status=1 + + and csb.name like concat('%',#{supplierName},'%') + +