标注修改

common/common_utils/src/main/java/com/founder/commonutils/bzptEntity/TbStAsjEsEntity.java

@@ -95,7 +95,7 @@ public class TbStAsjEsEntity {
 
     private String ladw_gajgmc;// 立案单位公安机关名称
 
-    private String asjbz_ajfl;// 案事件标注_案件分类
+    private String asjbzAjfl;// 案事件标注_案件分类
 
     private String asjbz_ajfl01;// 盗窃
     private String asjbz_ajfl02;// 抢劫

service/bzpt/src/main/java/com/founder/bzpt/controller/DetailController.java

@@ -371,7 +371,7 @@ public class DetailController {
             request.doc(XContentFactory.jsonBuilder().startObject()
 
                     .field("asjbh", tbStAsjEsEntity.getAsjbh())
-                    .field("asjbzAjfl",tbStAsjEsEntity.getAsjbz_ajfl())// 案件分类
+                    .field("asjbzAjfl",tbStAsjEsEntity.getAsjbzAjfl())// 案件分类
                     .field("ajzlb",tbStAsjEsEntity.getAjzlb())
                     .field("ajzlbMc",tbStAsjEsEntity.getAjzlbmc())// 主案类别名称
                     .field("ajxzlb",tbStAsjEsEntity.getAjxzlb())
@@ -402,7 +402,7 @@ public class DetailController {
                     requestXyr.doc(XContentFactory.jsonBuilder().startObject()
 
                             .field("asjbh", tbStAsjEsEntityXyr.get(i).getAsjbh())
-                            .field("asjbzAjfl",tbStAsjEsEntityXyr.get(i).getAsjbz_ajfl())// 案件分类
+                            .field("asjbzAjfl",tbStAsjEsEntityXyr.get(i).getAsjbzAjfl())// 案件分类
                             .field("ajzlb",tbStAsjEsEntityXyr.get(i).getAjzlb())
                             .field("ajzlbMc",tbStAsjEsEntityXyr.get(i).getAjzlbmc())// 主案类别名称
                             .field("ajxzlb",tbStAsjEsEntityXyr.get(i).getAjxzlb())
@@ -435,7 +435,7 @@ public class DetailController {
                     requestShr.doc(XContentFactory.jsonBuilder().startObject()
 
                             .field("asjbh", tbStAsjEsEntityShr.get(i).getAsjbh())
-                            .field("asjbzAjfl",tbStAsjEsEntityShr.get(i).getAsjbz_ajfl())// 案件分类
+                            .field("asjbzAjfl",tbStAsjEsEntityShr.get(i).getAsjbzAjfl())// 案件分类
                             .field("ajzlb",tbStAsjEsEntityShr.get(i).getAjzlb())
                             .field("ajzlbMc",tbStAsjEsEntityShr.get(i).getAjzlbmc())// 主案类别名称
                             .field("ajxzlb",tbStAsjEsEntityShr.get(i).getAjxzlb())
@@ -468,7 +468,7 @@ public class DetailController {
                     requestXyrShr.doc(XContentFactory.jsonBuilder().startObject()
 
                             .field("asjbh", tbStAsjEsEntityXyrShr.get(i).getAsjbh())
-                            .field("asjbzAjfl",tbStAsjEsEntityXyrShr.get(i).getAsjbz_ajfl())// 案件分类
+                            .field("asjbzAjfl",tbStAsjEsEntityXyrShr.get(i).getAsjbzAjfl())// 案件分类
                             .field("ajzlb",tbStAsjEsEntityXyrShr.get(i).getAjzlb())
                             .field("ajzlbMc",tbStAsjEsEntityXyrShr.get(i).getAjzlbmc())// 主案类别名称
                             .field("ajxzlb",tbStAsjEsEntityXyrShr.get(i).getAjxzlb())

service/bzpt/src/main/java/com/founder/bzpt/mapper/xml/DetailMapper.xml

@@ -326,7 +326,7 @@
                  (select name from sys_dictitem where groupid='CODE_ZCJDDM' AND code = T.ZCJDDM) AS zcjdmc,
                  T.ASJFSDD_XZQHDM AS asjfsdd_xzqhdm,
                  (select name from sys_dictitem where groupid='CODE_XZQH' AND code = T.ASJFSDD_XZQHDM) AS asjfsdd_xzqhmc,
-                 ASJBZ.ASJBZ_AJFL AS asjbz_ajfl,
+                 ASJBZ.ASJBZ_AJFL AS asjbzAjfl,
                  ASJBZ.AJZLB AS ajzlb,
                  (select name from sys_dictitem where groupid='CODE_GABAJZLB' AND code = ASJBZ.AJZLB) as ajzlbmc,
                  ASJBZ.AJXZLB AS ajxzlb,
@@ -385,6 +385,7 @@
         ASJBZ.xalbdmbcms	AS	xalbdmbcms,
         (select name from sys_dictitem where groupid='CODE_GABXALBDMBCMS' AND code = ASJBZ.xalbdmbcms) AS xalbdmbcmsMc,
         ASJBZ.bzzt as bzzt,
+        ASJBZ.asjbz_ajfl AS asjbzAjfl,
         T.SSJZRMBY AS ssjzrmby,
         case when ASJBZ.bzzt='1' then '已标注' else case when ASJBZ.bzzt='2' then '待标注' else '未标注'  end end AS bzztMs
         FROM tb_st_asj T LEFT JOIN tb_st_asjbz ASJBZ ON T.ASJBH = ASJBZ.ASJBH ,tb_xw_rybh RYBH where

service/bzpt/src/main/java/com/founder/bzpt/service/impl/EsAsjQueryServiceImpl.java

@@ -14,10 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.elasticsearch.search.sort.SortOrder.DESC;
 
@@ -222,23 +219,28 @@ public class EsAsjQueryServiceImpl {
 
                 // 案件分类查询 01-盗窃  02-诈骗案 03-抢劫案  04抢夺案   05招摇撞骗案
                 if(StringUtils.isNotEmpty(asj.getAsjbz_ajfl())){
+                    String ajfl = asj.getAsjbz_ajfl().replace("，",",").replace(",",",");
+                    String ajfls[] = ajfl.split(",");
                     BoolQueryBuilder bqShould = QueryBuilders.boolQuery();
-                    if("01".equals(asj.getAsjbz_ajfl())) {
-                        TermsQueryBuilder termQueryBuilder = QueryBuilders.termsQuery("asjbzAjfl", "01");
-                        bqShould.should(termQueryBuilder);
-                    }else if("02".equals(asj.getAsjbz_ajfl())) {
-                        TermsQueryBuilder termQueryBuilder = QueryBuilders.termsQuery("asjbzAjfl", "02");
-                        bqShould.should(termQueryBuilder);
-                    }else if("03".equals(asj.getAsjbz_ajfl())) {
-                        TermsQueryBuilder termQueryBuilder = QueryBuilders.termsQuery("asjbzAjfl", "03");
-                        bqShould.should(termQueryBuilder);
-                    }else if("04".equals(asj.getAsjbz_ajfl())) {
-                        TermsQueryBuilder termQueryBuilder = QueryBuilders.termsQuery("asjbzAjfl", "04");
-                        bqShould.should(termQueryBuilder);
-                    }else if("05".equals(asj.getAsjbz_ajfl())) {
-                        TermsQueryBuilder termQueryBuilder = QueryBuilders.termsQuery("asjbzAjfl", "05");
-                        bqShould.should(termQueryBuilder);
-                    }
+                    Arrays.stream(ajfls).forEach(p->{
+
+                        if("01".equals(p)) {
+                            TermsQueryBuilder termQueryBuilder = QueryBuilders.termsQuery("asjbzAjfl", "01");
+                            bqShould.should(termQueryBuilder);
+                        }else if("02".equals(p)) {
+                            TermsQueryBuilder termQueryBuilder = QueryBuilders.termsQuery("asjbzAjfl", "02");
+                            bqShould.should(termQueryBuilder);
+                        }else if("03".equals(p)) {
+                            TermsQueryBuilder termQueryBuilder = QueryBuilders.termsQuery("asjbzAjfl", "03");
+                            bqShould.should(termQueryBuilder);
+                        }else if("04".equals(p)) {
+                            TermsQueryBuilder termQueryBuilder = QueryBuilders.termsQuery("asjbzAjfl", "04");
+                            bqShould.should(termQueryBuilder);
+                        }else if("05".equals(p)) {
+                            TermsQueryBuilder termQueryBuilder = QueryBuilders.termsQuery("asjbzAjfl", "05");
+                            bqShould.should(termQueryBuilder);
+                        }
+                    });
                     bq.must(bqShould);
                 }
             }