From 4beaeacfcb77855a1c23d43ec21e9f79b6640130 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 20 Aug 2020 09:42:49 +0800 Subject: [PATCH] =?UTF-8?q?getX()=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/BranchBuildRankFormDTO.java | 12 +++++++++- .../BranchBuildOrderByCountResultDTO.java | 23 +++++++++++++++++++ .../dao/screen/ScreenPartyBranchDataDao.java | 2 ++ .../impl/GrassrootsPartyDevServiceImpl.java | 14 +++++++---- .../screen/ScreenPartyBranchDataDao.xml | 5 +++- 5 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildOrderByCountResultDTO.java diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java index 169a24b29a..458f2e4af5 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java @@ -1,8 +1,10 @@ package com.epmet.screen.dto.form; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -16,18 +18,26 @@ import java.io.Serializable; public class BranchBuildRankFormDTO implements Serializable { private static final long serialVersionUID = -6580433475773171870L; + public interface BranchBuildRankGroup extends CustomerClientShowGroup{} + /** * 机关Id * */ + @NotBlank(message = "机关Id不能为空",groups = BranchBuildRankGroup.class) private String agencyId; /** - * 支部建设情况：zbjs; 联建共建情况：ljgj;支部建设情况：zbjs; 联建共建情况：ljgj；联建党员志愿服务情况:ljdyzy + * 支部建设情况：zbjs; 联建共建情况：ljgj;联建党员志愿服务情况:ljdyzy * */ + @NotBlank(message = "类型key不能为空" , groups = BranchBuildRankGroup.class) private String category; /** * 默认显示前4，显示全部传入0 * */ private Integer topNum = NumConstant.FOUR; + + private String monthId; + + private String bottomMonthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildOrderByCountResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildOrderByCountResultDTO.java new file mode 100644 index 0000000000..d6ba6ae18b --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildOrderByCountResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.screen.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 查询机关组织次数、参加人数的排序返参 + * @ClassName BranchBuildOrderByCountResultDTO + * @Auth wangc + * @Date 2020-08-20 09:20 + */ +@Data +public class BranchBuildOrderByCountResultDTO implements Serializable { + private static final long serialVersionUID = -8268706123005848128L; + + private String orgName; + + private Integer organizeData; + + private Integer joinData; + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java index bd51bb6869..5b6bbbed94 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java @@ -17,6 +17,7 @@ package com.epmet.datareport.dao.screen; +import com.epmet.screen.dto.result.BranchBuildOrderByCountResultDTO; import com.epmet.screen.dto.result.BranchIssueDataResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -51,4 +52,5 @@ public interface ScreenPartyBranchDataDao { **/ List selectBranchDataByTypeAndTimeZone(@Param("agencyId") String agencyId , @Param("type") String type, @Param("category") String category, @Param("bottomMonthId") String bottomMonthId); + List selectBranchDataByTypeOrder(String agencyId,String category,String monthId,String bottomMonthId); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java index 893f5115ce..09852df8aa 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java @@ -158,6 +158,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService **/ @Override public BranchBuildRankResultDTO branchBuildRank(BranchBuildRankFormDTO param) { + //TODO .. 传参为agencyId 返参的横坐标为agencyId数组，传入的agencyId是父Id？还是应该传入customerId return null; } @@ -176,8 +177,8 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService * @author wangc * @date 2020.08.19 12:46 **/ - private Map getX(){ - SimpleDateFormat format = new SimpleDateFormat("YYYYmm"); + public Map getX(){ + SimpleDateFormat format = new SimpleDateFormat("yyyyMM"); Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); // 设置为当前时间 calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月 @@ -212,7 +213,10 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService public static void main(String[] args) { SimpleDateFormat format = new SimpleDateFormat("yyyyMM"); - String currentMonth = format.format(new Date()); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); // 设置为当前时间 + calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月 + String currentMonth = format.format(calendar.getTime()); Integer monthCounter = Integer.parseInt(currentMonth); Map monthMap = new HashMap<>(); int i = NumConstant.ONE; @@ -233,10 +237,10 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService i++; } - Map result = Maps.newLinkedHashMap(); - monthMap.entrySet().stream().sorted(Map.Entry.comparingByKey()) + monthMap.entrySet().stream().sorted(Map.Entry.comparingByKey()) .forEachOrdered((e -> result.put(e.getKey(),e.getValue()))); + result.forEach((k,v) -> { System.out.print(k); System.out.print(" -> "); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml index 67b6006b05..1268f91a2b 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml @@ -38,7 +38,8 @@ ISSUE_CATEGORY_NAME - SELECT ORG_NAME, COUNT( ORGANIZE_COUNT ) AS organizeData, @@ -54,12 +55,14 @@ AND MONTH_ID = #{monthId} + AND MONTH_ID = ]]> #{bottomMonthId} ORDER BY + (organizeData + joinData) DESC, organizeData DESC, joinData DESC