Browse Source

问题修改

zhanglei
God 2 years ago
parent
commit
b9c3562fca
  1. 8
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  2. 16
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowRecordVo.java
  3. 116
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTaskDto.java
  4. 4
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java
  5. 4
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java
  6. 54
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/SysProUrlVo.java
  7. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java
  8. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java
  9. 31
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

8
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -7,7 +7,7 @@ public enum ProcDefEnum {
/***************************正式流程id***********************************/
/*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO:正式新2022-11-25
@ -38,12 +38,12 @@ public enum ProcDefEnum {
SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),
/******************************测试流程id*********************************************/
ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
/*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),
@ -74,7 +74,7 @@ public enum ProcDefEnum {
BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id*/
;
ProcDefEnum(String proDefName, String proDefId) {

16
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowRecordVo.java

@ -0,0 +1,16 @@
package com.yxt.anrui.portal.api.flow;
import java.util.ArrayList;
import java.util.List;
public class FlowRecordVo {
private List<FlowTask> flowList = new ArrayList<>();
public List<FlowTask> getFlowList() {
return flowList;
}
public void setFlowList(List<FlowTask> flowList) {
this.flowList = flowList;
}
}

116
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTaskDto.java

@ -0,0 +1,116 @@
package com.yxt.anrui.portal.api.flow;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
/**
* <p>工作流任务<p>
*
* @author XuanXuan
* @date 2021-04-03
*/
@ApiModel("工作流任务相关-返回参数")
@Data
public class FlowTaskDto implements Serializable {
@ApiModelProperty("任务编号")
private String taskId;
@ApiModelProperty("任务名称")
private String taskName;
@ApiModelProperty("任务Key")
private String taskDefKey;
@ApiModelProperty("任务执行人Id")
private String assigneeSid;
@ApiModelProperty("部门名称")
private String deptName;
@ApiModelProperty("流程发起人部门名称")
private String startDeptName;
@ApiModelProperty("任务执行人名称")
private String assigneeName;
@ApiModelProperty("流程发起人Id")
private String startUserSid;
@ApiModelProperty("流程发起人名称")
private String startUserName;
@ApiModelProperty("流程类型")
private String category;
@ApiModelProperty("流程变量信息")
private Object procVars;
@ApiModelProperty("局部变量信息")
private Object taskLocalVars;
@ApiModelProperty("流程部署编号")
private String deployId;
@ApiModelProperty("流程ID")
private String procDefId;
@ApiModelProperty("流程key")
private String procDefKey;
@ApiModelProperty("流程定义名称")
private String procDefName;
@ApiModelProperty("流程定义内置使用版本")
private int procDefVersion;
@ApiModelProperty("流程实例ID")
private String procInsId;
@ApiModelProperty("历史流程实例ID")
private String hisProcInsId;
@ApiModelProperty("任务耗时")
private String duration;
@ApiModelProperty("任务意见")
private FlowCommentDto comment;
@ApiModelProperty("候选执行人")
private String candidate;
@ApiModelProperty("结束事件ID")
private String endActId;
@ApiModelProperty("流程创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date processCreateTime;
@ApiModelProperty("任务创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty("任务结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
@ApiModelProperty("任务完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date finishTime;
@ApiModelProperty("业务表单参数集合")
private Map<String, Object> processVariables;
/*@ApiModelProperty("手机端参数集合")
private Map<String, Object> appVariables;
@ApiModelProperty("pc端参数集合")
private Map<String, Object> pcVariables;*/
@ApiModelProperty("是否显示撤回按钮(登录用户与待办人是否为同一个)")
private boolean hasRevokeButton = false;
@ApiModelProperty("办理的url")
private SysProUrlVo sysProUrlVo ;
}

4
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java

@ -1,8 +1,6 @@
package com.yxt.anrui.portal.api.flow;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskDto;
import com.yxt.anrui.portal.api.flow.app.FlowTaskDoQuery;
import com.yxt.anrui.portal.api.flow.app.FlowTaskDoVo;
import com.yxt.anrui.portal.api.flow.app.FlowTaskFinishVo;
@ -11,8 +9,6 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.Map;
@Component
public class FlowableFallback implements FlowableFeign{
/* @Override

4
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java

@ -1,8 +1,6 @@
package com.yxt.anrui.portal.api.flow;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskDto;
import com.yxt.anrui.portal.api.flow.app.FlowTaskDoQuery;
import com.yxt.anrui.portal.api.flow.app.FlowTaskDoVo;
import com.yxt.anrui.portal.api.flow.app.FlowTaskFinishVo;
@ -15,8 +13,6 @@ import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@Api(tags = "Flowable")
@FeignClient(
contextId = "anrui-portal-flow-Flowable",

54
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/SysProUrlVo.java

@ -0,0 +1,54 @@
package com.yxt.anrui.portal.api.flow;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* 流程业务表单url对象 SysProUrl
*
* @author XuanXuan Xuan
* @date 2021-03-30
*/
@Data
@ApiModel("流程业务表单url对象")
public class SysProUrlVo implements Vo {
/**
* 表单主键
*/
private String url;
/**
* 类型办理或者详情
*/
private String type;
/**
* 终端pc/mobile
*/
private String terminal;
/**
* 表单id
*/
private String formId;
/**
* 名称
*/
private String title;
/**
* 流程定义id
*/
private String proc_def_id;
/**
* 节点id
*/
private String taskDefKey;
/**
* app插件名称模块名称
*/
private String modulePluginName;
}

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java

@ -2,7 +2,7 @@ package com.yxt.anrui.portal.api.flow.app;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
import com.yxt.anrui.portal.api.flow.SysProUrlVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java

@ -3,7 +3,7 @@ package com.yxt.anrui.portal.api.flow.app;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
import com.yxt.anrui.portal.api.flow.SysProUrlVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

31
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@ -25,9 +25,8 @@
*********************************************************/
package com.yxt.anrui.portal.biz.flow;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskDto;
import com.yxt.anrui.portal.api.flow.*;
import com.yxt.anrui.portal.api.flow.app.FlowTaskDoQuery;
import com.yxt.anrui.portal.api.flow.app.FlowTaskDoVo;
@ -134,8 +133,13 @@ public class FlowableRest implements FlowableFeign {
@Override
public ResultBean<FlowRecordVo> flowRecord(String procInsId, String deployId) {
ResultBean<FlowRecordVo> flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId);
return flowRecordVoResultBean;// flowableService.flowRecord(procInsId, deployId);
ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowRecordVo> flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId);
com.yxt.anrui.flowable.api.flowtask.FlowRecordVo flowRecordVo = flowRecordVoResultBean.getData();
FlowRecordVo flowRecordVo1 = new FlowRecordVo();
BeanUtil.copyProperties(flowRecordVo,flowRecordVo1);
ResultBean<FlowRecordVo> resultBean = new ResultBean<FlowRecordVo>().success();
resultBean.setData(flowRecordVo1);
return resultBean;
}
@Override
@ -174,7 +178,14 @@ public class FlowableRest implements FlowableFeign {
sb.delete(sb.length() - 1, sb.length());
}
pQuery.getParams().setOrgSid(sb.toString());
return flowableService.todoAllTaskList(userSid, pQuery);
Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto> data = flowableService.todoAllTaskList(userSid, pQuery).getData();
Page<FlowTaskDto> page = new Page<>();
BeanUtil.copyProperties(data,page);
ResultBean< Page<FlowTaskDto>> success = new ResultBean< Page<FlowTaskDto>>().success();
success.setData(page);
return success;
}
@Override
@ -199,7 +210,15 @@ public class FlowableRest implements FlowableFeign {
@Override
public ResultBean<Page<FlowTaskDto>> doneAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {//已办列表
return flowableService.doneAllTaskList(userSid, pQuery);
ResultBean<Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto>> pageResultBean = flowableService.doneAllTaskList(userSid, pQuery);
Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto> data = pageResultBean.getData();
Page<FlowTaskDto> page = new Page<>();
BeanUtil.copyProperties(data,page);
ResultBean< Page<FlowTaskDto>> success = new ResultBean< Page<FlowTaskDto>>().success();
success.setData(page);
return success;
}
@Override

Loading…
Cancel
Save