添加sql supplierId

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 待完善，部门名称

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;
+
 
     /**
      * 打分项集合

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业务层处理

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;
     /**
      * 评价结果
      */

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;
 }

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;
 }

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 ,

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,

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,

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

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml

@@ -232,6 +232,7 @@
     <select id="getSupplierExitStatistics" resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo" parameterType="map">
         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 ,