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() { - return R.ok(service.lambdaQuery().list()); + @PostMapping("/listByType/{templateFreq}") + public R> 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 detail(@Schema(name = "id") @PathVariable("id") Long id) { + return R.ok(service.getById(id)); + } + @Operation(summary = "根据模板id查询关联的指标") @GetMapping("/queryIndicators/{id}") public R> 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 { and t1.category_id = #{obj.menuId} - and t1.indicator_name like concat('%', #{obj.name}, '%') + and t1.indicator_name like concat('%', #{obj.name}::text, '%') order by t2.order_index,t1.order_index 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 records) { + public void fillRating(List records) { List ids = records.stream().map(AssessIndicator::getId).collect(Collectors.toList()); List relList = indicatorRatingService.queryRatingList(ids); Map> 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 queryIndicators(Long id) { - return this.baseMapper.queryIndicators(id); + List list = this.baseMapper.queryIndicators(id); + if(CollectionUtils.isEmpty(list)){ + return list; + } + indicatorService.fillRating(list); + return list; + } + + public List listByType(Integer templateFreq) { + return this.list(new QueryWrapper().eq("template_freq",templateFreq)); } }