diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index 27d88957b5..168d343a79 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/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 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 99894e3165..6c294e4608 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/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 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java index ce4b03c9b7..68d30ddc19 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java @@ -268,6 +268,7 @@ public interface IcUserDemandRecService extends BaseService wrapper = new LambdaUpdateWrapper(); - wrapper.eq(IcUserDemandRecEntity::getOriginId, originId) - .eq(IcUserDemandRecEntity::getOrigin,origin) - .set(IcUserDemandRecEntity::getUpdatedTime,new Date()) - .set(IcUserDemandRecEntity::getCreatedBy,loginUserUtil.getLoginUserId()) - .set(IcUserDemandRecEntity::getDelFlag,NumConstant.ONE_STR); - return baseDao.update(null, wrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(IcUserDemandRecEntity::getOrigin,origin).eq(IcUserDemandRecEntity::getOriginId,originId); + IcUserDemandRecEntity recEntity = baseDao.selectOne(queryWrapper); + if (null == recEntity) { + return 0; + } + //删除服务需求 + 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 ids) { + Date nowTime = new Date(); + String currentUserId = loginUserUtil.getLoginUserId(); + for (String id : ids) { + LambdaUpdateWrapper 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 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 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 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); + } } /**