老mis 嫌疑人 ，被害人，报案人 查询及案件分类查询；实体类新增的嫌疑人字段

src/main/java/com/cc/controller/MisSolrController.java

@@ -260,7 +260,28 @@ public class MisSolrController {
             misAsjq += " AND CASETYPE:*" + misAsjRyRelateVO.getCasetype()+"*";
         }
         if(null!=misAsjRyRelateVO.getCasearea() && !"".equals(misAsjRyRelateVO.getCasearea())){
-            misAsjq += " AND CASEAREA:*" + misAsjRyRelateVO.getCasearea()+"*";
+            if(misAsjRyRelateVO.getCasearea().indexOf(",") > 0){
+                String[] arrs = misAsjRyRelateVO.getCasearea().split(",");
+                String mgs = " AND (";
+                for (int i = 0; i < arrs.length; i++) {
+                    if (i < arrs.length - 1) {
+                        mgs += "CASEAREA:" + arrs[i] + " OR ";
+                    } else {
+                        mgs += "CASEAREA:" + arrs[i];
+                    }
+                }
+                mgs += ")";
+                misAsjq += mgs;
+            }else{
+                misAsjq += " AND CASEAREA:"+misAsjRyRelateVO.getCasearea();
+            }
+        }
+        if(null!=misAsjRyRelateVO.getCaseareamc() && !"".equals(misAsjRyRelateVO.getCaseareamc())){
+            if("null".equals(misAsjRyRelateVO.getCaseareamc())){
+                misAsjq += " AND -CASEAREAMC:*";
+            }else{
+                misAsjq += " AND CASEAREAMC:"+misAsjRyRelateVO.getCaseareamc();
+            }
         }
         if(null!=misAsjRyRelateVO.getCaseplace() && !"".equals(misAsjRyRelateVO.getCaseplace())){
             misAsjq += " AND CASEPLACE:*" + misAsjRyRelateVO.getCaseplace()+"*";
@@ -617,7 +638,7 @@ public class MisSolrController {
             if("null".equals(misAsjRyRelateVO.getBhr_phone())){
                 misAsjq += " AND -PHONE:*";
             }else{
-                misAsjq += " AND PHONE:"+misAsjRyRelateVO.getBhr_phone();
+                misAsjq += " AND PHONE:*"+misAsjRyRelateVO.getBhr_phone()+"*";
             }
         }
         if(null!=misAsjRyRelateVO.getBhr_tag() && !"".equals(misAsjRyRelateVO.getBhr_tag())){
@@ -761,7 +782,7 @@ public class MisSolrController {
             if("null".equals(misAsjRyRelateVO.getBar_phone())){
                 misAsjq += " AND -PHONE:*";
             }else{
-                misAsjq += " AND PHONE:"+misAsjRyRelateVO.getBar_phone();
+                misAsjq += " AND PHONE:*"+misAsjRyRelateVO.getBar_phone()+"*";
             }
         }
         if(null!=misAsjRyRelateVO.getBar_tag() && !"".equals(misAsjRyRelateVO.getBar_tag())){

src/main/java/com/cc/service/impl/MisSolrServiceImpl.java

@@ -120,6 +120,8 @@ public class MisSolrServiceImpl implements IMisSolrService {
                     mapResult.put("casestatusmc", solrDocument.get("CASESTATUSMC"));
                     mapResult.put("registerunit", solrDocument.get("REGISTERUNIT"));
                     mapResult.put("registerunit_gajgmc", solrDocument.get("REGISTERUNIT_GAJGMC"));
+                    mapResult.put("deadamount", solrDocument.get("DEADAMOUNT"));
+                    mapResult.put("registerdate", solrDocument.get("REGISTERDATE"));
                     // 输出高亮
                     Map<String, List<String>> map = highlighting.get(solrDocument.get("CASEID"));
                     List<String> list = map.get("keywords");
@@ -597,7 +599,7 @@ public class MisSolrServiceImpl implements IMisSolrService {
                                                     map.put("groupid", group.getGroupValue());
                                                     map.put("groupNum", group.getResult().getNumFound());
                                                 }
-                                            }else if(groupid.indexOf("ASJFSSJ_ASJFSKSSJ")!=-1 || groupid.indexOf("LARQ")!=-1 || groupid.indexOf("ZCZJ_ZXSJ01")!=-1 || groupid.indexOf("DJSJ")!=-1){
+                                            }else if(groupid.indexOf("CASETIMEF")!=-1||groupid.indexOf("REGISTERDATE")!=-1 ){
                                                 if(groupid.indexOf("YEAR")!=-1){
                                                     String groupValue = group.getGroupValue();
                                                     if (null == groupValue || "null".equals(groupValue)) {
@@ -611,7 +613,8 @@ public class MisSolrServiceImpl implements IMisSolrService {
                                                     map.put("groupValue", group.getGroupValue());
                                                     map.put("groupNum", group.getResult().getNumFound());
                                                 }else{
-                                                    if((StringUtils.isNotBlank(misAsjRyRelateVO.getCasetimef_date()) && misAsjRyRelateVO.getCasetimef_date().length()==7)
+                                                    if((StringUtils.isNotBlank(misAsjRyRelateVO.getCasetimef_date()) && misAsjRyRelateVO.getCasetimef_date().length()==7)||
+                                                            (StringUtils.isNotBlank(misAsjRyRelateVO.getRegisterdate_date()) && misAsjRyRelateVO.getRegisterdate_date().length()==7)
                                                             ){
                                                         map.put("groupValue", group.getGroupValue());
                                                         map.put("groupNum", group.getResult().getNumFound());
@@ -885,6 +888,7 @@ public class MisSolrServiceImpl implements IMisSolrService {
                     mapResult.put("addrdetail", solrDocument.get("ADDRDETAIL"));
                     mapResult.put("harmgread", solrDocument.get("HARMGREAD"));
                     mapResult.put("hjdetail", solrDocument.get("HJDATAIL"));
+                    mapResult.put("phone", solrDocument.get("PHONE"));
                     // 输出高亮
                     Map<String, List<String>> map = highlighting.get(solrDocument.get("CASEID"));
                     List<String> list = map.get("keywords");