|
@@ -2171,35 +2171,42 @@ public class GenreSetPushService {
|
|
|
newpointmap.put("gf_y_jhfdl",StringUtils.round(gf_y_jhfdl,2));
|
|
|
|
|
|
newpointmap.put("gf_n_jhfdl",StringUtils.round(gf_n_jhfdl,2));
|
|
|
-
|
|
|
- if(jr_gf_zjrl!=0)
|
|
|
- {
|
|
|
- double gffhl= new BigDecimal(jr_gf_sjgl).divide(new BigDecimal(jr_gf_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
-
|
|
|
- newpointmap.put("gf_fhl",StringUtils.round(gffhl*100,2));
|
|
|
- }else
|
|
|
- {
|
|
|
- newpointmap.put("gf_fhl",0.0);
|
|
|
- }
|
|
|
- if(jr_fd_zjrl!=0)
|
|
|
- {
|
|
|
- double fdfhl= new BigDecimal(jr_fd_sjgl).divide(new BigDecimal(jr_fd_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
-
|
|
|
- newpointmap.put("fd_fhl",StringUtils.round(fdfhl*100,2));
|
|
|
- }else
|
|
|
- {
|
|
|
- newpointmap.put("fd_fhl",0.0);
|
|
|
- }
|
|
|
-
|
|
|
- if((jr_gf_zjrl+jr_fd_zjrl)!=0)
|
|
|
- {
|
|
|
- double fdfhl= new BigDecimal(jr_gf_sjgl+jr_fd_sjgl).divide(new BigDecimal(jr_gf_zjrl+jr_fd_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
-
|
|
|
- newpointmap.put("qjny_fhl",StringUtils.round(fdfhl*100,2));
|
|
|
- }else
|
|
|
- {
|
|
|
- newpointmap.put("qjny_fhl",0.0);
|
|
|
- }
|
|
|
+
|
|
|
+ newpointmap.put("gf_fhl",StringUtils.round(jr_gf_sjgl,2));
|
|
|
+
|
|
|
+ newpointmap.put("fd_fhl",StringUtils.round(jr_fd_sjgl,2));
|
|
|
+
|
|
|
+
|
|
|
+ newpointmap.put("qjny_fhl",StringUtils.round(jr_gf_sjgl+jr_fd_sjgl,2));
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
map.put("newpointmap",newpointmap);
|
|
|
|