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

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml

@@ -228,7 +228,7 @@
 	)
                                          as themeName
         FROM cosco_blacklist cb
-        where cb.del_falg = 'normal'
+        where cb.del_flag = 'normal'
         order by cb.create_time desc
     </select>
 

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

@@ -221,7 +221,7 @@
         ccl.remark,
         CASE
         WHEN ccl.approve_status = 0 AND ccl.work_flow_id IS NULL THEN '未开始'
-        WHEN ccl.approve_status = 0 AND ccl.work_flow_id IS NOT NULL THEN '进行中'
+        WHEN ccl.approve_status = 3 THEN '进行中'
         ELSE '已结束'
         END AS approveStatusName,
         CASE

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

@@ -186,7 +186,7 @@
 
         select cclsa.id, ccl.name,ccl.area,'张三' as applyUser ,
                ccl.create_time as applyTime,cclsa.approve_status as approveStatus,
-               case when cclsa.approve_status=0 then '未开始'
+               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 '已结束'
                    end as processStatusName,

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

@@ -87,11 +87,13 @@
 
             </if>
         </where>
+        order by cc.order_by asc
     </select>
 
     <select id="selectMyPage" parameterType="object"
             resultMap="CoscoCategoryResult">
         <include refid="selectCoscoCategoryVo"/>
+        order by order_by asc
     </select>
 
     <select id="selectCoscoCategoryById" parameterType="String"

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

@@ -289,6 +289,7 @@
         cet.STATUS ,
         cet.dept_id as deptId,
         cetsu.review_status reviewStatus,
+        cetsu.review_time reviewTime,
         case when cet.STATUS=0 then '未开始'
         when cet.status =1 then '进行中'
         when cet.status =2 then '已结束' end as statusName,