From 2a2ea03958d332059b149fc1e25341a96aa21e83 Mon Sep 17 00:00:00 2001 From: houjishuang <46269784@qq.com> Date: Fri, 20 Jun 2025 10:45:50 +0800 Subject: [PATCH 1/7] gongyingshangxinxi yewuyuan --- src/main/resources/application-master.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/resources/application-master.yml b/src/main/resources/application-master.yml index 46677dd..d03d66e 100644 --- a/src/main/resources/application-master.yml +++ b/src/main/resources/application-master.yml @@ -73,12 +73,15 @@ spring: # 生产区 redis 配置 redis: - host: localhost # Redis 服务器地址，默认本地:ml-citation{ref="1,4" data="citationList"} - port: 6379 # 监听端口，默认 6379:ml-citation{ref="1,4" data="citationList"} - # password: Yhblsqt%21 # 访问密码（若无密码可省略）:ml-citation{ref="1,4" data="citationList"} - # database: 4 # 选择数据库编号，默认 0:ml-citation{ref="1,6" data="citationList"} - timeout: 3000 # 连接超时时间（单位：毫秒）:ml-citation{ref="4,6" data="citationList"} - + sentinel: + master: mymaster + nodes: 10.60.161.59:26379, 10.60.161.59:26380, 10.60.161.59:26381 + password: pass + database: + sharding: 1 + cache: 2 + idempotent: 3 + userinfo: 4 From af4c72510e215b163f1e938cf55b28565ef31060 Mon Sep 17 00:00:00 2001 From: houjishuang <46269784@qq.com> Date: Wed, 25 Jun 2025 15:44:08 +0800 Subject: [PATCH 2/7] gongyingshangxinxi yewuyuan --- pom.xml | 5 +++++ src/main/resources/application-master.yml | 10 ++++++++++ src/main/resources/application.yml | 4 ---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 851baf0..6998e86 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,11 @@ + + org.springframework.boot + spring-boot-starter-security + + org.apache.commons diff --git a/src/main/resources/application-master.yml b/src/main/resources/application-master.yml index d03d66e..8f37e13 100644 --- a/src/main/resources/application-master.yml +++ b/src/main/resources/application-master.yml @@ -157,3 +157,13 @@ management: cors: allowed-origins: "*" allowed-methods: "*" +login: + password: + privateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAK8sGQAshhH/H1G/lOJdAZYBdPOto38d7zSv2BCi9JDmhM/yqWUv345zUt1OKM8VGx10daDfu6a8WWLCGa6RTU1P6jaWgZwqnIwcWRz9Q82NAu935gVHidiGA/yX52ZE061BZrA63l1uSxEpOCEyMD4UpPb6K0yxrBKzX4hz7OgjAgMBAAECgYAT/jx8QJisxSmV8v/TNjpQHKp0hYT7pTcAFHHctDylrSnLci7TVbt2TsNObvVJbWdC3V/vlJmeVjD9jJnRytO/pgc+p8I3Q3pfF7ACiBAz1+4VZM40vFz0RfQKJ/kZB3DiGohprOw60kRR0eMtHuaA07luhBCbne6700Paf+OOAQJBAP9THm3KEcnChnRBC6yPdNHLN/XplgGaIJU2Wo0biI8Oz2bM3eJGPSwrVCqObOwVPNYJIfEQRhlWlB9kpBS0ECECQQCvorUUJwJhV+Fx6bhUK5aa1/rDTODPmS1MycvLtjOp7ig1sGcb4g9Vl8uRPzsvQZ6Z+sNTD4mFFnYFneCvPL/DAkAMZo4QyQKqKO98z/fwLpt+4P7by7eEZmb0uEoXlmHAiPibxpF0PvMTpRsWYgp6QOHOh20Fl0PAUUsqZyns833hAkBEzV9UIqfrDCsTnbQIvP6FcAAay53xlRbK0u5Twe9hLRtxVMY/hQHuzMUBBB0iOPlxZmtnuVls2kynjJ4853ZTAkEAu+lLTmM7DBV9jDEc9sNM7UNa0MvAUb6r9DsTKHGLLRqB7ljQ1R2RiLRknFaegUPEVsvdMszH2rdy3CaIWkC5OQ== + publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvLBkALIYR/x9Rv5TiXQGWAXTzraN/He80r9gQovSQ5oTP8qllL9+Oc1LdTijPFRsddHWg37umvFliwhmukU1NT+o2loGcKpyMHFkc/UPNjQLvd+YFR4nYhgP8l+dmRNOtQWawOt5dbksRKTghMjA+FKT2+itMsawSs1+Ic+zoIwIDAQAB + token: + time_limit: 20 + captcha: + privateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAK8sGQAshhH/H1G/lOJdAZYBdPOto38d7zSv2BCi9JDmhM/yqWUv345zUt1OKM8VGx10daDfu6a8WWLCGa6RTU1P6jaWgZwqnIwcWRz9Q82NAu935gVHidiGA/yX52ZE061BZrA63l1uSxEpOCEyMD4UpPb6K0yxrBKzX4hz7OgjAgMBAAECgYAT/jx8QJisxSmV8v/TNjpQHKp0hYT7pTcAFHHctDylrSnLci7TVbt2TsNObvVJbWdC3V/vlJmeVjD9jJnRytO/pgc+p8I3Q3pfF7ACiBAz1+4VZM40vFz0RfQKJ/kZB3DiGohprOw60kRR0eMtHuaA07luhBCbne6700Paf+OOAQJBAP9THm3KEcnChnRBC6yPdNHLN/XplgGaIJU2Wo0biI8Oz2bM3eJGPSwrVCqObOwVPNYJIfEQRhlWlB9kpBS0ECECQQCvorUUJwJhV+Fx6bhUK5aa1/rDTODPmS1MycvLtjOp7ig1sGcb4g9Vl8uRPzsvQZ6Z+sNTD4mFFnYFneCvPL/DAkAMZo4QyQKqKO98z/fwLpt+4P7by7eEZmb0uEoXlmHAiPibxpF0PvMTpRsWYgp6QOHOh20Fl0PAUUsqZyns833hAkBEzV9UIqfrDCsTnbQIvP6FcAAay53xlRbK0u5Twe9hLRtxVMY/hQHuzMUBBB0iOPlxZmtnuVls2kynjJ4853ZTAkEAu+lLTmM7DBV9jDEc9sNM7UNa0MvAUb6r9DsTKHGLLRqB7ljQ1R2RiLRknFaegUPEVsvdMszH2rdy3CaIWkC5OQ== + publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvLBkALIYR/x9Rv5TiXQGWAXTzraN/He80r9gQovSQ5oTP8qllL9+Oc1LdTijPFRsddHWg37umvFliwhmukU1NT+o2loGcKpyMHFkc/UPNjQLvd+YFR4nYhgP8l+dmRNOtQWawOt5dbksRKTghMjA+FKT2+itMsawSs1+Ic+zoIwIDAQAB + time_limit: 2 #Minutes \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 863f1a9..6e35b83 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,7 +1,3 @@ -# 对应 apollo 配置中心的应用名 -app: - id: biz-supplier-manage - spring: profiles: From 697b7303de7f44943656274d204caea5f82b1ba0 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Fri, 27 Jun 2025 17:21:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nualreviewTaskSupplierUserServiceImpl.java | 16 ++++++++++ .../AnnualreviewTaskSupplierUserInfoVo.java | 29 +++++++++++++++++++ 2 files changed, 45 insertions(+) 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/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; + + /** * 打分项集合 */ From b121d8254cbf24297fb2e4d03bdb04574d2a355b Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Mon, 30 Jun 2025 09:58:09 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CoscoAnnualreviewTaskMapper.xml | 9 +++------ .../CoscoAnnualreviewTaskSupplierMapper.xml | 5 ++++- ...oscoAnnualreviewTaskSupplierUserMapper.xml | 10 ++++++++-- .../entity/CoscoAnnualreviewTemplate.java | 4 ++++ .../CoscoAnnualreviewTaskServiceImpl.java | 1 + .../vo/AnnualreviewTaskSupplierListVo.java | 7 +++++++ .../dao/mapper/CoscoBlacklistMapper.xml | 2 +- .../CoscoCategoryLibraryContainMapper.java | 7 +++++++ .../dao/CoscoCategoryMapper.java | 5 +++++ .../CoscoCategoryLibraryContainMapper.xml | 7 +++++++ ...oscoCategoryLibrarySupplierApplyMapper.xml | 7 +++++++ .../ICoscoCategoryLibraryContainService.java | 7 +++++++ ...oscoCategoryLibraryContainServiceImpl.java | 10 ++++++++++ ...tegoryLibrarySupplierApplyServiceImpl.java | 17 ++++++++++++++++- ...stCoscoCategoryLibrarySupplierApplyVo.java | 12 ++++++++++++ .../dao/mapper/CoscoEvaluateTaskMapper.xml | 19 +++++++++++++------ .../CoscoEvaluateTaskSupplierMapper.xml | 16 ++++++++++++++++ .../impl/CoscoEvaluateTaskServiceImpl.java | 1 + .../vo/CoscoEvaluateTemplateVo.java | 2 +- .../coscosupplier/vo/SupplierPageVo.java | 4 ++++ .../dao/mapper/CoscoSupplierBaseMapper.xml | 13 ++++++++++++- 21 files changed, 146 insertions(+), 19 deletions(-) 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..1d2db27 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} + 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..374fcb3 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 @@ -62,6 +62,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()); 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/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml index 8b473e9..9c8248d 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 @@ -232,7 +232,7 @@ + select cclc.category_id + from cosco_category_library_contain cclc + join cosco_category cc on cc.id= cclc.category_id + where cclc.category_library_id = #{libraryId} and cc.type=1 + + 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..dddb7b6 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 ccl.area = #{vo.approveStatus} + GROUP BY cclsa.id diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java index 2ff4c77..c8aa8c1 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java @@ -96,4 +96,11 @@ public interface ICoscoCategoryLibraryContainService extends IBaseService 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/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/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/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..06d4d9b 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 csb.level_name = #{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} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java index 6dcb140..0351aae 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java @@ -155,6 +155,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { addCoscoEvaluateTaskVo.setBlackSupplierVos(blackSupplierVos); addCoscoEvaluateTaskVo.setIndicatorList(vos); } catch (Exception e) { + e.printStackTrace(); throw new RuntimeException(e); } return addCoscoEvaluateTaskVo; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java index bee2503..5b1a1de 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java @@ -21,7 +21,7 @@ public class CoscoEvaluateTemplateVo implements Serializable { /** * 品类id */ - private Long categoryId; + private String categoryId; /** * 创建单位 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java index c53345f..ce0e788 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java @@ -43,6 +43,10 @@ public class SupplierPageVo { /** 最新评价时间 */ private String supplierType; + /** + * 品类id + */ + private String categoryId; /** * 黑名单部门list diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml index 3de3028..5261c73 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml @@ -897,7 +897,7 @@ SELECT csb.id, MAX(csb.name) AS name, - csb.social_credit_code AS socialCreditCode, + MAX(csb.social_credit_code) AS socialCreditCode, MAX(cas.dept_id) AS deptId, MAX(caw.id) AS accessWorkId, MAX(caw.update_time) AS admissionTime, @@ -941,6 +941,7 @@ LEFT JOIN ( SELECT casc.supplier_id, + GROUP_CONCAT(casc.category_id SEPARATOR ', ') AS categoryId, GROUP_CONCAT(cc.category_name SEPARATOR ', ') AS categoryName FROM cosco_access_supplier_category casc @@ -987,6 +988,16 @@ ) + + and csb.name like concat('%',#{vo.name},'%') + + + and cas.dept_id = #{vo.deptId} + + + and category_info.categoryId like concat('%',#{vo.categoryId},'%') + + GROUP BY csb.id From e5af0b7c27d3788adff93a5e502e321ae8b58188 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Mon, 30 Jun 2025 17:13:51 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoscoAnnualreviewTaskSupplierMapper.java | 7 + .../CoscoAnnualreviewTaskSupplierMapper.xml | 38 +++++ .../dao/mapper/CoscoBlacklistMapper.xml | 1 + .../supplier/coscoBlack/vo/BlackListVo.java | 5 + .../dao/CoscoEvaluateTaskSupplierMapper.java | 2 + .../CoscoEvaluateTaskSupplierMapper.xml | 40 +++++- .../CoscoSupplierQualificationsMapper.java | 6 + .../dao/mapper/CoscoSupplierexitMapper.java | 7 + .../controller/DataStatisticeController.java | 132 +++++++++++++++++- .../service/DataStatisticeService.java | 29 ++++ .../impl/DataStatisticeServiceImpl.java | 35 +++++ .../vo/SupplierAnnualReviewStatisticsVo.java | 17 ++- .../vo/SupplierEvaluateStatisticsVo.java | 17 ++- .../vo/SupplierExitStatisticsVo.java | 8 ++ .../vo/SupplierQualificationExpireVo.java | 8 ++ .../CoscoSupplierQualificationsMapper.xml | 39 ++++++ .../dao/mapper/CoscoSupplierexitMapper.xml | 26 ++++ 17 files changed, 404 insertions(+), 13 deletions(-) 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/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml index 1d2db27..33c884c 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 @@ -184,6 +184,44 @@ set del_flag = 'deleted' where annualreview_task_id = #{taskId} + + + @@ -318,6 +318,44 @@ where evaluate_task_id = #{taskId} + + + SELECT + csq.authority, + csq.term_of_validity, + 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, + ( + SELECT + GROUP_CONCAT( DISTINCT cc.category_name 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 + FROM + cosco_supplier_qualifications csq + JOIN cosco_supplier_base csb ON csq.supplier_id = csb.id + WHERE + csq.del_flag = 'normal' + AND ( csq.term_of_validity < CURDATE() OR csq.term_of_validity + BETWEEN CURDATE() AND DATE_ADD( CURDATE(), INTERVAL 30 DAY ) ) + + and csb.name like concat('%',#{vo.supplierName},'%') + + ORDER BY + csq.term_of_validity ASC + + 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('%',#{vo.supplierName},'%') + + select @@ -210,11 +210,11 @@ join cosco_annualreview_task cat on cat.id = cats.annualreview_task_id cats.del_flag = 'normal' - - and csb.name like concat('%',#{vo.supplierName},'%') + + and csb.name like concat('%',#{supplierName},'%') - - and cat.annualreview_year = #{vo.annualreviewYear} + + and cat.annualreview_year = #{annualreviewYear} and review_result is not null @@ -230,7 +230,7 @@ case when csb.supplier_type = 'ovs' then '境外' when csb.supplier_type = 'ovs' then '境内' else '境内' end as area , - csb.id, + cats.id, '准入单位' as accessUnit, '准入部门' as accessDept, case when cats.review_result = 1 then '合格' 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 374fcb3..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.*; @@ -77,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. @@ -107,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/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/CoscoBlacklistSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistSupplierMapper.xml index 3e75f68..293dc64 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistSupplierMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistSupplierMapper.xml @@ -4,9 +4,10 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - + + + @@ -14,7 +15,9 @@ from cosco_blacklist_supplier - blacklist_id = #{blacklistId} @@ -23,19 +26,20 @@ - + 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/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml index dddb7b6..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 @@ -211,7 +211,7 @@ and ccl.area = #{vo.area} - and ccl.area = #{vo.approveStatus} + 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 @@ 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/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/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml index bccc0fc..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 @@ -327,7 +327,7 @@ case when csb.supplier_type = 'ovs' then '境外' when csb.supplier_type = 'ovs' then '境内' else '境内' end as area , - csb.id, + cets.id, (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' ) from cosco_access_supplier_category casc join cosco_category cc @@ -344,14 +344,14 @@ cets.del_flag = 'normal' and cets.review_result is not null - - and csb.name like concat('%',#{vo.supplierName},'%') + + and csb.name like concat('%',#{supplierName},'%') - - and cet.evaluate_year = #{vo.evaluateYear} + + and cet.evaluate_year = #{evaluateYear} - - and cets.review_result = #{vo.evaluateResult} + + and cets.review_result = #{evaluateResult} order by cets.create_time desc diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java index 0351aae..df333af 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java @@ -10,10 +10,12 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.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.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.common.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; @@ -124,19 +126,19 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { List userNdTypeVos1 = map.get(userId); vo.setType(userNdTypeVos1.get(0).getType()); - - if (EvaluateTaskConstant.INDICATOR_TYPE_ND_1.equals(vo.getType())) { - List indicatorIds = userNdTypeVos1.stream().map(UserNdTypeVo::getNeId).collect(Collectors.toList()); - vo.setIndicatorIds(indicatorIds); - } else { - vo.setIndicatorIds(new ArrayList<>()); - } + List indicatorIds = userNdTypeVos1.stream().map(UserNdTypeVo::getNeId).collect(Collectors.toList()); + vo.setIndicatorIds(indicatorIds); +// if (EvaluateTaskConstant.INDICATOR_TYPE_ND_1.equals(vo.getType())) { +// +// } else { +// vo.setIndicatorIds(new ArrayList<>()); +// } vos.add(vo); }); List supplierIds = list.stream().map(TaskSupplierVo::getId).collect(Collectors.toList()); Map> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds,(existing, replacement) -> existing)); - Map userMap = userService.getUser(new ArrayList<>()).stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo)); + Map userMap = userService.getUser(new SelectUserVo()).stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo)); List blackSupplierVos = coscoSupplierBaseMapper.selectSupplierByIds(supplierIds); blackSupplierVos.forEach(blackSupplierVo -> { List strings = suppMap.get(blackSupplierVo.getSupplierId()); @@ -147,7 +149,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { vo.setName(userMap.get(userId).getUserName()); vo.setUserDept(userMap.get(userId).getUserDept()); vo.setUserDeptId(userMap.get(userId).getUserDeptId()); - vo.setSelected( true); + vo.setIsSelected( true); taskUserVos.add(vo); }); blackSupplierVo.setUserList(taskUserVos); @@ -162,7 +164,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { } private List getUserList(List coscoEvaluateTaskSupplierUsers) { - List user = userService.getUser(new ArrayList<>()); + List user = userService.getUser(new SelectUserVo()); Map map = user.stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo)); Map suUser = coscoEvaluateTaskSupplierUsers.stream() .collect(Collectors.toMap( @@ -482,25 +484,25 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { * @param vo * @param coscoEvaluateTemplateIndicatorNds */ - public void adduserMap(Map> userMap, AdduserIndicatorVo vo, List coscoEvaluateTemplateIndicatorNds) { + public void adduserMap(Map> userMap, AdduserIndicatorVo vo, + List coscoEvaluateTemplateIndicatorNds) { Map map = new HashMap<>(); coscoEvaluateTemplateIndicatorNds.forEach(coscoEvaluateTemplateIndicatorNd -> { map.put(coscoEvaluateTemplateIndicatorNd.getId(), coscoEvaluateTemplateIndicatorNd.getIndicatorStId()); }); - Long type = vo.getType(); //一级项信息 - Map stIdMap = new HashMap<>(); + //Map stIdMap = new HashMap<>(); //二级项信息 Map ndIdMap = new HashMap<>(); - if (type.equals(0L)) { + if (CoscoCategoryConstant.CATEGORY_LEVEL_TOP.equals(vo.getType())) { coscoEvaluateTemplateIndicatorNds.forEach(coscoEvaluateTemplateIndicatorNd -> { - stIdMap.put(coscoEvaluateTemplateIndicatorNd.getIndicatorStId(), coscoEvaluateTemplateIndicatorNd.getIndicatorStId()); + //stIdMap.put(coscoEvaluateTemplateIndicatorNd.getIndicatorStId(), coscoEvaluateTemplateIndicatorNd.getIndicatorStId()); ndIdMap.put(coscoEvaluateTemplateIndicatorNd.getId(), coscoEvaluateTemplateIndicatorNd.getId()); }); } else { List indicatorIds = vo.getIndicatorIds(); indicatorIds.forEach(indicatorId -> { - stIdMap.put(map.get(indicatorId), map.get(indicatorId)); + //stIdMap.put(map.get(indicatorId), map.get(indicatorId)); ndIdMap.put(indicatorId, indicatorId); }); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java index 7e03bd1..3bd6c06 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java @@ -4,6 +4,7 @@ import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageConstant; 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.common.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; @@ -83,7 +84,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { //查询当前任务的人员信息及人员评价情况 List calculateAndObtainScoresVos = coscoEvaluateScoringMapper.selectCalculateAndObtainScores(coscoEvaluateTask.getId()); //获取人员信息 - List user = userService.getUser(new ArrayList<>()); + List user = userService.getUser(new SelectUserVo()); //给人员添加部门信息 Map userMap = user.stream().collect(Collectors.toMap(UserVo::getUserId, UserVo::getUserDeptId)); calculateAndObtainScoresVos.forEach(vos -> { diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java index d894f29..40e0f61 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java @@ -29,6 +29,6 @@ public class TaskUserVo implements Serializable { /** * 是否被选中（用于UI显示） */ - private Boolean selected=true; + private Boolean isSelected=true; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java index d48cc89..94f5131 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java @@ -50,15 +50,10 @@ public class DataStatisticeController { try { List list = dataStatisticeService.getSupplierEvaluateStatisticsList(vo); String fileName = URLEncoder.encode("供应评价.xlsx", "UTF-8"); - // 动态设置导出字段（忽略未标注字段） - Set includeFields = new HashSet<>(Arrays.asList( - "supplierName", "categoryName", "reviewScore", "reviewResult" // 指定要导出的字段名 - )); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setCharacterEncoding("utf-8"); EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) - .includeColumnFieldNames(includeFields) .sheet("供应评价") .doWrite(list); } catch (Exception e) { @@ -89,14 +84,11 @@ public class DataStatisticeController { List list = dataStatisticeService.getSupplierAnnualReviewStatisticsList(vo); String fileName = URLEncoder.encode("供应年审.xlsx", "UTF-8"); // 动态设置导出字段（忽略未标注字段） - Set includeFields = new HashSet<>(Arrays.asList( - "supplierName", "categoryName", "reviewScore", "reviewResult" // 指定要导出的字段名 - )); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setCharacterEncoding("utf-8"); EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) - .includeColumnFieldNames(includeFields) .sheet("供应年审") .doWrite(list); } catch (Exception e) { @@ -128,14 +120,11 @@ public class DataStatisticeController { List list = dataStatisticeService.getSupplierExitStatisticsList(vo); String fileName = URLEncoder.encode("供应商退出信息.xlsx", "UTF-8"); // 动态设置导出字段（忽略未标注字段） - Set includeFields = new HashSet<>(Arrays.asList( - "supplierName", "categoryName", "reviewScore", "reviewResult" // 指定要导出的字段名 - )); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setCharacterEncoding("utf-8"); EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) - .includeColumnFieldNames(includeFields) .sheet("供应商退出信息") .doWrite(list); } catch (Exception e) { @@ -165,14 +154,11 @@ public class DataStatisticeController { List list = dataStatisticeService.getSupplierQualificationExpireList(vo); String fileName = URLEncoder.encode("供应商资质.xlsx", "UTF-8"); // 动态设置导出字段（忽略未标注字段） - Set includeFields = new HashSet<>(Arrays.asList( - "supplierName", "categoryName", "reviewScore", "reviewResult" // 指定要导出的字段名 - )); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setCharacterEncoding("utf-8"); EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) - .includeColumnFieldNames(includeFields) .sheet("供应商资质") .doWrite(list); } catch (Exception e) { diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml index 5261c73..4aa8ac3 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml @@ -896,6 +896,7 @@ resultType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo"> SELECT csb.id, + csb.supplier_type as supplierType, MAX(csb.name) AS name, MAX(csb.social_credit_code) AS socialCreditCode, MAX(cas.dept_id) AS deptId, diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml index b7f3d97..12ac8d8 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml @@ -222,7 +222,7 @@ - SELECT csq.authority, csq.term_of_validity, @@ -254,8 +254,8 @@ csq.del_flag = 'normal' AND ( csq.term_of_validity < CURDATE() OR csq.term_of_validity BETWEEN CURDATE() AND DATE_ADD( CURDATE(), INTERVAL 30 DAY ) ) - - and csb.name like concat('%',#{vo.supplierName},'%') + + and csb.name like concat('%',#{supplierName},'%') ORDER BY csq.term_of_validity ASC @@ -272,7 +272,7 @@ WHEN csb.supplier_type = 'ovs' THEN '境内' ELSE '境内' END AS area, - csb.id, + csq.id, '准入单位' AS accessUnit, '准入部门' AS accessDept, ( diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml index f474e7a..f72c22e 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml @@ -191,7 +191,9 @@ - select csb.name supplierName, case when csb.supplier_type = 'ovs' then '境外' @@ -212,8 +214,8 @@ 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('%',#{vo.supplierName},'%') + + and csb.name like concat('%',#{supplierName},'%')