From 112b0c83176b013075a7c1e4885da3b133399c31 Mon Sep 17 00:00:00 2001 From: "ys.git" <18439391935@163.com> Date: Mon, 15 Dec 2025 11:50:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E5=88=86?= =?UTF-8?q?=E5=8F=91=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/DistributeStatusEnum.java | 3 +- .../pojo/dto/YcCompletedResultDTO.java | 44 ++++++++++++++++++- .../pojo/dto/YcInitiatorResultDTO.java | 32 ++++++++++++++ .../pojo/dto/YcTodoTaskResultDTO.java | 35 +++++++++++++++ .../impl/DataEntryEngineModelServiceImpl.java | 8 ++-- .../service/impl/TodoTaskServiceImpl.java | 7 +++ 6 files changed, 124 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xdap/self_development/enums/DistributeStatusEnum.java b/src/main/java/com/xdap/self_development/enums/DistributeStatusEnum.java index 03fdeb8..c391bc2 100644 --- a/src/main/java/com/xdap/self_development/enums/DistributeStatusEnum.java +++ b/src/main/java/com/xdap/self_development/enums/DistributeStatusEnum.java @@ -6,7 +6,8 @@ import lombok.Getter; public enum DistributeStatusEnum { DISTRIBUTED(1, "已分发"), - UNDISTRIBUTED(2, "未分发"); + UNDISTRIBUTED(2, "未分发"), + PART(3, "部分分发"); private final Integer code; private final String desc; diff --git a/src/main/java/com/xdap/self_development/pojo/dto/YcCompletedResultDTO.java b/src/main/java/com/xdap/self_development/pojo/dto/YcCompletedResultDTO.java index 273e9cd..dc24930 100644 --- a/src/main/java/com/xdap/self_development/pojo/dto/YcCompletedResultDTO.java +++ b/src/main/java/com/xdap/self_development/pojo/dto/YcCompletedResultDTO.java @@ -1,5 +1,47 @@ package com.xdap.self_development.pojo.dto; -//已办 +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +//已办示例 +//{ +// "id": "966531", +// "title": "do et est incididunt" +// "createDate": "voluptate commodo esse mollit veniam", +// "activityName": "nulla", +// "type": "in aliquip sit in", +// "url": "in aliquip sit in", +// "urlMobileOA": "in aliquip sit in", +// "urlWx": "in aliquip sit in", +// "mobileSuit": "in aliquip sit in" +// } +@Data +@AllArgsConstructor +@NoArgsConstructor public class YcCompletedResultDTO { + /* +员工编号 +主题 +经办时间 +当前环节 +类别，玉柴云/OA/CRM/SRM/TC/法务平台 +PC端流程地址 +移动OA流程地址，可以留空 +企业微信流程地址，可以留空 +"是否支持移动化，支持移动OA展示，传入1 +是否支持移动化，支持企业微信，传入2 +是否支持移动化，支持支持移动OA+企业微信，传入3 +可以留空" +*/ + private String username; + private String title; + private String createDate; + private String activityName; + private String type; + private String url; + private String urlMobileOA; + private String urlWx; + private String mobileSuit; + } diff --git a/src/main/java/com/xdap/self_development/pojo/dto/YcInitiatorResultDTO.java b/src/main/java/com/xdap/self_development/pojo/dto/YcInitiatorResultDTO.java index 1f1be5c..e2701d5 100644 --- a/src/main/java/com/xdap/self_development/pojo/dto/YcInitiatorResultDTO.java +++ b/src/main/java/com/xdap/self_development/pojo/dto/YcInitiatorResultDTO.java @@ -1,5 +1,37 @@ package com.xdap.self_development.pojo.dto; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + //发起人 +@Data +@AllArgsConstructor +@NoArgsConstructor public class YcInitiatorResultDTO { + /* + * private String id string 非必须 流程唯一id +private String username string 非必须 员工编号 +private String title string 非必须 主题 +private String createDate string 非必须 经办时间 +private String activityName string 非必须 当前环节 +private String type string 非必须 类别，玉柴云/OA/CRM/SRM/TC/法务平台 +private String url string 非必须 PC端流程地址 +private String urlMobileOA string 非必须 移动OA流程地址，可以留空 +private String urlWx string 非必须 企业微信流程地址，可以留空 +private String mobileSuit string 非必须 "是否支持移动化，支持移动OA展示，传入1 +是否支持移动化，支持企业微信，传入2 +是否支持移动化，支持支持移动OA+企业微信，传入3 +可以留空" +*/ + private String username; + private String title; + private String createDate; + private String activityName; + private String type; + private String url; + private String urlMobileOA; + private String urlWx; + private String mobileSuit; + } diff --git a/src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskResultDTO.java b/src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskResultDTO.java index 92a4530..21c6712 100644 --- a/src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskResultDTO.java +++ b/src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskResultDTO.java @@ -1,5 +1,40 @@ package com.xdap.self_development.pojo.dto; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + //待办 +//返回示例 +//{ +// "code": "ok", +// "total": 1, +// "table": [ +// { +// "title": "关于111/发动机YC6G205L-D20-111零部件发图/布点开发评审流程(免理化)", +// "url": "http://172.16.90.68:7777/ycloudShipElectricityApp/#/YcBpmShipProcess/YcShipElectricityDistributeProcess/submitted/900165654?instanceId=44573722", +// "updateDate": "2024-08-19 18:18", +// "activityLabel": "分管领导审核", +// "systemName": "BPM" +// } +// ], +// "requestid": "e078ecd04886494ab884630303f413e8" +// } +@Data +@AllArgsConstructor +@NoArgsConstructor public class YcTodoTaskResultDTO { + // 待办主题 + private String title; + // 待办地址 + private String url; + // 待办最近更新日期 + private Date updateDate; + // 当前处理环节 + private String activityLabel; + // 来源系统名称 + private String systemName; + } diff --git a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java index 38118fb..f29da96 100644 --- a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java @@ -118,6 +118,8 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ log.warn("注意：传入参数为空默认无条件首页十条"); } log.info("查找到的责任人：{}", resPerIds); + DistributeStatusEnum byDesc = DistributeStatusEnum.getByDesc(request.getDistributeStatus()); + Integer status = byDesc != null ? byDesc.getCode() : null; PageQueryResult pageQueryResult = sw .buildFromDatasource("xdap_app_223770822127386625") @@ -132,7 +134,7 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ .like("project_number", request.getProjectNumber()) .like("brand", request.getBrand()) .in("responsible_person_id", resPerIds) - .like("distribute_status", request.getDistributeStatus()) + .eq("distribute_status", status) .doPageQuery(page, size, DataEntryEngineModelPojo.class); for (DataEntryEngineModelPojo modelPojo : pageQueryResult.getResult()) { @@ -149,8 +151,8 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ // if (ObjectUtils.isNotEmpty(xdapUsersPojo)) { // dataEntryEngineModelDto.setResPerson(xdapUsersPojo.getUsername()); // } - DistributeStatusEnum byDesc = DistributeStatusEnum.getByCode(modelPojo.getDistributeStatus()); - dataEntryEngineModelDto.setDistributeStatus(byDesc != null ? byDesc.getDesc() : null); + DistributeStatusEnum byDesc1 = DistributeStatusEnum.getByCode(modelPojo.getDistributeStatus()); + dataEntryEngineModelDto.setDistributeStatus(byDesc1 != null ? byDesc1.getDesc() : null); dataEntryEngineModelDtos.add(dataEntryEngineModelDto); } tPageResultDTO.setList(dataEntryEngineModelDtos); diff --git a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java index d8ab177..bbe410c 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java @@ -165,6 +165,13 @@ public class TodoTaskServiceImpl implements TodoTaskService { .eq("id", modelId) .update("distribute_status", status) .doUpdate(DataEntryEngineModelPojo.class); + }else{ + DistributeStatusEnum byDesc = DistributeStatusEnum.getByDesc("部分分发"); + Integer status = byDesc != null ? byDesc.getCode() : null; + sw.buildFromDatasource("xdap_app_223770822127386625") + .eq("id", modelId) + .update("distribute_status", status) + .doUpdate(DataEntryEngineModelPojo.class); } }