diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index f4db4cd0..70497d04 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -191,7 +191,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { leaseApplyInfo.setUserId(userId == 0 ? null : userId); List list = mapper.selectLeaseApplyInfoList(leaseApplyInfo); if (!CollectionUtils.isEmpty(list)) { - /*for (LeaseApplyInfo applyInfo : list) { + for (LeaseApplyInfo applyInfo : list) { // 根据任务id查询sys_workflow_record表,看任务是否已经开始,修改tm_task表状态为审核中 Integer status = mapper.selectStatusByTaskId(applyInfo.getTaskId()); if (status != null && status == 1) { @@ -199,7 +199,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { applyInfo.setTaskStatusName(LeaseTaskStatusEnum.LEASE_AUDIT_ING.getStatusName()); mapper.updateLeaseTaskStatus(applyInfo.getTaskId(), LeaseTaskStatusEnum.LEASE_AUDIT_ING.getStatus()); } - }*/ + } Integer taskStatus = leaseApplyInfo.getTaskStatus(); String keyWord = leaseApplyInfo.getKeyWord(); // 如果关键字不为空,进行过滤 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 7b29080a..59edd1b9 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 @@ -381,9 +381,9 @@ lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id, lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party, lai.lease_sign_url, lai.lease_sign_type,tt.task_id as taskId, - lai.unit_id,lai.project_id,bu.unit_name, bp.pro_name, swr.task_status as taskStatus, + lai.unit_id,lai.project_id,bu.unit_name, bp.pro_name, tt.task_status as taskStatus, - case swr.task_status + case tt.task_status when 0 then '待审核' when 1 then '审核中' when 2 then '已完成'