|
|
@ -3,11 +3,6 @@ package com.epmet.service.impl; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
|
import com.epmet.commons.tools.constant.Constant; |
|
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
|
import com.epmet.dao.IcPolicyDao; |
|
|
|
import com.epmet.dao.IcPolicyRuleDetailDao; |
|
|
|
import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; |
|
|
|
import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; |
|
|
|
import com.epmet.commons.tools.constant.StrConstant; |
|
|
|
import com.epmet.commons.tools.dto.form.FileCommonDTO; |
|
|
|
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; |
|
|
@ -18,12 +13,13 @@ import com.epmet.commons.tools.page.PageData; |
|
|
|
import com.epmet.commons.tools.redis.common.CustomerStaffRedis; |
|
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
|
import com.epmet.commons.tools.validator.ValidatorUtils; |
|
|
|
import com.epmet.dao.*; |
|
|
|
import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; |
|
|
|
import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; |
|
|
|
import com.epmet.dto.IcPolicyCategoryDTO; |
|
|
|
import com.epmet.dto.IcPolicyDTO; |
|
|
|
import com.epmet.dto.IcPolicyItemResultDTO; |
|
|
|
import com.epmet.entity.IcPolicyEntity; |
|
|
|
import com.epmet.entity.IcPolicyRuleDetailEntity; |
|
|
|
import com.epmet.dto.IcPolicyRuleDTO; |
|
|
|
import com.epmet.dto.form.policy.IcPolicyFormDTO; |
|
|
|
import com.epmet.dto.form.policy.IcPolicyPageFormDTO; |
|
|
@ -41,13 +37,8 @@ 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.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Set; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
/** |
|
|
|
* 政策表 |
|
|
@ -137,6 +128,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn |
|
|
|
if (CollectionUtils.isNotEmpty(rule.getResiRuleList())) { |
|
|
|
int resiRuleSort = 1; |
|
|
|
for (IcPolicyRuleDetailDTO ruleDetailDTO : rule.getResiRuleList()) { |
|
|
|
ValidatorUtils.validateEntity(ruleDetailDTO,IcPolicyRuleDetailDTO.ResiRulerShowGroup.class); |
|
|
|
IcPolicyRuleDetailEntity icPolicyRuleDetailEntity = ConvertUtils.sourceToTarget(ruleDetailDTO, IcPolicyRuleDetailEntity.class); |
|
|
|
icPolicyRuleDetailEntity.setCustomerId(formDTO.getCustomerId()); |
|
|
|
icPolicyRuleDetailEntity.setIcPolicyId(icPolicyEntity.getId()); |
|
|
@ -150,6 +142,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn |
|
|
|
if (CollectionUtils.isNotEmpty(rule.getHouseRuleList())) { |
|
|
|
int houseRuleSort = 1; |
|
|
|
for (IcPolicyRuleDetailDTO ruleDetailDTO : rule.getHouseRuleList()) { |
|
|
|
ValidatorUtils.validateEntity(ruleDetailDTO,IcPolicyRuleDetailDTO.HouseRulerShowGroup.class); |
|
|
|
IcPolicyRuleDetailEntity icPolicyRuleDetailEntity = ConvertUtils.sourceToTarget(ruleDetailDTO, IcPolicyRuleDetailEntity.class); |
|
|
|
icPolicyRuleDetailEntity.setCustomerId(formDTO.getCustomerId()); |
|
|
|
icPolicyRuleDetailEntity.setIcPolicyId(icPolicyEntity.getId()); |
|
|
@ -163,6 +156,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn |
|
|
|
if (CollectionUtils.isNotEmpty(rule.getStatRuleList())) { |
|
|
|
int statRuleSort = 1; |
|
|
|
for (IcPolicyRuleDetailDTO ruleDetailDTO : rule.getStatRuleList()) { |
|
|
|
ValidatorUtils.validateEntity(ruleDetailDTO,IcPolicyRuleDetailDTO.StatRulerShowGroup.class); |
|
|
|
IcPolicyRuleDetailEntity icPolicyRuleDetailEntity = ConvertUtils.sourceToTarget(ruleDetailDTO, IcPolicyRuleDetailEntity.class); |
|
|
|
icPolicyRuleDetailEntity.setCustomerId(formDTO.getCustomerId()); |
|
|
|
icPolicyRuleDetailEntity.setIcPolicyId(icPolicyEntity.getId()); |
|
|
|