From 9dad212d54eae24c6dfebbdcd2923b7cc9258350 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Thu, 5 Sep 2024 13:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A8=A1=E6=9D=BFid=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8C=87=E6=A0=87=E4=BF=A1=E6=81=AF=E5=B8=A6=E4=B8=8A?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E8=AF=84=E5=88=86=E7=BB=86=E5=88=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=9B=E8=A7=A3=E5=86=B3=E9=80=89=E6=8B=A9=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyt/controller/AssessTemplateController.java  | 12 +++++++++---
 .../project/xyt/mapper/AssessIndicatorMapper.java |  2 +-
 .../xyt/service/AssessIndicatorService.java       |  2 +-
 .../xyt/service/AssessTemplateService.java        | 15 ++++++++++++++-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/AssessTemplateController.java b/src/main/java/com/gunshi/project/xyt/controller/AssessTemplateController.java
index 827bdc2..a6919c0 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/AssessTemplateController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/AssessTemplateController.java
@@ -56,9 +56,9 @@ public class AssessTemplateController {
     }
 
     @Operation(summary = "列表")
-    @PostMapping("/list")
-    public R<List<AssessTemplate>> list() {
-        return R.ok(service.lambdaQuery().list());
+    @PostMapping("/listByType/{templateFreq}")
+    public R<List<AssessTemplate>> listByType(@Schema(name = "templateFreq") @PathVariable("templateFreq") Integer templateFreq) {
+        return R.ok(service.listByType(templateFreq));
     }
 
     @Operation(summary = "分页")
@@ -67,6 +67,12 @@ public class AssessTemplateController {
         return R.ok(service.pageQuery(page));
     }
 
+    @Operation(summary = "根据模板id查询模板详情")
+    @GetMapping("/detail/{id}")
+    public R<AssessTemplate> detail(@Schema(name = "id") @PathVariable("id") Long id) {
+        return R.ok(service.getById(id));
+    }
+
     @Operation(summary = "根据模板id查询关联的指标")
     @GetMapping("/queryIndicators/{id}")
     public R<List<AssessIndicator>> queryIndicators(@Schema(name = "id") @PathVariable("id") Long id) {
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AssessIndicatorMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessIndicatorMapper.java
index 6490158..5703690 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AssessIndicatorMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessIndicatorMapper.java
@@ -25,7 +25,7 @@ public interface AssessIndicatorMapper extends BaseMapper<AssessIndicator> {
                         and t1.category_id = #{obj.menuId} 
                     </if>
                     <if test="obj.name != null and obj.name != ''">
-                        and t1.indicator_name like concat('%', #{obj.name}, '%')
+                        and t1.indicator_name like concat('%', #{obj.name}::text, '%')
                     </if>
                     order by t2.order_index,t1.order_index
             </script>
diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessIndicatorService.java b/src/main/java/com/gunshi/project/xyt/service/AssessIndicatorService.java
index b1e87fc..bd389e2 100644
--- a/src/main/java/com/gunshi/project/xyt/service/AssessIndicatorService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/AssessIndicatorService.java
@@ -76,7 +76,7 @@ public class AssessIndicatorService extends ServiceImpl<AssessIndicatorMapper, A
         }
     }
 
-    private void fillRating(List<AssessIndicator> records) {
+    public void fillRating(List<AssessIndicator> records) {
         List<Long> ids = records.stream().map(AssessIndicator::getId).collect(Collectors.toList());
         List<AssessIndicatorRating> relList = indicatorRatingService.queryRatingList(ids);
         Map<Long, List<AssessIndicatorRating>> map = relList.stream().collect(Collectors.groupingBy(AssessIndicatorRating::getIndicatorId));
diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java b/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java
index ef4b829..7db67b5 100644
--- a/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java
@@ -1,6 +1,8 @@
 package com.gunshi.project.xyt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -33,6 +35,8 @@ public class AssessTemplateService extends ServiceImpl<AssessTemplateMapper, Ass
     @Autowired
     private AssessTemplateIndicatorRelService relService;
 
+    @Autowired AssessIndicatorService indicatorService;
+
     public AssessTemplate saveData(AssessTemplate dto) {
         dto.setId(IdWorker.getId());
         dto.setStatus(0);
@@ -85,7 +89,16 @@ public class AssessTemplateService extends ServiceImpl<AssessTemplateMapper, Ass
     }
 
     public List<AssessIndicator> queryIndicators(Long id) {
-        return this.baseMapper.queryIndicators(id);
+        List<AssessIndicator> list = this.baseMapper.queryIndicators(id);
+        if(CollectionUtils.isEmpty(list)){
+            return list;
+        }
+        indicatorService.fillRating(list);
+        return list;
+    }
+
+    public List<AssessTemplate> listByType(Integer templateFreq) {
+        return this.list(new QueryWrapper<AssessTemplate>().eq("template_freq",templateFreq));
     }
 }