Browse Source

手动打分表添加两个字段

feature/dangjian
yujintao 6 years ago
parent
commit
e5b7bd528a
  1. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java
  2. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreTempDTO.java
  3. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiManualScoreTemplateResultDTO.java
  4. 44
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java
  5. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreTempEntity.java
  6. 107
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreTempExcel.java
  7. 12
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java

@ -56,7 +56,7 @@ public class KpiManualScoreDTO implements Serializable {
* 被打分的部门id * 被打分的部门id
*/ */
@NotBlank(message = "考核部门id不能为空") @NotBlank(message = "考核部门id不能为空")
private String deptId; private Long deptId;
/** /**
* 得分 * 得分

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreTempDTO.java

@ -46,7 +46,7 @@ public class KpiManualScoreTempDTO implements Serializable {
/** /**
* 被打分的部门id * 被打分的部门id
*/ */
private String deptId; private Long deptId;
/** /**
* 得分 * 得分

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiManualScoreTemplateResultDTO.java

@ -59,7 +59,7 @@ public class KpiManualScoreTemplateResultDTO implements Serializable {
/** /**
* 被打分的部门id * 被打分的部门id
*/ */
private String deptId; private Long deptId;
/** /**
* 考核起止日期yyyy-MM-dd * 考核起止日期yyyy-MM-dd

44
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java

@ -33,55 +33,65 @@ import java.util.Date;
* @since v1.0.0 2019-12-04 * @since v1.0.0 2019-12-04
*/ */
@Data @Data
@EqualsAndHashCode(callSuper=false) @EqualsAndHashCode(callSuper = false)
@TableName("epdc_kpi_manual_score") @TableName("epdc_kpi_manual_score")
public class KpiManualScoreEntity extends BaseEpdcEntity { public class KpiManualScoreEntity extends BaseEpdcEntity {
private static final long serialVersionUID = -8994029691874794620L; private static final long serialVersionUID = -8994029691874794620L;
/** /**
* epdc_kpi_rule表主键 * epdc_kpi_rule表主键
*/ */
private String ruleId; private String ruleId;
/** /**
* 被打分的部门id * 被打分的部门id
*/ */
private String deptId; private Long deptId;
/** /**
* 得分 * 得分
*/ */
private BigDecimal score; private BigDecimal score;
/** /**
* 考核起止日期 * 考核起止日期
*/ */
private Date scoreStartDate; private Date scoreStartDate;
/** /**
* 考核终止日期 * 考核终止日期
*/ */
private Date scoreEndDate; private Date scoreEndDate;
/** /**
* 所有父级部门id * 所有父级部门id
*/ */
private String parentDeptIds; private String parentDeptIds;
/** /**
* 所有父级部门名称 * 所有父级部门名称
*/ */
private String parentDeptNames; private String parentDeptNames;
/** /**
* 完整部门id * 完整部门id
*/ */
private String allDeptIds; private String allDeptIds;
/** /**
* 完整部门名称 * 完整部门名称
*/ */
private String allDeptNames; private String allDeptNames;
/**
* 打分者的部门id
*/
private String creatorDeptName;
/**
* 打分者的部门名称
*/
private Long creatorDeptId;
} }

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreTempEntity.java

@ -45,7 +45,7 @@ public class KpiManualScoreTempEntity {
/** /**
* 被打分的部门id * 被打分的部门id
*/ */
private String deptId; private Long deptId;
/** /**
* 得分 * 得分

107
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreTempExcel.java

@ -1,107 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 绩效考核手动打分记录
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-06
*/
@Data
public class KpiManualScoreTempExcel {
@Excel(name = "主键")
private String id;
@Excel(name = "epdc_kpi_rule表主键")
private String ruleId;
@Excel(name = "被打分的部门id")
private String deptId;
@Excel(name = "得分")
private Integer score;
@Excel(name = "考核起止日期yyyy-MM-dd")
private Date scoreStartDate;
@Excel(name = "考核终止日期yyyy-MM-dd")
private Date scoreEndDate;
@Excel(name = "所有父级部门id")
private String parentDeptIds;
@Excel(name = "所有父级部门名称")
private String parentDeptNames;
@Excel(name = "完整部门名称")
private String allDeptNames;
@Excel(name = "完整部门id")
private String allDeptIds;
@Excel(name = "导出用户id")
private String userId;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
@Excel(name = "删除标记")
private String delFlag;
@Excel(name = "街道")
private String street;
@Excel(name = "社区")
private String community;
@Excel(name = "网格")
private String grid;
@Excel(name = "规则名称")
private String ruleName;
@Excel(name = "考核周期")
private String kpiCycleName;
@Excel(name = "考核起止日期")
private String scoreStartTime;
@Excel(name = "考核终止日期")
private Date scoreEndTime;
}

12
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java

@ -29,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.constant.StrConstant;
import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis; import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
@ -217,7 +218,7 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
kpiManualScoreTemplateResultDTO.setScore(null); kpiManualScoreTemplateResultDTO.setScore(null);
kpiManualScoreTemplateResultDTO.setRuleId(kpiRuleEntity.getId()); kpiManualScoreTemplateResultDTO.setRuleId(kpiRuleEntity.getId());
kpiManualScoreTemplateResultDTO.setDeptId(userSysDeptInfoResultDTO.getId().toString()); kpiManualScoreTemplateResultDTO.setDeptId(userSysDeptInfoResultDTO.getId());
kpiManualScoreTemplateResultDTO.setScoreStartDate(LocalDateUtils.localDateToDate(scoreStartDateMonth.atDay(NumConstant.ONE))); kpiManualScoreTemplateResultDTO.setScoreStartDate(LocalDateUtils.localDateToDate(scoreStartDateMonth.atDay(NumConstant.ONE)));
kpiManualScoreTemplateResultDTO.setScoreEndDate(LocalDateUtils.localDateToDate(scoreEndDate)); kpiManualScoreTemplateResultDTO.setScoreEndDate(LocalDateUtils.localDateToDate(scoreEndDate));
kpiManualScoreTemplateResultDTO.setParentDeptIds(userSysDeptInfoResultDTO.getPids()); kpiManualScoreTemplateResultDTO.setParentDeptIds(userSysDeptInfoResultDTO.getPids());
@ -285,9 +286,14 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
return new Result().error("Excel数据异常,请修改后重新导入"); return new Result().error("Excel数据异常,请修改后重新导入");
} }
List<KpiManualScoreEntity> kpiManualScoreEntityList = ConvertUtils.sourceToTarget(tempEntityList, KpiManualScoreEntity.class); List<KpiManualScoreEntity> kpiManualScoreEntityList = ConvertUtils.sourceToTarget(tempEntityList, KpiManualScoreEntity.class);
UserDetail user = SecurityUser.getUser();
//循环插入:如果存在则删除原纪录 //循环插入:如果存在则删除原纪录
for (KpiManualScoreEntity kpiManualScoreEntity : kpiManualScoreEntityList) { for (KpiManualScoreEntity kpiManualScoreEntity : kpiManualScoreEntityList) {
baseDao.delete(getUniqueWrapper(kpiManualScoreEntity)); baseDao.delete(getUniqueWrapper(kpiManualScoreEntity));
kpiManualScoreEntity.setCreatorDeptId(user.getDeptId());
kpiManualScoreEntity.setCreatorDeptName(user.getDeptName());
baseDao.insert(kpiManualScoreEntity); baseDao.insert(kpiManualScoreEntity);
} }
//删除临时表数据 //删除临时表数据
@ -373,7 +379,7 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
dto.setScoreStartDate(getFirstDayDateOfMonth(dto.getScoreStartMonth())); dto.setScoreStartDate(getFirstDayDateOfMonth(dto.getScoreStartMonth()));
dto.setScoreEndDate(getLastDayOfMonth(scoreEndDateMonth)); dto.setScoreEndDate(getLastDayOfMonth(scoreEndDateMonth));
//根据部门ID获取上级所有部门信息 //根据部门ID获取上级所有部门信息
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(dto.getDeptId()); Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
if (!parentAndAllDeptDTOResult.success()) { if (!parentAndAllDeptDTOResult.success()) {
return new Result().error(parentAndAllDeptDTOResult.getMsg()); return new Result().error(parentAndAllDeptDTOResult.getMsg());
} }
@ -419,7 +425,7 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
public QueryWrapper<KpiManualScoreEntity> getUniqueWrapper(KpiManualScoreEntity entity) { public QueryWrapper<KpiManualScoreEntity> getUniqueWrapper(KpiManualScoreEntity entity) {
QueryWrapper<KpiManualScoreEntity> wrapper = new QueryWrapper<>(); QueryWrapper<KpiManualScoreEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(entity.getRuleId()), "RULE_ID", entity.getRuleId()) wrapper.eq(StringUtils.isNotBlank(entity.getRuleId()), "RULE_ID", entity.getRuleId())
.eq(StringUtils.isNotBlank(entity.getDeptId()), "DEPT_ID", entity.getDeptId()) .eq(null != entity.getDeptId(), "DEPT_ID", entity.getDeptId())
.eq("score_end_date", entity.getScoreEndDate()) .eq("score_end_date", entity.getScoreEndDate())
.eq("score_start_date", entity.getScoreStartDate()); .eq("score_start_date", entity.getScoreStartDate());
return wrapper; return wrapper;

Loading…
Cancel
Save