From c799f07949c1602c227bd145938110748c8809f7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Feb 2021 08:37:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97=E9=87=87?= =?UTF-8?q?=E9=9B=86=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0orgName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/ScreenWorkRecordOrgDailyDTO.java | 5 +++ .../ScreenWorkRecordOrgMonthlyDTO.java | 5 +++ .../result/WorkRecordRankResultDTO.java | 2 + .../plugins/WorkRecordController.java | 3 +- .../plugins/ScreenWorkRecordOrgDailyDao.java | 6 +++ .../ScreenWorkRecordOrgDailyEntity.java | 5 +++ .../ScreenWorkRecordOrgMonthlyEntity.java | 5 +++ .../ScreenWorkRecordOrgDailyServiceImpl.java | 25 +++++++---- .../plugins/ScreenWorkRecordOrgDailyDao.xml | 41 ++++++++++++++----- .../ScreenWorkRecordCommonFormDTO.java | 7 +++- .../impl/IndexCalculateServiceImpl.java | 1 + .../migration/V0.0.8__add_plugins_table.sql | 2 + .../plugins/ScreenWorkRecordOrgDailyDao.xml | 2 + .../plugins/ScreenWorkRecordOrgMonthlyDao.xml | 3 +- 14 files changed, 91 insertions(+), 21 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/ScreenWorkRecordOrgDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/ScreenWorkRecordOrgDailyDTO.java index 948cd23b37..55e9c883d0 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/ScreenWorkRecordOrgDailyDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/ScreenWorkRecordOrgDailyDTO.java @@ -54,6 +54,11 @@ public class ScreenWorkRecordOrgDailyDTO implements Serializable { */ private String orgId; + /** + * 组织名称或者网格名 + */ + private String orgName; + /** * 会议类型编码；对应screen_customer_work_record_dict的资源编码 */ diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/ScreenWorkRecordOrgMonthlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/ScreenWorkRecordOrgMonthlyDTO.java index 7da8fec074..168e0296d4 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/ScreenWorkRecordOrgMonthlyDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/ScreenWorkRecordOrgMonthlyDTO.java @@ -54,6 +54,11 @@ public class ScreenWorkRecordOrgMonthlyDTO implements Serializable { */ private String orgId; + /** + * 组织名称或者网格名 + */ + private String orgName; + /** * 会议类型编码；对应screen_customer_work_record_dict的资源编码 */ diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordRankResultDTO.java index 42a721c513..08c8df3ff2 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordRankResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.plugins.result; +import lombok.AllArgsConstructor; import lombok.Data; import java.io.Serializable; @@ -11,6 +12,7 @@ import java.util.List; * @author yinzuomei@elink-cn.com * @date 2021/2/23 23:11 */ +@AllArgsConstructor @Data public class WorkRecordRankResultDTO implements Serializable { /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/plugins/WorkRecordController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/plugins/WorkRecordController.java index e7f6744cb2..77c11404d5 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/plugins/WorkRecordController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/plugins/WorkRecordController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; public class WorkRecordController { @Autowired private ScreenWorkRecordOrgDailyService screenWorkRecordOrgDailyService; - //todo + //todo 工作日志是否要添加area_code、parent_area_code、orgType;插件是否可以提供；也可以采集的时候赋值 //5、【工作日志】本机及下级排名 //NEI接口地址：https://nei.netease.com/interface/detail/?pid=57068&id=348966 //返参中的当前组织的参与人数、组织次数 直接sum所有下级的值; @@ -36,4 +36,5 @@ public class WorkRecordController { //6、【工作日志】近12月趋势图 //NEI接口地址：https://nei.netease.com/interface/detail/?pid=57068&id=348967 + //可以下级组织+下级网格 orgId 直接 in } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java index 8a0daa8f53..ca0bc02fda 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java @@ -19,6 +19,7 @@ package com.epmet.datareport.dao.plugins; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.datareport.entity.plugins.ScreenWorkRecordOrgDailyEntity; +import com.epmet.plugins.result.WorkRecordRankResultDTO; import com.epmet.plugins.result.WorkRecordSubRank; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -43,9 +44,14 @@ public interface ScreenWorkRecordOrgDailyDao extends BaseDao selectSubList(@Param("areaCode") String areaCode, + @Param("agencyId") String agencyId, @Param("dataType") String dataType, @Param("topRow") Integer topRow, @Param("dateId")String dateId); String selectLatestDateId(String customerId); + + WorkRecordRankResultDTO selectCurrentAgency(@Param("areaCode") String areaCode, + @Param("dataType") String dataType, + @Param("dateId")String dateId); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/plugins/ScreenWorkRecordOrgDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/plugins/ScreenWorkRecordOrgDailyEntity.java index b72aa830fb..f5dab21989 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/plugins/ScreenWorkRecordOrgDailyEntity.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/plugins/ScreenWorkRecordOrgDailyEntity.java @@ -50,6 +50,11 @@ public class ScreenWorkRecordOrgDailyEntity extends BaseEpmetEntity { */ private String orgId; + /** + * 组织名称或者网格名 + */ + private String orgName; + /** * 会议类型编码；对应screen_customer_work_record_dict的资源编码 */ diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java index c4f2bbb938..47f9f6ddfe 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java @@ -50,6 +50,11 @@ public class ScreenWorkRecordOrgMonthlyEntity extends BaseEpmetEntity { */ private String orgId; + /** + * 组织名称或者网格名 + */ + private String orgName; + /** * 会议类型编码；对应screen_customer_work_record_dict的资源编码 */ 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 b6939226b7..692989e278 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 @@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -108,15 +109,23 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl()); + } else { + //非社区的 + WorkRecordRankResultDTO resultDTO = baseDao.selectCurrentAgency(agencyDTO.getAreaCode(), formDTO.getDataType(), dateId); + resultDTO.setSubRankList(baseDao.selectSubList(agencyDTO.getAreaCode(), agencyDTO.getAgencyId(), formDTO.getDataType(), formDTO.getTopRow(), dateId)); + return resultDTO; } - WorkRecordRankResultDTO resultDTO=new WorkRecordRankResultDTO(); - String dateId=baseDao.selectLatestDateId(formDTO.getCustomerId()); - resultDTO.setSubRankList(baseDao.selectSubList(agencyDTO.getAreaCode(),formDTO.getDataType(),formDTO.getTopRow(),dateId)); - //todo 待完善 - return resultDTO; } } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml index 74476254db..f09b5f3f51 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml @@ -12,21 +12,42 @@ m.DEL_FLAG = '0' AND m.CUSTOMER_ID = #{customerId} + + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordCommonFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordCommonFormDTO.java index 2223143cc7..f72d2f3667 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordCommonFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordCommonFormDTO.java @@ -15,10 +15,15 @@ public class ScreenWorkRecordCommonFormDTO implements Serializable { private static final long serialVersionUID = 819322082786098071L; /** - * 组织Id + * 组织Id或者网格id */ private String orgId; + /** + * 组织名称或者网格名 + */ + private String orgName; + /** * 会议类型编码；对应screen_customer_work_record_dict的资源编码 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java index 82142afec4..db48bb1214 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java @@ -94,6 +94,7 @@ public class IndexCalculateServiceImpl implements IndexCalculateService { return flag; } catch (Exception e) { e.printStackTrace(); + log.warn("indexCalculate exception:{}",e); log.error("indexCalculate exception,param:{}", JSON.toJSONString(formDTO)); } finally { //清除缓存 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql index 513549004f..74480896cb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql @@ -94,6 +94,7 @@ CREATE TABLE `screen_work_record_org_monthly` ( `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id：yyyyMM', `ORG_ID` varchar(64) NOT NULL COMMENT '组织Idor网格id', + `ORG_NAME` varchar(255) DEFAULT NULL COMMENT '组织名或网格名', `MEETING_CODE` varchar(255) DEFAULT NULL COMMENT '会议类型编码；对应screen_customer_work_record_dict的资源编码', `TYPE_CODE` varchar(255) NOT NULL COMMENT '随手记类型编码；对应screen_customer_work_record_dict的资源编码', `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '组织次数', @@ -115,6 +116,7 @@ CREATE TABLE `screen_work_record_org_daily` ( `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', `DATE_ID` varchar(8) NOT NULL COMMENT '日期Id：yyyyMMdd', `ORG_ID` varchar(64) NOT NULL COMMENT '组织Idor网格id', + `ORG_NAME` varchar(255) DEFAULT NULL COMMENT '组织名或网格名', `MEETING_CODE` varchar(255) DEFAULT NULL COMMENT '会议类型编码；对应screen_customer_work_record_dict的资源编码', `TYPE_CODE` varchar(255) NOT NULL COMMENT '随手记类型编码；对应screen_customer_work_record_dict的资源编码', `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '组织次数', diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml index 0fd68eddf4..9bf253e4a5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml @@ -17,6 +17,7 @@ customer_id, DATE_ID, org_id, + org_name, meeting_code, type_code, organize_total, @@ -35,6 +36,7 @@ #{customerId}, #{dateId}, #{item.orgId}, + #{item.orgName}, #{item.meetingCode}, #{item.typeCode}, #{item.organizeTotal}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml index 8c9c216b5e..4036d053b4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml @@ -29,6 +29,7 @@ customer_id, month_id, org_id, + org_name, meeting_code, type_code, organize_total, @@ -50,7 +51,7 @@ #{monthId}, #{item.orgId}, - + #{item.orgName}, #{item.meetingCode}, #{item.typeCode},