修改新添加逻辑

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml

@@ -22,6 +22,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="lastUpdateTime" column="last_update_time"/>
+        <result property="templateName" column="template_name"/>
     </resultMap>
 
     <sql id="selectCoscoAnnualreviewTaskVo">
@@ -89,8 +90,26 @@
 
     <select id="selectCoscoAnnualreviewTaskById" parameterType="String"
             resultMap="CoscoAnnualreviewTaskResult">
-        <include refid="selectCoscoAnnualreviewTaskVo"/>
-        where id = #{id}
+        select cat.id,
+               cat.annualreview_theme,
+               cat.dept_id,
+               cat.annualreview_year,
+               cat.start_time,
+               cat.end_time,
+               cat.template_id,
+               cat.category_limitation,
+               cat.category_id,
+               cat.status,
+               cat.del_flag,
+               cat.create_by,
+               cat.create_time,
+               cat.update_by,
+               cat.update_time,
+               cate.template_name,
+               cat.last_update_time
+        from cosco_annualreview_task cat
+        left join cosco_annualreview_template cate on cat.template_id = cate.id
+        where cat.id = #{id}
     </select>
 
     <insert id="insertCoscoAnnualreviewTask"
@@ -218,6 +237,7 @@
         cat.annualreview_theme AS annualreviewTheme,
         cat.start_time startTime,
         cat.end_time endTime,
+        cat.category_limitation AS categoryLimitation,
         cat.category_id AS categoryId,
         cat.`status`,
         cat.dept_id AS deptId,

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml

@@ -37,16 +37,14 @@
         SELECT
         csb.id supplierId,
         csb.NAME,
+        cc.id as categoryId,
         cats.annualreview_task_id as annualreviewTaskId,
         '单位' as deptName,
-        cc.category_name as categoryName,
         cat.dept_id as deptId,
+        cat.category_limitation as categoryLimitation,
         cats.review_result,
         case when cats.review_result=1 then '合格'
-        when cats.review_result=2 then '不合格' else '待审批' end as reviewResultName,
-        (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' ) AS categoryName 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 category
+        when cats.review_result=2 then '不合格' else '待审批' end as reviewResultName
         FROM
         cosco_annualreview_task_supplier cats
         join cosco_annualreview_task cat on cats.annualreview_task_id = cat.id

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml

@@ -47,6 +47,7 @@
         cat.dept_id as deptId,
         cat.annualreview_theme as annualreviewTheme,
         cat.category_id categoryId,
+        cat.category_limitation as categoryLimitation,
         '单位' AS deptName,
         cat.start_time startTime,
         cat.end_time endTime,