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 0c9763e..b0833a1 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 @@ -7,6 +7,7 @@ import com.bonus.purchase.domain.BpmPurchaseInfo; import com.bonus.purchase.dto.PurchaseDto; import com.bonus.purchase.dto.PurchaseTaskDto; import com.bonus.purchase.service.impl.BpmPurchaseInfoService; +import com.bonus.purchase.vo.PurchaseAcceptVo; import com.bonus.purchase.vo.PurchaseVo; import com.bonus.task.service.BpmTaskService; import org.springframework.web.bind.annotation.*; @@ -53,9 +54,9 @@ public class BpmPurchaseInfoController extends BaseController { */ @GetMapping(value = "/detailsList") @RequiresPermissions("purchase:bpmPurchaseInfo:query") - public TableDataInfo getDetailsList(BpmPurchaseInfo bpmPurchaseInfo) { + public TableDataInfo getDetailsList(PurchaseDto record) { startPage(); - List list = this.bpmPurchaseInfoService.selectAll(bpmPurchaseInfo); + List list = this.bpmPurchaseInfoService.getDetailsList(record); return getDataTable(list); } diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseDto.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseDto.java index f1529ba..1b052dd 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseDto.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseDto.java @@ -37,10 +37,10 @@ public class PurchaseDto { @ApiModelProperty(value = "出厂日期") private String productDate; - @ApiModelProperty(value = "id集合") + @ApiModelProperty(value = "id列表") private List taskIds; - @ApiModelProperty(value = "任务id集合") + @ApiModelProperty(value = "任务id") private String taskId; @ApiModelProperty(value = "二级明细id") 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 7a82019..92fb4fe 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 @@ -1,6 +1,7 @@ package com.bonus.purchase.mapper; import com.bonus.base.api.domain.MaType; import com.bonus.purchase.dto.PurchaseDto; +import com.bonus.purchase.vo.PurchaseAcceptVo; import com.bonus.purchase.vo.PurchaseVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -35,6 +36,14 @@ public interface BpmPurchaseInfoMapper { */ List selectMaTypeCascader(); + /** + * 查询---根据任务ID详情设备列表 + * + * @param record 请求体 + * @return 详情列表 + */ + List getDetailsList(PurchaseDto record); + MaType selectMaTypeById(@Param("id") Integer id); /** 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 95af88d..60a8247 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 @@ -11,6 +11,7 @@ import com.bonus.common.core.utils.DateTimeHelper; import com.bonus.common.core.utils.StringHelper; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.purchase.dto.PurchaseDto; +import com.bonus.purchase.vo.PurchaseAcceptVo; import com.bonus.purchase.vo.PurchaseVo; import com.bonus.task.domain.BpmTask; import com.bonus.purchase.dto.PurchaseTaskDto; @@ -81,6 +82,16 @@ public class BpmPurchaseInfoService{ return bpmPurchaseInfoMapper.selectAll(bpmPurchaseInfo); } + /** + * 查询---根据任务ID详情设备列表 + * + * @param record 请求体 + * @return 详情列表 + */ + public List getDetailsList(PurchaseDto record) { + return bpmPurchaseInfoMapper.getDetailsList(record); + } + public int insertList(PurchaseTaskDto purchaseTaskDto) { // 映射Dto至Pojo对象 BpmTask task = new BpmTask(); diff --git a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseInfoMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseInfoMapper.xml index fa795b3..7b1ffb3 100644 --- a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseInfoMapper.xml +++ b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseInfoMapper.xml @@ -670,4 +670,30 @@ left join ma_type mt1 ON mt.parent_id = mt1.id where mt.is_active = '1' and mt.id = #{id,jdbcType=INTEGER} + + \ No newline at end of file