From 2f2818845ac355585f6b55f05fb1ae1eee79e959 Mon Sep 17 00:00:00 2001
From: jiangchao <jiangchao@feewee.cn>
Date: Thu, 16 Mar 2023 17:31:30 +0800
Subject: [PATCH] feature(bug):  条件阶梯百分数处理

---
 fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiGroupIndicatorPreconditionDao.java                           |  2 ++
 fw-morax-dao/src/main/resources/mapper/kpi/KpiGroupIndicatorPreconditionDao.xml                                | 20 ++++++++++++++++++++
 fw-morax-service/src/main/java/cn/fw/morax/service/data/kpi/impl/KpiGroupIndicatorPreconditionServiceImpl.java |  6 +-----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiGroupIndicatorPreconditionDao.java b/fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiGroupIndicatorPreconditionDao.java
index c60f265..e438e3e 100644
--- a/fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiGroupIndicatorPreconditionDao.java
+++ b/fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiGroupIndicatorPreconditionDao.java
@@ -22,6 +22,8 @@ import java.util.List;
 public interface KpiGroupIndicatorPreconditionDao extends BaseMapper<KpiGroupIndicatorPrecondition> {
 
 
+    List<KpiGroupIndicatorPreconditionVO> getVos(@Param("kpiGroupId") Long kpiGroupId);
+
     List<KpiGroupIndicatorPreconditionVO> getHitVos(@Param("kpiGroupIndicatorId") Long kpiGroupIndicatorId,
                                                     @Param("userId") Long userId,
                                                     @Param("dataDate") LocalDate dataDate);
diff --git a/fw-morax-dao/src/main/resources/mapper/kpi/KpiGroupIndicatorPreconditionDao.xml b/fw-morax-dao/src/main/resources/mapper/kpi/KpiGroupIndicatorPreconditionDao.xml
index b03ac83..1ebe579 100644
--- a/fw-morax-dao/src/main/resources/mapper/kpi/KpiGroupIndicatorPreconditionDao.xml
+++ b/fw-morax-dao/src/main/resources/mapper/kpi/KpiGroupIndicatorPreconditionDao.xml
@@ -18,6 +18,26 @@
                 <result column="update_time" property="updateTime"/>
     </resultMap>
 
+    <select id="getVos" resultType="cn.fw.morax.domain.vo.kpi.KpiGroupIndicatorPreconditionVO">
+        SELECT
+            t1.`id` AS `id`,
+            t1.`kpi_group_id` AS `kpiGroupId`,
+            t1.`kpi_group_indicator_id` AS `kpiGroupIndicatorId`,
+            t1.`indicator_code` AS `indicatorCode`,
+            t1.`indicator_name` AS `indicatorName`,
+            t1.`target_calc_type` AS `targetCalcType`,
+            t1.`target_type` AS `targetType`,
+            t1.`target_value` AS `targetValue`,
+            t1.`sort` AS `sort`,
+            t3.`data_type` AS `dataType`
+        FROM
+            kpi_group_indicator_precondition t1
+                LEFT JOIN indicators t3 ON t3.indicator_code = t1.indicator_code AND t3.yn = 1
+        WHERE
+            t1.yn = 1
+          AND t1.kpi_group_id = #{kpiGroupId}
+    </select>
+
     <select id="getHitVos" resultType="cn.fw.morax.domain.vo.kpi.KpiGroupIndicatorPreconditionVO">
         SELECT
             t1.`id` AS `id`,
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/data/kpi/impl/KpiGroupIndicatorPreconditionServiceImpl.java b/fw-morax-service/src/main/java/cn/fw/morax/service/data/kpi/impl/KpiGroupIndicatorPreconditionServiceImpl.java
index c489912..b1b2f74 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/data/kpi/impl/KpiGroupIndicatorPreconditionServiceImpl.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/data/kpi/impl/KpiGroupIndicatorPreconditionServiceImpl.java
@@ -30,12 +30,8 @@ public class KpiGroupIndicatorPreconditionServiceImpl extends ServiceImpl<KpiGro
 
     @Override
     public Map<Long, List<KpiGroupIndicatorPreconditionVO>> getKpiGroupIndicatorCondVO(Long kpiGroupId) {
-        List<KpiGroupIndicatorPrecondition> preconditions = this.list(Wrappers.<KpiGroupIndicatorPrecondition>lambdaQuery()
-                .eq(KpiGroupIndicatorPrecondition::getKpiGroupId, kpiGroupId)
-                .eq(KpiGroupIndicatorPrecondition::getYn, Boolean.TRUE)
-        );
+        List<KpiGroupIndicatorPreconditionVO> preconditionVOS = this.baseMapper.getVos(kpiGroupId);
 
-        List<KpiGroupIndicatorPreconditionVO> preconditionVOS = PublicUtil.copyList(preconditions, KpiGroupIndicatorPreconditionVO.class);
         preconditionVOS.stream().forEach(KpiGroupIndicatorPreconditionVO::processPercent);
 
         Map<Long, List<KpiGroupIndicatorPreconditionVO>> indicatorCondMap = preconditionVOS.stream()
--
libgit2 0.22.2