From f9b143a0d63f0bdfdfcd717c136ea344d6f94bc1 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 31 Jan 2023 12:02:26 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/kingdee/bank/BDBankService.java | 2 +- .../flowable/api/flowtask/AppUserVo.java | 23 +++ .../api/processcomment/ProcessComment.java | 68 +++++++++ .../ProcessCommentDetailsVo.java | 69 +++++++++ .../api/processcomment/ProcessCommentDto.java | 69 +++++++++ .../processcomment/ProcessCommentFeign.java | 81 +++++++++++ .../ProcessCommentFeignFallback.java | 77 ++++++++++ .../processcomment/ProcessCommentQuery.java | 67 +++++++++ .../api/processcomment/ProcessCommentVo.java | 72 ++++++++++ .../anrui/flowable/biz/flow/FlowableRest.java | 3 + .../biz/flowtask/FlowTaskService.java | 13 +- .../processcomment/ProcessCommentMapper.java | 72 ++++++++++ .../processcomment/ProcessCommentMapper.xml | 20 +++ .../processcomment/ProcessCommentRest.java | 105 ++++++++++++++ .../processcomment/ProcessCommentService.java | 135 ++++++++++++++++++ anrui-portal/anrui-portal-api/pom.xml | 4 +- .../yxt/anrui/terminal/api/app/AppFeign.java | 15 +- .../AppFlowableRecordAndCommentVo.java | 33 +++++ .../api/app/flowable/ProcessComment.java | 72 ++++++++++ .../api/app/flowable/ProcessCommentVo.java | 63 ++++++++ anrui-terminal/anrui-terminal-biz/pom.xml | 6 + .../yxt/anrui/terminal/biz/app/AppRest.java | 28 +++- .../anrui/terminal/biz/app/AppService.java | 52 ++++++- 23 files changed, 1134 insertions(+), 15 deletions(-) create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/AppUserVo.java create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDetailsVo.java create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeignFallback.java create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentQuery.java create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java create mode 100644 anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.java create mode 100644 anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml create mode 100644 anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java create mode 100644 anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java index db943d7b4d..911ed8540a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java @@ -47,7 +47,7 @@ public class BDBankService extends FinKingDeeService { Map map_fEntityModel_= object2Map(bDBank); map_fEntityModel_.put("FBANKID","0"); map_fEntityModel_.put("IsDeleteEntry", "True"); - //准备 物料列表的数据 ForEntryBill + //准备 银行列表的数据 ForEntryBill String kingDeeData = BDBankCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); ResultBean resultBean = accessKingDeeInterface( KingDeeBillId.BD_BANK.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/AppUserVo.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/AppUserVo.java new file mode 100644 index 0000000000..c6b29a036c --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/AppUserVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.flowable.api.flowtask; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/7/28 16:24 + * @Description + */ +@Data +public class AppUserVo implements Vo { + private static final long serialVersionUID = -3220584066025636920L; + @ApiModelProperty(value = "名称") + @JsonProperty("name") + private String assigneeName; + @ApiModelProperty(value = "头像") + @JsonProperty("image") + private String assigneeHeadImage; + +} diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java new file mode 100644 index 0000000000..73cb5e3a8d --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.flowable.api.processcomment; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessComment.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.api.processcomment.ProcessComment
+ * Description: process_comment.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "process_comment", description = "process_comment") +@TableName("process_comment") +public class ProcessComment extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("评论人") + private String reviewer; // 评论人 + @ApiModelProperty("评论人sid") + private String reviewerSid; // 评论人sid + @ApiModelProperty("评论时间") + private Date time; // 评论时间 + @ApiModelProperty("评论内容") + private String content; // 评论内容 + @ApiModelProperty("评论的流程id") + private String processId; // 评论的流程id + @ApiModelProperty("评论的流程实列的sid") + private String processInstSid; // 评论的流程实列的sid + +} diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDetailsVo.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDetailsVo.java new file mode 100644 index 0000000000..311ea5a2a4 --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDetailsVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.flowable.api.processcomment; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentVo.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.api.processcomment.ProcessCommentVo
+ * Description: process_comment 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "process_comment 视图数据详情", description = "process_comment 视图数据详情") +public class ProcessCommentDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("评论人") + private String reviewer; // 评论人 + @ApiModelProperty("评论人sid") + private String reviewerSid; // 评论人sid + @ApiModelProperty("评论时间") + private Date time; // 评论时间 + @ApiModelProperty("评论内容") + private String content; // 评论内容 + @ApiModelProperty("评论的流程id") + private String processId; // 评论的流程id + @ApiModelProperty("评论的流程实列的sid") + private String processInstSid; // 评论的流程实列的sid + +} \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java new file mode 100644 index 0000000000..08ff5e22ce --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.flowable.api.processcomment; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentDto.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.api.processcomment.ProcessCommentDto
+ * Description: process_comment 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "process_comment 数据传输对象", description = "process_comment 数据传输对象") +public class ProcessCommentDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("评论人") + private String reviewer; // 评论人 + @ApiModelProperty("评论人sid") + private String reviewerSid; // 评论人sid + @ApiModelProperty("评论时间") + private Date time; // 评论时间 + @ApiModelProperty("评论内容") + private String content; // 评论内容 + @ApiModelProperty("评论的流程id") + private String processId; // 评论的流程id + @ApiModelProperty("评论的流程实列的sid") + private String processInstSid; // 评论的流程实列的sid + +} \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java new file mode 100644 index 0000000000..1212610ca5 --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.flowable.api.processcomment; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentFeign.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.api.processcomment.ProcessCommentFeign
+ * Description: process_comment.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@FeignClient( + contextId = "processcomment-ProcessComment", + name = "anrui-flowable", + path = "v1/processcomment", + fallback = ProcessCommentFeignFallback.class) +public interface ProcessCommentFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ProcessCommentDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("根据流程实列的id获取流程相关的评论") + @GetMapping("/getCommentList/{processId}") + @ResponseBody + ResultBean> getCommentList(@PathVariable("processId")String processId); +} \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeignFallback.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeignFallback.java new file mode 100644 index 0000000000..a4e8687c4b --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeignFallback.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.flowable.api.processcomment; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentFeignFallback.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.api.processcomment.ProcessCommentFeignFallback
+ * Description: process_comment.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ProcessCommentFeignFallback implements ProcessCommentFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口processcomment/processcomment/listPage无法访问"); + } + + @Override + public ResultBean save(ProcessCommentDto dto){ + return ResultBean.fireFail().setMsg("接口processcomment/processcomment/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口processcomment/processcomment/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口processcomment/processcomment/fetchDetailsBySid无法访问"); + } + + @Override + public ResultBean> getCommentList(String processId) { + return null; + } +} \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentQuery.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentQuery.java new file mode 100644 index 0000000000..13b90162c0 --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentQuery.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.flowable.api.processcomment; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentQuery.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.api.processcomment.ProcessCommentQuery
+ * Description: process_comment 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "process_comment 查询条件", description = "process_comment 查询条件") +public class ProcessCommentQuery implements Query { + + @ApiModelProperty("评论人") + private String reviewer; // 评论人 + @ApiModelProperty("评论人sid") + private String reviewerSid; // 评论人sid + @ApiModelProperty("评论时间") + private Date time; // 评论时间 + @ApiModelProperty("评论内容") + private String content; // 评论内容 + @ApiModelProperty("评论的流程id") + private String processId; // 评论的流程id + @ApiModelProperty("评论的流程实列的sid") + private String processInstSid; // 评论的流程实列的sid + +} diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java new file mode 100644 index 0000000000..e4dc90a066 --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.flowable.api.processcomment; + + +import com.yxt.anrui.flowable.api.flowtask.AppUserVo; +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentVo.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.api.processcomment.ProcessCommentVo
+ * Description: process_comment 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "process_comment 视图数据对象", description = "process_comment 视图数据对象") +public class ProcessCommentVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("评论人") + private String reviewer; // 评论人 + @ApiModelProperty("评论人sid") + private String reviewerSid; // 评论人sid + @ApiModelProperty("评论时间") + private Date time; // 评论时间 + @ApiModelProperty("评论内容") + private String content; // 评论内容 + @ApiModelProperty("评论的流程id") + private String processId; // 评论的流程id + @ApiModelProperty("评论的流程实列的sid") + private String processInstSid; // 评论的流程实列的sid + @ApiModelProperty("taskUserInfo") + private AppUserVo taskUserInfo; // AppUserVo + +} diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index ac4356233a..05b07b2c6c 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -27,6 +27,7 @@ package com.yxt.anrui.flowable.biz.flow; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.flowable.api.flow.*; import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; @@ -202,6 +203,8 @@ public class FlowableRest implements FlowableFeign { * @return */ public ResultBean handleProsess(BusinessVariables dto,boolean b) { + log.info("BusinessVariables:{}", JSONObject.toJSONString(dto)); + log.info("b:{}", b); UpdateFlowFieldVo vo = new UpdateFlowFieldVo(); ResultBean rb = ResultBean.fireFail(); // Map formVariables = dto.getFormVariables(); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index eab5111820..59e0aaef5d 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -308,7 +308,7 @@ public class FlowTaskService extends MybatisBaseService taskUserInfos = flowTask.getTaskUserInfos(); TaskUserInfo taskUserInfo = taskUserInfos.get(0); if(assigneeSid0.equals(taskUserInfo.getAssigneeSid())){ - ii++; + if(!FlowComment.RECALL.getType().equals( flowTask1.getComment().getType())){ + ii++; + } continue; }else{ ybrsid=flowList.get(i).getTaskUserInfos().get(0).getAssigneeSid(); @@ -1534,7 +1538,7 @@ public class FlowTaskService extends MybatisBaseService>().fail().setMsg("您不是上一环节处理人，不能进行撤回操作！").setData(new ArrayList<>()); } else { ResultBean> listResultBean = null; - for(int i=0;i<=ii;i++){ + for(int i=0;i<=ii;i++){ //ii==2的问题 listResultBean = revokeProcess_(historicTaskInstance.getProcessInstanceId(),userSid); } return listResultBean; @@ -1547,7 +1551,7 @@ public class FlowTaskService extends MybatisBaseService> revokeProcess_( String processInstanceId, String assignee ) { -// 流程回退到上一个节点，审批人继续审批 + // 流程回退到上一个节点，审批人继续审批 // 获取流程定义信息 Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult(); ProcessDefinition processDefinition = repositoryService @@ -1572,6 +1576,7 @@ public class FlowTaskService extends MybatisBaseService网关->销售经理->销售支持部经理 List parentUserTaskList = FlowableUtils.iteratorFindParentUserTasks(source, null, null); if (parentUserTaskList == null || parentUserTaskList.size() == 0) { // throw new CustomException("当前节点为"); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.java new file mode 100644 index 0000000000..2974556ee8 --- /dev/null +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.flowable.biz.processcomment; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.flowable.api.processcomment.ProcessComment; +import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto; +import com.yxt.anrui.flowable.api.processcomment.ProcessCommentVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentMapper.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.biz.processcomment.ProcessCommentMapper
+ * Description: process_comment.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ProcessCommentMapper extends BaseMapper { + + //@Update("update process_comment set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from process_comment") + List selectListVo(); + + List getCommentList(@Param("processId")String processId); + @Select("select * from process_comment where sid=#{sid}") + ProcessComment fetchBySid(@Param("sid")String sid); + + void insertByDto(ProcessCommentDto dto); +} \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml new file mode 100644 index 0000000000..4b3c0d8dd2 --- /dev/null +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + insert into `process_comment` ( `sid`, `reviewer`, `reviewerSid`, `time`, `content`, `processId`, `processInstSid`) + values(#{sid},#{reviewer},#{reviewerSid},#{time},#{content},#{processId},#{processInstSid}); + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java new file mode 100644 index 0000000000..cb660f5db3 --- /dev/null +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java @@ -0,0 +1,105 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.flowable.biz.processcomment; + +import com.yxt.anrui.flowable.api.processcomment.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; +import java.util.UUID; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentFeignFallback.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.biz.processcomment.ProcessCommentRest
+ * Description: process_comment.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "process_comment") +@RestController +@RequestMapping("v1/processcomment") +public class ProcessCommentRest implements ProcessCommentFeign { + + @Autowired + private ProcessCommentService processCommentService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = processCommentService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ProcessCommentDto dto){ + ResultBean rb = ResultBean.fireFail(); + dto.setTime(new Date()); + processCommentService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + processCommentService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ProcessCommentDetailsVo vo = processCommentService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean> getCommentList(String processId) { + ResultBean rb = ResultBean.fireFail(); + List vo = processCommentService.getCommentList(processId); + return rb.success().setData(vo); + } +} diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java new file mode 100644 index 0000000000..a6ded5b701 --- /dev/null +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java @@ -0,0 +1,135 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.flowable.biz.processcomment; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.flowable.api.flowtask.AppUserVo; +import com.yxt.anrui.flowable.api.flowtask.TaskUserInfo; +import com.yxt.anrui.flowable.api.processcomment.*; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.common.base.config.component.FileUploadComponent; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentService.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.biz.processcomment.ProcessCommentService
+ * Description: process_comment 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ProcessCommentService extends MybatisBaseService { + @Resource + private SysUserFeign sysUserFeign; + @Resource + private FileUploadComponent fileUploadComponent; + private QueryWrapper createQueryWrapper(ProcessCommentQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ProcessCommentQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ProcessCommentDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + dto.setSid(UUID.randomUUID().toString()); + baseMapper.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ProcessCommentDto dto){ + ProcessComment entity = new ProcessComment(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ProcessCommentDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ProcessComment entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ProcessCommentDetailsVo fetchDetailsVoBySid(String sid){ + ProcessComment entity = fetchBySid(sid); + ProcessCommentDetailsVo vo = new ProcessCommentDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List getCommentList(String processId) { + List commentList = baseMapper.getCommentList(processId); + for(ProcessCommentVo histIns:commentList){ + ResultBean> sysUserVoResultBean = sysUserFeign.fetchBySids(histIns.getReviewerSid());// sysUserService.selectUserById(Long.parseLong(histIns.getAssignee())); + List data1 = sysUserVoResultBean.getData(); + for( SysUserVo data:data1){ + AppUserVo taskUserInfo=new AppUserVo(); + taskUserInfo.setAssigneeName(data.getName()); + if(!com.yxt.common.base.utils.StringUtils.isBlank(data.getHeadImage())){ + taskUserInfo.setAssigneeHeadImage(fileUploadComponent.getUrlPrefix() +data.getHeadImage()); + } + histIns.setTaskUserInfo(taskUserInfo); + } + } + return commentList; + } +} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/pom.xml b/anrui-portal/anrui-portal-api/pom.xml index 6bdb237440..a3893b1159 100644 --- a/anrui-portal/anrui-portal-api/pom.xml +++ b/anrui-portal/anrui-portal-api/pom.xml @@ -23,11 +23,11 @@ yxt-common-core 0.0.1 - + org.springframework.cloud spring-cloud-starter-openfeign diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java index f2b4931be4..bb9fdc93fa 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java @@ -1,15 +1,18 @@ package com.yxt.anrui.terminal.api.app; -import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordQuery; -import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordVo; +import com.yxt.anrui.terminal.api.app.flowable.*; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; +import javax.validation.Valid; import java.util.List; +import java.util.Map; /** * @Author dimengzhe @@ -29,5 +32,13 @@ public interface AppFeign { @ResponseBody ResultBean> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery); + @ApiOperation("流程审核记录和评论记录") + @GetMapping("/getProgressCommentList") + @ResponseBody + ResultBean> getProgressCommentList(AppFlowableRecordQuery appFlowableRecordQuery); + @ApiOperation("新增评论") + @PostMapping("/addProgressComment") + @ResponseBody + ResultBean addProgressComment(@RequestBody @Valid ProcessComment processComment); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java new file mode 100644 index 0000000000..a8d3689c12 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.terminal.api.app.flowable; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author dimengzhe + * @Date 2022/7/28 16:19 + * @Description + */ +@Data +public class AppFlowableRecordAndCommentVo implements Vo { + private static final long serialVersionUID = -3272069366532392941L; + @ApiModelProperty(value = "流程状态") + @JsonProperty("state") + private String state; + @ApiModelProperty(value = "时间") + @JsonProperty("time") + private Date time; + @ApiModelProperty(value = "审批记录") + @JsonProperty("flowableRecordVo") + private AppFlowableRecordVo flowableRecordVo; + @ApiModelProperty("流程评论") + @JsonProperty("processcommentVo") + private ProcessCommentVo processcommentVo; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java new file mode 100644 index 0000000000..9ea1c384f2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.app.flowable; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentVo.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.api.processcomment.ProcessCommentVo
+ * Description: process_comment 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "process_comment 视图数据对象", description = "process_comment 视图数据对象") +public class ProcessComment implements Vo { + + @ApiModelProperty("评论人") + @NotBlank(message = "reviewer不能为空") + private String reviewer; // 评论人 + @ApiModelProperty("评论人") + @NotBlank(message = "reviewerSid不能为空") + private String reviewerSid; // 评论人 + @ApiModelProperty("评论内容") + @NotBlank(message = "content不能为空") + private String content; // 评论内容 + @ApiModelProperty("评论的流程id") + @NotBlank(message = "processId不能为空") + private String processId; // 评论的流程id + @ApiModelProperty("评论的流程实列的sid") + private String processInstSid; // 评论的流程实列的sid + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java new file mode 100644 index 0000000000..947a1edc9f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.app.flowable; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * Project: processcomment(流程评论)
+ * File: ProcessCommentVo.java
+ * Class: com.yxt.anrui.flowable.api.processcomment.api.processcomment.ProcessCommentVo
+ * Description: process_comment 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-30 14:40:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "process_comment 视图数据对象", description = "process_comment 视图数据对象") +public class ProcessCommentVo implements Vo { + + @ApiModelProperty("评论时间") + private Date time; // 评论时间 + @ApiModelProperty("评论内容") + private String content; // 评论内容 + @ApiModelProperty(value = "环节的办理人信息") + @JsonProperty("handleBean") + private AppUserVo taskUserInfo; + +} diff --git a/anrui-terminal/anrui-terminal-biz/pom.xml b/anrui-terminal/anrui-terminal-biz/pom.xml index 6ad996201a..c5a2c1b92d 100644 --- a/anrui-terminal/anrui-terminal-biz/pom.xml +++ b/anrui-terminal/anrui-terminal-biz/pom.xml @@ -30,6 +30,12 @@ com.yxt.anrui 0.0.1-SNAPSHOT + + com.yxt.anrui + anrui-flowable-api + 0.0.1-SNAPSHOT + compile + anrui-buscenter-api com.yxt.anrui diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java index 1243d04352..84027dcd56 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java @@ -1,14 +1,16 @@ package com.yxt.anrui.terminal.biz.app; import com.yxt.anrui.terminal.api.app.AppFeign; -import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordQuery; -import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordVo; +import com.yxt.anrui.terminal.api.app.flowable.*; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import java.util.List; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; /** * @Author dimengzhe @@ -26,4 +28,24 @@ public class AppRest implements AppFeign { public ResultBean> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery) { return appService.getProgressList(appFlowableRecordQuery); } + + /** + * 获取流程审批记录和评论 + * @param appFlowableRecordQuery + * @return + */ + @Override + public ResultBean> getProgressCommentList(AppFlowableRecordQuery appFlowableRecordQuery) { + ResultBean> rb = ResultBean.fireFail(); + ResultBean> list = appService.getProgressAndCommentList(appFlowableRecordQuery); + /* List newList = list.stream(). + sorted(Comparator.comparing(AppFlowableRecordAndCommentVo::getTime, Comparator.reverseOrder())). + collect(Collectors.toList());*/ + return list; + } + + @Override + public ResultBean addProgressComment(ProcessComment processComment) { + return appService.addProgressComment(processComment); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java index a2199888b5..5364268e85 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java @@ -1,12 +1,13 @@ package com.yxt.anrui.terminal.biz.app; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; -import com.yxt.anrui.terminal.api.app.flowable.AppFlowCommentVo; -import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordQuery; -import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordVo; +import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto; +import com.yxt.anrui.flowable.api.processcomment.ProcessCommentFeign; +import com.yxt.anrui.terminal.api.app.flowable.*; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +27,8 @@ public class AppService { @Autowired private FlowTaskFeign flowTaskFeign; + @Autowired + private ProcessCommentFeign processCommentFeign; public ResultBean> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -55,4 +58,47 @@ public class AppService { } return rb.success().setData(voList); } + public ResultBean> getProgressAndCommentList(AppFlowableRecordQuery appFlowableRecordQuery) { + ResultBean> rb = ResultBean.fireFail(); + ResultBean> progressdata = getProgressList(appFlowableRecordQuery); + ResultBean> commentList = getCommentList(appFlowableRecordQuery); + List list=new ArrayList<>(); + List progressList = progressdata.getData(); + progressList.forEach(f->{ + AppFlowableRecordAndCommentVo a=new AppFlowableRecordAndCommentVo(); + a.setTime(f.getCreateTime()); + a.setFlowableRecordVo(f); + a.setState(0+""); + list.add(a); + }); + + commentList.getData().forEach(f->{ + AppFlowableRecordAndCommentVo a=new AppFlowableRecordAndCommentVo(); + a.setTime(f.getTime()); + a.setProcesscommentVo(f); + a.setState(1+""); + list.add(a); + }); + list.sort((t1, t2) -> t2.getTime().compareTo(t1.getTime())); + return rb.success().setData(list); + } + + public ResultBean> getCommentList(AppFlowableRecordQuery appFlowableRecordQuery) { + ResultBean> rb = ResultBean.fireFail(); + ResultBean> commentList = + processCommentFeign.getCommentList(appFlowableRecordQuery.getProgressId()); + List list=new ArrayList<>(); + commentList.getData().forEach(f->{ + ProcessCommentVo processCommentVo = new ProcessCommentVo(); + BeanUtil.copyProperties(f,processCommentVo); + list.add(processCommentVo); + }); + return rb.success().setData(list); + } + + public ResultBean addProgressComment(ProcessComment processComment) { + ProcessCommentDto dto=new ProcessCommentDto(); + BeanUtil.copyProperties(processComment,dto); + return processCommentFeign.save(dto); + } } From d6f72e8ee7cfebff88e9fcc41b6861bd4d1ee785 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 31 Jan 2023 12:16:12 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scmvehicleexamine/ScmVehicleExamineService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index b89138d7f6..8083f4e345 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -213,11 +213,13 @@ public class ScmVehicleExamineService extends MybatisBaseService Date: Tue, 31 Jan 2023 13:05:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/flowable/api/utils/ProcDefEnum.java | 8 +- .../anrui/portal/api/flow/FlowRecordVo.java | 16 +++ .../anrui/portal/api/flow/FlowTaskDto.java | 116 ++++++++++++++++++ .../portal/api/flow/FlowableFallback.java | 4 - .../anrui/portal/api/flow/FlowableFeign.java | 4 - .../anrui/portal/api/flow/SysProUrlVo.java | 54 ++++++++ .../portal/api/flow/app/FlowTaskDoVo.java | 2 +- .../portal/api/flow/app/FlowTaskFinishVo.java | 2 +- .../anrui/portal/biz/flow/FlowableRest.java | 31 ++++- 9 files changed, 217 insertions(+), 20 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowRecordVo.java create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTaskDto.java create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/SysProUrlVo.java diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 53a9728bed..95f44e819a 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/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) { diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowRecordVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowRecordVo.java new file mode 100644 index 0000000000..708b26733f --- /dev/null +++ b/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 flowList = new ArrayList<>(); + + public List getFlowList() { + return flowList; + } + + public void setFlowList(List flowList) { + this.flowList = flowList; + } +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTaskDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTaskDto.java new file mode 100644 index 0000000000..c97aecdbe7 --- /dev/null +++ b/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; + +/** + *

工作流任务

+ * + * @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 processVariables; + + /*@ApiModelProperty("手机端参数集合") + private Map appVariables; + + @ApiModelProperty("pc端参数集合") + private Map pcVariables;*/ + + @ApiModelProperty("是否显示撤回按钮(登录用户与待办人是否为同一个)") + private boolean hasRevokeButton = false; + @ApiModelProperty("办理的url") + private SysProUrlVo sysProUrlVo ; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java index 7c2a2e6572..90e4b70e96 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java +++ b/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 diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java index 031983838b..2ab5d5f835 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java +++ b/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", diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/SysProUrlVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/SysProUrlVo.java new file mode 100644 index 0000000000..d4d3ca2422 --- /dev/null +++ b/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; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java index 0e1a35ce62..f41e816546 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java +++ b/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; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java index 350d82418d..cf0408e031 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java +++ b/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; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 320440d520..2442ed5f9f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/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 flowRecord(String procInsId, String deployId) { - ResultBean flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId); - return flowRecordVoResultBean;// flowableService.flowRecord(procInsId, deployId); + ResultBean flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId); + com.yxt.anrui.flowable.api.flowtask.FlowRecordVo flowRecordVo = flowRecordVoResultBean.getData(); + FlowRecordVo flowRecordVo1 = new FlowRecordVo(); + BeanUtil.copyProperties(flowRecordVo,flowRecordVo1); + ResultBean resultBean = new ResultBean().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 data = flowableService.todoAllTaskList(userSid, pQuery).getData(); + Page page = new Page<>(); + + BeanUtil.copyProperties(data,page); + + ResultBean< Page> success = new ResultBean< Page>().success(); + success.setData(page); + return success; } @Override @@ -199,7 +210,15 @@ public class FlowableRest implements FlowableFeign { @Override public ResultBean> doneAllTaskList(String userSid, PagerQuery pQuery) {//已办列表 - return flowableService.doneAllTaskList(userSid, pQuery); + ResultBean> pageResultBean = flowableService.doneAllTaskList(userSid, pQuery); + Page data = pageResultBean.getData(); + Page page = new Page<>(); + + BeanUtil.copyProperties(data,page); + + ResultBean< Page> success = new ResultBean< Page>().success(); + success.setData(page); + return success; } @Override From 810a70ff7290b6064da582ed9bf7db6db4f5375a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 31 Jan 2023 13:44:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/portal/biz/flow/FlowableRest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 2442ed5f9f..55e1c0eec8 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -178,10 +178,9 @@ public class FlowableRest implements FlowableFeign { sb.delete(sb.length() - 1, sb.length()); } pQuery.getParams().setOrgSid(sb.toString()); - Page data = flowableService.todoAllTaskList(userSid, pQuery).getData(); Page page = new Page<>(); - BeanUtil.copyProperties(data,page); + BeanUtil.copyProperties(flowableService.todoAllTaskList(userSid, pQuery).getData(),page); ResultBean< Page> success = new ResultBean< Page>().success(); success.setData(page); @@ -211,10 +210,9 @@ public class FlowableRest implements FlowableFeign { @Override public ResultBean> doneAllTaskList(String userSid, PagerQuery pQuery) {//已办列表 ResultBean> pageResultBean = flowableService.doneAllTaskList(userSid, pQuery); - Page data = pageResultBean.getData(); Page page = new Page<>(); - BeanUtil.copyProperties(data,page); + BeanUtil.copyProperties(pageResultBean.getData(),page); ResultBean< Page> success = new ResultBean< Page>().success(); success.setData(page); From a91a7c17071bd7665639508c24f87bf9fceaad5e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 31 Jan 2023 13:46:39 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 95f44e819a..53a9728bed 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/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) { From ef8f742442924371e707d0a51ae72b736c749d7e Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 31 Jan 2023 14:01:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/terminal/biz/app/AppRest.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java index 84027dcd56..38b3d24cd2 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java @@ -1,5 +1,7 @@ package com.yxt.anrui.terminal.biz.app; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.terminal.api.app.AppFeign; import com.yxt.anrui.terminal.api.app.flowable.*; import com.yxt.common.core.result.ResultBean; @@ -23,6 +25,8 @@ public class AppRest implements AppFeign { @Autowired private AppService appService; + @Autowired + private SysUserFeign sysUserFeign; @Override public ResultBean> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery) { @@ -36,16 +40,18 @@ public class AppRest implements AppFeign { */ @Override public ResultBean> getProgressCommentList(AppFlowableRecordQuery appFlowableRecordQuery) { - ResultBean> rb = ResultBean.fireFail(); ResultBean> list = appService.getProgressAndCommentList(appFlowableRecordQuery); - /* List newList = list.stream(). - sorted(Comparator.comparing(AppFlowableRecordAndCommentVo::getTime, Comparator.reverseOrder())). - collect(Collectors.toList());*/ return list; } @Override public ResultBean addProgressComment(ProcessComment processComment) { + String reviewerSid = processComment.getReviewerSid(); + ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(reviewerSid); + if(!sysUserVoResultBean.getSuccess()){ + return ResultBean.fireFail().setMsg("用户不存在!"); + } + processComment.setReviewer(sysUserVoResultBean.getData().getName()); return appService.addProgressComment(processComment); } } From 3895f3ccd518a8e9bcaac8ed8528b5b9cee99657 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 31 Jan 2023 14:12:59 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/terminal/api/app/flowable/ProcessComment.java | 5 ++--- .../main/java/com/yxt/anrui/terminal/biz/app/AppService.java | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java index 9ea1c384f2..5441ed3bc0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java @@ -55,7 +55,6 @@ import java.util.Date; public class ProcessComment implements Vo { @ApiModelProperty("评论人") - @NotBlank(message = "reviewer不能为空") private String reviewer; // 评论人 @ApiModelProperty("评论人") @NotBlank(message = "reviewerSid不能为空") @@ -64,8 +63,8 @@ public class ProcessComment implements Vo { @NotBlank(message = "content不能为空") private String content; // 评论内容 @ApiModelProperty("评论的流程id") - @NotBlank(message = "processId不能为空") - private String processId; // 评论的流程id + @NotBlank(message = "procInsId不能为空") + private String procInsId; // 评论的流程id @ApiModelProperty("评论的流程实列的sid") private String processInstSid; // 评论的流程实列的sid diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java index 5364268e85..a3b75ceecf 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java @@ -99,6 +99,8 @@ public class AppService { public ResultBean addProgressComment(ProcessComment processComment) { ProcessCommentDto dto=new ProcessCommentDto(); BeanUtil.copyProperties(processComment,dto); + String procInsId = processComment.getProcInsId(); + dto.setProcessId(procInsId); return processCommentFeign.save(dto); } }