Merge remote-tracking branch '99/dev' into 99dev

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/CoscoEvaluateScoringMapper.xml

@@ -192,7 +192,7 @@
 
     <select id="selectByTaskIds" parameterType="list"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CalculateAndObtainScoresVo">
-        select cetsu.user_id as userId, ces.score, ces.indicator_nd_id as indicatorNdId, '1' as dept_id as deptId,
+        select cetsu.user_id as userId, ces.score, ces.indicator_nd_id as indicatorNdId, '1'  as deptId,
          cets.supplier_id as supplierId,cetsu.evaluate_task_id as evaluateTaskId
         from cosco_evaluate_scoring ces
                  join cosco_evaluate_task_supplier_user cetsu

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml

@@ -389,6 +389,7 @@
             </if>
 
         </where>
+        group by cet.id
         order by cet.create_time desc
     </select>
     <select id="selectMyPage"

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml

@@ -281,9 +281,11 @@
         SELECT
         cetsu.id,
         csb.`name`,
+        csb.id as supplierId,
         cet.evaluate_theme evaluateTheme,
         cet.start_time startTime,
         cet.end_time endTime,
+        cetsu.user_id as userId,
         case when cc.category_name is null then '未指定'
         else cc.category_name end as categoryName,
         cet.STATUS ,
@@ -295,11 +297,12 @@
         when cet.status =2 then '已结束' end as statusName,
         case when cetsu.review_status =0 then '未提交'
         when cetsu.review_status=1 then '已提交' end as reviewStatusName,
-        (select sum(score)
-        from cosco_evaluate_scoring where del_flag='normal'
-        and evaluate_task_supplier_user_id=cetsu.id)
-        as suscore
-
+        IFNULL((
+        SELECT SUM(score)
+        FROM cosco_evaluate_scoring
+        WHERE del_flag='normal'
+        AND evaluate_task_supplier_user_id=cetsu.id
+        ), 0) AS suScore
         FROM
         cosco_evaluate_task_supplier_user cetsu
         LEFT JOIN cosco_evaluate_task cet ON cetsu.evaluate_task_id = cet.id

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 ,