修改研判报告

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

@@ -628,22 +628,20 @@
     </select>
 
     <select id="getMaZdswCountNew" resultType="java.lang.Integer">
-        select count(*)
-        from (select count(1) from tb_st_asj asj inner join tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh inner join
-                (
-                    select asj.asjbh from tb_st_asj asj inner join tb_xw_rybh rybh on asj.asjbh=rybh.asjbh
-                    where asj.xxsc_pdbz='0' and rybh.xxsc_pdbz='0' and rybh.RSSHCDDM='1'
-                    <if test="larqQssj!=null and larqQssj!=''">
-                        and DATE_FORMAT(asj.larq,'%Y-%m-%d %H:%i:%S') <![CDATA[>=]]>(str_to_date(#{larqQssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))
-                    </if>
-                    <if test="larqJssj!=null and larqJssj!=''">
-                        and DATE_FORMAT(asj.larq,'%Y-%m-%d %H:%i:%S') <![CDATA[<=]]>(str_to_date(#{larqJssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))
-                    </if>
-                    group by rybh.asjbh having count(*) >=3
-                ) zdsw
-            on asj.asjbh=zdsw.asjbh
-            <include refid="common-condition"/>
-          ) a
+        select count(1) from tb_st_asj asj inner join tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh inner join
+        (
+        select asj.asjbh from tb_st_asj asj inner join tb_xw_rybh rybh on asj.asjbh=rybh.asjbh
+        where asj.xxsc_pdbz='0' and rybh.xxsc_pdbz='0' and rybh.RSSHCDDM='1'
+        <if test="larqQssj!=null and larqQssj!=''">
+            and DATE_FORMAT(asj.larq,'%Y-%m-%d %H:%i:%S') <![CDATA[>=]]>(str_to_date(#{larqQssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))
+        </if>
+        <if test="larqJssj!=null and larqJssj!=''">
+            and DATE_FORMAT(asj.larq,'%Y-%m-%d %H:%i:%S') <![CDATA[<=]]>(str_to_date(#{larqJssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))
+        </if>
+        group by rybh.asjbh having count(*) >=3
+        ) zdsw
+        on asj.asjbh=zdsw.asjbh
+        <include refid="common-condition"/>
     </select>
 
     <select id="getMaZdswBhrCount" resultType="java.lang.Integer">

src/main/java/org/springblade/founder/ypbg/service/impl/YpbgServiceImpl.java

@@ -346,9 +346,7 @@ public class YpbgServiceImpl implements IYpbgService {
 		Matj matjnew = new Matj();
 		matjnew.setLarqJssj(matj.getLarqJssj());
 		matjnew.setLarqQssj(matj.getLarqQssj());
-		matjnew.setTypeFlag("zdsw");
 		Map<String, String> map = YdypbgTbhb(matjnew);
-
 		String matbStr = map.get("matbStr");
 		matbStr = matbStr.substring(0,1)+snyear+"年"+matbStr.substring(3);
 		String maZdswTbStr = map.get("maZdswTbStr");
@@ -424,7 +422,6 @@ public class YpbgServiceImpl implements IYpbgService {
 		Matj matjnew = new Matj();
 		matjnew.setLarqJssj(matj.getLarqJssj());
 		matjnew.setLarqQssj(matj.getLarqQssj());
-		matjnew.setTypeFlag("zdsw");
 		Map<String, String> map = YdypbgTbhb(matjnew);
 		String tbhbbg = "<p style=\"font-size: 21px;text-indent:50px; font-family: 仿宋\">"+month+"月"+qsDay+"日至"+jsDay+"日，全国共发生"
 			+zdswCount+"起一案杀死多人（3人及以上）案件，" +map.get("maZdswTbStr")+"，"+map.get("maZdswHbStr")+"，共造成"+bndBhrCount+"人死亡，"