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 f69981a..e0b2760 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 @@ -60,6 +60,7 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua //返回封装 AnnualreviewTaskSupplierUserInfoVo vo = new AnnualreviewTaskSupplierUserInfoVo(); vo.setId(id); + vo.setSupplierId(coscoAnnualreviewTaskSupplierUser.getSupplierId()); vo.setName(baseCategoryNameVo.getName()); BaseCacheUser currentUser = TokenUtil.getCurrentUser(); //TODO 待完善，部门名称 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 04e9968..e9abdc6 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 @@ -47,6 +47,8 @@ public class AnnualreviewTaskSupplierUserInfoVo implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd") private Date endTime; + private String supplierId; + /** * 打分项集合 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java index e96676d..117fc46 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java @@ -1,23 +1,24 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl; -import java.util.*; -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.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.common.base.entity.SysUser; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierService; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.SupplierDimensionVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskIndicatorBaseVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskIndicatorVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskSubIndicatorVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierService; + +import java.util.*; +import java.util.stream.Collectors; /** * 【供应商评价_评价任务关联供应商表】Service业务层处理 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 e77565d..6e35e8a 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 @@ -46,6 +46,8 @@ public class SupplierAnnualReviewStatisticsVo { */ @ExcelProperty("评价年度") private String annualreviewYear; + + private String supplierId; /** * 评价结果 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java index df75f1b..86d54ea 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java @@ -43,6 +43,8 @@ public class SupplierExitStatisticsVo { @ExcelProperty("退出时间") private String applyTime; + private String supplierId; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java index 0466b3f..7894b35 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java @@ -58,6 +58,8 @@ public class SupplierQualificationExpireVo { @ExcelProperty("分类名称") private String categoryName; + private String supplierId; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; } 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 02797bf..4f089df 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 @@ -237,6 +237,7 @@ select csb.name supplierName, + csb.id as supplierId, case when csb.supplier_type = 'ovs' then '境外' when csb.supplier_type = 'ovs' then '境内' else '境内' end as area , diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml index a10621c..38030ba 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml @@ -43,6 +43,7 @@ SELECT catsu.id, csb.NAME, + csb.id as supplierId, cat.dept_id as deptId, cat.annualreview_theme, '单位' AS deptName, diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml index 1f725b0..d250016 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml @@ -281,6 +281,7 @@ SELECT cetsu.id, csb.`name`, + csb.id as supplierId, cet.evaluate_theme evaluateTheme, cet.start_time startTime, cet.end_time endTime, 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 7307b34..9cc7f41 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 @@ -265,6 +265,7 @@ csq.authority, csq.term_of_validity, csb.NAME supplierName, + csb.id as supplierId, CASE WHEN csb.supplier_type = 'ovs' THEN 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 710ea1c..5a2c460 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 @@ -232,6 +232,7 @@