|
|
@ -3,7 +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.constant.ServiceConstant; |
|
|
|
import com.epmet.commons.tools.constant.StrConstant; |
|
|
|
import com.epmet.commons.tools.dto.form.FileCommonDTO; |
|
|
|
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; |
|
|
@ -281,6 +280,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn |
|
|
|
if (CollectionUtils.isNotEmpty(ruleDTOList)) { |
|
|
|
ruleList = ConvertUtils.sourceToTarget(ruleDTOList, IcPolicyRuleFormDTO.class); |
|
|
|
for (IcPolicyRuleFormDTO rule : ruleList) { |
|
|
|
//人员信息
|
|
|
|
LambdaQueryWrapper<IcPolicyRuleDetailEntity> ruleDetailWrapper = new LambdaQueryWrapper<>(); |
|
|
|
ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) |
|
|
|
.eq(IcPolicyRuleDetailEntity::getGroupType, "resi") |
|
|
@ -289,19 +289,22 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn |
|
|
|
List<IcPolicyRuleDetailDTO> resiRuleList = CollectionUtils.isNotEmpty(resiList) ? ConvertUtils.sourceToTarget(resiList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); |
|
|
|
rule.setResiRuleList(resiRuleList); |
|
|
|
|
|
|
|
ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) |
|
|
|
//房屋信息
|
|
|
|
LambdaQueryWrapper<IcPolicyRuleDetailEntity> houseDetailWrapper = new LambdaQueryWrapper<>(); |
|
|
|
houseDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) |
|
|
|
.eq(IcPolicyRuleDetailEntity::getGroupType, "house") |
|
|
|
.orderByAsc(IcPolicyRuleDetailEntity::getSort); |
|
|
|
List<IcPolicyRuleDetailEntity> houseList = icPolicyRuleDetailDao.selectList(ruleDetailWrapper); |
|
|
|
List<IcPolicyRuleDetailEntity> houseList = icPolicyRuleDetailDao.selectList(houseDetailWrapper); |
|
|
|
List<IcPolicyRuleDetailDTO> houseRuleList = CollectionUtils.isNotEmpty(houseList) ? ConvertUtils.sourceToTarget(houseList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); |
|
|
|
rule.setHouseRuleList(houseRuleList); |
|
|
|
|
|
|
|
ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) |
|
|
|
//统计信息
|
|
|
|
LambdaQueryWrapper<IcPolicyRuleDetailEntity> statDetailWrapper = new LambdaQueryWrapper<>(); |
|
|
|
statDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) |
|
|
|
.eq(IcPolicyRuleDetailEntity::getGroupType, "stat") |
|
|
|
.orderByAsc(IcPolicyRuleDetailEntity::getSort); |
|
|
|
List<IcPolicyRuleDetailEntity> statList = icPolicyRuleDetailDao.selectList(ruleDetailWrapper); |
|
|
|
List<IcPolicyRuleDetailEntity> statList = icPolicyRuleDetailDao.selectList(statDetailWrapper); |
|
|
|
List<IcPolicyRuleDetailDTO> statRuleList = CollectionUtils.isNotEmpty(statList) ? ConvertUtils.sourceToTarget(statList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); |
|
|
|
; |
|
|
|
rule.setStatRuleList(statRuleList); |
|
|
|
} |
|
|
|
} |
|
|
|