From e0c6a414fa7997464c4647a63c430f61299336ee Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 15 Dec 2023 15:56:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=89=B9=E9=87=8F=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esAnnualInit/controller/ESAnnualInitController.java | 7 +++---- .../process/esAnnualInit/entity/vo/AnnualInitDataVO.java | 3 +++ .../service/impl/ProcessEsAnnualInitServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java index 1878ddc3..2d958ba3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java @@ -135,13 +135,12 @@ public class ESAnnualInitController { */ @AutoLog(value = "企标年度制修订标准化发起流程-批量驳回") @ApiOperation(value="企标年度制修订标准化发起流程-批量驳回", notes="企标年度制修订标准化发起流程-批量驳回") - @GetMapping("/batchReject") - public Result reject(AnnualInitDataVO annualInitData, String ids) { - annualInitService.batchReject(annualInitData, ids); + @PostMapping("/batchReject") + public Result batchReject(@RequestBody AnnualInitDataVO annualInitData) { + annualInitService.batchReject(annualInitData, annualInitData.getBatchRejectIds()); return Result.OK(); } - /** * 导入模板下载 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/vo/AnnualInitDataVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/vo/AnnualInitDataVO.java index bab02e3a..a23fd407 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/vo/AnnualInitDataVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/vo/AnnualInitDataVO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit; import lombok.Data; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; import java.util.Map; @@ -24,4 +25,6 @@ public class AnnualInitDataVO { @JsonProperty("flowUser") private Map flowUser; + @JsonProperty("batchRejectIds") + private String batchRejectIds; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index c5cb14fc..ac6e341a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -207,7 +207,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId); Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); String taskName = task.getName(); switch (taskName) { @@ -285,6 +284,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl d.setRejectFlag(YesOrNoEnum.YES.getValue())); + dataList.forEach(data -> data.setExecutionId(executionId)); saveOrUpdateBatch(dataList); } }