diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaType.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaType.java index 6d5af26..0868b76 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaType.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaType.java @@ -72,7 +72,7 @@ public class MaType extends BaseEntity implements Serializable { */ private Integer leasePrice; /** - * 管理类型(0是编码 1数量和编码 2数量) + * 管理类型(0是编码 1数量) */ private String manageType; /** diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java index 5f58144..7463542 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java @@ -66,10 +66,11 @@ public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService { //只有任务状态为待验收时,方可批量验收合格 if (purchaseDto.getId() != null) { String[] split = purchaseDto.getId().split(","); - ArrayList taskIdList = new ArrayList<>(); + List taskIdList = new ArrayList<>(); for (int i = 0; i < split.length; i++) { taskIdList.add(Integer.parseInt(split[i])); } + purchaseDto.setTaskIds(taskIdList); List statusList = mapper.selectStatus(purchaseDto); if (CollectionUtils.isNotEmpty(statusList)) { for (Integer status : statusList) { diff --git a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml index 0a1984d..16b0836 100644 --- a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml +++ b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml @@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select task_id as id, status as status - from bpm_purchase_info bp + from bpm_purchase_info where id in #{taskId}