zero 1 年之前
父節點
當前提交
15d3ba2bb4

+ 4 - 0
src/main/java/cn/cslg/pas/mapper/FinalProofGroupMapper.java

@@ -3,6 +3,9 @@ package cn.cslg.pas.mapper;
 
 import cn.cslg.pas.domain.FinalProofGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author admin
@@ -12,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface FinalProofGroupMapper extends BaseMapper<FinalProofGroup> {
 
+    List<FinalProofGroup> selectProofList(@Param("invalidStatueIds") List<Integer> invalidStatueIds);
 }
 
 

+ 1 - 3
src/main/java/cn/cslg/pas/service/FinalInvalidStatueService.java

@@ -303,9 +303,7 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
             return claimsVOS;
         }
         List<Integer> invalidStatueIds = statueList.stream().map(FinalInvalidStatue::getId).collect(Collectors.toList());
-        List<FinalProofGroup> proofGroups = proofGroupMapper.selectList(new LambdaQueryWrapper<FinalProofGroup>()
-                .in(FinalProofGroup::getFinalInvalidStatueId, invalidStatueIds)
-                .orderByAsc(FinalProofGroup::getFeatureSort));
+        List<FinalProofGroup> proofGroups = proofGroupMapper.selectProofList(invalidStatueIds);
         for (FinalInvalidStatue statue : statueList) {
              Integer invalidStatueId = statue.getId();
             List<FinalProofGroup> statueGroups = proofGroups.stream().filter(item -> item.getFinalInvalidStatueId().equals(invalidStatueId)).collect(Collectors.toList());

+ 1 - 1
src/main/resources/jsons/reportProject.json

@@ -3,7 +3,7 @@
     "type":"Integer",
     "value":"id",
     "field":"id",
-    "sqlField": "p.id",
+    "sqlField": "t.id",
     "sqlClass": "getComSql",
     "orderClass": "",
     "groupClass":"",

+ 21 - 0
src/main/resources/mapper/FinalProofGroupMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.cslg.pas.mapper.FinalProofGroupMapper">
+
+    <sql id="FinalProofGroupColumn">
+        id,final_invalid_statue_id,invalid_reason,present_opinions,project_id,rb_decision,
+        create_id,create_time,feature_sort,feature_content,court_opinions1,court_opinions2
+    </sql>
+
+    <select id="selectProofList" resultType="cn.cslg.pas.domain.FinalProofGroup">
+        select <include refid="FinalProofGroupColumn"/>
+        from final_proof_group
+        <where>
+            final_invalid_statue_id in
+            <foreach collection="invalidStatueIds" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+        order by ISNULL(feature_sort) asc
+    </select>
+</mapper>