修改研判报告附件

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

@@ -305,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,
-        (IFNULL(format(paNum/faNum,2),0)*100) palNum
+        (IFNULL(format(paNum*100/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 !=''">

src/main/java/org/springblade/founder/ypbg/controller/YpbgController.java

@@ -163,7 +163,7 @@ public class YpbgController {
 			List<Xqfpaxx> xqfpa_num_List=ypbgService.getYpbgXqFaPaCount(matj);
 
 			//辖区发破案并  根据每十万人发案率
-			matj.setTypeFlag("fal");
+			matj.setPxzd("fal");
 			List<Xqfpaxx> xqfpa_fal_List=ypbgService.getYpbgXqFaPaCount(matj);
 
 			//辖区重大伤亡发破案并   根据发案数排序
@@ -173,6 +173,9 @@ public class YpbgController {
 
 
 			LinkedHashMap<String,Object> map=null;
+			int count6 = 0;
+			int count9 = 0;
+			int count12 = 0;
 			for(int i=0;i< xqfpaList.size();i++){
 				map=new LinkedHashMap<>();
 
@@ -182,15 +185,38 @@ public class YpbgController {
 
 				String col_4=xqfpa_num_List.get(i).getDwName();
 				String col_5=xqfpa_num_List.get(i).getFaNum();
-				int col_6=i+1;
+				int col_6 = 0;
+				if (i>0&&xqfpa_num_List.get(i).getFaNum().equals(xqfpa_num_List.get(i-1).getFaNum())){
+					count6 ++;
+					col_6 = i+1-count6;
+				}else {
+					col_6 = i+1;
+					count6 = 0;
+				}
 
 				String col_7=xqfpa_fal_List.get(i).getDwName();
 				String col_8=xqfpa_fal_List.get(i).getFalNumSw();
-				int col_9=i+1;
+				int col_9=0;
+				if (i>0&&xqfpa_fal_List.get(i).getFalNumSw().equals(xqfpa_fal_List.get(i-1).getFalNumSw())){
+					count9 ++;
+					col_9 = i+1-count9;
+				}else {
+					col_9 = i+1;
+					count9 = 0;
+				}
 
 				String col_10=xqzdswfpa_num_List.get(i).getDwName();
 				String col_11=xqzdswfpa_num_List.get(i).getFaNum();
-				int col_12=i+1;
+				int col_12=0;
+
+				if (i>0&&xqzdswfpa_num_List.get(i).getFaNum().equals(xqzdswfpa_num_List.get(i-1).getFaNum())){
+					count12 ++;
+					col_12 = i+1-count12;
+				}else {
+					col_12 = i+1;
+					count12 = 0;
+				}
+
 				map.put("col_1",col_1);
 				map.put("col_2",col_2);
 				map.put("col_3",col_3);

src/main/java/org/springblade/founder/ypbg/mapper/YpbgMapper.xml

@@ -303,14 +303,14 @@
             ) pa
             on dw.dscode=pa.dscode
         ) result
-        <if test="pxzd=='' or pxzd ==''">
-            order by result.dwCode
+        <if test="pxzd=='' or pxzd ==null ">
+            order by result.dwCode asc
         </if>
         <if test="pxzd=='num'">
-            order by result.faNum,result.dwCode desc
+            order by result.faNum desc,result.dwCode asc
         </if>
         <if test="pxzd=='fal'">
-            order by result.fal_sw desc
+            order by result.falNumSw desc
         </if>
     </select>
     <select id="getQgrkCount" parameterType="java.lang.String" resultType="java.lang.String" >

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

@@ -1323,7 +1323,15 @@ public class YpbgServiceImpl implements IYpbgService {
 			 */
 			resultStr="<p style=\"font-size: 21px;text-indent:50px; font-family: 仿宋\">"+month+"月，全国共发一案杀死多人案件"+maZdswCount+"起，" +
 				"同比"+maZdswBdlUp+maZdswBdl+hbstr+
-				"。从发案原因看，"+zadjStr+"。从发案省份看，<b>"+zdswfasf1+"</b>。</p>";
+				"。";
+			if (!StringUtils.isEmpty(zadjStr)){
+				resultStr += "从发案原因看，"+zadjStr+"。";
+			}
+			if (!StringUtils.isEmpty(zdswfasf1)){
+				resultStr += "从发案省份看，<b>"+zdswfasf1+"</b>。";
+			}
+			resultStr += "</p>";
+
 		}else if("year".equals(qryType)){
 			/**
 			 * 1至2月全国共发一案杀死多人案件16起，
@@ -1333,8 +1341,16 @@ public class YpbgServiceImpl implements IYpbgService {
 			 * 发案较多的五个省份是：辽宁（3起）、吉林（2起）、山东（2起）、湖南（2起）、广西（2起）。
 			 */
 			resultStr="<p style=\"font-size: 21px;text-indent:50px; font-family: 仿宋\">1至"+month+"月，全国共发一案杀死多人案件"+maZdswCount+"起，" +
-				"同比"+maZdswBdlUp+maZdswBdl+"。其中，"+zadjStr+"。发案较多的五个省份是：<b>"+zdswfasf1+"</b>。</p>";
+				"同比"+maZdswBdlUp+maZdswBdl+"。";
+			if (!StringUtils.isEmpty(zadjStr)){
+				resultStr += "其中，"+zadjStr+"。";
+			}
+			if (!StringUtils.isEmpty(zdswfasf1)){
+				resultStr += "发案较多的五个省份是：<b>"+zdswfasf1+"</b>。";
+			}
+			resultStr += "</p>";
 		}
+
 		return resultStr;
 	}
 	@Override