From 5c9658ddc804dbcf035f66a5d0847b1b418ef8c6 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 27 Aug 2020 13:41:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?11=E3=80=81=E5=9F=BA=E5=B1=82=E6=B2=BB?= =?UTF-8?q?=E7=90=86-=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8E=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=B9=B3=E5=9D=87=E7=8E=87=E8=AE=A1=E7=AE=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/screen/impl/ScreenCollServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java index 83162e601a..1411cd9c00 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java @@ -334,9 +334,10 @@ public class ScreenCollServiceImpl implements ScreenCollService { String[] lastMonth = this.lastMonthDate(); // 获取上个月的基本数据 + String moneth = lastMonth[NumConstant.ZERO] + lastMonth[NumConstant.ONE]; List lastMonthJoinList = screenUserJoinDao.selectLastMonthScreenUserJoinList(customerId, lastMonth[NumConstant.ZERO], - lastMonth[NumConstant.ONE], + moneth, orgIds); // 定义本月待添加数据的集合 From 1a0c352156e7ac5074d3318a46fb58c2a9681e2f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Aug 2020 14:18:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/screen/impl/PartyMemberLeadServiceImpl.java | 2 +- .../src/main/resources/mapper/screen/ScreenEventDataDao.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java index 79868496d1..c00487d080 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java @@ -158,7 +158,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { public List getXPro(){ List xAxis = new ArrayList<>(); LocalDate today = LocalDate.now(); - for(int i = NumConstant.TWELVE;i >= NumConstant.ONE; i--){ + for(int i = NumConstant.ELEVEN;i >= NumConstant.ZERO; i--){ LocalDate localDate = today.minusMonths(i); String s = localDate.getMonth().getValue() + ScreenConstant.MONTH; xAxis.add(s); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml index 0b2e8698e2..a484d4549a 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml @@ -6,7 +6,7 @@ From e12e6071b453173c99d3a492173dc3c12ea08ec1 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 27 Aug 2020 14:24:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=20->=E9=BB=98=E8=AE=A4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=8A=E4=B8=AA=E6=9C=88=E4=BB=A5=E5=8F=8A=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=9F=A5=E8=AF=A2=E6=88=AA=E8=87=B3=E4=B8=8A=E4=B8=AA?= =?UTF-8?q?=E6=9C=88=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=94=B9=E6=88=90?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9F=A5=E8=AF=A2=E6=9C=AC=E6=9C=88=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E9=BB=98=E8=AE=A4=E6=9F=A5=E8=AF=A2=E6=88=AA=E8=87=B3?= =?UTF-8?q?=E6=9C=AC=E6=9C=88=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=9B=20->?= =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=8D=95-?= =?UTF-8?q?=E5=85=88=E8=BF=9B=E7=BB=84=E7=BB=87=EF=BC=8C=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?agenyId=E6=9F=A5=E8=AF=A2=E4=B8=8B=E7=BA=A7=E6=9C=BA=E5=85=B3?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=EF=BC=8C=E5=BD=93=E5=89=8D=E6=9C=BA=E5=85=B3?= =?UTF-8?q?=E4=B8=BA=E7=A4=BE=E5=8C=BA=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=8E=92=E8=A1=8C=EF=BC=9B=20->=E5=85=88?= =?UTF-8?q?=E8=BF=9B=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=8D=95-=E5=85=88?= =?UTF-8?q?=E8=BF=9B=E5=85=9A=E5=91=98=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E6=9C=BA=E5=85=B3ORG=5FID=E4=B8=BA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=9C=BA=E5=85=B3Id=E7=9A=84=E5=85=9A=E5=91=98=E6=8E=92?= =?UTF-8?q?=E8=A1=8C=E6=83=85=E5=86=B5;=20->=E6=94=BF=E5=BA=9C=E6=B2=BB?= =?UTF-8?q?=E7=90=86=E8=83=BD=E5=8A=9B=E6=A6=9C=E5=8D=95=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9C=AC=E6=9C=BA=E6=9C=BA=E5=85=B3=E7=9A=84=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E6=9C=BA=E5=85=B3=EF=BC=8C=E5=BD=93=E5=89=8D=E6=9C=BA?= =?UTF-8?q?=E5=85=B3=E4=B8=BA=E7=A4=BE=E5=8C=BA=E6=97=B6=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BD=91=E6=A0=BC=E6=8E=92=E8=A1=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GrassRootsGovernServiceImpl.java | 4 ++-- .../impl/GrassrootsPartyDevServiceImpl.java | 7 +++++-- .../screen/impl/PartyMemberLeadServiceImpl.java | 2 +- .../com/epmet/datareport/utils/DateUtils.java | 17 +++++++++++++++-- .../mapper/screen/ScreenDifficultyDataDao.xml | 4 ++-- .../mapper/screen/ScreenGovernRankDataDao.xml | 2 +- .../mapper/screen/ScreenOrgRankDataDao.xml | 2 +- .../screen/ScreenPartyUserRankDataDao.xml | 4 ++-- 8 files changed, 29 insertions(+), 13 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java index 2dd8233800..f798d5047e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java @@ -104,7 +104,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { @Override public PublicPartiProfileResultDTO publicPartiProfile(AgencyFormDTO param) { - String monthId = dateUtils.getPreviousMonthId(); + String monthId = dateUtils.getCurrentMonthId(); UserJoinIndicatorGrowthRateResultDTO latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId); if(null == latest) return new PublicPartiProfileResultDTO(); PublicPartiProfileResultDTO result = ConvertUtils.sourceToTarget(latest,PublicPartiProfileResultDTO.class); @@ -154,7 +154,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { if(NumConstant.ZERO == param.getTopNum()) param.setTopNum(NumConstant.MAX); PageHelper.startPage(NumConstant.ONE,param.getTopNum()); List orderList = - screenGovernRankDataDao.selectGovernCapacityRatio(dateUtils.getPreviousMonthId(),param.getAgencyId()); + screenGovernRankDataDao.selectGovernCapacityRatio(dateUtils.getCurrentMonthId(),param.getAgencyId()); if(null == orderList || orderList.isEmpty()) return new ArrayList<>(); List result = new LinkedList<>(); orderList.forEach(o -> { 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 3cbb95a0db..aa1b23a448 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 @@ -7,6 +7,7 @@ import com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao; import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao; import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao; import com.epmet.datareport.service.screen.GrassrootsPartyDevService; +import com.epmet.datareport.utils.DateUtils; import com.epmet.datareport.utils.ModuleConstant; import com.epmet.screen.dto.form.BranchBuildRankFormDTO; import com.epmet.screen.dto.form.BranchBuildTrendFormDTO; @@ -42,6 +43,8 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService private ScreenCpcBaseDataDao screenCpcBaseDataDao; @Autowired private ScreenPartyBranchDataDao screenPartyBranchDataDao; + @Autowired + private DateUtils dateUtils; /** * @Description 1、党员基本情况-饼状图概况 @@ -178,7 +181,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService param.setCategory(ModuleConstant.KEY_BRANCH_CATEGORY_PARTY); } if(StringUtils.isBlank(param.getMonthId())){ - param.setMonthId(getPreviousMonthId()); + param.setMonthId(dateUtils.getCurrentMonthId()); } if(NumConstant.ZERO == param.getTopNum()) param.setTopNum(NumConstant.MAX); PageHelper.startPage(NumConstant.ONE,param.getTopNum()); @@ -215,7 +218,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService SimpleDateFormat format = new SimpleDateFormat("yyyyMM"); Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); // 设置为当前时间 - calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月 + //calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月 String currentMonth = format.format(calendar.getTime()); Integer monthCounter = Integer.parseInt(currentMonth); Map monthMap = new HashMap<>(); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java index 79868496d1..8580503f88 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java @@ -184,7 +184,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { } PageHelper.startPage(NumConstant.ONE,param.getTopNum()); List gridData = - screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),dateUtils.getPreviousMonthId()); + screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),dateUtils.getCurrentMonthId()); List result = new LinkedList<>(); if(null == gridData || gridData.isEmpty()) return result; gridData.forEach( data -> { diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java index 6db1756fdb..b2d99c00f1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java @@ -31,7 +31,7 @@ public class DateUtils { public Map getX(){ Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); // 设置为当前时间 - calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月 + //calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月 String currentMonth = defaultFormat.format(calendar.getTime()); Integer monthCounter = Integer.parseInt(currentMonth); Map monthMap = new HashMap<>(); @@ -64,7 +64,7 @@ public class DateUtils { Map xAxis = new HashMap<>(); LocalDate today = LocalDate.now(); - for(int i = NumConstant.TWELVE;i >= NumConstant.ONE; i--){ + for(int i = NumConstant.ELEVEN;i >= NumConstant.ZERO; i--){ LocalDate localDate = today.minusMonths(i); String s = localDate.getMonth().getValue() + "月"; xAxis.put(localDate.format(fmt),s); @@ -108,6 +108,19 @@ public class DateUtils { return format.format(c.getTime()); } + /** + * @Description 得到当前月份的monthId + * @param + * @return + * @author wangc + * @date 2020.08.27 13:43 + **/ + public String getCurrentMonthId(){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); // 设置为当前时间 + return defaultFormat.format(calendar.getTime()); + } + public static void main(String[] args) { DateUtils util = new DateUtils(); Map result = util.getXpro(); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml index 77f6fb0108..8b98c54ebe 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml @@ -7,9 +7,9 @@ diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml index a484d4549a..750439bb3e 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml @@ -16,8 +16,7 @@ screen_event_data WHERE del_flag = '0' - AND parent_id = #{parentId} - AND all_parent_ids LIKE concat('%', #{agencyId}, '%') + AND all_parent_ids LIKE concat('%', #{parentId}, '%')