Skip to content

C
cnooc_zydeepen-cggl_expert-manage-miniapp
Commit 2f6ca50d by kenzo
Options

fix bug

parent 0988759b
Showing with 742 additions and 196 deletions
src/main/java/com/cnooc/expert/controller/portal/PortalController.java
package com.cnooc.expert.controller.portal;
import com.cnooc.expert.common.response.ApiResult;
import com.cnooc.expert.common.response.BasePageResp;
import com.cnooc.expert.controller.common.AbstractBaseController;
import com.cnooc.expert.controller.portal.model.request.AgentNumReq;
import com.cnooc.expert.controller.portal.model.request.AgentPageReq;
import com.cnooc.expert.controller.portal.model.request.MessagePageReq;
import com.cnooc.expert.controller.portal.model.response.AgentNumResp;
import com.cnooc.expert.controller.portal.model.response.MessageNumResp;
import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
import com.cnooc.expert.external.portal.model.response.AgentNumGetApiResp;
import com.cnooc.expert.external.portal.model.response.AgentNumPageApiResp;
import com.cnooc.expert.external.portal.model.response.MessageNumGetApiResp;
import com.cnooc.expert.external.portal.model.response.MessageNumPageApiResp;
import com.cnooc.expert.service.portal.PortalService;
import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.AllArgsConstructor;
......@@ -26,19 +28,15 @@ public class PortalController extends AbstractBaseController {
// *** 业务待办 ***
@PostMapping("/agent/num/test")
public String agentNumTest(AgentNumReq req) throws JsonProcessingException {
return objectMapper.writeValueAsString(portalService.getAgentNum(req));
}
/**
* 已办待办数量
*
* @return
*/
@PostMapping("/agent/num")
public ApiResult<AgentNumResp> agentNum(AgentNumReq req) {
return ApiResult.successWithResult(portalService.getAgentNum(req));
public ApiResult<AgentNumGetApiResp> agentNum(AgentNumReq req) {
AgentNumGetApiResp apiResp = portalService.getAgentNum(req);
return ApiResult.successWithResult(apiResp);
}
/**
......@@ -47,9 +45,9 @@ public class PortalController extends AbstractBaseController {
* @return
*/
@PostMapping("/agent/page")
public ApiResult<BasePageResp<Object>> agentPage(@RequestBody @Validated AgentPageReq req) {
int curUserId = 1;
return ApiResult.successWithResult(portalService.pageAgentNum(req));
public ApiResult<ApiBasePageResp<AgentNumPageApiResp>> agentPage(@RequestBody @Validated AgentPageReq req) {
ApiBasePageResp<AgentNumPageApiResp> apiResp = portalService.pageAgentNum(req);
return ApiResult.successWithResult(apiResp);
}
// *** 我的消息 ***
......@@ -60,8 +58,9 @@ public class PortalController extends AbstractBaseController {
* @return
*/
@PostMapping("/message/num")
public ApiResult<MessageNumResp> messageNum() {
return ApiResult.successWithResult(portalService.getMessageNum(null));
public ApiResult<MessageNumGetApiResp> messageNum() {
MessageNumGetApiResp apiResp = portalService.getMessageNum(null);
return ApiResult.successWithResult(apiResp);
}
/**
......@@ -71,9 +70,9 @@ public class PortalController extends AbstractBaseController {
* @return
*/
@PostMapping("/message/page")
public ApiResult<BasePageResp<Object>> messagePage(@RequestBody @Validated MessagePageReq req) {
int curUserId = 1;
return ApiResult.successWithResult(portalService.pageMessageNum(req));
public ApiResult<ApiBasePageResp<MessageNumPageApiResp>> messagePage(@RequestBody @Validated MessagePageReq req) {
ApiBasePageResp<MessageNumPageApiResp> apiResp = portalService.pageMessageNum(req);
return ApiResult.successWithResult(apiResp);
}
}
src/main/java/com/cnooc/expert/controller/portal/PortalMockController.java
......@@ -26,11 +26,6 @@ public class PortalMockController extends AbstractBaseController {
// *** 业务待办 ***
@PostMapping("/agent/num/test")
public String agentNumTest(AgentNumReq req) throws JsonProcessingException {
return objectMapper.writeValueAsString(portalMockService.getAgentNum(req));
}
/**
* 已办待办数量
*
......
src/main/java/com/cnooc/expert/controller/workflow/WorkflowController.java
......@@ -11,11 +11,13 @@ import com.cnooc.expert.external.workflow.model.request.InstCalculateApiReq;
import com.cnooc.expert.external.workflow.model.request.InstExistedQueryApiReq;
import com.cnooc.expert.external.workflow.model.request.InstRevokeApiReq;
import com.cnooc.expert.external.workflow.model.request.InstStartApiReq;
import com.cnooc.expert.external.workflow.model.request.StageDetailShowApiReq;
import com.cnooc.expert.external.workflow.model.response.ApprovePathSettingByConditionGetApiResp;
import com.cnooc.expert.external.workflow.model.response.InstCalculateApiResp;
import com.cnooc.expert.external.workflow.model.response.InstStartApiResp;
import com.cnooc.expert.external.workflow.model.response.ProcDefPageApiResp;
import com.cnooc.expert.external.workflow.model.response.ReceiveSettingByConditionFindApiResp;
import com.cnooc.expert.external.workflow.model.response.StageDetailShowApiResp;
import com.cnooc.expert.service.workflow.WorkflowService;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
......@@ -88,5 +90,12 @@ public class WorkflowController extends AbstractBaseController {
Boolean apiResp = workflowService.queryInstExisted(req);
return ApiResult.successWithResult(apiResp);
}
// 发起人,我的申请页面, 审批流程需要展示的阶段(含详情)<二选一>
@PostMapping("/inst/showStageDetail")
public ApiResult<List<StageDetailShowApiResp>> showStageDetail(@RequestBody @Validated StageDetailShowApiReq req) {
List<StageDetailShowApiResp> apiResp = workflowService.showStageDetail(req);
return ApiResult.successWithResult(apiResp);
}
}
src/main/java/com/cnooc/expert/controller/workflow/WorkflowMockController.java
......@@ -16,6 +16,8 @@ import com.cnooc.expert.external.workflow.model.request.InstCalculateApiReq;
import com.cnooc.expert.external.workflow.model.request.InstExistedQueryApiReq;
import com.cnooc.expert.external.workflow.model.request.InstRevokeApiReq;
import com.cnooc.expert.external.workflow.model.request.InstStartApiReq;
import com.cnooc.expert.external.workflow.model.request.StageDetailShowApiReq;
import com.cnooc.expert.external.workflow.model.response.StageDetailShowApiResp;
import com.cnooc.expert.service.workflow.WorkflowMockService;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
......@@ -88,5 +90,11 @@ public class WorkflowMockController extends AbstractBaseController {
return ApiResult.successWithResult(apiResp);
}
// 发起人,我的申请页面, 审批流程需要展示的阶段(含详情)<二选一>
@PostMapping("/inst/showStageDetail")
public ApiResult<List<StageDetailShowApiResp>> queryInstExisted(@RequestBody @Validated StageDetailShowApiReq req) {
List<StageDetailShowApiResp> apiResp = workflowMockService.showStageDetail(req);
return ApiResult.successWithResult(apiResp);
}
}
src/main/java/com/cnooc/expert/external/workflow/api/WorkflowServiceApi.java
......@@ -9,11 +9,13 @@ import com.cnooc.expert.external.workflow.model.request.InstCalculateApiReq;
import com.cnooc.expert.external.workflow.model.request.InstExistedQueryApiReq;
import com.cnooc.expert.external.workflow.model.request.InstRevokeApiReq;
import com.cnooc.expert.external.workflow.model.request.InstStartApiReq;
import com.cnooc.expert.external.workflow.model.request.StageDetailShowApiReq;
import com.cnooc.expert.external.workflow.model.response.ApprovePathSettingByConditionGetApiResp;
import com.cnooc.expert.external.workflow.model.response.InstCalculateApiResp;
import com.cnooc.expert.external.workflow.model.response.InstStartApiResp;
import com.cnooc.expert.external.workflow.model.response.ProcDefPageApiResp;
import com.cnooc.expert.external.workflow.model.response.ReceiveSettingByConditionFindApiResp;
import com.cnooc.expert.external.workflow.model.response.StageDetailShowApiResp;
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.GET;
......@@ -59,4 +61,8 @@ public interface WorkflowServiceApi {
@POST("/api/workflow2/expertManage/management/qryInstExisted")
Call<ApiBaseResult<Boolean>> queryInstExistedApi(@HeaderMap Map<String, Object> headers, @Body InstExistedQueryApiReq req);
// 发起人,我的申请页面, 审批流程需要展示的阶段(含详情)<二选一>
@POST("/api/workflow2/expertManage/management/showStageDetail")
Call<ApiBaseResult<List<StageDetailShowApiResp>>> showStageDetailApi(@HeaderMap Map<String, Object> headers, @Body StageDetailShowApiReq req);
}
src/main/java/com/cnooc/expert/external/workflow/model/request/StageDetailShowApiReq.java 0 → 100644
package com.cnooc.expert.external.workflow.model.request;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class StageDetailShowApiReq {
// 业务id
@NotNull(message = "业务id 不能为空")
private String businessId;
// 事项类型
@NotEmpty(message = "事项类型 不能为空")
private List<String> busTypeCodeList;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/StageDetailShowApiResp.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response;
import com.cnooc.expert.external.workflow.model.response.model.SingleDetailVO;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
/**
* 展示阶段VO
*/
public class StageDetailShowApiResp {
// 事项类型
private String busTypeCode;
// 单个阶段单个企业下的审批详情VO
private List<SingleDetailVO> singleDetailVOList;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/ApprovalExecutionRecordVO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ApprovalExecutionRecordVO {
// 租户id
private String tenantId;
// 流程实例id
private String instId;
// 步骤id
private String executionId;
// 申请人personId
private String starterId;
// 申请人名称
private String starterName;
// 开始时间
private String createAt;
// 结束时间
private String endAt;
// 文件pathId
private String pathId;
// 开始备注
private String opinion;
// 结束原因
private String reasonForEnding;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/ApprovalProcessVO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
/**
* 审批流程vo
*/
public class ApprovalProcessVO {
// 流程定义信息
private ProcDefInfoVO procDefInfoVO;
// 流程抄送人
private List<ApprovePersonVO> instCcPersonList;
// 当前审批节点信息
private List<ProcInstTaskDTO> currentTaskDTOList;
// 节点人员配置信息
private List<TaskParticipantConfigDTO> taskParticipantConfigDTOList;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/ApprovalRecordVO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ApprovalRecordVO {
// 步骤记录vo
private ApprovalExecutionRecordVO executionRecordVO;
// 任务记录列表vo
private List<ApprovalTaskRecordVO> taskRecordVOList;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/ApprovalTaskRecordVO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
/**
* 审批记录任务列表DTO
*/
public class ApprovalTaskRecordVO {
// 租户id
private String tenantId;
// 流程实例id
private String instId;
// 步骤id
private String executionId;
// 流程任务id
private String taskId;
// 节点名称
private String taskName;
// 职务
private String job;
// 审批人id
private String approveId;
// 审批人名称
private String approveName;
// 审批人企业名称
private String approveCropName;
// 结束时间
private String endAt;
// 审批意见
private String opinion;
// 文件pathId
private String pathId;
// 任务审批状态
private Integer taskStatus;
// 操作
private String operate;
// 来源类型 普通：0, 其余是其他（加签、转审等）
private Integer sourceType;
// 附件
private List<FileInfo> fileInfo;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/ApprovePersonDTO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ApprovePersonDTO {
// id
private String id;
// 审批人名称
private String name;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/ApprovePersonVO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
/**
* 审批流程vo
*/
public class ApprovePersonVO {
// id
private String id;
// 审批人名称
private String name;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/BpmnDeployInfoVO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BpmnDeployInfoVO {
// 前端绘制的bpmn的xml信息
private String bpmnXml;
// 条件的配置信息
private List<ConditionDTO> bpmnConditions;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/ConditionDTO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ConditionDTO {
// 连线的id
private String flowSequenceId;
// 连线的名称
private String flowSequenceName;
// 是否默认路径
private Boolean defaultSeq;
// 审批条件
private FlowConditionGroupDTO matchCondition;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/FileInfo.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FileInfo {
// 文件名称
private String fileName;
// 文件地址
private String fileUrl;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/FlowConditionDTO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FlowConditionDTO {
// 变量key值
private String varKey;
// 变量名称
private String varName;
// 变量 扩展倍数； 如： 概算价
private Double variableExpansionMultiple;
// 操作key值
private String opKey;
// 操作名称
private String opType;
// 值key
private String key;
// 值名称
private String value;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/FlowConditionGroupDTO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FlowConditionGroupDTO {
// 条件连接类型
private String conditionConnectType;
// 条件连接类型名称
private String conditionConnectName;
// 流程条件
private List<FlowConditionDTO> flowConditions;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/ParticipantGroupDTO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ParticipantGroupDTO {
// 参与者类型：person-人员、orgHead-部门负责人、role-角色
private String type;
// 是否需要 协助(秘书协助等)
private Boolean needAssist;
// 分组名称
private String groupName;
// 审批人
private List<ApprovePersonDTO> participants;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/ProcDefInfoVO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ProcDefInfoVO {
// 业务类型名称
private String businessTypeName;
// 是否最新的版本
private Boolean newestVersion;
// 定义方式
private Short definitionWay;
// 版本
private Integer version;
// 发布的定义id
private String deployDefId;
// bpmn方式的流程定义
private BpmnDeployInfoVO bpmnDeployInfoVO;
// 树型流程定义
// private TreeDeployInfoVO treeDeployInfoVO;
// 简单方式的流程定义
// private SimpleDeployInfoVO simpleDeployInfoVO;
/**
* 节点的配置
* 暂时只有任务节点的配置
*/
// 任务节点配置 暂时只有任务节点的配置
// private List<NodeConfigDTO> nodeConfigs;
// 启用状态
private Boolean off;
// 主体id
private String subjectId;
// 租户id
private String tenantId;
// 创建人id
private String creatorId;
// 创建人名称
private String creatorName;
// 发布时间
private String deployTime;
// 创建时间
private String createAt;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/ProcInstTaskDTO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
/**
* 审批流程vo
*/
public class ProcInstTaskDTO {
// 流程定义信息
private ProcDefInfoVO procDefInfoVO;
// 流程抄送人
private List<ApprovePersonVO> instCcPersonList;
// 当前审批节点信息
private List<ProcInstTaskDTO> currentTaskDTOList;
// 节点人员配置信息
private List<TaskParticipantConfigDTO> taskParticipantConfigDTOList;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/SingleDetailVO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
/**
* 单个阶段单个企业下的审批详情VO
*/
public class SingleDetailVO {
// 企业id
private String subjectId;
// 企业名称
private String subjectName;
// 配置来源
private Integer engineType;
// 是否使用Ifream嵌入第三方模板
private Boolean useIfream;
// 使用Ifream嵌入第三方模板url
private String ifreamUrl;
// 审批流程
private ApprovalProcessVO approvalProcessVO;
// 审批记录")
private List<ApprovalRecordVO> approvalRecordVOList;
}
src/main/java/com/cnooc/expert/external/workflow/model/response/model/TaskParticipantConfigDTO.java 0 → 100644
package com.cnooc.expert.external.workflow.model.response.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
/**
* 审批流程vo
*/
public class TaskParticipantConfigDTO {
// 任务定义的key值
private String key;
// 任务定义的名称
private String name;
// 是否拆分审批人组
private Boolean allowSplitParty;
// 任务（节点）抄送人
private List<ApprovePersonDTO> ccParticipants;
// 审批人配置信息
private List<ParticipantGroupDTO> participantGroups;
}
src/main/java/com/cnooc/expert/external/workflow/service/WorkflowServiceClient.java
......@@ -12,11 +12,13 @@ import com.cnooc.expert.external.workflow.model.request.InstCalculateApiReq;
import com.cnooc.expert.external.workflow.model.request.InstExistedQueryApiReq;
import com.cnooc.expert.external.workflow.model.request.InstRevokeApiReq;
import com.cnooc.expert.external.workflow.model.request.InstStartApiReq;
import com.cnooc.expert.external.workflow.model.request.StageDetailShowApiReq;
import com.cnooc.expert.external.workflow.model.response.ApprovePathSettingByConditionGetApiResp;
import com.cnooc.expert.external.workflow.model.response.InstCalculateApiResp;
import com.cnooc.expert.external.workflow.model.response.InstStartApiResp;
import com.cnooc.expert.external.workflow.model.response.ProcDefPageApiResp;
import com.cnooc.expert.external.workflow.model.response.ReceiveSettingByConditionFindApiResp;
import com.cnooc.expert.external.workflow.model.response.StageDetailShowApiResp;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import retrofit2.Call;
......@@ -90,4 +92,10 @@ public class WorkflowServiceClient extends AbstractRetrofitManager {
return this.getResponseBody(call, "queryInstExisted");
}
// 查询是否存在流程实例对象
public ApiBaseResult<List<StageDetailShowApiResp>> showStageDetail(StageDetailShowApiReq apiReq) {
Map<String, Object> headers = super.getHeaders();
Call<ApiBaseResult<List<StageDetailShowApiResp>>> call = workflowServiceApi.showStageDetailApi(headers, apiReq);
return this.getResponseBody(call, "showStageDetail");
}
}
src/main/java/com/cnooc/expert/service/portal/PortalMockService.java
......@@ -22,19 +22,8 @@ public class PortalMockService {
private final PortalServiceClient portalServiceClient;
private String getCurUserAccount() {
return "ex_zhanglh15";
}
public AgentNumResp getAgentNum(AgentNumReq req) {
// AgentNumGetApiReq apiReq = AgentNumGetApiReq.builder()
// .account(this.getCurUserAccount())
// .title(req.getTitle())
// .build();
// ApiBaseResult<AgentNumGetApiResp> apiResp = portalServiceClient.getAgentNumApi(apiReq);
// return apiResp;
AgentNumResp result = AgentNumResp.builder()
.backlogNum(0)
.doneNum(3)
......@@ -45,15 +34,6 @@ public class PortalMockService {
public BasePageResp<Object> pageAgentNum(AgentPageReq req) {
// AgentNumPageApiReq apiReq = AgentNumPageApiReq.builder()
// .pageNum(req.getPageNo())
// .pageSize(req.getPageSize())
// .account(this.getCurUserAccount())
// .status(req.getStatus())
// .title(req.getTitle())
// .build();
// ApiBaseResult<ApiBasePageResp<AgentNumPageApiResp>> apiResp = portalServiceClient.pageAgentNumApi(apiReq);
List<Object> data = Lists.newArrayList(
AgentPageResp.builder()
.id(182182)
......@@ -115,12 +95,6 @@ public class PortalMockService {
public MessageNumResp getMessageNum(MessageNumReq req) {
// MessageNumGetApiReq apiReq = MessageNumGetApiReq.builder()
// .receivers(this.getCurUserAccount())
// .build();
// ApiBaseResult<MessageNumGetApiResp> apiResp = portalServiceClient.getMessageNumApi(apiReq);
// return apiResp;
MessageNumResp result = MessageNumResp.builder()
.read(1)
.unRead(1)
......@@ -131,15 +105,6 @@ public class PortalMockService {
public BasePageResp<Object> pageMessageNum(MessagePageReq req) {
// MessageNumPageApiReq apiReq = MessageNumPageApiReq.builder()
// .pageNum(req.getPageNo())
// .pageSize(req.getPageSize())
// .receivers(this.getCurUserAccount())
// .status(req.getStatus())
// .build();
// ApiBaseResult<ApiBasePageResp<MessageNumPageApiResp>> apiResp = portalServiceClient.pageMessageNumApi(apiReq);
// return apiResp;
List<Object> data = Lists.newArrayList(
MessagePageResp.builder()
.id(182182)
......
src/main/java/com/cnooc/expert/service/portal/PortalService.java
package com.cnooc.expert.service.portal;
import com.cnooc.expert.common.response.BasePageResp;
import com.cnooc.expert.controller.portal.model.request.AgentNumReq;
import com.cnooc.expert.controller.portal.model.request.AgentPageReq;
import com.cnooc.expert.controller.portal.model.request.MessageNumReq;
import com.cnooc.expert.controller.portal.model.request.MessagePageReq;
import com.cnooc.expert.controller.portal.model.response.AgentNumResp;
import com.cnooc.expert.controller.portal.model.response.AgentPageResp;
import com.cnooc.expert.controller.portal.model.response.MessageNumResp;
import com.cnooc.expert.controller.portal.model.response.MessagePageResp;
import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
import com.cnooc.expert.external.common.model.response.ApiBaseResult;
import com.cnooc.expert.external.portal.model.request.AgentNumGetApiReq;
import com.cnooc.expert.external.portal.model.request.AgentNumPageApiReq;
import com.cnooc.expert.external.portal.model.request.MessageNumGetApiReq;
import com.cnooc.expert.external.portal.model.request.MessageNumPageApiReq;
import com.cnooc.expert.external.portal.model.response.AgentNumGetApiResp;
import com.cnooc.expert.external.portal.model.response.AgentNumPageApiResp;
import com.cnooc.expert.external.portal.model.response.MessageNumGetApiResp;
import com.cnooc.expert.external.portal.model.response.MessageNumPageApiResp;
import com.cnooc.expert.external.portal.service.PortalServiceClient;
import com.google.common.collect.Lists;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@AllArgsConstructor
@Service
public class PortalService {
......@@ -26,150 +28,49 @@ public class PortalService {
return "ex_zhanglh15";
}
public AgentNumResp getAgentNum(AgentNumReq req) {
// AgentNumGetApiReq apiReq = AgentNumGetApiReq.builder()
// .account(this.getCurUserAccount())
// .title(req.getTitle())
// .build();
// ApiBaseResult<AgentNumGetApiResp> apiResp = portalServiceClient.getAgentNumApi(apiReq);
// return apiResp;
public AgentNumGetApiResp getAgentNum(AgentNumReq req) {
AgentNumResp result = AgentNumResp.builder()
.backlogNum(0)
.doneNum(3)
AgentNumGetApiReq apiReq = AgentNumGetApiReq.builder()
.account(this.getCurUserAccount())
.title(req.getTitle())
.build();
ApiBaseResult<AgentNumGetApiResp> apiResp = portalServiceClient.getAgentNumApi(apiReq);
return result;
return apiResp.getData();
}
public BasePageResp<Object> pageAgentNum(AgentPageReq req) {
// AgentNumPageApiReq apiReq = AgentNumPageApiReq.builder()
// .pageNum(req.getPageNo())
// .pageSize(req.getPageSize())
// .account(this.getCurUserAccount())
// .status(req.getStatus())
// .title(req.getTitle())
// .build();
// ApiBaseResult<ApiBasePageResp<AgentNumPageApiResp>> apiResp = portalServiceClient.pageAgentNumApi(apiReq);
public ApiBasePageResp<AgentNumPageApiResp> pageAgentNum(AgentPageReq req) {
List<Object> data = Lists.newArrayList(
AgentPageResp.builder()
.id(182182)
.account("wzzx18")
.content("供应商测试-资格审查评审")
.createName("")
.createTime("2025-10-24T05:49:14.000+0000")
.createdTime("")
.infoId("c0b939e87b29c7bd22197cd95f6e1e84")
.modifyName("")
.pushType(3)
.redirectUrl("https://req-e.m-bid.cnooc.com.cn/workbench/todoEventIndex?id=c0b939e87b29c7bd22197cd95f6e1e84")
.status(true)
.title("供应商测试-资格审查评审")
.type("资格审查评审")
.updatedTime("")
.build(),
AgentPageResp.builder()
.id(121804)
.account("wzzx18")
.content("AutoTest_新签单次合同_货物_生产经营_非集采_法定_邀请招标_20250508134836-资格审查评审")
.createName("")
.createTime("2025-05-08T06:07:27.000+0000")
.createdTime("")
.infoId("be027ac3f4a57accb850ae0b2b7fd293")
.modifyName("")
.pushType(3)
.redirectUrl("https://req-e.m-bid.cnooc.com.cn/workbench/todoEventIndex?id=be027ac3f4a57accb850ae0b2b7fd293")
.status(true)
.title("AutoTest_新签单次合同_货物_生产经营_非集采_法定_邀请招标_20250508134836-资格审查评审")
.type("资格审查评审")
.updatedTime("")
.build(),
AgentPageResp.builder()
.id(120738)
.account("wzzx18")
.content("物装中心十八已被邀请入库，可进行申请")
.createName("")
.createTime("2025-04-23T06:54:00.000+0000")
.createdTime("")
.infoId("e499147e-ebee-4f3b-a3d4-58e897b8f841")
.modifyName("")
.pushType(3)
.redirectUrl("https://req-e.m-bid.cnooc.com.cn/workbench/todoEventIndex?id=c0b939e87b29c7bd22197cd95f6e1e84")
.status(true)
.title("物装中心十八-专家认证")
.type("专家认证")
.updatedTime("")
.build()
);
return BasePageResp.builder()
.current(1)
.pages(1)
.total(3)
.data(data)
AgentNumPageApiReq apiReq = AgentNumPageApiReq.builder()
.pageNum(req.getPageNo())
.pageSize(req.getPageSize())
.account(this.getCurUserAccount())
.status(req.getStatus())
.title(req.getTitle())
.build();
}
ApiBaseResult<ApiBasePageResp<AgentNumPageApiResp>> apiResp = portalServiceClient.pageAgentNumApi(apiReq);
public MessageNumResp getMessageNum(MessageNumReq req) {
// MessageNumGetApiReq apiReq = MessageNumGetApiReq.builder()
// .receivers(this.getCurUserAccount())
// .build();
// ApiBaseResult<MessageNumGetApiResp> apiResp = portalServiceClient.getMessageNumApi(apiReq);
// return apiResp;
return apiResp.getData();
}
MessageNumResp result = MessageNumResp.builder()
.read(1)
.unRead(1)
public MessageNumGetApiResp getMessageNum(MessageNumReq req) {
MessageNumGetApiReq apiReq = MessageNumGetApiReq.builder()
.receivers(this.getCurUserAccount())
.build();
return result;
ApiBaseResult<MessageNumGetApiResp> apiResp = portalServiceClient.getMessageNumApi(apiReq);
return apiResp.getData();
}
public BasePageResp<Object> pageMessageNum(MessagePageReq req) {
// MessageNumPageApiReq apiReq = MessageNumPageApiReq.builder()
// .pageNum(req.getPageNo())
// .pageSize(req.getPageSize())
// .receivers(this.getCurUserAccount())
// .status(req.getStatus())
// .build();
// ApiBaseResult<ApiBasePageResp<MessageNumPageApiResp>> apiResp = portalServiceClient.pageMessageNumApi(apiReq);
// return apiResp;
List<Object> data = Lists.newArrayList(
MessagePageResp.builder()
.id(182182)
.contentId("")
.createBy("")
.createName("")
.createTime("2024-12-30 14:53:49")
.endTime("")
.infoId("c0b939e87b29c7bd22197cd95f6e1e84")
.messageContent("专家状态已修改为: 手动冻结")
.messageHeader("专家状态已修改为: 手动冻结")
.modifyBy("")
.modifyName("")
.orgId("")
.receiver("")
.receivers("")
.redirectUrl("https://req-e.m-bid.cnooc.com.cn/workbench/todoEventIndex?id=c0b939e87b29c7bd22197cd95f6e1e84")
.startTime("")
.status(1)
.updatedTime("")
.visiblePosition("")
.build()
);
public ApiBasePageResp<MessageNumPageApiResp> pageMessageNum(MessagePageReq req) {
return BasePageResp.builder()
.current(1)
.pages(1)
.total(1)
.data(data)
MessageNumPageApiReq apiReq = MessageNumPageApiReq.builder()
.pageNum(req.getPageNo())
.pageSize(req.getPageSize())
.receivers(this.getCurUserAccount())
.status(req.getStatus())
.build();
ApiBaseResult<ApiBasePageResp<MessageNumPageApiResp>> apiResp = portalServiceClient.pageMessageNumApi(apiReq);
return apiResp.getData();
}
}
src/main/java/com/cnooc/expert/service/workflow/WorkflowMockService.java
......@@ -14,6 +14,12 @@ import com.cnooc.expert.external.workflow.model.request.InstCalculateApiReq;
import com.cnooc.expert.external.workflow.model.request.InstExistedQueryApiReq;
import com.cnooc.expert.external.workflow.model.request.InstRevokeApiReq;
import com.cnooc.expert.external.workflow.model.request.InstStartApiReq;
import com.cnooc.expert.external.workflow.model.request.StageDetailShowApiReq;
import com.cnooc.expert.external.workflow.model.response.StageDetailShowApiResp;
import com.cnooc.expert.external.workflow.model.response.model.ApprovalExecutionRecordVO;
import com.cnooc.expert.external.workflow.model.response.model.ApprovalRecordVO;
import com.cnooc.expert.external.workflow.model.response.model.ApprovalTaskRecordVO;
import com.cnooc.expert.external.workflow.model.response.model.SingleDetailVO;
import com.google.common.collect.Lists;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
......@@ -176,4 +182,64 @@ public class WorkflowMockService {
public Boolean queryInstExisted(InstExistedQueryApiReq req) {
return Boolean.TRUE;
}
public List<StageDetailShowApiResp> showStageDetail(StageDetailShowApiReq req) {
List<ApprovalTaskRecordVO> taskRecordVOList = Lists.newArrayList(
ApprovalTaskRecordVO.builder()
.tenantId("892422091105296385")
.instId("1407379834176692224")
.executionId("1407379834180886529")
.taskId("node2831f49a2484a0dd77b58cccb2696079")
.taskName("一级审批")
.job("默认岗")
.approveId(null)
.approveName("杨斌")
.approveCropName("中国海洋石油集团有限公司")
.endAt("1755587159884")
.opinion("同意。")
.pathId(null)
.taskStatus(null)
.operate("同意")
.sourceType(1)
.fileInfo(Collections.emptyList())
.build()
);
ApprovalExecutionRecordVO executionRecordVO = ApprovalExecutionRecordVO.builder()
.tenantId("892422091105296385")
.instId("1407379834176692224")
.executionId("1407379834180886529")
.starterId("1369611720561750016")
.starterName("物装中心十七")
.createAt("1755587100321")
.endAt("1755587160232")
.pathId(null)
.opinion(null)
.reasonForEnding("审批结束")
.build();
List<ApprovalRecordVO> approvalRecordVOList = Lists.newArrayList(
ApprovalRecordVO.builder()
.executionRecordVO(executionRecordVO)
.taskRecordVOList(taskRecordVOList)
.build()
);
List<SingleDetailVO> singleDetailVOList = Lists.newArrayList(
SingleDetailVO.builder()
.subjectId("1171522650451877889")
.subjectName("中化建国际招标有限责任公司")
.engineType(1)
.useIfream(true)
.ifreamUrl("https://flow.m-bid.cnooc.com.cn/deta/scene-talk/approvalFlowChart.html?templateId=70873f3faf714e939d4659cba405c358&approveId=listd3d8c5a0-d1e3-44a9-81f6-9c5fac329356284b")
.approvalProcessVO(null)
.approvalRecordVOList(approvalRecordVOList)
.build()
);
return Lists.newArrayList(
StageDetailShowApiResp.builder()
.busTypeCode("expertModifyApply-innerApprove")
.singleDetailVOList(singleDetailVOList)
.build()
);
}
}
src/main/java/com/cnooc/expert/service/workflow/WorkflowService.java
......@@ -12,11 +12,13 @@ import com.cnooc.expert.external.workflow.model.request.InstCalculateApiReq;
import com.cnooc.expert.external.workflow.model.request.InstExistedQueryApiReq;
import com.cnooc.expert.external.workflow.model.request.InstRevokeApiReq;
import com.cnooc.expert.external.workflow.model.request.InstStartApiReq;
import com.cnooc.expert.external.workflow.model.request.StageDetailShowApiReq;
import com.cnooc.expert.external.workflow.model.response.ApprovePathSettingByConditionGetApiResp;
import com.cnooc.expert.external.workflow.model.response.InstCalculateApiResp;
import com.cnooc.expert.external.workflow.model.response.InstStartApiResp;
import com.cnooc.expert.external.workflow.model.response.ProcDefPageApiResp;
import com.cnooc.expert.external.workflow.model.response.ReceiveSettingByConditionFindApiResp;
import com.cnooc.expert.external.workflow.model.response.StageDetailShowApiResp;
import com.cnooc.expert.external.workflow.service.WorkflowServiceClient;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
......@@ -83,4 +85,9 @@ public class WorkflowService {
ApiBaseResult<Boolean> apiResp = workflowServiceClient.queryInstExisted(req);
return apiResp.getData();
}
public List<StageDetailShowApiResp> showStageDetail(StageDetailShowApiReq req) {
ApiBaseResult<List<StageDetailShowApiResp>> apiResp = workflowServiceClient.showStageDetail(req);
return apiResp.getData();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment