elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化代码，添加元数据表字段

feature/dangjian
yujintao 6 years ago
parent
775a898a9f
commit
8684db58bb
3 changed files with 73 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java
  2. 23
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java
  3. 62
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java

36
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java
View File

@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -32,76 +33,81 @@ import java.math.BigDecimal;
@Data @Data
public class KpiMetaDataDTO implements Serializable { 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 * 部门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;
} }

23
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java
View File

@ -33,45 +33,50 @@ import java.util.Date;
* @since v1.0.0 2019-12-16 * @since v1.0.0 2019-12-16
*/ */
@Data @Data
@EqualsAndHashCode(callSuper=false) @EqualsAndHashCode(callSuper = false)
@TableName("epdc_kpi_meta_data") @TableName("epdc_kpi_meta_data")
public class KpiMetaDataEntity extends BaseEpdcEntity { 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 * 部门ID
*/ */
private Long deptId; private Long deptId;
/**
* 部门类别
*/
private String deptTypeKey;
} }

62
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java
View File

@ -224,38 +224,52 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
*/ */
private List<KpiMetaDataEntity> packageMetaDataList(List<KpiEventReportAmountResultDTO> eventReportAmountList, private List<KpiMetaDataEntity> packageMetaDataList(List<KpiEventReportAmountResultDTO> eventReportAmountList,
EventReportAmountFormDTO eventReportAmountFormDto, String kpiCycle) { EventReportAmountFormDTO eventReportAmountFormDto, String kpiCycle) {
Date startDate = eventReportAmountFormDto.getStartDate(); Date startDate = eventReportAmountFormDto.getStartDate();
Date endDate = eventReportAmountFormDto.getEndDate(); Date endDate = eventReportAmountFormDto.getEndDate();
// 声明集合用于存放所有元数据对象
List<KpiMetaDataEntity> kpiMetaDataEntityList = Lists.newArrayList(); List<KpiMetaDataEntity> kpiMetaDataEntityList = Lists.newArrayList();
KpiMetaDataEntity reportAmountEntity; KpiMetaDataEntity kpiMetaDataEntity;
KpiMetaDataEntity respondAmountEntity;
for (KpiEventReportAmountResultDTO reportAmount : eventReportAmountList) { for (KpiEventReportAmountResultDTO reportAmount : eventReportAmountList) {
reportAmountEntity = new KpiMetaDataEntity(); // 群众反映问题总数
reportAmountEntity.setDataCode(KpiMetaDataEnum.PEOPLE_REPORT_AMOUNT.getValue()); kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.PEOPLE_REPORT_AMOUNT, BigDecimal.valueOf(reportAmount.getReportAmount())
reportAmountEntity.setDataName(KpiMetaDataEnum.PEOPLE_REPORT_AMOUNT.getName()); , reportAmount.getGridId(), OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, kpiCycle, startDate, endDate);
reportAmountEntity.setDataValue(BigDecimal.valueOf(reportAmount.getReportAmount())); kpiMetaDataEntityList.add(kpiMetaDataEntity);
reportAmountEntity.setDeptId(reportAmount.getGridId()); // 群众反映问题被响应总数
reportAmountEntity.setKpiCycle(kpiCycle); kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.PEOPLE_REPORT_RESP_AMOUNT, BigDecimal.valueOf(reportAmount.getRespondAmount())
reportAmountEntity.setStartDate(startDate); , reportAmount.getGridId(), OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, kpiCycle, startDate, endDate);
reportAmountEntity.setEndDate(endDate); kpiMetaDataEntityList.add(kpiMetaDataEntity);
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);
} }
return kpiMetaDataEntityList; 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 @Override
public void createEvaluationData() { public void createEvaluationData() {

Write Preview
Loading…
Cancel
Save