删除服务需求方法完善

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -173,6 +173,7 @@ public interface EpmetHeartOpenFeignClient {
 
     /**
      * desc:根据来源id 删除需求 只删主表
+     * 服务需求相关表都删除：ic_user_demand_rec、ic_user_demand_service、ic_user_demand_satisfaction、ic_user_demand_operate_log
      * @param originId
      * @param origin
      * @return

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java

@@ -398,6 +398,7 @@ public class IcUserDemandRecController implements ResultDataResolver {
 
     /**
      * desc:根据来源id 删除需求 只删主表
+     * 2022.10.12:删除服务需求：ic_user_demand_rec、ic_user_demand_service、ic_user_demand_satisfaction、ic_user_demand_operate_log
      * @param originId
      * @param origin
      * @return

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java

@@ -268,6 +268,7 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
 
     /**
      * desc:根据来源id 删除需求 只删主表
+     * 2022.10.12:删除服务需求：ic_user_demand_rec、ic_user_demand_service、ic_user_demand_satisfaction、ic_user_demand_operate_log
      * @param originId
      * @param origin
      * @return

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -18,6 +18,7 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -520,18 +521,66 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         return serverInfoDTO;
     }
 
+    /**
+     * 此方法是删除事件时调用，如果事件被转了服务，服务记录也要删除
+     * @param originId
+     * @param origin
+     * @return
+     */
     @Override
     public Integer deleteByOriginId(String originId, String origin) {
         if(StringUtils.isBlank(originId) || StringUtils.isBlank(origin)){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误");
         }
-        LambdaUpdateWrapper<IcUserDemandRecEntity> wrapper = new LambdaUpdateWrapper();
+        LambdaQueryWrapper<IcUserDemandRecEntity> queryWrapper = new LambdaQueryWrapper();
-        wrapper.eq(IcUserDemandRecEntity::getOriginId, originId)
+        queryWrapper.eq(IcUserDemandRecEntity::getOrigin,origin).eq(IcUserDemandRecEntity::getOriginId,originId);
-                .eq(IcUserDemandRecEntity::getOrigin,origin)
+        IcUserDemandRecEntity recEntity = baseDao.selectOne(queryWrapper);
-                .set(IcUserDemandRecEntity::getUpdatedTime,new Date())
+        if (null == recEntity) {
-                .set(IcUserDemandRecEntity::getCreatedBy,loginUserUtil.getLoginUserId())
+            return 0;
-                .set(IcUserDemandRecEntity::getDelFlag,NumConstant.ONE_STR);
+        }
-        return baseDao.update(null, wrapper);
+        //删除服务需求
+        deleteUserDemand(Arrays.asList(recEntity.getId()));
+        return 1;
+    }
+
+    /**
+     * 删除服务需求
+     * ic_user_demand_rec、ic_user_demand_service、ic_user_demand_satisfaction、ic_user_demand_operate_log
+     * @param ids
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteUserDemand(List<String> ids) {
+        Date nowTime = new Date();
+        String currentUserId = loginUserUtil.getLoginUserId();
+        for (String id : ids) {
+            LambdaUpdateWrapper<IcUserDemandRecEntity> wrapper = new LambdaUpdateWrapper();
+            wrapper.eq(IcUserDemandRecEntity::getId, id)
+                    .set(IcUserDemandRecEntity::getUpdatedTime, nowTime)
+                    .set(IcUserDemandRecEntity::getCreatedBy, currentUserId)
+                    .set(IcUserDemandRecEntity::getDelFlag, NumConstant.ONE_STR);
+            baseDao.update(null, wrapper);
+
+            LambdaUpdateWrapper<IcUserDemandServiceEntity> serviceWrapper = new LambdaUpdateWrapper();
+            serviceWrapper.eq(IcUserDemandServiceEntity::getDemandRecId, id)
+                    .set(IcUserDemandServiceEntity::getUpdatedTime, nowTime)
+                    .set(IcUserDemandServiceEntity::getCreatedBy, currentUserId)
+                    .set(IcUserDemandServiceEntity::getDelFlag, NumConstant.ONE_STR);
+            demandServiceDao.update(null, serviceWrapper);
+
+            LambdaUpdateWrapper<IcUserDemandSatisfactionEntity> statWrapper = new LambdaUpdateWrapper();
+            statWrapper.eq(IcUserDemandSatisfactionEntity::getDemandRecId, id)
+                    .set(IcUserDemandSatisfactionEntity::getUpdatedTime, nowTime)
+                    .set(IcUserDemandSatisfactionEntity::getCreatedBy, currentUserId)
+                    .set(IcUserDemandSatisfactionEntity::getDelFlag, NumConstant.ONE_STR);
+            demandSatisfactionDao.update(null, statWrapper);
+
+            LambdaUpdateWrapper<IcUserDemandOperateLogEntity> logWrapper = new LambdaUpdateWrapper();
+            logWrapper.eq(IcUserDemandOperateLogEntity::getDemandRecId, id)
+                    .set(IcUserDemandOperateLogEntity::getUpdatedTime, nowTime)
+                    .set(IcUserDemandOperateLogEntity::getCreatedBy, currentUserId)
+                    .set(IcUserDemandOperateLogEntity::getDelFlag, NumConstant.ONE_STR);
+            operateLogDao.update(null, logWrapper);
+        }
     }
 
     /**