From b6f2442b49b4eaf7a09bc32d4b986523282c1557 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 6 Aug 2025 09:19:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplier/base/constant/TaskSelectConstant.java | 2 ++ .../controller/CoscoEvaluateTaskController.java | 2 +- .../service/impl/CoscoEvaluateTaskServiceImpl.java | 3 ++- .../ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java | 2 ++ .../mapper/CoscoEvaluateTaskMapper.xml | 10 ++++++++-- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java index 2e49721..ae046f0 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java @@ -5,6 +5,8 @@ public class TaskSelectConstant { * 创建人 create */ public static final String CREATE = "create"; + + /** * 用户 user */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java index d747f12..02e217b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java @@ -50,7 +50,7 @@ public class CoscoEvaluateTaskController extends BaseController { public BaseResponse> getTaskPage(@ApiParam(value = "对象数据", required = true) @RequestBody TaskPageVo taskListVo) { if(taskListVo.getSelectBy().equals(TaskSelectConstant.CREATE)){ - taskListVo.setCreateBy(TokenUtil.getCurrentUser().getUserId()); + //taskListVo.setCreateBy(TokenUtil.getCurrentUser().getUserId()); }else if(taskListVo.getSelectBy().equals(TaskSelectConstant.USER)){ taskListVo.setUserId(TokenUtil.getCurrentUser().getUserId()); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java index 3bd3fbd..8b0deb8 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java @@ -379,7 +379,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { @MessageLog(messageType = MessageType.MESSAGETYPE_GYSJYSH) public ApproveVo evaluateApprove(AddCoscoEvaluateTaskVo vo) { //根据工作流id查询任务信息 - CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId()); + CoscoEvaluateTask coscoEvaluateTask = + coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId()); coscoEvaluateTask.setApproveStatus(vo.getApproveStatus()); coscoEvaluateTask.setStatus(null); //修改任务信息 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java index 585bf61..b76db03 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java @@ -74,6 +74,8 @@ public class TaskPageVo implements Serializable { */ private String categoryPathName; + private String workFlowId; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml index 5ca94c0..d760a07 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml @@ -168,7 +168,7 @@ cet.update_time, cete.template_name, cet.approve_status, - cet.work_flow_id + cet.work_flow_id, cet.last_update_time from cosco_evaluate_task cet left join cosco_evaluate_template cete on cete.id = cet.template_id @@ -338,6 +338,9 @@ approve_status = #{approveStatus}, + work_flow_id = + #{workFlowId}, + where id = #{id} @@ -370,12 +373,14 @@ '单位' as tenantName, cet.start_time as startTime, cet.end_time as endTime, + cet.work_flow_id as workFlowId, cet.status, cet.category_id as categoryId, cet.category_path_name as categoryPathName, cet.category_name as categoryName, cet.dept_id as deptId, cet.approve_status as approveStatus, + case when cet.approve_status = 0 then '审批中' when cet.approve_status = 1 then '通过' @@ -386,7 +391,8 @@ when cet.status = 1 then '评价中' when cet.status = 2 then '已结束' end as statusName from cosco_evaluate_task cet - left join cosco_evaluate_task_supplier_user cetsu on cet.id = cetsu.evaluate_task_id + left join cosco_evaluate_task_supplier_user cetsu + on cet.id = cetsu.evaluate_task_id