From fe6b5da2798a66fc06342a1436dc43aaf36df9de Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Thu, 22 Aug 2024 15:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=B1=BB=E5=9E=8B=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/purchase/controller/BpmPurchaseInfoController.java | 4 ++-- .../java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java | 4 ++-- .../bonus/purchase/service/impl/BpmPurchaseInfoService.java | 4 ++-- .../src/main/java/com/bonus/purchase/utils/Constants.java | 4 ---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java index dafe301..17f0093 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java @@ -117,7 +117,7 @@ public class BpmPurchaseInfoController extends BaseController { public ResultBean commit(@RequestBody @NotEmpty(message = "请求参数不能为空") Integer[] taskArray) { int result = 0; result += this.bpmTaskService.updateStatusById(PENDING_CONFIRMATION, Arrays.asList(taskArray)); - result += this.bpmPurchaseInfoService.updateStatusByTaskId(PENDING_CONFIRMATION_BYTE, Arrays.asList(taskArray)); + result += this.bpmPurchaseInfoService.updateStatusByTaskId(PENDING_CONFIRMATION, Arrays.asList(taskArray)); return ResultBean.toIsSuccess(result); } @@ -130,7 +130,7 @@ public class BpmPurchaseInfoController extends BaseController { public ResultBean confirm(@RequestBody @NotEmpty(message = "请求参数不能为空") Integer[] taskArray) { int result = 0; result += this.bpmTaskService.updateStatusById(PENDING_NOTIFICATION, Arrays.asList(taskArray)); - result += this.bpmPurchaseInfoService.updateStatusByTaskId(PENDING_NOTIFICATION_BYTE, Arrays.asList(taskArray)); + result += this.bpmPurchaseInfoService.updateStatusByTaskId(PENDING_NOTIFICATION, Arrays.asList(taskArray)); return ResultBean.toIsSuccess(result); } diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java index 4416714..9cc7599 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java @@ -104,9 +104,9 @@ public interface BpmPurchaseInfoMapper { int updateByPrimaryKeySelective(BpmPurchaseInfo record); - int updateStatusByTaskId(@Param("updatedStatus")Byte updatedStatus,@Param("taskId")Integer taskId); + int updateStatusByTaskId(@Param("updatedStatus") Integer updatedStatus,@Param("taskId")Integer taskId); - int updateStatusByTaskIdIn(@Param("updatedStatus")Byte updatedStatus,@Param("taskIdCollection")Collection taskIdCollection); + int updateStatusByTaskIdIn(@Param("updatedStatus") Integer updatedStatus,@Param("taskIdCollection")Collection taskIdCollection); diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java index e395c91..f9c1a07 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java @@ -209,11 +209,11 @@ public class BpmPurchaseInfoService{ return itemNode; } - public int updateStatusByTaskId(Byte updatedStatus,Integer taskId){ + public int updateStatusByTaskId(Integer updatedStatus,Integer taskId){ return bpmPurchaseInfoMapper.updateStatusByTaskId(updatedStatus,taskId); } - public int updateStatusByTaskId(Byte updatedStatus, Collection taskIdCollection){ + public int updateStatusByTaskId(Integer updatedStatus, Collection taskIdCollection){ return bpmPurchaseInfoMapper.updateStatusByTaskIdIn(updatedStatus,taskIdCollection); } diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/utils/Constants.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/utils/Constants.java index a5c405e..97d6893 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/utils/Constants.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/utils/Constants.java @@ -22,10 +22,6 @@ public class Constants { */ public static final Integer PENDING_CONFIRMATION = 48; - /** - * 待确认 - */ - public static final Byte PENDING_CONFIRMATION_BYTE = 48; /** * 待通知