增加xxsc_pdbz='0'

src/main/java/org/springblade/founder/asj/controller/MatjController.java

@@ -327,12 +327,12 @@ public class MatjController extends BladeController {
 		matj.setLev(levMap.get("lev"));
 
 		fpaList = matjService.getXqFaPaCount(matj);
-		if(null!=fpaList && fpaList.size()>0){
+		/*if(null!=fpaList && fpaList.size()>0){
 			for(Xqfpaxx xqfpaxx:fpaList){
 				String palNum = NumberUtil.getPercent(Integer.parseInt(xqfpaxx.getPaNum()), Integer.parseInt(xqfpaxx.getFaNum()));//发案率
 				xqfpaxx.setPalNum(palNum);
 			}
-		}
+		}*/
 		resultMap.put("data",fpaList);
 
 		return R.ok().data(resultMap);

src/main/java/org/springblade/founder/asj/mapper/MaTjfxMapper.xml

@@ -227,11 +227,9 @@
         from tb_st_asj asj
         inner join tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh
         inner join tb_xw_zbfzxyr xyr on asj.asjbh = xyr.asjbh
-        where asj.xxsc_pdbz='0'
-        and asjcz.laywsjzt ='02'
-        and asj.sfma_pdbz = '1'
-        and (xyr.ZHFZXYR_ASJXGRYSF_ASJXGRYSFDM is not null  or xyr.ZHFZXYR_ASJXGRYSF_ASJXGRYSFDM != '')
         <include refid="common-condition"/>
+        and xyr.xxsc_pdbz='0'
+        and (xyr.ZHFZXYR_ASJXGRYSF_ASJXGRYSFDM is not null  or xyr.ZHFZXYR_ASJXGRYSF_ASJXGRYSFDM != '')
         group by xyr.ZHFZXYR_ASJXGRYSF_ASJXGRYSFDM
         order by sjajs desc limit 1
     </select>

src/main/java/org/springblade/founder/asj/mapper/MatjMapper.xml

@@ -231,6 +231,7 @@
         select zczj.zczj_zadjdm as zczjzadjdm ,count(*) as num
         from tb_st_asj asj INNER JOIN tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh INNER JOIN tb_xw_zczj zczj on asj.asjbh=zczj.asjbh
         <include refid="pa-condition"/>
+        and zczj.xxsc_pdbz='0'
         group by zczj.zczj_zadjdm
     </select>
 
@@ -304,7 +305,7 @@
         dw.lev,
         (SELECT JD FROM SYS_DICTITEM_GL_JWD WHERE CODE= left(dw.dscode, 6) AND GROUPID='CODE_XZQH') jd,
         (SELECT WD FROM SYS_DICTITEM_GL_JWD WHERE CODE= left(dw.dscode, 6) AND GROUPID='CODE_XZQH') wd,
-        format(paNum/faNum,2) palNum
+        IFNULL(format(paNum/faNum,2),0) palNum
         FROM
         (select name_sj as dsname,code as dscode,lev from code_gxs  where lev=#{lev}
         <if test="codeLevCol != null and codeLevCol !=''">
@@ -854,7 +855,7 @@
     </select>
 
     <!--抓捕犯罪嫌疑人学历-->
-    <!--学历 大学及以上50、高中40、初中30、小学及以下20、其他-->
+    <!--学历 大学（大中专）及以上50、高中40、初中30、小学及以下20、其他-->
     <select id="getZhfzxyrXlTj" resultType="org.springblade.founder.asj.entity.MatjResult">
         select dictitem.code,
         (CASE WHEN dictitem.code='999' THEN '其他' ELSE (select name from sys_dictitem where groupid='CODE_WHCD' and code=dictitem.code) END) as name,

src/main/java/org/springblade/founder/asj/mapper/MatjTsMapper.xml

@@ -1384,6 +1384,7 @@
         <if test="type=='pasd'">
             INNER JOIN TB_XW_ZCZJ ZCZJ ON asj.asjbh=zczj.asjbh
             <include refid="pa-condition"/>
+            and zczj.xxsc_pdbz='0'
             <if test="code == '999'">
                 and (ZCZJ.pasddm not in ('01','02','03','04') or ZCZJ.pasddm is null or ZCZJ.pasddm ='')
             </if>
@@ -1458,6 +1459,7 @@
         <if test="type=='pasd'">
             INNER JOIN TB_XW_ZCZJ ZCZJ ON asj.asjbh=zczj.asjbh
             <include refid="pa-condition"/>
+            and zczj.xxsc_pdbz='0'
             <if test="code == '999'">
                 and (ZCZJ.pasddm not in ('01','02','03','04') or ZCZJ.pasddm is null or ZCZJ.pasddm ='')
             </if>
@@ -1502,6 +1504,7 @@
         <include refid="common-column" />
         from tb_st_asj asj inner join tb_xw_asjcz asjcz on  asj.asjbh=asjcz.asjbh  INNER JOIN tb_xw_zczj zczj on asj.asjbh=zczj.asjbh
         <include refid="pa-condition"/>
+        and zczj.xxsc_pdbz='0'
         <if test="zadj == '0000'"><!--未知-->
             and (zczj.zczj_zadjdm is null or zczj.zczj_zadjdm = '')
         </if>
@@ -1516,6 +1519,7 @@
         count(*)
         from tb_st_asj asj inner join tb_xw_asjcz asjcz on  asj.asjbh=asjcz.asjbh  INNER JOIN tb_xw_zczj zczj on asj.asjbh=zczj.asjbh
         <include refid="pa-condition"/>
+        and zczj.xxsc_pdbz='0'
         <if test="zadj == '0000'"><!--未知-->
             and (zczj.zczj_zadjdm is null or zczj.zczj_zadjdm = '')
         </if>
@@ -1724,7 +1728,7 @@
         zbfzxyr.ZHFZXYR_HJDZ_XZQHDM as hjdzXzqhdm,
         zbfzxyr.ZHFZXYR_HJDZ_DZMC hjdzDzmc
         FROM tb_st_asj asj INNER JOIN tb_xw_asjcz asjcz on asj.asjbh = asjcz.asjbh INNER JOIN tb_xw_zbfzxyr zbfzxyr on
-        asj.asjbh = zbfzxyr.asjbh WHERE
+        asj.asjbh = zbfzxyr.asjbh
         <include refid="pa-condition"/>
         AND zbfzxyr.xxsc_pdbz = '0'
         <if test="xyrtzdm == '01'">