From f1489178a2dcf77be297750d29cf1289b9efab3f Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 15 Sep 2022 19:45:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=B5=81=E7=A8=8B-=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=8A=9E=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tLawsInventoryRejectCauseEOController.java | 39 +++++++---- .../ProjectLawsInventoryRejectCauseEO.java | 16 ++--- ...jectLawsInventoryRejectCauseEOService.java | 2 + ...LawsInventoryRejectCauseEOServiceImpl.java | 45 ++++++++++++- .../wkflow/controller/workFlowController.java | 16 +++++ .../jero/modules/wkflow/entity/BusMes.java | 65 +++++++++++++++++++ .../feginClient/WorkFlowFeignClient.java | 8 +++ .../impl/WorkFlowFeignClientImpl.java | 10 +++ 8 files changed, 178 insertions(+), 23 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java index 4b2d19ce5..5430b03ff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java @@ -1,25 +1,26 @@ package com.jero.modules.project.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO; -import com.jero.modules.project.service.IProjectLawsInventoryRejectCauseEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO; +import com.jero.modules.project.service.IProjectLawsInventoryRejectCauseEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -85,6 +86,20 @@ public class ProjectLawsInventoryRejectCauseEOController extends JeroController< return Result.OK("添加成功！"); } + /** + * 批量添加 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-批量添加") + @ApiOperation(value="清单确认-拒绝原因表-批量添加", notes="清单确认-拒绝原因表-批量添加") + @PostMapping(value = "/addBatch") + public Result addBatch(@Validated @RequestBody ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + projectLawsInventoryRejectCauseEOService.addBatch(projectLawsInventoryRejectCauseEO); + return Result.OK("添加成功！"); + } + /** * 编辑 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java index 8b7304ff7..ce9e64e4a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java @@ -1,21 +1,19 @@ package com.jero.modules.project.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** @@ -88,4 +86,6 @@ public class ProjectLawsInventoryRejectCauseEO implements Serializable { @ApiModelProperty(value = "拒绝类型") private java.lang.String rejectType; + @TableField(exist = false) + private String taskIds; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java index f112fe1a4..a71e5a86f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java @@ -22,6 +22,8 @@ public interface IProjectLawsInventoryRejectCauseEOService extends IService implements IProjectLawsInventoryRejectCauseEOService { + @Autowired + private TaskFeignClient taskFeignClient; + /** * 保存 * @@ -35,6 +45,35 @@ public class ProjectLawsInventoryRejectCauseEOServiceImpl extends ServiceImpl taskIdList = Arrays.asList(projectLawsInventoryRejectCauseEO.getTaskIds().split(",")); + + List insertEOList = new ArrayList<>(); + // 获取法规清单id + for(String taskId : taskIdList) { + ProjectLawsInventoryRejectCauseEO insertEO = new ProjectLawsInventoryRejectCauseEO(); + BeanUtils.copyProperties(projectLawsInventoryRejectCauseEO, insertEO); + + String taskDetailJson = taskFeignClient.queryTaskDetailByTaskIds(taskId); + ProjectLawsInventoryEO projectLawsInventoryEO = JSONObject.parseObject(taskDetailJson, ProjectLawsInventoryEO.class); + insertEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId()); + insertEO.setTaskIds(null); + Date now = new Date(); + insertEO.setCreateTime(now); + insertEO.setUpdateTime(now); + + insertEOList.add(insertEO); + } + saveBatch(insertEOList); + } + /** * 更新 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index 8d1c4b8fd..0d4502e30 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -97,6 +97,22 @@ public class workFlowController { return str; } + @AutoLog(value = "批量完成任务") + @ApiOperation(value="批量完成任务", notes="批量完成任务") + @PostMapping("/completeTaskBatch") + public Result completeTaskByUserIdBatch(@RequestBody BusMes busMes){ + if(StringUtils.isEmpty(busMes.getUserId())){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + busMes.setUserId(currentUser.getId()); + } + Result str = workFlowFeignClient.completeTaskByUserIdBatch(busMes); + if(str.getCode() == 500){ + str.setSuccess(false); + } +// sendWebsocket(busMes.getTaskId(),busMes.getTaskId()); + return str; + } + public void sendWebsocket(String msgId, String msgTet) { com.alibaba.fastjson.JSONObject obj = new com.alibaba.fastjson.JSONObject(); obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusMes.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusMes.java index 9efe58262..c60926925 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusMes.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusMes.java @@ -28,6 +28,15 @@ public class BusMes { private String nowStateType; + private String flag; + private String approvalOpinion; // 反馈意见 待办流程-批量办理专用 + private String dreUserId; // 待办流程-批量办理专用 + private String dreUserIdName; // 待办流程-批量办理专用 + private String handlingTime; // 待办流程-批量办理专用 + private String projectLawsInventoryIds; // 待办流程-批量办理专用 + private String taskDefinitionKey; // 待办流程-批量办理专用 + + public String getUserId() { return userId; } @@ -128,4 +137,60 @@ public class BusMes { public String getNowStateType() { return nowStateType; } public void setNowStateType(String nowStateType) { this.nowStateType = nowStateType; } + + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + + public String getApprovalOpinion() { + return approvalOpinion; + } + + public void setApprovalOpinion(String approvalOpinion) { + this.approvalOpinion = approvalOpinion; + } + + public String getDreUserId() { + return dreUserId; + } + + public void setDreUserId(String dreUserId) { + this.dreUserId = dreUserId; + } + + public String getDreUserIdName() { + return dreUserIdName; + } + + public void setDreUserIdName(String dreUserIdName) { + this.dreUserIdName = dreUserIdName; + } + + public String getHandlingTime() { + return handlingTime; + } + + public void setHandlingTime(String handlingTime) { + this.handlingTime = handlingTime; + } + + public String getProjectLawsInventoryIds() { + return projectLawsInventoryIds; + } + + public void setProjectLawsInventoryIds(String projectLawsInventoryIds) { + this.projectLawsInventoryIds = projectLawsInventoryIds; + } + + public String getTaskDefinitionKey() { + return taskDefinitionKey; + } + + public void setTaskDefinitionKey(String taskDefinitionKey) { + this.taskDefinitionKey = taskDefinitionKey; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 5cf557492..0490604f4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -36,6 +36,14 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/completeTask",method = RequestMethod.POST) Result completeTaskByUserId(@RequestBody BusMes busMes); + /** + * 批量完成任务 + * @param busMes + * @return + */ + @RequestMapping(value = "/bat-wkflow/completeTaskBatch",method = RequestMethod.POST) + Result completeTaskByUserIdBatch(@RequestBody BusMes busMes); + /** * 通过流程实例id查询当前待办的流程实例是否结束 * @param prcId diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index ae1940c04..e8db6f85e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -46,6 +46,16 @@ public class WorkFlowFeignClientImpl{ return stringWrapper; } + /** + * 批量完成任务 + * @param busMes + * @return + */ + public Result completeTaskByUserIdBatch( BusMes busMes){ + Result stringWrapper = workFlowFeignClient.completeTaskByUserIdBatch(busMes); + return stringWrapper; + } + /** * 通过流程实例id查询当前待办的流程实例是否结束 * @param prcId