|
|
|
@ -19,9 +19,9 @@ package com.elink.esua.epdc.service.impl; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
|
import com.elink.esua.epdc.dao.KpiMetaDataDao; |
|
|
|
import com.elink.esua.epdc.dao.KpiResultSuperiorDao; |
|
|
|
import com.elink.esua.epdc.dto.KpiMetaDataDTO; |
|
|
|
@ -32,14 +32,15 @@ import com.elink.esua.epdc.enums.KpiMetaDataEnum; |
|
|
|
import com.elink.esua.epdc.redis.KpiResultSuperiorRedis; |
|
|
|
import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; |
|
|
|
import com.elink.esua.epdc.service.KpiResultSuperiorService; |
|
|
|
import com.sun.org.apache.bcel.internal.generic.NEW; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.*; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
/** |
|
|
|
* 街道或区直绩效考核最终得分 |
|
|
|
@ -194,27 +195,47 @@ public class KpiResultSuperiorServiceImpl extends BaseServiceImpl<KpiResultSuper |
|
|
|
List<KpiResultSuperiorEntity> entities = new ArrayList<>(); |
|
|
|
for (KpiResultSuperiorDTO superior: superiorList) { |
|
|
|
KpiResultSuperiorEntity entity = new KpiResultSuperiorEntity(); |
|
|
|
if (StringUtils.isNotEmpty(superior.getParentDeptIds()) && StringUtils.isNotEmpty(superior.getParentDeptNames())) { |
|
|
|
List<String> parentDeptIds = Arrays.asList(superior.getParentDeptIds().split(",")); |
|
|
|
List<String> parentDeptNames = Arrays.asList(superior.getParentDeptNames().split("-")); |
|
|
|
int index = parentDeptIds.indexOf(dto.getDeptId().toString()); |
|
|
|
if (index >= 0 && parentDeptNames.size() > index) { |
|
|
|
parentDeptNames.set(index, dto.getNewDeptName()); |
|
|
|
entity.setId(superior.getId()); |
|
|
|
entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); |
|
|
|
} |
|
|
|
if("grid_party".equals(dto.getTypeKey())) { |
|
|
|
entity.setId(superior.getId()); |
|
|
|
entity.setAllDeptIds(dto.getAllDeptIds()); |
|
|
|
entity.setAllDeptNames(dto.getAllDeptNames()); |
|
|
|
entity.setParentDeptIds(dto.getParentDeptIds()); |
|
|
|
entity.setParentDeptNames(dto.getParentDeptNames()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(superior.getAllDeptIds()) && StringUtils.isNotEmpty(superior.getAllDeptNames())) { |
|
|
|
if("community_party".equals(dto.getTypeKey())) { |
|
|
|
List<String> allDeptIds = Arrays.asList(superior.getAllDeptIds().split(",")); |
|
|
|
List<String> allDeptNames = Arrays.asList(superior.getAllDeptNames().split("-")); |
|
|
|
int index = allDeptIds.indexOf(dto.getDeptId().toString()); |
|
|
|
if (index >= 0 && allDeptNames.size() > index) { |
|
|
|
allDeptNames.set(index, dto.getNewDeptName()); |
|
|
|
entity.setId(superior.getId()); |
|
|
|
entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); |
|
|
|
} |
|
|
|
String gridName = allDeptNames.get(index + 1); |
|
|
|
String girdId = allDeptIds.get(index + 1); |
|
|
|
entity.setId(superior.getId()); |
|
|
|
entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId); |
|
|
|
entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName); |
|
|
|
entity.setParentDeptIds(dto.getAllDeptIds()); |
|
|
|
entity.setParentDeptNames(dto.getAllDeptNames()); |
|
|
|
|
|
|
|
} |
|
|
|
// if (StringUtils.isNotEmpty(superior.getParentDeptIds()) && StringUtils.isNotEmpty(superior.getParentDeptNames())) {
|
|
|
|
// List<String> parentDeptIds = Arrays.asList(superior.getParentDeptIds().split(","));
|
|
|
|
// List<String> parentDeptNames = Arrays.asList(superior.getParentDeptNames().split("-"));
|
|
|
|
// int index = parentDeptIds.indexOf(dto.getDeptId().toString());
|
|
|
|
// if (index >= 0 && parentDeptNames.size() > index) {
|
|
|
|
// parentDeptNames.set(index, dto.getNewDeptName());
|
|
|
|
// entity.setId(superior.getId());
|
|
|
|
// entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// if (StringUtils.isNotEmpty(superior.getAllDeptIds()) && StringUtils.isNotEmpty(superior.getAllDeptNames())) {
|
|
|
|
// List<String> allDeptIds = Arrays.asList(superior.getAllDeptIds().split(","));
|
|
|
|
// List<String> allDeptNames = Arrays.asList(superior.getAllDeptNames().split("-"));
|
|
|
|
// int index = allDeptIds.indexOf(dto.getDeptId().toString());
|
|
|
|
// if (index >= 0 && allDeptNames.size() > index) {
|
|
|
|
// allDeptNames.set(index, dto.getNewDeptName());
|
|
|
|
// entity.setId(superior.getId());
|
|
|
|
// entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
|
|
|
|
entities.add(entity); |
|
|
|
} |
|
|
|
|
Jackwang
4 years ago