修改部门

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

@@ -180,7 +180,7 @@
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AuditQuantityVo">
         select
             count(cas.id) totalNumber,
-            count(case when cas.examine_result=1 then 1 end ) errornumber
+            count(case when cas.examine_result=0 then 1 end ) errornumber
         from cosco_annualreview_scoring cas
                  join cosco_annualreview_task_supplier_user catsu
                       on cas.annualreview_task_supplier_user_id=catsu.id

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

@@ -72,7 +72,7 @@
             parameterType="list"
             resultMap="CoscoAnnualreviewTaskSupplierResult">
         <include refid="selectCoscoAnnualreviewTaskSupplierVo"/>
-        where id in
+        where annualreview_task_id in
         <foreach item="item" collection="list" separator="," open="(" close=")">
             #{item}
         </foreach>

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

@@ -50,6 +50,7 @@
         cat.start_time startTime,
         cat.end_time endTime,
         cat.STATUS,
+        catsu.user_id userId,
         case when cat.status = 0 then '未开始'
         when cat.status =1 then '进行中'
         when cat.status=2 then '已结束' end statusName,
@@ -79,6 +80,9 @@
             <if test="vo.name!=null and vo.name!=''">
                 and csb.name like concat('%',#{vo.name},'%')
             </if>
+            <if test="vo.annualreviewTaskId!=null and vo.annualreviewTaskId!=''">
+                and cat.id = #{vo.annualreviewTaskId}
+            </if>
             <if test="vo.status!=null and vo.status!=''">
                 and cat.status=#{vo.status}
             </if>

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml

@@ -202,6 +202,7 @@
         <result column="approveStatusName" property="approveStatusName"/>
         <result column="approveResult" property="approveResult"/>
         <result column="snumber" property="snumber"/>
+        <result column="dept_id" property="deptId"/>
         <result column="remark" property="remark"/>
         <result column="create_time" property="createTime"/>
     </resultMap>
@@ -212,9 +213,9 @@
         ccl.name,
         GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
         ccl.area,
-        "集团" AS deptName,
         "张三" AS createName,
         ccl.term_of_validity AS termOfValidity,
+        ccl.dept_id,
         ccl.approve_status AS approveStatus,
         ccl.last_update_time as approveTime,
         ccl.create_time,

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml

@@ -185,7 +185,7 @@
     <select id="selectPageList" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo">
 
         select cclsa.id, ccl.name,ccl.area,'张三' as applyUser ,
-               ccl.create_time as applyTime,cclsa.approve_status as approveStatus,
+               ccl.create_time as applyTime,cclsa.approve_status as approveStatus,ccl.dept_id as deptId,
                case when cclsa.approve_status=0 and cclsa.work_flow_id is  null then '未开始'
                     when cclsa.approve_status=0 and cclsa.work_flow_id is not null then '进行中'
                     else '已结束'