From 231c914bea17c25ee50e15253b6564e0efa048d1 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Thu, 22 Aug 2024 09:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E4=BA=8C=E7=BA=A7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BpmPurchaseInfoController.java |  5 ++--
 .../com/bonus/purchase/dto/PurchaseDto.java   |  4 +--
 .../mapper/BpmPurchaseInfoMapper.java         |  9 +++++++
 .../service/impl/BpmPurchaseInfoService.java  | 11 ++++++++
 .../mapper/BpmPurchaseInfoMapper.xml          | 26 +++++++++++++++++++
 5 files changed, 51 insertions(+), 4 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 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<BpmPurchaseInfo> list = this.bpmPurchaseInfoService.selectAll(bpmPurchaseInfo);
+        List<PurchaseAcceptVo> 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<Integer> 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<MaType> selectMaTypeCascader();
 
+    /**
+     * 查询---根据任务ID详情设备列表
+     *
+     * @param record 请求体
+     * @return 详情列表
+     */
+    List<PurchaseAcceptVo> 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<PurchaseAcceptVo> 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}
   </select>
+
+  <select id="getDetailsList" resultType="com.bonus.purchase.vo.PurchaseAcceptVo">
+    SELECT
+      bp.id,
+      mt1.`name` AS materialName,
+      mt.`name` AS specificationCode,
+      sda.dict_label AS unitName,
+      bp.purchase_price AS purchasePrice,
+      bp.notax_price AS notaxPrice,
+      bp.purchase_num AS purchaseNum,
+      bs.`name` AS supplierName,
+      bp.product_date AS productDate,
+      bp.`status` AS STATUS,
+      sda1.dict_label AS statusName
+    FROM
+      bpm_purchase_info bp
+        LEFT JOIN bpm_task bt ON bp.task_id = bt.id
+        LEFT JOIN ma_type mt ON bp.type_id = mt.id
+        LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.id
+        LEFT JOIN sys_dict_data sda ON mt.unit_id = sda.dict_code
+        LEFT JOIN bm_supplier bs ON bp.supplier_id = bs.id
+        LEFT JOIN sys_dict_data sda1 ON sda1.dict_code = bp.`status`
+    WHERE
+      bp.is_active = '1'
+      AND bp.task_id = #{taskId,jdbcType=INTEGER}
+  </select>
 </mapper>
\ No newline at end of file