From 8684db58bbe79b28f4e6c983ef774fa55ff31e48 Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 20 Dec 2019 14:08:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=83=E6=95=B0=E6=8D=AE=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/KpiMetaDataDTO.java | 36 ++++++----- .../esua/epdc/entity/KpiMetaDataEntity.java | 23 ++++--- .../service/impl/KpiMetaDataServiceImpl.java | 62 ++++++++++++------- 3 files changed, 73 insertions(+), 48 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java index 562dd44f4..6456a5b45 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto; import java.io.Serializable; import java.util.Date; + import lombok.Data; import java.math.BigDecimal; @@ -32,76 +33,81 @@ import java.math.BigDecimal; @Data public class KpiMetaDataDTO implements Serializable { - private static final long serialVersionUID = -1867098364969648532L; + private static final long serialVersionUID = -5970791269666802942L; /** * 主键 */ - private String id; + private String id; /** * 数据项编码 */ - private String dataCode; + private String dataCode; /** * 数据项名称 */ - private String dataName; + private String dataName; /** * 元数据值 */ - private BigDecimal dataValue; + private BigDecimal dataValue; /** * 考核周期(字典值 代表月，季，年) */ - private String kpiCycle; + private String kpiCycle; /** * 考核周期开始日 */ - private Date startDate; + private Date startDate; /** * 考核周期结束日 */ - private Date endDate; + private Date endDate; /** * 部门ID */ - private Long deptId; + private Long deptId; + + /** + * 部门类别 + */ + private String deptTypeKey; /** * 乐观锁 */ - private Integer revision; + private Integer revision; /** * 创建人 */ - private String createdBy; + private String createdBy; /** * 创建时间 */ - private Date createdTime; + private Date createdTime; /** * 更新人 */ - private String updatedBy; + private String updatedBy; /** * 更新时间 */ - private Date updatedTime; + private Date updatedTime; /** * 删除标记 */ - private String delFlag; + private String delFlag; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java index 0116d548a..36fac4299 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java @@ -33,45 +33,50 @@ import java.util.Date; * @since v1.0.0 2019-12-16 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("epdc_kpi_meta_data") public class KpiMetaDataEntity extends BaseEpdcEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -27618138854750989L; /** * 数据项编码 */ - private String dataCode; + private String dataCode; /** * 数据项名称 */ - private String dataName; + private String dataName; /** * 元数据值 */ - private BigDecimal dataValue; + private BigDecimal dataValue; /** * 考核周期(字典值 代表月，季，年) */ - private String kpiCycle; + private String kpiCycle; /** * 考核周期开始日 */ - private Date startDate; + private Date startDate; /** * 考核周期结束日 */ - private Date endDate; + private Date endDate; /** * 部门ID */ - private Long deptId; + private Long deptId; + + /** + * 部门类别 + */ + private String deptTypeKey; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java index 2530c5326..2388741f6 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java @@ -224,38 +224,52 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl packageMetaDataList(List eventReportAmountList, EventReportAmountFormDTO eventReportAmountFormDto, String kpiCycle) { - Date startDate = eventReportAmountFormDto.getStartDate(); Date endDate = eventReportAmountFormDto.getEndDate(); - + // 声明集合用于存放所有元数据对象 List kpiMetaDataEntityList = Lists.newArrayList(); - KpiMetaDataEntity reportAmountEntity; - KpiMetaDataEntity respondAmountEntity; + KpiMetaDataEntity kpiMetaDataEntity; for (KpiEventReportAmountResultDTO reportAmount : eventReportAmountList) { - reportAmountEntity = new KpiMetaDataEntity(); - reportAmountEntity.setDataCode(KpiMetaDataEnum.PEOPLE_REPORT_AMOUNT.getValue()); - reportAmountEntity.setDataName(KpiMetaDataEnum.PEOPLE_REPORT_AMOUNT.getName()); - reportAmountEntity.setDataValue(BigDecimal.valueOf(reportAmount.getReportAmount())); - reportAmountEntity.setDeptId(reportAmount.getGridId()); - reportAmountEntity.setKpiCycle(kpiCycle); - reportAmountEntity.setStartDate(startDate); - reportAmountEntity.setEndDate(endDate); - - respondAmountEntity = new KpiMetaDataEntity(); - respondAmountEntity.setDataCode(KpiMetaDataEnum.PEOPLE_REPORT_RESP_AMOUNT.getValue()); - respondAmountEntity.setDataName(KpiMetaDataEnum.PEOPLE_REPORT_RESP_AMOUNT.getName()); - respondAmountEntity.setDataValue(BigDecimal.valueOf(reportAmount.getRespondAmount())); - respondAmountEntity.setDeptId(reportAmount.getGridId()); - respondAmountEntity.setKpiCycle(kpiCycle); - respondAmountEntity.setStartDate(startDate); - respondAmountEntity.setEndDate(endDate); - - kpiMetaDataEntityList.add(reportAmountEntity); - kpiMetaDataEntityList.add(respondAmountEntity); + // 群众反映问题总数 + kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.PEOPLE_REPORT_AMOUNT, BigDecimal.valueOf(reportAmount.getReportAmount()) + , reportAmount.getGridId(), OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, kpiCycle, startDate, endDate); + kpiMetaDataEntityList.add(kpiMetaDataEntity); + // 群众反映问题被响应总数 + kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.PEOPLE_REPORT_RESP_AMOUNT, BigDecimal.valueOf(reportAmount.getRespondAmount()) + , reportAmount.getGridId(), OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, kpiCycle, startDate, endDate); + kpiMetaDataEntityList.add(kpiMetaDataEntity); } return kpiMetaDataEntityList; } + /** + * 组装元数据对象 + * + * @param metaDataEnum 元数据类别枚举 + * @param dataValue 元数据值 + * @param deptId 部门id + * @param deptTypeKey 部门类别 + * @param kpiCycle 考核周期 + * @param startDate 考核开始日 + * @param endDate 考核结束日 + * @return com.elink.esua.epdc.entity.KpiMetaDataEntity + * @author work@yujt.net.cn + * @date 2019/12/20 14:05 + */ + private KpiMetaDataEntity packageMetaDataEntity(KpiMetaDataEnum metaDataEnum, BigDecimal dataValue, Long deptId, + String deptTypeKey, String kpiCycle, Date startDate, Date endDate) { + KpiMetaDataEntity kpiMetaDataEntity = new KpiMetaDataEntity(); + kpiMetaDataEntity.setDataCode(metaDataEnum.getValue()); + kpiMetaDataEntity.setDataName(metaDataEnum.getName()); + kpiMetaDataEntity.setDataValue(dataValue); + kpiMetaDataEntity.setDeptId(deptId); + kpiMetaDataEntity.setDeptTypeKey(deptTypeKey); + kpiMetaDataEntity.setKpiCycle(kpiCycle); + kpiMetaDataEntity.setStartDate(startDate); + kpiMetaDataEntity.setEndDate(endDate); + return kpiMetaDataEntity; + } + @Override public void createEvaluationData() {