Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java

@@ -4,7 +4,6 @@ import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.GovTokenDto;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.DateUtils;

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java

@@ -48,6 +48,11 @@ public class ProjectCategoryResultDTO implements Serializable {
      */
     private Integer closedProjectTotal;
 
+    /**
+     * 所有项目总数
+     */
+    private Integer allProjectTotal;
+
     /**
      * 总数占比
      */
@@ -67,8 +72,9 @@ public class ProjectCategoryResultDTO implements Serializable {
         this.categoryName = "";
         this.projectTotal = NumConstant.ZERO;
         this.closedProjectTotal = NumConstant.ZERO;
-        this.totalRatio = "";
-        this.closedRatio = "";
+        this.totalRatio = "0.00%";
+        this.closedRatio = "0.00%";
         this.children = new ArrayList<>();
+        this.allProjectTotal = NumConstant.ZERO;
     }
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -284,6 +284,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
             endCategoryList.forEach(e -> {
                 e.setTotalRatio(ratio(e.getProjectTotal(), finalTotal));
                 e.setClosedRatio(ratio(e.getClosedProjectTotal(),e.getProjectTotal()));
+                e.setAllProjectTotal(finalTotal);
             });
         }else {
             Integer endTotal = screenProjectOrgDailyDao.selectProjectTotalByAgency(customerId, endTime, orgId);
@@ -302,6 +303,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
             endCategoryList.forEach(e -> {
                 e.setTotalRatio(ratio(e.getProjectTotal(), finalTotal));
                 e.setClosedRatio(ratio(e.getClosedProjectTotal(),e.getProjectTotal()));
+                e.setAllProjectTotal(finalTotal);
             });
         }
         List<ProjectCategoryResultDTO> finalEndCategoryList = endCategoryList;
@@ -310,10 +312,12 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
                 r.setTotalRatio(e.getTotalRatio());r.setClosedRatio(e.getClosedRatio());
                 r.setProjectTotal(e.getProjectTotal());
                 r.setClosedProjectTotal(e.getClosedProjectTotal());
+                r.setAllProjectTotal(e.getAllProjectTotal());
             });
             r.getChildren().forEach(son -> finalEndCategoryList.stream().filter(e -> son.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> {
                 son.setTotalRatio(e.getTotalRatio());son.setClosedRatio(e.getClosedRatio());
                 son.setProjectTotal(e.getProjectTotal());son.setClosedProjectTotal(e.getClosedProjectTotal());
+                son.setAllProjectTotal(e.getAllProjectTotal());
             }));
         });
         // 排序

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java

@@ -195,7 +195,7 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl<ScreenProj
         agencyInfos.forEach(a -> {
             a.setDateId(dateId);
             projectOrgDaily.forEach(p -> {
-                if (a.getAreaCode().equals(p.getAreaCode())){
+                if (a.getOrgId().equals(p.getOrgId())){
                     a.setBadTotal(p.getBadTotal() + a.getBadTotal());
                     a.setEvaluateTotal(p.getEvaluateTotal() + a.getEvaluateTotal());
                     a.setGoodTotal(p.getGoodTotal() + a.getGoodTotal());