From 40e8ae9d0bc360a117cdd662c07b1acc93066bda Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 23 Jul 2025 13:32:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=B1=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoscoAnnualreviewTaskServiceImpl.java | 9 ++-- ...coAnnualreviewTaskSupplierServiceImpl.java | 7 ++-- ...nualreviewTaskSupplierUserServiceImpl.java | 22 ++++++---- .../impl/CoscoCategoryLibraryServiceImpl.java | 11 ++--- ...tegoryLibrarySupplierApplyServiceImpl.java | 10 ++--- .../impl/CoscoCategoryServiceImpl.java | 1 + .../impl/DataStatisticeServiceImpl.java | 41 ++++++++++++++++--- .../vo/SupplierAnnualReviewStatisticsVo.java | 2 + .../CoscoAnnualreviewTaskSupplierMapper.xml | 15 +++---- 9 files changed, 69 insertions(+), 49 deletions(-) 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 cabfb77..f88002f 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 @@ -17,8 +17,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddTaskVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.CoscoAnnualreviewTaskListVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.SupplierPeopleVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; -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.service.ICoscoCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskUserVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; @@ -56,7 +55,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS @Autowired private IOrgService orgService; @Autowired - private CoscoCategoryMapper organizationMapper; + private ICoscoCategoryService coscoCategoryService; /** * 查询供应商年审_年审任务主 @@ -78,7 +77,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS vo.setEndTime(coscoAnnualreviewTask.getEndTime()); vo.setTemplateName(coscoAnnualreviewTask.getTemplateName()); if(coscoAnnualreviewTask.getCategoryId()!=null && !AnnualreviewTaskConstant.universalUnlimitedCategory.equals(coscoAnnualreviewTask.getCategoryLimitation())){ - vo.setCategoryName(organizationMapper.selectCategoryNameById(coscoAnnualreviewTask.getCategoryId())); + vo.setCategoryName(coscoCategoryService.getCategoryNameById(coscoAnnualreviewTask.getCategoryId())); } vo.setCategoryId(coscoAnnualreviewTask.getCategoryId()); vo.setCategoryLimitation(coscoAnnualreviewTask.getCategoryLimitation()); @@ -286,7 +285,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS List deptIds = new ArrayList<>(); coscoAnnualreviewTaskListVoIPage.getRecords().forEach(ss -> { if(!AnnualreviewTaskConstant.universalUnlimitedCategory.equals(ss.getCategoryLimitation())){ - ss.setCategoryName(organizationMapper.selectCategoryNameById(ss.getCategoryId())); + ss.setCategoryName(coscoCategoryService.getCategoryNameById(ss.getCategoryId())); } OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(ss.getDeptId()); ss.setDeptName(orgDeptInfo.getOrgName()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java index 93c4b5a..fcde8c2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java @@ -1,6 +1,5 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -12,7 +11,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskSupplierService; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualreviewTaskSupplierListVo; -import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTemplateVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,7 +31,7 @@ public class CoscoAnnualreviewTaskSupplierServiceImpl implements ICoscoAnnualrev @Autowired private IOrgService orgService; @Autowired - private CoscoCategoryMapper coscoCategoryMapper; + private ICoscoCategoryService coscoCategoryService; /** * 查询供应商评价_年审任务关联供应商 @@ -116,7 +115,7 @@ public class CoscoAnnualreviewTaskSupplierServiceImpl implements ICoscoAnnualrev //获取查询部门信息 TODO 待完善 annualreviewTaskSupplierListVoIPage.getRecords().forEach(vo -> { if(!AnnualreviewTaskConstant.universalUnlimitedCategory.equals(vo.getCategoryLimitation())){ - vo.setCategoryName(coscoCategoryMapper.selectCategoryNameById(vo.getCategoryId())); + vo.setCategoryName(coscoCategoryService.getCategoryNameById(vo.getCategoryId())); } SysOrg orgInfo = orgService.getOrgInfo(vo.getDeptId()); if(!ObjectUtil.isEmpty(orgInfo)){ 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 d875b6d..90beacc 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 @@ -20,7 +20,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualAddScoreVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualTaskIndicatorVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualreviewTaskSupplierUserInfoVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualreviewTaskSupplierUserVo; -import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; @@ -28,7 +28,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 供应商评价_年审任务供应商对应评审人Service业务层处理 @@ -49,7 +52,7 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua @Autowired private CoscoAnnualreviewScoringMapper coscoAnnualreviewScoringMapper; @Autowired - private CoscoCategoryMapper coscoCategoryMapper; + private ICoscoCategoryService coscoCategoryService; @Autowired private IOrgService orgService; @@ -78,10 +81,10 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua vo.setAnnualreviewTheme(coscoAnnualreviewTask.getAnnualreviewTheme()); vo.setReviewerName(currentUser.getUserId()); - if(coscoAnnualreviewTaskSupplierUser.getReviewStatus().equals(AnnualreviewTaskConstant.WAIT_APPROVE)){ + if (coscoAnnualreviewTaskSupplierUser.getReviewStatus().equals(AnnualreviewTaskConstant.WAIT_APPROVE)) { vo.setReviewStatusName("待评审"); } - if(coscoAnnualreviewTaskSupplierUser.getReviewStatus().equals(AnnualreviewTaskConstant.APPROVE_PASS)){ + if (coscoAnnualreviewTaskSupplierUser.getReviewStatus().equals(AnnualreviewTaskConstant.APPROVE_PASS)) { vo.setReviewStatusName("已评审"); } @@ -161,20 +164,20 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua userVo.getBasePageRequest().getPageSize()); IPage annualreviewTaskSupplierUserVoIPage = coscoAnnualreviewTaskSupplierUserMapper.selectPage(p, userVo); List user = userService.getUser(new SelectUserVo()); - Map userMap = new HashMap<>(); + Map userMap = new HashMap<>(); user.forEach(uso -> { userMap.put(uso.getUserId(), uso); }); annualreviewTaskSupplierUserVoIPage.getRecords().forEach(vo -> { UserVo userVo1 = userMap.get(vo.getUserId()); - if(userVo1!=null){ + if (userVo1 != null) { vo.setUserName(userVo1.getUserName()); vo.setDeptName(userVo1.getUserDept()); OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(userVo1.getUserDeptId()); vo.setTenantName(orgDeptInfo.getOrgName()); } - if(!AnnualreviewTaskConstant.universalUnlimitedCategory.equals(vo.getCategoryLimitation())){ - vo.setCategoryName(coscoCategoryMapper.selectCategoryNameById(vo.getCategoryId())); + if (!AnnualreviewTaskConstant.universalUnlimitedCategory.equals(vo.getCategoryLimitation())) { + vo.setCategoryName(coscoCategoryService.getCategoryNameById(vo.getCategoryId())); } }); return annualreviewTaskSupplierUserVoIPage; @@ -193,6 +196,7 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua /** * 添加分数 + * * @param vo */ @Override 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 a33caf6..ef1441b 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 @@ -10,15 +10,10 @@ import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; -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.ICoscoCategoryLibrarAttachmentsService; -import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService; -import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryService; -import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; import org.apache.commons.beanutils.BeanUtils; @@ -48,7 +43,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl strings = coscoCategoryLibraryContainService.selectCoscoCateGoryIdByLibraryId(id); StringBuilder sb = new StringBuilder(); for (String s : strings) { - String categoryName = coscoCategoryMapper.selectCategoryNameById(s); + String categoryName = coscoCategoryService.getCategoryNameById(s); if (sb.length() > 0) { sb.append(","); } 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 9886894..8e0b0e0 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 @@ -11,13 +11,9 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; 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.CoscoCategoryLibrarAttachments; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply; -import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarAttachmentsService; -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.service.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCoscoCategoryLibrarySupplierApplyVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo; @@ -44,7 +40,7 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp @Autowired private ICoscoCategoryLibraryContainService coscoCategoryLibraryContainService; @Autowired - private CoscoCategoryMapper coscoCategoryMapper; + private ICoscoCategoryService coscoCategoryService; @Autowired private IOrgService orgService; @Autowired @@ -68,7 +64,7 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp if (sb.length() > 0) { sb.append(","); } - sb.append(coscoCategoryMapper.selectCategoryNameById(s)); + sb.append(coscoCategoryService.getCategoryNameById(s)); } vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id)); vo.setCategoryName(sb.toString()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java index d8687df..19735d4 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java @@ -136,6 +136,7 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl> treeList = categoryClient.getTreeList(coscoCategory); return treeList; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java index 2aea34e..de417ca 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskSupplierMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskSupplierMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierQualificationsMapper; @@ -27,6 +28,9 @@ public class DataStatisticeServiceImpl implements DataStatisticeService { @Autowired private CoscoSupplierexitMapper coscoSupplierexitMapper; + @Autowired + private ICoscoCategoryService coscoCategoryService; + @Autowired private CoscoSupplierQualificationsMapper coscoSupplierQualificationsMapper; @@ -41,17 +45,40 @@ public class DataStatisticeServiceImpl implements DataStatisticeService { public IPage getSupplierAnnualReviewStatistics(SupplierAnnualReviewStatisticsVo vo) { IPage p = new Page<>(vo.getBasePageRequest().getPageNo(), vo.getBasePageRequest().getPageSize()); - return coscoAnnualreviewTaskMapper.getSupplierAnnualReviewStatistics(p, vo); + IPage supplierAnnualReviewStatistics = coscoAnnualreviewTaskMapper.getSupplierAnnualReviewStatistics(p, vo); + supplierAnnualReviewStatistics.getRecords().forEach(item -> { + StringBuilder builder = new StringBuilder(); + if (item.getCategoryIds() != null && item.getCategoryIds().length() > 0) { + String[] split = item.getCategoryIds().split(","); + for (String s : split) { + builder.append(coscoCategoryService.getCategoryNameById(s)); + } + } + item.setCategoryName(builder.toString()); + }); + return supplierAnnualReviewStatistics; } /** * 查询导出年审数据 + * * @param vo * @return */ @Override - public List getSupplierAnnualReviewStatisticsList(SupplierAnnualReviewStatisticsVo vo){ - return coscoAnnualreviewTaskMapper.getSupplierAnnualReviewStatisticsList(vo); + public List getSupplierAnnualReviewStatisticsList(SupplierAnnualReviewStatisticsVo vo) { + List supplierAnnualReviewStatisticsList = coscoAnnualreviewTaskMapper.getSupplierAnnualReviewStatisticsList(vo); + supplierAnnualReviewStatisticsList.forEach(item -> { + StringBuilder builder = new StringBuilder(); + if (item.getCategoryIds() != null && item.getCategoryIds().length() > 0) { + String[] split = item.getCategoryIds().split(","); + for (String s : split) { + builder.append(coscoCategoryService.getCategoryNameById(s)); + } + } + item.setCategoryName(builder.toString()); + }); + return supplierAnnualReviewStatisticsList; } @Override @@ -63,10 +90,11 @@ public class DataStatisticeServiceImpl implements DataStatisticeService { /** * 供应商退出统计查询 + * * @param vo * @return */ - public List getSupplierExitStatisticsList(SupplierExitStatisticsVo vo){ + public List getSupplierExitStatisticsList(SupplierExitStatisticsVo vo) { return coscoSupplierexitMapper.getSupplierExitStatisticsList(vo); } @@ -79,11 +107,12 @@ public class DataStatisticeServiceImpl implements DataStatisticeService { /** * 供应商资质 + * * @param vo * @return */ - public List getSupplierQualificationExpireList(SupplierQualificationExpireVo vo){ - return coscoSupplierQualificationsMapper.getSupplierQualificationExpireList( vo); + public List getSupplierQualificationExpireList(SupplierQualificationExpireVo vo) { + return coscoSupplierQualificationsMapper.getSupplierQualificationExpireList(vo); } @Override diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java index 6e35e8a..4d20f89 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java @@ -48,6 +48,8 @@ public class SupplierAnnualReviewStatisticsVo { private String annualreviewYear; private String supplierId; + + private String categoryIds; /** * 评价结果 */ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml index 6244f25..e47cf2c 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml @@ -37,7 +37,7 @@ SELECT csb.id supplierId, csb.NAME, - cc.id as categoryId, + cat.category_id as categoryId, cats.annualreview_task_id as annualreviewTaskId, '单位' as deptName, cat.dept_id as deptId, @@ -49,7 +49,6 @@ 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 = cat.category_id where cats.del_flag='normal' and csb.name like concat('%',#{vo.name},'%') @@ -206,11 +205,9 @@ '准入部门' as accessDept, case when cats.review_result = 1 then '合格' else '不合格' end as annualStatisticsResult, - (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' ) + (select GROUP_CONCAT( DISTINCT casc.category_id SEPARATOR ', ' ) from cosco_access_supplier_category casc - join cosco_category cc - ON cc.id = casc.category_id - where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName, + where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryIds, cat.annualreview_year from cosco_annualreview_task_supplier cats @@ -244,11 +241,9 @@ '准入部门' as accessDept, case when cats.review_result = 1 then '合格' else '不合格' end as annualStatisticsResult, - (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' ) + (select GROUP_CONCAT( DISTINCT casc.category_id SEPARATOR ', ' ) from cosco_access_supplier_category casc - join cosco_category cc - ON cc.id = casc.category_id - where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName, + where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryIds, cat.annualreview_year from cosco_annualreview_task_supplier cats