From 4f979b5c919a861912b11b66f3331952caaf7d2e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 14 Jul 2021 14:06:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=BB=84=E7=BB=87=E6=AC=A1=E6=95=B0=E3=80=81=E6=80=BB?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E4=BA=BA=E6=AC=A1=EF=BC=8C=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=BB=84=E7=BB=87=E6=AC=A1=E6=95=B0=E9=99=8D?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ScreenWorkRecordOrgDailyServiceImpl.java | 14 ++++++++++++-- .../mapper/screen/ScreenCustomerAgencyDao.xml | 1 + .../mapper/screen/ScreenCustomerGridDao.xml | 1 + .../ScreenCustomerWorkRecordDictServiceImpl.java | 3 ++- .../impl/ScreenWorkRecordOrgDailyServiceImpl.java | 3 ++- .../ScreenWorkRecordOrgMonthlyServiceImpl.java | 3 ++- 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java index 52de467168..313d7008b6 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java @@ -167,8 +167,18 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl= formDTO.getTopRow() ? - returnDto.getSubRankList().subList(NumConstant.ZERO, formDTO.getTopRow()) : returnDto.getSubRankList()); + //按照组织次数降序排列 + if(CollectionUtils.isNotEmpty(returnDto.getSubRankList())){ + Collections.sort(returnDto.getSubRankList(), new Comparator() { + @Override + public int compare(WorkRecordSubRank o1, WorkRecordSubRank o2) { + return o2.getParticipateTotal().compareTo(o1.getParticipateTotal()); + } + }); + if(returnDto.getSubRankList().size() >= formDTO.getTopRow()){ + returnDto.getSubRankList().subList(NumConstant.ZERO, formDTO.getTopRow()); + } + } return returnDto; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index 183e74bb02..6f83783845 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -321,6 +321,7 @@ and sca.PID=#{agencyId} + order by CONVERT ( sca.AGENCY_NAME USING gbk ) ASC diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml index a700e40792..ac5f466642 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml @@ -137,5 +137,6 @@ and m.PARENT_AGENCY_ID=#{agencyId} + order by CONVERT ( m.grid_name USING gbk ) ASC \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenCustomerWorkRecordDictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenCustomerWorkRecordDictServiceImpl.java index 7a6291717a..e082a9af8c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenCustomerWorkRecordDictServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenCustomerWorkRecordDictServiceImpl.java @@ -35,6 +35,7 @@ import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.Arrays; import java.util.List; @@ -108,7 +109,7 @@ public class ScreenCustomerWorkRecordDictServiceImpl extends BaseServiceImpl data) { - if(data.getIsFirst()){ + if (data.getIsFirst() && !CollectionUtils.isEmpty(data.getDataList())) { int affectedRows = baseDao.deleteBatch(data.getCustomerId()); while(affectedRows > 0){ affectedRows = baseDao.deleteBatch(data.getCustomerId()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java index 8f4d4f7c84..504a948c50 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java @@ -28,6 +28,7 @@ import com.epmet.entity.plugins.ScreenWorkRecordOrgDailyEntity; import com.epmet.service.plugins.ScreenWorkRecordOrgDailyService; import com.google.common.collect.Lists; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; /** * 工作日志-组织按日统计(累计值) @@ -42,7 +43,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl data) { - if(data.getIsFirst()){ + if (data.getIsFirst() && !CollectionUtils.isEmpty(data.getDataList())) { int affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getDateId()); while(affectedRows > 0){ affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getDateId()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgMonthlyServiceImpl.java index 7ecd3c4eb6..a153cbac9e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgMonthlyServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.service.plugins.ScreenWorkRecordOrgMonthlyService; import com.google.common.collect.Lists; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; /** * 工作日志-组织按月统计 @@ -51,7 +52,7 @@ public class ScreenWorkRecordOrgMonthlyServiceImpl extends BaseServiceImpl data) { - if(data.getIsFirst()){ + if(data.getIsFirst() && !CollectionUtils.isEmpty(data.getDataList())){ int affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getMonthId()); while(affectedRows > 0){ affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getMonthId());