From a7002e25ec105e5f73c27f91944f1c0b4991c355 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 30 十二月 2021 14:23:41 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java
index 7c93d7a..d513916 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java
@@ -53,25 +53,28 @@
BigScreenStatisticAgeGender age = bigScreenDAO.age(bigScreenStatisticAgeGenderDTO);
BigScreenStatisticAgeGender ageGender = new BigScreenStatisticAgeGender();
- BeanUtils.copyProperties(age, ageGender);
- ageGender.setManTotal(gender.getManTotal());
- ageGender.setWomeTotal(gender.getWomeTotal());
+ if(age!=null){
+ BeanUtils.copyProperties(age, ageGender);
+ ageGender.setManTotal(gender.getManTotal());
+ ageGender.setWomeTotal(gender.getWomeTotal());
- /**
- * 计算百分比
- */
- Double manPer = 1.0 * ageGender.getManTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
- Double womenPer = 1.0 * ageGender.getWomeTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
- ageGender.setManPer(manPer);
- ageGender.setWomenPer(womenPer);
+ /**
+ * 计算百分比
+ */
+ Double manPer = 1.0 * ageGender.getManTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
+ Double womenPer = 1.0 * ageGender.getWomeTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
+ ageGender.setManPer(manPer);
+ ageGender.setWomenPer(womenPer);
- Integer memTotal = ageGender.getThirtyTotal() + ageGender.getSixtyTotal() + ageGender.getBiggerTotal();
- Double thrPer = 1.0 * ageGender.getThirtyTotal() / memTotal;
- Double sixPer = 1.0 * ageGender.getSixtyTotal() / memTotal;
- Double biggerPer = 1.0 * ageGender.getBiggerTotal() / memTotal;
- ageGender.setThirtyPer(thrPer);
- ageGender.setSixtyPer(sixPer);
- ageGender.setBiggerPer(biggerPer);
+ Integer memTotal = ageGender.getThirtyTotal() + ageGender.getSixtyTotal() + ageGender.getBiggerTotal();
+ Double thrPer = 1.0 * ageGender.getThirtyTotal() / memTotal;
+ Double sixPer = 1.0 * ageGender.getSixtyTotal() / memTotal;
+ Double biggerPer = 1.0 * ageGender.getBiggerTotal() / memTotal;
+ ageGender.setThirtyPer(thrPer);
+ ageGender.setSixtyPer(sixPer);
+ ageGender.setBiggerPer(biggerPer);
+ }
+
return R.ok(ageGender);
}
--
Gitblit v1.7.1