From 85fcaefbc30cc9a55e8047e79441c67012def8be Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 20 Jul 2022 15:22:57 +0800
Subject: [PATCH] update

---
 .../service/impl/IcPolicyServiceImpl.java     | 24 ++++++++-----------
 .../main/resources/mapper/IcPolicyRuleDao.xml |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
index 2c05ac4565..0745a52db3 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
@@ -4,22 +4,17 @@ 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.feign.ResultDataResolver;
-import com.epmet.commons.tools.utils.EpmetRequestHolder;
-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;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.feign.ResultDataResolver;
 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.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dao.*;
@@ -28,14 +23,12 @@ import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient;
 import com.epmet.dto.IcPolicyCategoryDTO;
 import com.epmet.dto.IcPolicyDTO;
 import com.epmet.dto.IcPolicyItemResultDTO;
-import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO;
-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;
 import com.epmet.dto.form.policy.IcPolicyRuleDetailDTO;
 import com.epmet.dto.form.policy.IcPolicyRuleFormDTO;
+import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.service.IcPolicyService;
@@ -48,7 +41,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -116,13 +112,13 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
         if(StringUtils.isNotBlank(formDTO.getPolicyId())){
             icPolicyEntity.setId(formDTO.getPolicyId());
             baseDao.updateById(icPolicyEntity);
-        }else{
-            // 插入政策主表
-            baseDao.insert(icPolicyEntity);
             //删除规则、规则明细、分类、附件
             icPolicyRuleDao.deleteByIcPolicyId(icPolicyEntity.getId());
             icPolicyCategoryDao.deleteByIcPolicyId(icPolicyEntity.getId());
             heartAttachmentDao.deleteByBusinessId(icPolicyEntity.getId());
+        }else{
+            // 插入政策主表
+            baseDao.insert(icPolicyEntity);
         }
         // 插入细则
         int ruleSort = 1;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDao.xml
index 777da08654..1c87b556cf 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDao.xml
@@ -18,6 +18,6 @@
     </resultMap>
 
     <delete id="deleteByIcPolicyId" parameterType="java.lang.String">
-        delete  from ic_policy_rule where IC_POLICY_ID=#{policyId}
+        delete  from ic_policy_rule where IC_POLICY_ID = #{policyId}
     </delete>
 </mapper>
\ No newline at end of file