From 9b5813b5f20b24fc42ff770aa98547d50b9f7512 Mon Sep 17 00:00:00 2001
From: zhouhaibin <zhouhaibin@qq.com>
Date: Tue, 29 Apr 2025 13:39:37 +0800
Subject: [PATCH] =?UTF-8?q?sjj=20=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=B8=8E=E4=BC=98=E5=8C=963?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ContractualInfoController.java        |  7 ++++++-
 .../controller/ContractualProductInfoController.java | 12 +++++++++++-
 .../domain/bo/ContractualInfoBo.java                 |  1 +
 .../service/IContractualInfoService.java             |  1 +
 .../service/IContractualProductInfoService.java      |  2 ++
 .../service/impl/ContractualInfoServiceImpl.java     |  7 +++++++
 .../impl/ContractualProductInfoServiceImpl.java      |  9 +++++++++
 .../ContractualProductInfoMapper.xml                 |  5 +++--
 8 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualInfoController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualInfoController.java
index 0c18368..f1a9d4e 100644
--- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualInfoController.java
+++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualInfoController.java
@@ -68,7 +68,12 @@ public class ContractualInfoController extends BaseController {
                                      @PathVariable Long id) {
         return R.ok(ContractualInfoService.queryById(id));
     }
-
+    @SaCheckPermission("productManagement:ContractualInfo:query")
+    @GetMapping("/getInfoByTaskid/{id}")
+    public R<ContractualInfoVo> getInfoByTaskid(@NotNull(message = "主键不能为空")
+                                        @PathVariable Long id) {
+        return R.ok(ContractualInfoService.getInfoByTaskid(id));
+    }
     /**
      * 新增合同信息保存
      */
diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java
index 85052c1..ebad1a2 100644
--- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java
+++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java
@@ -71,7 +71,17 @@ public class ContractualProductInfoController extends BaseController {
                                      @PathVariable Long id) {
         return R.ok(contractualProductInfoService.queryById(id));
     }
-
+    /**
+     * 获取合同产品信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("productManagement:ContractualProductInfo:query")
+    @GetMapping("/getInfoByTaskid/{id}")
+    public R<List<ContractualProductInfoVo>> getInfoByTaskid(@NotNull(message = "主键不能为空")
+                                               @PathVariable Long id) {
+        return R.ok(contractualProductInfoService.getInfoByTaskid(id));
+    }
     /**
      * 新增合同产品信息
      */
diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/domain/bo/ContractualInfoBo.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/domain/bo/ContractualInfoBo.java
index 8502df0..bda2401 100644
--- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/domain/bo/ContractualInfoBo.java
+++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/domain/bo/ContractualInfoBo.java
@@ -51,5 +51,6 @@ public class ContractualInfoBo extends BaseEntity {
     @NotBlank(message = "合同金额不能为空", groups = { AddGroup.class, EditGroup.class })
     private String contractAmount;
 
+    private String taskId;
 
 }
diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/IContractualInfoService.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/IContractualInfoService.java
index 00cac0f..e7ed058 100644
--- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/IContractualInfoService.java
+++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/IContractualInfoService.java
@@ -67,4 +67,5 @@ public interface IContractualInfoService {
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
 
+    ContractualInfoVo getInfoByTaskid(Long id);
 }
diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/IContractualProductInfoService.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/IContractualProductInfoService.java
index 5eaede8..d9275e7 100644
--- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/IContractualProductInfoService.java
+++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/IContractualProductInfoService.java
@@ -81,4 +81,6 @@ public interface IContractualProductInfoService {
      * @return 产品统计数据
      */
     ProductStatisticsData getProductStatistics(ContractualProductInfoBo bo);
+
+    List<ContractualProductInfoVo> getInfoByTaskid(Long id);
 }
diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualInfoServiceImpl.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualInfoServiceImpl.java
index c0fe46d..dba8c7b 100644
--- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualInfoServiceImpl.java
+++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualInfoServiceImpl.java
@@ -131,4 +131,11 @@ public class ContractualInfoServiceImpl implements IContractualInfoService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    public ContractualInfoVo getInfoByTaskid(Long id) {
+        LambdaQueryWrapper<ContractualInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ContractualInfo::getTaskId, id);
+        return baseMapper.selectVoOne(lqw);
+    }
 }
diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualProductInfoServiceImpl.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualProductInfoServiceImpl.java
index 1fda77b..c80dbf8 100644
--- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualProductInfoServiceImpl.java
+++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualProductInfoServiceImpl.java
@@ -188,6 +188,15 @@ public class ContractualProductInfoServiceImpl implements IContractualProductInf
         return statisticsData;
     }
 
+    @Override
+    public List<ContractualProductInfoVo> getInfoByTaskid(Long id) {
+        LambdaQueryWrapper<ContractualProductInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ContractualProductInfo::getTaskId, id);
+        List<ContractualProductInfoVo> contractualProductInfoVos = baseMapper.selectVoList(lqw);
+        return contractualProductInfoVos;
+
+    }
+
     /**
      * 将Map列表转换为StatItem列表
      */
diff --git a/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml b/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml
index 8157a8a..1480332 100644
--- a/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml
+++ b/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml
@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND i.purchaser_name = #{queryParam.purchaserName}
             </if>
             AND p.del_flag = '0'
+            AND dt.result_type = 'reviewSuccess'
         </where>
         ORDER BY
         i.purchaser_name,p.type, p.brand
@@ -130,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectModelStatistics" resultType="map">
         SELECT
-            CONCAT(p.brand, ' ', p.version_str) AS name,
+            CONCAT(p.brand) AS name,
             SUM(p.quantity) AS value
         FROM
             contractual_product_info p
@@ -151,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND ci.purchaser_name = #{bo.purchaserName}
         </if>
         GROUP BY
-            p.brand, p.version_str
+            p.brand
         ORDER BY
             value DESC
     </select>