刑事技术串并调整提交(湖南)

service/publicapi/src/main/java/com/founder/publicapi/controller/AsjService/AsjController.java

@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Api(tags = "案件管理")
@@ -168,9 +169,24 @@ public class AsjController {
             }
                a.put("cbzaj",listCbzByXlajbh);
         }
+        // 返回结果处理
+        List<CbxszAndXlaj> listXszXgajResult = new ArrayList<>();
+        if (listXszXgaj.size() > 0) {
+            // 现根据 案件号相同时分组
+            Map<String, List<CbxszAndXlaj>> map = listXszXgaj.stream().collect(Collectors.groupingBy(o -> o.getAsjbh()));
+            map.forEach((key, value) -> {
+                if (value.size() > 1) {
+                    String cblx = String.join("、", value.stream().map(CbxszAndXlaj::getCblxStr).collect(Collectors.toList()));
+                    value.get(0).setCblxStr(cblx);
+                    listXszXgajResult.add(value.get(0));
+                } else {
+                    listXszXgajResult.addAll(value);
+                }
+            });
+        }
         // 将查回的线索组封装成json
-        a.put("xszaj", listXszXgaj);
-        return MapRestResult.build(200,"成功",a.size(),a);
+        a.put("xszaj", listXszXgajResult);
+        return MapRestResult.build(200, "成功", listXszXgajResult.size(), a);
     }
 
     @OperLog(message = "公共_人员涉案信息",operation = OperationType.QUERY)

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml

@@ -128,7 +128,7 @@
     <select id="getXszajbhByAsjbh" parameterType="java.lang.String" resultType="String">
         select
         distinct XSZAJBH
-        from tb_yw_xsz_cbaj where 1=1 AND XXSC_PDBZ = 0
+        from tb_yw_xsz_cbaj where 1=1 AND XXSC_PDBZ = 0 AND CBLX IN ('0301','0302')
         <if test="asjbh!=null and asjbh!=''">
             and asjbh = #{asjbh}
         </if>
@@ -156,9 +156,9 @@
         (select name from sys_dictitem where groupid='CODE_AJLB' AND code = b.AJLBDM) as ajlbdmMc,
         (select name from sys_dictitem where groupid='CODE_AJXZ' AND code = b.ZATZ_JYQK) as zatzJyqkMc,
         (select name from sys_dictitem where groupid='CODE_AJXLB' AND code = bz.AJXLB) as ajxlbMc
-        from tb_yw_xsz_cbaj a,tb_st_asj b,tb_st_asj_asjbz bz where 1=1 AND a.asjbh = b.asjbh
-        AND a.asjbh = bz.asjbh
+        from tb_yw_xsz_cbaj a,tb_st_asj b LEFT JOIN tb_st_asj_asjbz bz ON b.asjbh = bz.asjbh where 1=1 AND a.asjbh = b.asjbh
         AND a.XXSC_PDBZ = 0
+        AND a.CBLX IN ('0301','0302')
         AND a.ASJBH != #{asjbhs}
         AND a.XSZAJBH IN
         <foreach collection="listxszajbh" index="index" item="item" open="(" separator="," close=")">
@@ -170,20 +170,22 @@
         select
         distinct a.ASJBH,
         a.CBLX,
+        (select name from sys_dictitem where groupid='CODE_CBYP_CBLX' and code=a.CBLX) as cblxStr,
         b.AJMC as ajmc,
         b.ASJFSDD_DQJD as x,
         b.ASJFSDD_DQWD as y,
         b.JYAQ as jyaq,
         DATE_FORMAT(b.ASJFSSJ_ASJFSKSSJ,'%Y-%m-%d %H:%i:%S') as asjfssjAsjfskssj,
         (select name from sys_dictitem where groupid='CODE_ZCJDDM' AND code = b.ZCJDDM) as zcjdmc,
-        (select name from sys_dictitem where groupid='CODE_AJLB' AND code = b.AJLBDM) as ajzlbmc,
-        (select name from sys_dictitem where groupid='CODE_AJXZ' AND code = b.ZATZ_JYQK) as ajxzlbmc,
-        (select name from sys_dictitem where groupid='CODE_AJXLB' AND code = bz.AJXLB) as xalbdmbcmsmc
-        from tb_yw_cbz_cbaj a,tb_st_asj b,tb_st_asj_asjbz bz where 1=1 AND a.asjbh = b.asjbh
-        AND a.asjbh = bz.asjbh
+        (select name from sys_dictitem where groupid='CODE_AJLB' AND code = b.AJLBDM) as ajlbdmMc,
+        (select name from sys_dictitem where groupid='CODE_AJXZ' AND code = b.ZATZ_JYQK) as zatzJyqkMc,
+        (select name from sys_dictitem where groupid='CODE_AJXLB' AND code = bz.AJXLB) as ajxlbMc
+        from tb_yw_xsz_cbaj a,tb_st_asj b LEFT JOIN tb_st_asj_asjbz bz ON b.asjbh = bz.asjbh  where 1=1
+        AND a.asjbh = b.asjbh
+        AND a.cblx in ('0301','0302')
         AND a.XXSC_PDBZ = 0
         AND a.ASJBH != #{asjbhs}
-        AND a.XLAJBH IN
+        AND a.XSZAJBH IN
         <foreach collection="listXlajbh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>