损失价值修改

src/main/java/org/springblade/founder/tjfx/mapper/TjfxMapper.java

@@ -45,7 +45,7 @@ public interface TjfxMapper {
 	 * @param ajtjParam
 	 * @return
 	 */
-	int getDxssjes(AjtjParam ajtjParam);
+	Double getDxssjes(AjtjParam ajtjParam);
 
 	/**
 	 * 电信网络诈骗损失金额数分月分析
@@ -74,4 +74,5 @@ public interface TjfxMapper {
 	 */
 	List<TbStAsj> getSsjeTs(AjtjParam ajtjParam);
 
+	int getSsjeTsCount(AjtjParam ajtjParam);
 }

src/main/java/org/springblade/founder/tjfx/mapper/TjfxMapper.xml

@@ -139,7 +139,7 @@
     </select>
 
     <!--电信网络诈骗损失金额数-->
-    <select id="getDxssjes" resultType="java.lang.Integer">
+    <select id="getDxssjes" resultType="java.lang.Double">
 
         SELECT nvl(sum(asj.SSJZRMBY),0)
         FROM tb_st_asj asj
@@ -189,7 +189,7 @@
         SELECT a.* , rownum r FROM (]]>
         select
         asj.asjbh as asjbh,
-        (SELECT name FROM code_gxs WHERE code = asj.ladw_Gajgjgdm) AS ladwGajgmc,
+        asj.ladw_Gajgmc AS ladwGajgmc,
         asj.ZCZJ_ZXSJ01 AS zczjZxsj01,
         asj.larq AS larq,
         asj.asjfssj_Asjfskssj AS asjfssjAsjfskssj,
@@ -199,7 +199,7 @@
         asj.jyaq AS jyaq,
         asj.SSJZRMBY as ssjzrmby
         from TB_ST_ASJ asj
-        where asj.xxsc_pdbz='0'
+        where asj.xxsc_pdbz='0' and  asj.SSJZRMBY>0
         <include refid="aj-condition"/>
         <include refid="common-condition"/>
         order by asj.larq desc
@@ -208,4 +208,10 @@
         WHERE r > #{ begin } ]]>
     </select>
 
+    <select id="getSsjeTsCount" resultType="java.lang.Integer">
+        select count(1) from tb_st_asj asj
+        where asj.xxsc_pdbz='0' and  asj.SSJZRMBY>0
+        <include refid="aj-condition"/>
+        <include refid="common-condition"/>
+    </select>
 </mapper>

src/main/java/org/springblade/founder/tjfx/service/impl/TjfxServiceImpl.java

@@ -15,6 +15,8 @@ import org.springblade.founder.utils.Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -147,13 +149,16 @@ public class TjfxServiceImpl implements TjfxService {
 			AjtjParam param = new AjtjParam();
 			param.setWnsj(DateUtil.getLastYear(curr.getMonthName()));
 			param.setType(type);
-			int wnsj = tjfxMapper.getDxssjes(param);
-			String tb = NumberUtil.getTbhb(Integer.parseInt(curr.getFaNum()),wnsj);
+			Double wnsj = tjfxMapper.getDxssjes(param);
+			String tb = NumberUtil.getTbhb(Integer.parseInt(curr.getFaNum()),wnsj.intValue());
 			result.get(result.size()-1).setTb("同比"+tb);
 			if (result.size() > 1) {
 				result.get(result.size() - 1).setHb("环比" + hb);
 			}
 		}
+		for (AjtjResult rs:result){
+			rs.setFaNum(getZwjeBySz(Double.parseDouble(rs.getFaNum())));
+		}
 		return R.ok().data("result", result);
 	}
 
@@ -165,23 +170,33 @@ public class TjfxServiceImpl implements TjfxService {
 		jntj.setType("jn");
 		LianTj qntj=new LianTj();
 		qntj.setType("qn");
-		int jn= tjfxMapper.getDxssjes(ajtjParam);
+		Double jn= tjfxMapper.getDxssjes(ajtjParam);
 
 		AjtjParam qntjParam = new AjtjParam();
 		qntjParam.setUnitcodeList2(ajtjParam.getUnitcodeList(),"");
 		qntjParam.setLarqQssj(DateUtil.getLastYearSFM(ajtjParam.getLarqQssj()));
 		qntjParam.setLarqJssj(DateUtil.getLastYearSFM(ajtjParam.getLarqJssj()));
 		qntjParam.setType(type);
-		Integer qn = tjfxMapper.getDxssjes(qntjParam);
-		qntj.setLiaCount(qn);
-		jntj.setLiaCount(jn);
+		Double qn = tjfxMapper.getDxssjes(qntjParam);
+		qntj.setLiaCount(Integer.valueOf(getZwjeBySz(qn)));
+		jntj.setLiaCount(Integer.valueOf(getZwjeBySz(jn)));
 		//计算百分比
-		jntj.setLatbbfb("同比"+NumberUtil.getTbhb(jn,qn));
+		jntj.setLatbbfb("同比"+NumberUtil.getTbhb(jn.intValue(),qn.intValue()));
 		tj.add(qntj);
 		tj.add(jntj);
 		return tj;
 	}
 
+	private String getZwjeBySz(double sajeZs) {
+		DecimalFormat df = new DecimalFormat("0.##");
+		df.setRoundingMode(RoundingMode.HALF_UP);
+		String zwje;
+
+			double yy = sajeZs / 100000000;
+			zwje = df.format(yy) ;
+
+		return zwje;
+	}
 	@Override
 	public R getFats(AjtjParam ajtjParam) {
 		int count = tjfxMapper.getAjTsCount(ajtjParam);
@@ -211,7 +226,7 @@ public class TjfxServiceImpl implements TjfxService {
 
 	@Override
 	public R getSsjeTs(AjtjParam ajtjParam) {
-		int count = tjfxMapper.getAjTsCount(ajtjParam);
+		int count = tjfxMapper.getSsjeTsCount(ajtjParam);
 		Utils.setOraclePageParams(ajtjParam);
 		List<TbStAsj> ajTs = tjfxMapper.getSsjeTs(ajtjParam);
 		return R.ok().data("rows",ajTs).data("total",count);