From c9cc3b8a3e3e55c122b25f0753697c9f87ca5845 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 22 Aug 2024 14:17:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=8C=87=E6=A0=87=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=9A=E6=8C=87=E6=A0=87=E5=88=86=E6=9E=90=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E3=80=81=E6=8C=87=E6=A0=87=E5=90=8D=E7=A7=B0=E3=80=81?= =?UTF-8?q?=E5=8E=9F=E5=AD=90=E6=8C=87=E6=A0=87=E5=90=8D=E7=A7=B0=E3=80=81?= =?UTF-8?q?=E6=8C=87=E6=A0=87=20=E6=9C=89/=E6=97=A0=E7=AC=94=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ModelCaseController.java | 13 +++-- .../police/dto/DictionaryByTypeParam.java | 3 ++ .../police/dto/IndexResultQuery.java | 26 ++++++++++ .../police/mapper/ModelCaseMapper.java | 4 ++ .../police/service/ModelCaseService.java | 3 +- .../service/impl/ModelCaseServiceImpl.java | 12 +++-- src/main/resources/mapper/ModelCaseMapper.xml | 49 +++++++++++++++++++ 7 files changed, 99 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/supervision/police/dto/IndexResultQuery.java diff --git a/src/main/java/com/supervision/police/controller/ModelCaseController.java b/src/main/java/com/supervision/police/controller/ModelCaseController.java index d7793cd..fa0ebc0 100644 --- a/src/main/java/com/supervision/police/controller/ModelCaseController.java +++ b/src/main/java/com/supervision/police/controller/ModelCaseController.java @@ -1,11 +1,10 @@ package com.supervision.police.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.common.domain.R; import com.supervision.police.domain.CasePerson; -import com.supervision.police.domain.ModelCase; import com.supervision.police.dto.IndexDetail; +import com.supervision.police.dto.IndexResultQuery; import com.supervision.police.dto.ModelCaseBase; import com.supervision.police.dto.ModelCaseDTO; import com.supervision.police.service.ModelCaseService; @@ -126,16 +125,16 @@ public class ModelCaseController { /** * 获取指标结果 * - * @param caseId - * @param indexType + * @param query + * @param page + * @param size * @return */ @PostMapping("/getIndexDetail") - public R> getIndexDetail(@RequestParam String caseId, - @RequestParam String indexType, + public R> getIndexDetail(@RequestBody IndexResultQuery query, @RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "20") Integer size) { - IPage indexDetail = modelCaseService.getIndexDetail(caseId, indexType, page, size); + IPage indexDetail = modelCaseService.getIndexDetail(query, page, size); return R.ok(indexDetail); } diff --git a/src/main/java/com/supervision/police/dto/DictionaryByTypeParam.java b/src/main/java/com/supervision/police/dto/DictionaryByTypeParam.java index f1d489d..bf2f9dd 100644 --- a/src/main/java/com/supervision/police/dto/DictionaryByTypeParam.java +++ b/src/main/java/com/supervision/police/dto/DictionaryByTypeParam.java @@ -20,4 +20,7 @@ public class DictionaryByTypeParam implements Serializable { @ApiModelProperty(value = "是否返回树形结构, 1返回, 0不返回, 默认为1") public Integer isTree = 1; + + @ApiModelProperty(value = "字典状态, 0：不可用，1：可用") + private String status; } diff --git a/src/main/java/com/supervision/police/dto/IndexResultQuery.java b/src/main/java/com/supervision/police/dto/IndexResultQuery.java new file mode 100644 index 0000000..dfc8af7 --- /dev/null +++ b/src/main/java/com/supervision/police/dto/IndexResultQuery.java @@ -0,0 +1,26 @@ +package com.supervision.police.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class IndexResultQuery { + + @Schema(description = "案件id") + private String caseId; + + @Schema(description = "指标类型") + private String indexType; + + @Schema(description = "指标名称") + private String indexName; + + @Schema(description = "指标结果 0：未评估 1：符合 2：不符合") + private String indexResult; + + @Schema(description = "指标是否有笔录 true:有笔录 false:无笔录") + private Boolean indexHasRecord; + + @Schema(description = "原子指标名称") + private String atomicName; +} diff --git a/src/main/java/com/supervision/police/mapper/ModelCaseMapper.java b/src/main/java/com/supervision/police/mapper/ModelCaseMapper.java index a8a463b..5a50ae3 100644 --- a/src/main/java/com/supervision/police/mapper/ModelCaseMapper.java +++ b/src/main/java/com/supervision/police/mapper/ModelCaseMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.police.domain.ModelCase; import com.supervision.police.dto.AtomicIndexDTO; import com.supervision.police.dto.IndexDetail; +import com.supervision.police.dto.IndexResultQuery; import com.supervision.police.vo.ModelCaseVO; import org.apache.ibatis.annotations.Param; @@ -44,6 +45,9 @@ public interface ModelCaseMapper extends BaseMapper { @Param("caseId") String caseId, @Param("indexType") String indexType); + + IPage pageListIndexResult(@Param("query") IndexResultQuery query, @Param("page") IPage page); + List getAtomicDetail(@Param("caseId") String caseId, @Param("indexId") String indexId, @Param("atomicIds") List atomicIds); diff --git a/src/main/java/com/supervision/police/service/ModelCaseService.java b/src/main/java/com/supervision/police/service/ModelCaseService.java index ee1ba9b..b1bc4d2 100644 --- a/src/main/java/com/supervision/police/service/ModelCaseService.java +++ b/src/main/java/com/supervision/police/service/ModelCaseService.java @@ -6,6 +6,7 @@ import com.supervision.common.domain.R; import com.supervision.police.domain.CasePerson; import com.supervision.police.domain.ModelCase; import com.supervision.police.dto.IndexDetail; +import com.supervision.police.dto.IndexResultQuery; import com.supervision.police.dto.ModelCaseBase; import com.supervision.police.dto.ModelCaseDTO; import com.supervision.police.vo.ModelCaseVO; @@ -46,7 +47,7 @@ public interface ModelCaseService extends IService { R uploadCase(MultipartFile file); - IPage getIndexDetail(String caseId, String indexType, Integer page, Integer size); + IPage getIndexDetail(IndexResultQuery query, Integer page, Integer size); } diff --git a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java index 7d7e8b5..4b556b6 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java @@ -353,10 +353,16 @@ public class ModelCaseServiceImpl extends ServiceImpl getIndexDetail(String caseId, String indexType, Integer page, Integer size) { + public IPage getIndexDetail(IndexResultQuery query, Integer page, Integer size) { + + Assert.notEmpty(query.getCaseId(), "案件id不能为空"); + Assert.notEmpty(query.getIndexType(), "指标类型不能为空"); + IPage iPage = new Page<>(page, size); - iPage = modelCaseMapper.getIndexDetail(iPage, caseId, indexType); + iPage = modelCaseMapper.pageListIndexResult(query,iPage); List records = iPage.getRecords(); + + // 添加 附属内容 for (IndexDetail record : records) { String judgeLogic = record.getJudgeLogic(); if (StringUtils.isEmpty(judgeLogic)) { @@ -369,7 +375,7 @@ public class ModelCaseServiceImpl extends ServiceImpl indexJundgeLogicMap = parseLogicMap(judgeLogic); List atomicIds = JudgeLogicUtil.pickAtomicIndexIds(judgeLogic); - List atomics = modelCaseMapper.getAtomicDetail(caseId, record.getIndexId(), atomicIds); + List atomics = modelCaseMapper.getAtomicDetail(query.getCaseId(), record.getIndexId(), atomicIds); for (AtomicIndexDTO atomic : atomics) { // 需要和原子指标的规则判断是否一致(解决出罪和入罪冲突的问题) String s = indexJundgeLogicMap.get(atomic.getAtomicIndexId()); diff --git a/src/main/resources/mapper/ModelCaseMapper.xml b/src/main/resources/mapper/ModelCaseMapper.xml index cf98b35..86f4a37 100644 --- a/src/main/resources/mapper/ModelCaseMapper.xml +++ b/src/main/resources/mapper/ModelCaseMapper.xml @@ -85,4 +85,53 @@ and mi.index_type = #{indexType} order by CASE mir.index_result WHEN 'true' THEN 1 WHEN 'false' THEN 2 else 0 END, mi.id desc + + + \ No newline at end of file