Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserIncrTrendFormDTO.java

@@ -13,15 +13,18 @@ import java.io.Serializable;
  */
 @Data
 public class UserIncrTrendFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
     /**
      * reg：注册居民 parti：参与用户，如果值为null，默认为reg
      */
-    @NotBlank(message = "regOrPartiFlag不能为空")
+    @NotBlank(message = "regOrPatiFlag不能为空", groups = {AddUserInternalGroup.class})
-    private String regOrPartiFlag;
+    private String regOrPatiFlag;
 
     /**
      * day：日维度 | month：月维度 | (周、季、年)…
      */
-    @NotBlank(message = "type不能为空")
+    @NotBlank(message = "type不能为空", groups = {AddUserInternalGroup.class})
     private String type;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubAgencyFormDTO.java

@@ -14,12 +14,15 @@ import java.io.Serializable;
 @Data
 public class UserSubAgencyFormDTO implements Serializable {
     private static final long serialVersionUID = -4558978951554887536L;
+    public interface AddUserInternalGroup {
+    }
+
     /**
      * reg：注册居民 parti：参与用户，如果值为null，默认为reg
      */
-    @NotBlank(message = "regOrPartiFlag不能为空")
+    @NotBlank(message = "regOrPartiFlag不能为空",groups = {AddUserInternalGroup.class})
     private String regOrPartiFlag;
 
-    @NotBlank(message = "查询日期不能为空")
+    @NotBlank(message = "查询日期不能为空",groups = {AddUserInternalGroup.class})
     private String dateId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSubGridFormDTO.java

@@ -14,12 +14,16 @@ import java.io.Serializable;
 @Data
 public class UserSubGridFormDTO implements Serializable {
     private static final long serialVersionUID = -1815903503939673149L;
+
+    public interface AddUserInternalGroup {
+    }
+
     /**
      * reg：注册居民 parti：参与用户，如果值为null，默认为reg
      */
-    @NotBlank(message = "regOrPartiFlag不能为空")
+    @NotBlank(message = "regOrPartiFlag不能为空", groups = {AddUserInternalGroup.class})
     private String regOrPartiFlag;
 
-    @NotBlank(message = "查询日期不能为空")
+    @NotBlank(message = "查询日期不能为空", groups = {AddUserInternalGroup.class})
     private String dateId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/user/UserSummaryInfoFormDTO.java

@@ -14,10 +14,11 @@ import java.io.Serializable;
 @Data
 public class UserSummaryInfoFormDTO implements Serializable {
     private static final long serialVersionUID = -1802471335671321322L;
-
+    public interface AddUserInternalGroup {
+    }
     /**
      * reg：注册居民 parti：参与用户，如果值为null，默认为reg
      */
-    @NotBlank(message = "regOrPartiFlag不能为空")
+    @NotBlank(message = "regOrPartiFlag不能为空",groups = {AddUserInternalGroup.class})
     private String regOrPartiFlag;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserSummaryInfoResultDTO.java

@@ -19,7 +19,7 @@ public class UserSummaryInfoResultDTO implements Serializable {
      * 数据更新至yyyy.MM.dd
      */
     private String currentDate;
-
+    private String dateId;
     /**
      * 注册居民数
      */

epmet-module/data-report/data-report-client/src/main/java/com/epmet/issue/constant/IssueConstant.java

@@ -7,7 +7,7 @@ package com.epmet.issue.constant;
  */
 public interface IssueConstant {
 	String MONTH = "month";
-	String DATE = "date";
+	String DATE = "day";
 	String VOTING_NAME = "表决中";
 	String SHIFT_NAME = "已转项目";
 	String CLOSED_NAME = "已关闭";

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java

@@ -6,7 +6,7 @@ package com.epmet.project.constant;
  **/
 public interface ProjectConstant {
 
-    String DATE = "date";
+    String DAY = "day";
     String MONTH = "month";
 
     /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/project/ProjectController.java

@@ -72,7 +72,7 @@ public class ProjectController {
     @PostMapping("incrtrend")
     public Result<List<ProjectIncrTrendResultDTO>> incrTrend(@LoginUser TokenDto tokenDto, @RequestBody ProjectIncrTrendFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ProjectIncrTrendFormDTO.ProjectIncr.class);
-        if (!ProjectConstant.DATE.equals(formDTO.getType()) && !ProjectConstant.MONTH.equals(formDTO.getType())) {
+        if (!ProjectConstant.DAY.equals(formDTO.getType()) && !ProjectConstant.MONTH.equals(formDTO.getType())) {
             throw new RenException(ProjectConstant.TYPE_EXCEPTION);
         }
         return new Result<List<ProjectIncrTrendResultDTO>>().ok(projectService.getProjectIncrTrend(tokenDto, formDTO));

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java

@@ -40,7 +40,7 @@ public class UserAnalysisController {
      **/
     @PostMapping("summaryinfo")
     public Result<UserSummaryInfoResultDTO> summaryInfo(@RequestBody UserSummaryInfoFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO,UserSummaryInfoFormDTO.AddUserInternalGroup.class);
         UserSummaryInfoResultDTO userSummaryInfoResultDTO = userService.summaryInfo(formDTO);
         return new Result<UserSummaryInfoResultDTO>().ok(userSummaryInfoResultDTO);
     }
@@ -54,7 +54,7 @@ public class UserAnalysisController {
      **/
     @PostMapping("subagency")
     public Result<List<UserSubAgencyResultDTO>> subAgency(@RequestBody UserSubAgencyFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO,UserSubAgencyFormDTO.AddUserInternalGroup.class);
         List<UserSubAgencyResultDTO> userSubAgencyResultDTO = userService.subAgency(formDTO);
         return new Result<List<UserSubAgencyResultDTO>>().ok(userSubAgencyResultDTO);
     }
@@ -68,7 +68,7 @@ public class UserAnalysisController {
      **/
     @PostMapping("subgrid")
     public Result<List<UserSubGridResultDTO>> subGrid(@RequestBody UserSubGridFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, UserSubGridFormDTO.AddUserInternalGroup.class);
         List<UserSubGridResultDTO> userSubGridResultDTO = userService.subGrid(formDTO);
         return new Result<List<UserSubGridResultDTO>>().ok(userSubGridResultDTO);
     }
@@ -82,7 +82,7 @@ public class UserAnalysisController {
      **/
     @PostMapping("incrtrend")
     public Result<List<UserIncrTrendResultDTO>> incrTrend(@RequestBody UserIncrTrendFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, UserIncrTrendFormDTO.AddUserInternalGroup.class);
         List<UserIncrTrendResultDTO> userIncrTrendResultDTO = userService.incrTrend(formDTO);
         return new Result<List<UserIncrTrendResultDTO>>().ok(userIncrTrendResultDTO);
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java

@@ -101,7 +101,7 @@ public interface UserAnalysisDao {
      * @return java.util.List<com.epmet.dto.result.user.UserIncrTrendResDTO>
      * @param myAgencyId
      * @author yinzuomei
-     * @description
+     * @description 注册用户：机关、日增量折现图 近90天
      * @Date 2020/6/23 11:24
      **/
     List<UserIncrTrendResDTO> selectRegDayIncr(@Param("agencyId")String myAgencyId);
@@ -110,7 +110,7 @@ public interface UserAnalysisDao {
      * @return java.util.List<com.epmet.dto.result.user.UserIncrTrendResDTO>
      * @param myAgencyId
      * @author yinzuomei
-     * @description
+     * @description 注册用户：机关、月增量折线图 近12个月包含当前月
      * @Date 2020/6/23 11:24
      **/
     List<UserIncrTrendResDTO> selectRegMonthIncr(@Param("agencyId")String myAgencyId);
@@ -119,7 +119,7 @@ public interface UserAnalysisDao {
      * @return java.util.List<com.epmet.dto.result.user.UserIncrTrendResDTO>
      * @param myAgencyId
      * @author yinzuomei
-     * @description
+     * @description 参与用户：机关、日增量折线图 近90天
      * @Date 2020/6/23 11:24
      **/
     List<UserIncrTrendResDTO> selectParticipationUserDayIncr(@Param("agencyId")String myAgencyId);
@@ -128,7 +128,7 @@ public interface UserAnalysisDao {
      * @return java.util.List<com.epmet.dto.result.user.UserIncrTrendResDTO>
      * @param myAgencyId
      * @author yinzuomei
-     * @description
+     * @description 参与用户：机关、月增量插线图  近12个月 包含当前月
      * @Date 2020/6/23 11:24
      **/
     List<UserIncrTrendResDTO> selectParticipationUserMonthIncr(@Param("agencyId") String myAgencyId);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.issue.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dao.issue.IssueDao;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
@@ -17,6 +18,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,15 +37,29 @@ public class IssueServiceImpl implements IssueService {
 		IssueSummaryInfoResultDTO result = new IssueSummaryInfoResultDTO();
 		String agencyId = getAgencyId(tokenDto);
 		IssueDataDTO data = issueDao.selectAgencyInfo(agencyId);
-		result.setAgencyId(agencyId);
+		if (null == data) {
-		result.setDateName(data.getDateName());
+			//获取当前日期前一天
-		result.setIssueTotal(data.getIssueTotal());
+			Date date = DateUtils.getBeforeDay(new Date());
-		result.setVotingTotal(data.getVotingTotal());
+			result.setAgencyId(agencyId);
-		result.setShiftProjectTotal(data.getShiftProjectTotal());
+			result.setDateName(DateUtils.format(date, "yyyy.MM.dd"));
-		result.setClosedTotal(data.getClosedTotal());
+			result.setIssueTotal(NumConstant.ZERO);
-		result.setVotingRatio(toRatio(data.getVotingPercent()));
+			result.setVotingTotal(NumConstant.ZERO);
-		result.setShiftProjectRatio(toRatio(data.getShiftProjectPercent()));
+			result.setShiftProjectTotal(NumConstant.ZERO);
-		result.setClosedRatio(toRatio(data.getClosedPercent()));
+			result.setClosedTotal(NumConstant.ZERO);
+			result.setVotingRatio("0%");
+			result.setShiftProjectRatio("0%");
+			result.setClosedRatio("0%");
+		} else {
+			result.setAgencyId(agencyId);
+			result.setDateName(data.getDateName());
+			result.setIssueTotal(data.getIssueTotal());
+			result.setVotingTotal(data.getVotingTotal());
+			result.setShiftProjectTotal(data.getShiftProjectTotal());
+			result.setClosedTotal(data.getClosedTotal());
+			result.setVotingRatio(toRatio(data.getVotingPercent()));
+			result.setShiftProjectRatio(toRatio(data.getShiftProjectPercent()));
+			result.setClosedRatio(toRatio(data.getClosedPercent()));
+		}
 		return result;
 	}
 
@@ -52,21 +68,39 @@ public class IssueServiceImpl implements IssueService {
 		List<IssueSummaryPieResultDTO> list = new ArrayList<>();
 		String agencyId = getAgencyId(tokenDto);
 		IssueDataDTO data = issueDao.selectAgencyInfo(agencyId);
-		IssueSummaryPieResultDTO voting = new IssueSummaryPieResultDTO();
+		if (null == data) {
-		voting.setName(IssueConstant.VOTING_NAME);
+			IssueSummaryPieResultDTO voting = new IssueSummaryPieResultDTO();
-		voting.setValue(data.getVotingTotal());
+			voting.setName(IssueConstant.VOTING_NAME);
-		voting.setRatio(toRatio(data.getVotingPercent()));
+			voting.setValue(NumConstant.ZERO);
-		list.add(voting);
+			voting.setRatio("0%");
-		IssueSummaryPieResultDTO shift = new IssueSummaryPieResultDTO();
+			list.add(voting);
-		shift.setName(IssueConstant.SHIFT_NAME);
+			IssueSummaryPieResultDTO shift = new IssueSummaryPieResultDTO();
-		shift.setValue(data.getShiftProjectTotal());
+			shift.setName(IssueConstant.SHIFT_NAME);
-		shift.setRatio(toRatio(data.getShiftProjectPercent()));
+			shift.setValue(NumConstant.ZERO);
-		list.add(shift);
+			shift.setRatio("0%");
-		IssueSummaryPieResultDTO closed = new IssueSummaryPieResultDTO();
+			list.add(shift);
-		closed.setName(IssueConstant.CLOSED_NAME);
+			IssueSummaryPieResultDTO closed = new IssueSummaryPieResultDTO();
-		closed.setValue(data.getClosedTotal());
+			closed.setName(IssueConstant.CLOSED_NAME);
-		closed.setRatio(toRatio(data.getClosedPercent()));
+			closed.setValue(NumConstant.ZERO);
-		list.add(closed);
+			closed.setRatio("0%");
+			list.add(closed);
+		} else {
+			IssueSummaryPieResultDTO voting = new IssueSummaryPieResultDTO();
+			voting.setName(IssueConstant.VOTING_NAME);
+			voting.setValue(data.getVotingTotal());
+			voting.setRatio(toRatio(data.getVotingPercent()));
+			list.add(voting);
+			IssueSummaryPieResultDTO shift = new IssueSummaryPieResultDTO();
+			shift.setName(IssueConstant.SHIFT_NAME);
+			shift.setValue(data.getShiftProjectTotal());
+			shift.setRatio(toRatio(data.getShiftProjectPercent()));
+			list.add(shift);
+			IssueSummaryPieResultDTO closed = new IssueSummaryPieResultDTO();
+			closed.setName(IssueConstant.CLOSED_NAME);
+			closed.setValue(data.getClosedTotal());
+			closed.setRatio(toRatio(data.getClosedPercent()));
+			list.add(closed);
+		}
 		return list;
 	}
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -133,7 +133,7 @@ public class ProjectServiceImpl implements ProjectService {
         String agencyId = getLoginUserDetails(tokenDto);
 
         //2:查询机关过去九十天日统计数据(sql降序取前九十条)
-        if (ProjectConstant.DATE.equals(formDTO.getType())) {
+        if (ProjectConstant.DAY.equals(formDTO.getType())) {
             resultList = projectDao.selectIncrTrendDaily(agencyId);
         }
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -46,7 +47,7 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private UserAnalysisDao userAnalysisDao;
-
+    DecimalFormat decimalFormat = new DecimalFormat("0.00");
     /**
      * @return java.lang.String
      * @param
@@ -91,8 +92,10 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
         if(null!=userSummaryInfoResultDTO){
             userSummaryInfoResultDTO.setCurrentDate(DateUtils.getxAxisDatePattern(userSummaryInfoResultDTO.getCurrentDate(),"."));
             //提取出工具类
-            userSummaryInfoResultDTO.setPartymemberProportion(userSummaryInfoResultDTO.getPartymemberProportionValue().stripTrailingZeros().toPlainString());
+            String partyMemberProStr=decimalFormat.format(userSummaryInfoResultDTO.getPartymemberProportionValue());
-            userSummaryInfoResultDTO.setWarmHeartedProportion(userSummaryInfoResultDTO.getWarmHeartedProportionValue().stripTrailingZeros().toPlainString());
+            userSummaryInfoResultDTO.setPartymemberProportion(partyMemberProStr.concat("%"));
+            String warmProStr=decimalFormat.format(userSummaryInfoResultDTO.getWarmHeartedProportionValue());
+            userSummaryInfoResultDTO.setWarmHeartedProportion(warmProStr.concat("%"));
         }
         logger.info(String.format("查询用户汇总信息返参%s",JSON.toJSONString(userSummaryInfoResultDTO)));
        return userSummaryInfoResultDTO;
@@ -303,16 +306,16 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             return new ArrayList<>();
         }
         List<UserIncrTrendResDTO> list=new ArrayList<>();
-        if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPartiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) {
+        if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) {
             //注册用户数、日
             list=userAnalysisDao.selectRegDayIncr(myAgencyId);
-        } else if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPartiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) {
+        } else if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) {
             //注册用户数、月
             list=userAnalysisDao.selectRegMonthIncr(myAgencyId);
-        } else if (UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPartiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) {
+        } else if (UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) {
             //参与用户数、日
             list=userAnalysisDao.selectParticipationUserDayIncr(myAgencyId);
-        } else if (UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPartiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) {
+        } else if (UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPatiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) {
             //参与用户数、月
             list=userAnalysisDao.selectParticipationUserMonthIncr(myAgencyId);
         } else {

epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -13,7 +13,7 @@
                CLOSED_TOTAL,
                CLOSED_PERCENT,
                MAX(DATE_ID) AS DATE_ID,
-               DATE_FORMAT(DATE_ID, '%Y.%m.%d') AS DATE_NAME
+               DATE_FORMAT(MAX(DATE_ID), '%Y.%m.%d') AS DATE_NAME
         FROM
             fact_issue_agency_daily fiad
         WHERE DEL_FLAG = '0'

epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -33,12 +33,13 @@
         SELECT
             m.id,
             m.DATE_ID AS currentDate,
+            m.DATE_ID AS dateId,
             m.REG_TOTAL AS regTotal,
             0 AS partiTotal,
             m.PARTYMEMBER_TOTAL AS partymemberTotal,
-            m.PARTYMEMBER_PROPORTION*100 AS partymemberProportion,
+            m.PARTYMEMBER_PROPORTION*100 AS partymemberProportionValue,
             m.WARM_HEARTED_TOTAL AS warmHeartedTotal,
-            m.WARM_HEARTED_PROPORTION*100 AS warmHeartedProportion
+            m.WARM_HEARTED_PROPORTION*100 AS warmHeartedProportionValue
         FROM
             fact_reg_user_agency_daily m
         WHERE
@@ -55,12 +56,13 @@
         SELECT
             m.id,
             m.DATE_ID AS currentDate,
+            m.DATE_ID AS dateId,
             m.REG_TOTAL AS regTotal,
             0 AS partiTotal,
             m.PARTYMEMBER_TOTAL AS partymemberTotal,
-            m.PARTYMEMBER_PROPORTION*100 AS partymemberProportion,
+            m.PARTYMEMBER_PROPORTION*100 AS partymemberProportionValue,
             m.WARM_HEARTED_TOTAL AS warmHeartedTotal,
-            m.WARM_HEARTED_PROPORTION*100 AS warmHeartedProportion
+            m.WARM_HEARTED_PROPORTION*100 AS warmHeartedProportionValue
         FROM
             fact_participation_user_agency_daily m
         WHERE
@@ -75,42 +77,42 @@
     <select id="selectParticipationSubAgencyRes" parameterType="map"
             resultType="com.epmet.dto.result.user.UserSubAgencyResDTO">
         SELECT
-            m.AGENCY_ID,
+            DA.ID AS AGENCY_ID,
             da.AGENCY_NAME,
             m.REG_TOTAL,
             M.RESI_TOTAL,
             M.WARM_HEARTED_TOTAL,
             M.PARTYMEMBER_TOTAL
         FROM
-            fact_participation_user_agency_daily m
+            dim_agency da
-            LEFT JOIN dim_agency da
+            LEFT JOIN fact_participation_user_agency_daily m
-            ON ( m.AGENCY_ID = da.ID
+            ON ( da.ID=m.AGENCY_ID
-                AND da.PID =#{agencyId}
+                and m.DEL_FLAG = '0'
-                AND da.DEL_FLAG = '0' )
+                and m.DATE_ID=#{dateId}
-        WHERE
+                )
-            m.DEL_FLAG = '0'
+        WHERE da.DEL_FLAG = '0'
-            and m.DATE_ID=#{dateId}
+            AND da.PID =#{agencyId}
             order by m.REG_TOTAL desc
     </select>
 
     <!--  注册用户：子级机关用户分析，按日（date_id）查询  -->
     <select id="selectRegSubAgencyRes" parameterType="map" resultType="com.epmet.dto.result.user.UserSubAgencyResDTO">
-        	SELECT
+        SELECT
-            m.AGENCY_ID,
+            DA.ID AS AGENCY_ID,
             da.AGENCY_NAME,
             m.REG_TOTAL,
             M.RESI_TOTAL,
             M.WARM_HEARTED_TOTAL,
             M.PARTYMEMBER_TOTAL
         FROM
-            fact_reg_user_agency_daily m
+            dim_agency da
-            LEFT JOIN dim_agency da
+            LEFT JOIN fact_reg_user_agency_daily m
-            ON ( m.AGENCY_ID = da.ID
+            ON (  da.ID=m.AGENCY_ID
-                AND da.PID =#{agencyId}
+                and m.DEL_FLAG = '0'
-                AND da.DEL_FLAG = '0' )
+                and m.DATE_ID=#{dateId}
-        WHERE
+                )
-            m.DEL_FLAG = '0'
+        WHERE da.DEL_FLAG = '0'
-            and m.DATE_ID=#{dateId}
+            AND da.PID =#{agencyId}
             order by m.REG_TOTAL desc
     </select>
 
@@ -147,7 +149,7 @@
             AND m.AGENCY_ID = #{agencyId}
     </select>
 
-    <!--    -->
+    <!--  注册用户：机关、日增量折现图 近90天  -->
     <select id="selectRegDayIncr" parameterType="java.lang.String"
             resultType="com.epmet.dto.result.user.UserIncrTrendResDTO">
         SELECT
@@ -159,12 +161,12 @@
             fact_reg_user_agency_daily m
         WHERE
             m.DEL_FLAG = '0'
-            AND m.AGENCY_ID =#{myAgencyId}
+            AND m.AGENCY_ID =#{agencyId}
         ORDER BY
             m.DATE_ID DESC
             LIMIT 90
     </select>
-    <!--    -->
+    <!--  注册用户：机关、月增量折线图 近12个月包含当前月  -->
     <select id="selectRegMonthIncr" parameterType="java.lang.String"
             resultType="com.epmet.dto.result.user.UserIncrTrendResDTO">
         SELECT
@@ -176,13 +178,13 @@
             fact_reg_user_agency_monthly m
         WHERE
             m.DEL_FLAG = '0'
-            AND m.AGENCY_ID =#{myAgencyId}
+            AND m.AGENCY_ID =#{agencyId}
         ORDER BY
             m.MONTH_ID DESC
             LIMIT 12
     </select>
 
-    <!--    -->
+    <!--  参与用户：机关、日增量折线图 近90天  -->
     <select id="selectParticipationUserDayIncr" parameterType="java.lang.String"
             resultType="com.epmet.dto.result.user.UserIncrTrendResDTO">
         SELECT
@@ -194,12 +196,12 @@
             fact_participation_user_agency_daily m
         WHERE
             m.DEL_FLAG = '0'
-            AND m.AGENCY_ID =#{myAgencyId}
+            AND m.AGENCY_ID =#{agencyId}
         ORDER BY
             m.DATE_ID DESC
             LIMIT 90
     </select>
-    <!--    -->
+    <!--  参与用户：机关、月增量插线图  近12个月 包含当前月-->
     <select id="selectParticipationUserMonthIncr" parameterType="java.lang.String"
             resultType="com.epmet.dto.result.user.UserIncrTrendResDTO">
         SELECT
@@ -211,7 +213,7 @@
             fact_participation_user_agency_monthly m
         WHERE
             m.DEL_FLAG = '0'
-            AND m.AGENCY_ID =#{myAgencyId}
+            AND m.AGENCY_ID =#{agencyId}
         ORDER BY
             m.MONTH_ID DESC
             LIMIT 12

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.1
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.2
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.1</version>
+    <version>0.3.2</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java

@@ -3,8 +3,10 @@ package com.epmet;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication (exclude = {DataSourceAutoConfiguration.class})
+@EnableAsync
 public class DataStatsApplication {
 
     public static void main(String[] args) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java

@@ -104,7 +104,7 @@ public class StatsDimServiceImpl implements StatsDimService {
             lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_AGENCY);
         }
 
-        Date statsEndTime = new Date();
+        Date statsEndTime = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD);
         Date statsStartTime = null;
         if (lastExecRecord.getExecTime() != null) {
             statsStartTime = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMMDD);
@@ -126,7 +126,7 @@ public class StatsDimServiceImpl implements StatsDimService {
             lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_CUSTOMER);
         }
 
-        Date statsEndTime = new Date();
+        Date statsEndTime = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD);
         Date statsStartTime = null;
         if (lastExecRecord.getExecTime() != null) {
             statsStartTime = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMMDD);
@@ -145,7 +145,7 @@ public class StatsDimServiceImpl implements StatsDimService {
             lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_DEPARTMENT);
         }
 
-        Date statsEndTime = new Date();
+        Date statsEndTime = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD);
         Date statsStartTime = null;
         if (lastExecRecord.getExecTime() != null) {
             statsStartTime = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMMDD);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java

@@ -71,10 +71,11 @@ public class StatsProjectServiceImpl implements StatsProjectService {
             if (!CollectionUtils.isEmpty(customerIdList)) {
                 for (String customerId : customerIdList) {
                     try {
+                        log.debug("for循环统计机关-项目-日月数据，当前统计的客户Id:" + customerId);
                         //遍历统计每一个客户数据
                         customerAgencyStats(customerId);
                     } catch (Exception e) {
-                        log.error("项目-机关-数据统计程序错误，对应客户Id:"+customerId, e);
+                        log.error("项目-机关-数据统计程序错误，对应客户Id:" + customerId, e);
                         log.error("Error creating model JSON", e);
                     }
                 }
@@ -92,11 +93,13 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
 
         //2:根据客户Id查询机关维度表数据
+        log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询机关维度数据，当前客户Id:" + customerId);
         DimAgencyDTO dimAgencyDTO = new DimAgencyDTO();
         dimAgencyDTO.setCustomerId(customerId);
         List<DimAgencyDTO> dimAgencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO);
 
         //3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据)
+        log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目业务表结案数据，当前客户Id:"+customerId);
         ProjectEntity projectEntity = new ProjectEntity();
         projectEntity.setCustomerId(customerId);
         projectEntity.setCreatedTime(date);
@@ -104,16 +107,19 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         List<ProjectEntity> projectList = projectService.getProjectList(projectEntity);
 
         //4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据)
+        log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目进展表业务数据，当前客户Id:"+customerId);
         List<ProjectProcessEntity> processList = projectProcessService.getProcessList(projectEntity);
 
         //5:机关层级日月统计
         if (null != dimAgencyList && dimAgencyList.size() > NumConstant.ZERO) {
             //5.1:执行机关日数据统计
+            log.debug("StatsProjectServiceImpl.customerAgencyStats-开始执行机关日统计方法，方法名:agencyDateProjectStats,客户Id:"+customerId);
             agencyDateProjectStats(customerId, dimId, dimAgencyList, projectList, processList);
 
             //5.2:执行机关月数据统计
             //if (Calendar.getInstance().get(Calendar.DATE) == 1) {
-                agencyMonthProjectStats(customerId, dimId, dimAgencyList);
+            log.debug("StatsProjectServiceImpl.customerAgencyStats-开始执行机关月统计方法，方法名:agencyMonthProjectStats,客户Id:"+customerId);
+            agencyMonthProjectStats(customerId, dimId, dimAgencyList);
             //}
         }
 
@@ -350,7 +356,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                         //遍历统计每一个客户数据
                         customerGridStats(customerId);
                     } catch (Exception e) {
-                        log.error("项目-网格-数据统计程序错误，对应客户Id:"+customerId, e);
+                        log.error("项目-网格-数据统计程序错误，对应客户Id:" + customerId, e);
                         log.error("Error creating model JSON", e);
                     }
                 }
@@ -387,11 +393,12 @@ public class StatsProjectServiceImpl implements StatsProjectService {
 
             //5.2:执行网格月数据统计
             //if (Calendar.getInstance().get(Calendar.DATE) == 1) {
-                gridMonthProjectStats(customerId, dimId, dimGridList);
+            gridMonthProjectStats(customerId, dimId, dimGridList);
             //}
         }
 
     }
+
     /**
      * @param customerId
      * @return

epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-job-server:
     container_name: epmet-job-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.9
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.10
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.9</version>
+    <version>0.3.10</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-job</artifactId>