diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml index 59edd1b9..fe538e12 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml @@ -385,9 +385,10 @@ case tt.task_status when 0 then '待审核' - when 1 then '审核中' - when 2 then '已完成' + when 6 then '审核中' when 3 then '已驳回' + when 2 then '已完成' + when 5 then '待提交' end as taskStatusName, IFNULL(sum(lad.pre_num),0) as preCountNum, IFNULL(sum(lad.al_num),0) as alNum, @@ -407,7 +408,7 @@ left join bm_project bp on bp.pro_id = lai.project_id left join sys_dept sd on sd.dept_id = bp.imp_unit left join sys_dict_data sda on tt.task_status = sda.dict_value - and sda.dict_type = 'lease_task_status' + and sda.dict_type = 'lease_apply_task_status' left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0' left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0' left join sys_workflow_record swr on swr.task_id = lai.task_id @@ -448,8 +449,8 @@ and lai.cost_bearing_party = #{costBearingParty} - and (tt.task_status = 0 or tt.task_status = 6) - and (tt.task_status = 1 ) + and (tt.task_status = 0 or tt.task_status = 6 or tt.task_status = 5) + and (tt.task_status = 2 or tt.task_status = 3) GROUP BY lai.id ORDER BY tt.task_status,tt.create_time desc