修改-修复排序错乱的问题

src/main/java/com/supervision/common/utils/IPages.java

@@ -3,6 +3,7 @@ package com.supervision.common.utils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -12,14 +13,14 @@ import static com.supervision.common.constant.Constants.TOTAL_COUNT;
 public class IPages {
 
     public static Map<String, Object> buildDataMap(IPage<?> iPage) {
-        Map<String, Object> dataMap = new HashMap<>();
+        Map<String, Object> dataMap = new LinkedHashMap<>();
         dataMap.put(TOTAL_COUNT, iPage.getTotal());
         dataMap.put(RESULT_LIST, iPage.getRecords());
         return dataMap;
     }
 
     public static Map<String, Object> buildDataMap(List list, int total) {
-        Map<String, Object> dataMap = new HashMap();
+        Map<String, Object> dataMap = new LinkedHashMap<>();
         dataMap.put(TOTAL_COUNT, total);
         dataMap.put(RESULT_LIST, list);
         return dataMap;

src/main/java/com/supervision/police/controller/ModelCaseController.java

@@ -4,6 +4,7 @@ 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.ModelCaseBase;
 import com.supervision.police.dto.ModelCaseDTO;
 import com.supervision.police.service.ModelCaseService;
@@ -27,6 +28,7 @@ public class ModelCaseController {
 
     /**
      * 查询案件列表
+     *
      * @param modelCase
      * @param page
      * @param size
@@ -43,6 +45,7 @@ public class ModelCaseController {
 
     /**
      * 检查案件编号是否已存在
+     *
      * @param caseNo
      * @return
      */
@@ -54,6 +57,7 @@ public class ModelCaseController {
 
     /**
      * 新增或修改
+     *
      * @param modelCaseBase
      * @return
      */
@@ -64,6 +68,7 @@ public class ModelCaseController {
 
     /**
      * 删除
+     *
      * @param id
      * @return
      */
@@ -74,6 +79,7 @@ public class ModelCaseController {
 
     /**
      * 查询案件人员信息列表
+     *
      * @param name
      * @return
      */
@@ -97,6 +103,7 @@ public class ModelCaseController {
 
     /**
      * 导入案件信息
+     *
      * @param file
      * @return
      */
@@ -107,16 +114,18 @@ public class ModelCaseController {
 
     /**
      * 获取指标结果
+     *
      * @param caseId
      * @param indexType
      * @return
      */
     @PostMapping("/getIndexDetail")
-    public R<?> getIndexDetail(@RequestParam String caseId,
+    public R<IPage<IndexDetail>> getIndexDetail(@RequestParam String caseId,
                                @RequestParam String indexType,
                                @RequestParam(required = false, defaultValue = "1") Integer page,
                                @RequestParam(required = false, defaultValue = "20") Integer size) {
-        return modelCaseService.getIndexDetail(caseId, indexType, page, size);
+        IPage<IndexDetail> indexDetail = modelCaseService.getIndexDetail(caseId, indexType, page, size);
+        return R.ok(indexDetail);
     }
 
 }

src/main/java/com/supervision/police/dto/AtomicIndexDTO.java

@@ -10,6 +10,8 @@ import java.util.Objects;
 @Data
 public class AtomicIndexDTO {
 
+    private String indexId;
+
     private String atomicIndexId;
 
     /**

src/main/java/com/supervision/police/dto/IndexDetail.java

@@ -7,6 +7,8 @@ import java.util.List;
 @Data
 public class IndexDetail {
 
+    private String indexId;
+
     /**
      * 指标名称
      */

src/main/java/com/supervision/police/mapper/ModelCaseMapper.java

@@ -45,6 +45,7 @@ public interface ModelCaseMapper extends BaseMapper<ModelCase> {
                                           @Param("indexType") String indexType);
 
     List<AtomicIndexDTO> getAtomicDetail(@Param("caseId") String caseId,
+                                         @Param("indexId") String indexId,
                                          @Param("atomicIds") List<String> atomicIds);
 
 }

src/main/java/com/supervision/police/service/ModelCaseService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 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.ModelCaseBase;
 import com.supervision.police.dto.ModelCaseDTO;
 import com.supervision.police.vo.ModelCaseVO;
@@ -41,7 +42,7 @@ public interface ModelCaseService extends IService<ModelCase> {
 
     R<?> uploadCase(MultipartFile file);
 
-    R<?> getIndexDetail(String caseId, String indexType, Integer page, Integer size);
+    IPage<IndexDetail> getIndexDetail(String caseId, String indexType, Integer page, Integer size);
 
 }
 

src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java

@@ -316,7 +316,7 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
     }
 
     @Override
-    public R<?> getIndexDetail(String caseId, String indexType, Integer page, Integer size) {
+    public IPage<IndexDetail> getIndexDetail(String caseId, String indexType, Integer page, Integer size) {
         IPage<IndexDetail> iPage = new Page<>(page, size);
         iPage = modelCaseMapper.getIndexDetail(iPage, caseId, indexType);
         List<IndexDetail> records = iPage.getRecords();
@@ -332,7 +332,7 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
             Map<String, String> indexJundgeLogicMap = parseLogicMap(judgeLogic);
             String[] array = record.getAtomicIds().split(",");
             List<String> atomicIds = Arrays.asList(array);
-            List<AtomicIndexDTO> atomics = modelCaseMapper.getAtomicDetail(caseId, atomicIds);
+            List<AtomicIndexDTO> atomics = modelCaseMapper.getAtomicDetail(caseId, record.getIndexId(), atomicIds);
             for (AtomicIndexDTO atomic : atomics) {
                 // 需要和原子指标的规则判断是否一致(解决出罪和入罪冲突的问题)
                 String s = indexJundgeLogicMap.get(atomic.getAtomicIndexId());
@@ -348,8 +348,7 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
             }
             record.setChildren(atomics);
         }
-        iPage.setRecords(records);
-        return R.ok(IPages.buildDataMap(iPage));
+        return iPage;
     }
 
     private Map<String, String> parseLogicMap(String judgeLogic) {

src/main/resources/mapper/ModelCaseMapper.xml

@@ -23,7 +23,8 @@
             </foreach>
         </if>
         <if test="modelCase.involvedPerson != null and modelCase.involvedPerson != ''">
-            and ( law_actor like concat('%', #{modelCase.involvedPerson}, '%') or law_party like concat('%', #{modelCase.involvedPerson}, '%'))
+            and ( law_actor like concat('%', #{modelCase.involvedPerson}, '%') or law_party like concat('%',
+            #{modelCase.involvedPerson}, '%'))
         </if>
         <if test="modelCase.lawActor != null and modelCase.lawActor != ''">
             and law_actor like concat('%', #{modelCase.lawActor}, '%')
@@ -53,23 +54,29 @@
           and mi.index_type = #{indexType}
     </select>
     <select id="getAtomicDetail" resultType="com.supervision.police.dto.AtomicIndexDTO">
-        select mai.id as atomicIndexId,mai.name as indexName,mai.index_source as indexSource,
+        select mar.index_id as indexId, mai.id as atomicIndexId,mai.name as indexName,mai.index_source as indexSource,
         mar.atomic_result as atomicResult,
         concat(nrs.question, nrs.answer) as record
         from model_atomic_result mar
         left join model_atomic_index mai on mar.atomic_id = mai.id
         left join note_record_split nrs on mar.record_split_id = nrs.id
-        where mar.case_id = #{caseId} and mar.atomic_id in
+        where mar.case_id = #{caseId} and mar.index_id = #{indexId} and mar.atomic_id in
         <foreach collection="atomicIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
     </select>
     <select id="getIndexDetail" resultType="com.supervision.police.dto.IndexDetail">
-        select mi.name as indexName, mi.index_score as score, mir.index_result,mir.pre_result as preResult, mir.atomic_ids,mi.judge_logic as judgeLogic
+        select mi.id          as indexId,
+               mi.name        as indexName,
+               mi.index_score as score,
+               mir.index_result,
+               mir.pre_result as preResult,
+               mir.atomic_ids,
+               mi.judge_logic as judgeLogic
         from model_index mi
                  left join model_index_result mir on (mi.id = mir.index_id and mir.case_id = #{caseId})
         WHERE mi.data_status = '1'
           and mi.index_type = #{indexType}
-        order by mir.index_result desc
+        order by mir.index_result, mi.id desc
     </select>
 </mapper>