diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml index 3861b40..38fe8ab 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml +++ b/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 diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml index 1126c82..06acf9b 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml +++ b/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, diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryMapper.xml index f9134e2..7b54065 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryMapper.xml @@ -87,11 +87,13 @@ + order by cc.order_by asc