删除事件时 删除项目和需求主表

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

@@ -171,4 +171,13 @@ public interface EpmetHeartOpenFeignClient {
     @PostMapping("/heart/icpartyunit/editpartyorcommunity")
     Result editPartyOrCommunity(@RequestBody CheckStaffInfoResultDTO formDTO);
 
+    /**
+     * desc:根据来源id 删除需求 只删主表
+     * @param originId
+     * @param origin
+     * @return
+     */
+    @PostMapping("/heart/userdemand/deleteByOriginId/{originId}/{origin}")
+    Result<Integer> deleteUserDemandByOriginId(String originId, String origin);
+
 }

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

@@ -13,7 +13,6 @@ import com.epmet.dto.form.IcDemandFormDTO;
 import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.demand.DemandRecId;
 import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO;
-import com.epmet.dto.form.demand.ServiceItemSelectFormDTO;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO;
@@ -21,7 +20,6 @@ import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
 import com.epmet.dto.result.CheckStaffInfoResultDTO;
 import com.epmet.dto.result.PartyUnitListResultDTO;
 import com.epmet.dto.result.demand.IcResiDemandDictDTO;
-import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
 
@@ -172,4 +170,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result editPartyOrCommunity(CheckStaffInfoResultDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "editPartyOrCommunity", formDTO);
     }
+
+    @Override
+    public Result<Integer> deleteUserDemandByOriginId(String originId, String origin) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "deleteUserDemandByOriginId", originId,origin);
+    }
 }

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

@@ -47,10 +47,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -399,5 +396,17 @@ public class IcUserDemandRecController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * desc:根据来源id 删除需求 只删主表
+     * @param originId
+     * @param origin
+     * @return
+     */
+    @PostMapping("deleteByOriginId/{originId}/{origin}")
+    public Result<Integer> deleteByOriginId(@PathVariable String originId, @PathVariable String origin) {
+        Integer effectRow = icUserDemandRecService.deleteByOriginId(originId,origin);
+        return new Result().ok(effectRow);
+    }
+
 
-}
+}

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

@@ -265,4 +265,13 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
     Integer selectCountByServerId(String serverId);
 
     ServerInfoDTO queryServiceName(String serverId, String serviceType);
-}
+
+    /**
+     * desc:根据来源id 删除需求 只删主表
+     * @param originId
+     * @param origin
+     * @return
+     */
+    Integer deleteByOriginId(String originId, String origin);
+
+}

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.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
@@ -467,6 +468,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      * @param serviceType
      * @return
      */
+    @Override
     public ServerInfoDTO queryServiceName(String serverId, String serviceType) {
         String serviceName="";
         String mobile="";
@@ -515,6 +517,17 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         return serverInfoDTO;
     }
 
+    @Override
+    public Integer deleteByOriginId(String originId, String origin) {
+        if(StringUtils.isBlank(originId) || StringUtils.isBlank(origin)){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误");
+        }
+        LambdaQueryWrapper<IcUserDemandRecEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcUserDemandRecEntity::getOriginId,originId)
+                .eq(IcUserDemandRecEntity::getOrigin,origin);
+        return baseDao.delete(wrapper);
+    }
+
     /**
      * 完成并评价
      *

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/enums/ProjectOriginEnum.java

@@ -0,0 +1,46 @@
+package com.epmet.enums;
+
+/**
+ * 项目来源枚举
+ * @author liujianjun
+ */
+public enum ProjectOriginEnum {
+    /**
+     * 项目来源
+     */
+    ISSUE("issue", "议题上报"),
+    AGENCY("agency", "直接立项"),
+    WORK_EVENT("work_event", "巡查上报"),
+    IC_EVENT("ic_event", "居民上报"),
+    RESI_EVENT("resi_event", "旧的居民上报（已废弃）");
+
+    private String code;
+    private String name;
+
+    ProjectOriginEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    /**
+     * 根据sourceType查询对应的枚举对象
+     * @param code
+     * @return
+     */
+    public static ProjectOriginEnum getEnumByCode(String code) {
+        for (ProjectOriginEnum e : ProjectOriginEnum.values()) {
+            if (e.getCode().equals(code)) {
+                return e;
+            }
+        }
+        return null;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@@ -397,4 +397,13 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 
     List<ProjectDTO> staffPendingProject(ProjectListFromDTO fromDTO);
     PageData<OrgProjectListResultDTO> orgProjectList(OrgProjectListFormDTO formDTO);
-}
+
+	/**
+	 * desc:根据来源id和类型 删除项目 （只删了主表）
+	 * @param originId
+	 * @param origin
+	 * @return
+	 */
+	Integer deleteByOriginId(String originId, String origin);
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -29,6 +29,7 @@ import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.enums.EcEventProcessStatusEnum;
+import com.epmet.enums.ProjectOriginEnum;
 import com.epmet.feign.*;
 import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.service.*;
@@ -407,8 +408,23 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
+        //已立项、已转服务的事件删除时，同时删除关联的服务和项目
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+        for (String id : ids) {
+            IcEventEntity entity = baseDao.selectById(id);
+            if (null == entity){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"数据不存在","数据不存在");
+            }
+            //1:已转项目  2:已转需求
+            if (NumConstant.ONE_STR.equals(entity.getOperationType())){
+                ProjectService projectService = SpringContextUtils.getBean(ProjectService.class);
+                Integer effectRow = projectService.deleteByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode());
+                log.info("delete project effectRow:{},eventId:{}", effectRow, id);
+            } else if (NumConstant.TWO_STR.equals(entity.getOperationType())){
+                Result<Integer> effectRow = epmetHeartOpenFeignClient.deleteUserDemandByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode());
+                log.info("delete userDemand effectRow:{},eventId:{}", effectRow, id);
+            }
+            baseDao.deleteById(id);
+        }
     }
 
     /**

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 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.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -3562,5 +3563,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return new PageData<>(list, pageInfo.getTotal());
 	}
 
+	@Override
+	public Integer deleteByOriginId(String originId, String origin) {
+		LambdaQueryWrapper<ProjectEntity> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(ProjectEntity::getOriginId, originId)
+		.eq(ProjectEntity::getOrigin,origin);
+		return baseDao.delete(wrapper);
+	}
+
 
 }