修改研判报告附件

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

@@ -1055,12 +1055,15 @@ public class YpbgServiceImpl implements IYpbgService {
 		//同比发案变动趋势
 		String maFaBdlraise="减少";
 		if (0 != snmaFaCount) {
+			maFabds=Math.abs(maFaCount - snmaFaCount);
+			maFaBdl = NumberUtil.getPercent(maFabds, snmaFaCount);
 			if (maFaCount > snmaFaCount) {
 				maFaBdlUp = "上升";
 				maFaBdlraise="增加";
+			}else if (maFaCount == snmaFaCount){
+				maFaBdlUp = "一致";
+				maFaBdl = "";
 			}
-			maFabds=Math.abs(maFaCount - snmaFaCount);
-			maFaBdl = NumberUtil.getPercent(maFabds, snmaFaCount);
 		}
 		//环比时间 前一个时间段的发案数
 		String hbKssj = DateUtil.getHbKssj(ori_larqQssj,ori_larqJssj);
@@ -1076,11 +1079,14 @@ public class YpbgServiceImpl implements IYpbgService {
 		//环比发案变动趋势
 		String maFaHbBdlUp="下降";
 		if (0 != hbMaFaCount) {
+			maFaHbBds=Math.abs(maFaCount - hbMaFaCount);
+			maFaHbBdl = NumberUtil.getPercent(maFaHbBds, hbMaFaCount);
 			if (maFaCount > hbMaFaCount) {
 				maFaHbBdlUp = "上升";
+			}else if (maFaCount == hbMaFaCount) {
+				maFaHbBdlUp = "一致";
+				maFaHbBdl = "";
 			}
-			maFaHbBds=Math.abs(maFaCount - hbMaFaCount);
-			maFaHbBdl = NumberUtil.getPercent(maFaHbBds, hbMaFaCount);
 		}
 		//按案发地分组
 		Map<String, String> levMap = StringUtil.getDwLevCode(unitcode, "B");
@@ -1153,10 +1159,13 @@ public class YpbgServiceImpl implements IYpbgService {
 		//同比发案变动趋势
 		String maFaBdlUp2="下降";
 		if (0 != snmaFaCount2) {
+			maFaBdl2 = NumberUtil.getPercent(Math.abs(bnmaFaCount - snmaFaCount2), snmaFaCount2);
 			if (bnmaFaCount > snmaFaCount2) {
 				maFaBdlUp2 = "上升";
+			}else if (bnmaFaCount == snmaFaCount2) {
+				maFaBdlUp2 = "一致";
+				maFaBdl2 = "";
 			}
-			maFaBdl2 = NumberUtil.getPercent(Math.abs(bnmaFaCount - snmaFaCount2), snmaFaCount2);
 		}
 		//全国每十万人发案数
 		int qgrs = ypbgMapper.getRks("01000000000");//获取全国人口数
@@ -1268,10 +1277,13 @@ public class YpbgServiceImpl implements IYpbgService {
 		String maZdswBdl="";
 		String maZdswBdlUp="下降";
 		if (0 != snmaZdswCount) {
+			maZdswBdl = NumberUtil.getPercent(Math.abs(maZdswCount - snmaZdswCount), snmaZdswCount);
 			if (maZdswCount > snmaZdswCount) {
 				maZdswBdlUp = "上升";
+			}else if (maZdswCount == snmaZdswCount) {
+				maZdswBdlUp = "一致";
+				maZdswBdl = "";
 			}
-			maZdswBdl = NumberUtil.getPercent(Math.abs(maZdswCount - snmaZdswCount), snmaZdswCount);
 		}
 		String hbstr="";
 		if("month".equals(qryType)){
@@ -1284,10 +1296,13 @@ public class YpbgServiceImpl implements IYpbgService {
 			String maZdswHbBdl="";//命案重大死亡环比变动率
 			String maZdswHbBdlUp="下降";
 			if (0 != hbmaZdswCount) {
+				maZdswHbBdl = NumberUtil.getPercent(Math.abs(maZdswCount - hbmaZdswCount), hbmaZdswCount);
 				if (maZdswCount > hbmaZdswCount) {
 					maZdswHbBdlUp = "上升";
+				}else if (maZdswCount == hbmaZdswCount) {
+					maZdswHbBdlUp = "一致";
+					maZdswHbBdl = "";
 				}
-				maZdswHbBdl = NumberUtil.getPercent(Math.abs(maZdswCount - hbmaZdswCount), hbmaZdswCount);
 			}
 			hbstr="，环比"+maZdswHbBdlUp+maZdswHbBdl;
 		}