区域碰撞增加区域个数分类

src/main/java/com/founder/interservice/regionalanalysis/VO/RegionalTaskResultVO.java

@@ -38,5 +38,6 @@ public class RegionalTaskResultVO {
     private String sqlStr;
     private String isNullField;
     private String groupByField;
+    private String orderByField;
 
 }

src/main/java/com/founder/interservice/regionalanalysis/service/impl/RegionalAnalysisServiceImpl.java

@@ -319,6 +319,7 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
         }else if("BZHLX".equals(checkVal)){
             vo.setSqlStr(" count(a.object_type) counts,max(a.object_type_name) names,a.object_type vals ");
             vo.setIsNullField("");
+            vo.setOrderByField("");
             vo.setGroupByField(" a.object_type ");
             list=regionalTaskResultDetailMapper.getFldhBzhCountList(vo);
         }else if("CSRQ".equals(checkVal)){
@@ -364,10 +365,11 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
             list=regionalTaskResultDetailMapper.getsjhmGsdList(vo);
         }else if("BZQY".equals(checkVal)){
             //比中区域分类
-            vo.setSqlStr(" count(a.regionlist) counts,a.regionlist names,a.regionlist vals ");
+            vo.setSqlStr(" count(LENGTHB(a.regionlist)-LENGTHB(REPLACE(a.regionlist,',',''))+1) counts,LENGTHB(a.regionlist)-LENGTHB(REPLACE(a.regionlist,',',''))+1||'个区域' names,LENGTHB(a.regionlist)-LENGTHB(REPLACE(a.regionlist,',',''))+1 vals ");
             vo.setIsNullField(" a.regionlist is not null  ");
-            vo.setGroupByField(" a.regionlist ");
-            list=regionalTaskResultDetailMapper.getFldhCountList(vo);
+            vo.setGroupByField(" LENGTHB(a.regionlist)-LENGTHB(REPLACE(a.regionlist,',',''))+1 ");
+            vo.setOrderByField(" LENGTHB(a.regionlist)-LENGTHB(REPLACE(a.regionlist,',',''))+1 ");
+            list=regionalTaskResultDetailMapper.getFldhBzhCountList(vo);
         }
         /*if (jsonObject != null) {
 

src/main/resources/mybatis/mapper/xzxt/RegionalTaskResultDetailMapper.xml

@@ -172,7 +172,7 @@
             and td.zjhm is null and substr(td.sjhm,1,7) in ( select phone from TB_ST_PHONENO where SERVICE_PROVIDER = #{sjhmyys})
         </if>
         <if test="regionlist!=null and regionlist!=''">
-            and t.regionlist =#{regionlist}
+            and LENGTHB(t.regionlist)-LENGTHB(REPLACE(t.regionlist,',',''))+1=#{regionlist}
         </if>
     </select>
     <select id="findRegionalTaskResultNewDetailList" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
@@ -243,7 +243,7 @@
             and td.zjhm is null and substr(td.sjhm,1,7) in ( select phone from TB_ST_PHONENO where SERVICE_PROVIDER = #{sjhmyys})
         </if>
         <if test="regionlist!=null and regionlist!=''">
-            and t.regionlist =#{regionlist}
+            and LENGTHB(t.regionlist)-LENGTHB(REPLACE(t.regionlist,',',''))+1=#{regionlist}
         </if>
         order by td.name desc nulls last,td.xxzjbh,t.DJSJ desc
         ) t1
@@ -309,6 +309,9 @@
         <if test="sjhmyys!=null and sjhmyys!=''">
             and td.zjhm is null and substr(td.sjhm,1,7) in ( select phone from TB_ST_PHONENO where SERVICE_PROVIDER = #{sjhmyys})
         </if>
+        <if test="regionlist!=null and regionlist!=''">
+            and LENGTHB(t.regionlist)-LENGTHB(REPLACE(t.regionlist,',',''))+1=#{regionlist}
+        </if>
     </select>
     <!--多区域碰撞新表   end-->
 
@@ -466,6 +469,9 @@
         <if test="groupByField!= null and groupByField!= ''">
             group by   ${groupByField}
         </if>
+        <if test="orderByField!= null and orderByField!= ''">
+            order by   ${orderByField}
+        </if>
     </select>
 
     <select id="getsjhmGsdList" parameterType="com.founder.interservice.regionalanalysis.VO.RegionalTaskResultVO" resultType="java.util.Map" >

src/main/resources/static/js/qypzjgxsNew.js

@@ -751,7 +751,7 @@ function exportExcel(){
 
     $.messager.confirm('确认', "确定导出excel附件吗？", function (r) {
         if (r) {
-            window.open ("/exportTaskResultNewDetailExcel?projectName=00&yhCate=00&taskId="+params.taskId +"&objectValue="+params.objectValue+"&birthday="+params.birthday+"&sfbs="+params.sfbs+"&sex="+params.sex+"&objectType="+params.objectType+"&sjhmgsd="+params.sjhmgsd+"&sjhmgsdsj="+params.sjhmgsdsj+"&sjhmyys="+params.sjhmyys+"&sfFzxyr="+params.sfFzxyr+"&sfGwry="+params.sfGwry);
+            window.open ("/exportTaskResultNewDetailExcel?projectName=00&yhCate=00&taskId="+params.taskId +"&objectValue="+params.objectValue+"&birthday="+params.birthday+"&sfbs="+params.sfbs+"&sex="+params.sex+"&objectType="+params.objectType+"&sjhmgsd="+params.sjhmgsd+"&sjhmgsdsj="+params.sjhmgsdsj+"&sjhmyys="+params.sjhmyys+"&sfFzxyr="+params.sfFzxyr+"&sfGwry="+params.sfGwry+"&regionlist="+params.regionlist);
 
         }
     });

src/main/webapp/WEB-INF/jsp/qypz/qypzjgxsNew.jsp

@@ -246,13 +246,13 @@
             </ul>
         </legend>
         <ul class="searchConfigChecks pull-clear">
+            <li class="searchConfigCheck pull-left"><input type="checkbox" showtype="minCheck"  name="navOption" value="BZQY" id="searchConfig8"><label for="searchConfig8">比中区域分类</label></li>
             <li class="searchConfigCheck pull-left"><input type="checkbox" showtype="minCheck"  name="navOption" value="BZHLX" id="searchConfig1"><label for="searchConfig1">标识号分类</label></li>
             <li class="searchConfigCheck pull-left"><input type="checkbox" showtype="minCheck"  name="navOption" value="RYBQ" id="searchConfig3"><label for="searchConfig3">人员背景分类</label></li>
             <li class="searchConfigCheck pull-left"><input type="checkbox" showtype="minCheck"  name="navOption" value="SJHMGSD" id="searchConfig6"><label for="searchConfig6">手机号码归属地分类</label></li>
             <li class="searchConfigCheck pull-left"><input type="checkbox" showtype="minCheck"  name="navOption" value="SJHMYYS" id="searchConfig7"><label for="searchConfig7">手机号码运营商分类</label></li>
             <li class="searchConfigCheck pull-left"><input type="checkbox" showtype="minCheck"  name="navOption" value="CSRQ" id="searchConfig4"><label for="searchConfig4">出生日期分类</label></li>
             <li class="searchConfigCheck pull-left"><input type="checkbox" showtype="minCheck"  name="navOption" value="XB" id="searchConfig2"><label for="searchConfig2">性别分类</label></li>
-            <li class="searchConfigCheck pull-left"><input type="checkbox" showtype="minCheck"  name="navOption" value="BZQY" id="searchConfig8"><label for="searchConfig8">比中区域分类</label></li>
         </ul>
         <div style="text-align: right;height: 32px;">
             <a class="btn_a btn_search" onclick="doQueryFL()">查询</a>