事件统一管理bug修改

esua-epdc/epdc-module/epdc-events/epdc-events-maintain/pom.xml

@@ -27,13 +27,23 @@
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-mybatis</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-api-version-control</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -45,7 +55,6 @@
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
-            <version>2.0.2</version>
         </dependency>
     </dependencies>
 
@@ -79,10 +88,11 @@
                 <filtering>true</filtering>
                 <directory>${basedir}/src/main/resources</directory>
                 <includes>
-                    <include>**/application*.yml</include>
+                    <include>application.yml</include>
                     <include>**/*.properties</include>
                     <include>logback-spring.xml</include>
                     <include>registry.conf</include>
+                    <include>mapper/**/*.xml</include>
                 </includes>
             </resource>
             <resource>

esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/events/service/impl/MaintainEpdcEventsServiceImpl.java

@@ -41,7 +41,7 @@ public class MaintainEpdcEventsServiceImpl extends BaseServiceImpl<MaintainEpdcE
     @Override
     public Result deleteEvents(String eventsId) {
         Map<String,Object> params = new HashMap<>();
-        params.put("EVENTS_ID",eventsId);
+        params.put("EVENT_ID",eventsId);
         List<MaintainEpdcIssueEntity> issueSummaryEntities = maintainEpdcIssueDao.selectByMap(params);
         if(issueSummaryEntities!=null && issueSummaryEntities.size()>0){
             return new Result().error("该事件下存在议题，请先删除对应议题");

esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/service/impl/MaintainEpdcIssueServiceImpl.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.maintain.modules.issue.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -8,6 +9,7 @@ import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
 import com.elink.esua.epdc.maintain.modules.issue.dao.IssueSummaryHandleDao;
 import com.elink.esua.epdc.maintain.modules.issue.dao.MaintainEpdcIssueDao;
 import com.elink.esua.epdc.maintain.modules.issue.dto.IssueSummaryDTO;
+import com.elink.esua.epdc.maintain.modules.issue.entity.IssueSummaryHandleEntity;
 import com.elink.esua.epdc.maintain.modules.issue.entity.MaintainEpdcIssueEntity;
 import com.elink.esua.epdc.maintain.modules.issue.service.MaintainEpdcIssueService;
 import com.elink.esua.epdc.maintain.modules.item.dao.MaintainEpdcItemDao;
@@ -18,6 +20,7 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author Liuchuang
@@ -55,7 +58,17 @@ public class MaintainEpdcIssueServiceImpl extends BaseServiceImpl<MaintainEpdcIs
         if(itemSummaryEntities!=null && itemSummaryEntities.size()>0){
             return new Result().error("该议题下存在项目，请先删除对应项目");
         }
-        return new Result().ok(maintainEpdcIssueDao.deleteById(issueId));
+        maintainEpdcIssueDao.deleteById(issueId);
+        //删除议题处理流程表
+        Map<String,Object> params2 = new HashMap<>();
+        params2.put("ISSUE_ID",issueId);
+        List<IssueSummaryHandleEntity> issueSummaryHandleEntities = issueSummaryHandleDao.selectByMap(params2);
+        if(issueSummaryHandleEntities.size()!=0){
+            List<String> ids = issueSummaryHandleEntities.stream().map(BaseEpdcEntity::getId).collect(Collectors.toList());
+            //删除项目处理流程表
+            issueSummaryHandleDao.deleteBatchIds(ids);
+        }
+        return new Result();
     }
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dao/MaintainEpdcItemDao.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.maintain.modules.item.dto.ItemSummaryDTO;
 import com.elink.esua.epdc.maintain.modules.item.entity.MaintainEpdcItemEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -22,4 +23,20 @@ public interface MaintainEpdcItemDao extends BaseDao<MaintainEpdcItemEntity> {
      * @return java.util.List<com.elink.esua.epdc.dto.issue.IssueDTO>
      **/
     List<ItemSummaryDTO> selectListOfItem(Map<String, Object> params);
+    /**
+     * @Description  删除项目部门关系表
+     * @Author songyunpeng
+     * @Date  2021/3/5
+     * @Param [itemId]
+     * @return void
+     **/
+    void deleteItemDeptByItemId(@Param("itemId") String itemId);
+    /**
+     * @Description  删除部门评价表
+     * @Author songyunpeng
+     * @Date  2021/3/5
+     * @Param [itemId]
+     * @return void
+     **/
+    void deleteItemEvaluateByItemId(String itemId);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dto/ItemSummaryDTO.java

@@ -61,4 +61,9 @@ public class ItemSummaryDTO implements Serializable {
      * 提交时间
      */
     private Date createdTime;
+
+    /**
+     * 事件ID
+     */
+    private String eventId;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/service/impl/MaintainEpdcItemServiceImpl.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.maintain.modules.item.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -8,13 +9,17 @@ import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
 import com.elink.esua.epdc.maintain.modules.item.dao.ItemSummaryHandleProcessDao;
 import com.elink.esua.epdc.maintain.modules.item.dao.MaintainEpdcItemDao;
 import com.elink.esua.epdc.maintain.modules.item.dto.ItemSummaryDTO;
+import com.elink.esua.epdc.maintain.modules.item.entity.ItemSummaryHandleProcessEntity;
 import com.elink.esua.epdc.maintain.modules.item.entity.MaintainEpdcItemEntity;
 import com.elink.esua.epdc.maintain.modules.item.service.MaintainEpdcItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author Liuchuang
@@ -44,8 +49,24 @@ public class MaintainEpdcItemServiceImpl extends BaseServiceImpl<MaintainEpdcIte
     }
 
     @Override
+    @Transactional
     public Result deleteItem(String itemId) {
-        return new Result().ok(maintainEpdcItemDao.deleteById(itemId));
+        maintainEpdcItemDao.deleteById(itemId);
+        /* 删除项目流程，流程对应部门表 项目部门评价表  */
+        //获取项目处理流程
+        Map<String,Object> params = new HashMap<>();
+        params.put("ITEM_ID",itemId);
+        List<ItemSummaryHandleProcessEntity> itemSummaryHandleProcessEntities = itemSummaryHandleProcessDao.selectByMap(params);
+        if(itemSummaryHandleProcessEntities.size()!=0){
+            List<String> ids = itemSummaryHandleProcessEntities.stream().map(BaseEpdcEntity::getId).collect(Collectors.toList());
+            //删除项目处理流程表
+            itemSummaryHandleProcessDao.deleteBatchIds(ids);
+        }
+        //删除流程对应部门表
+        baseDao.deleteItemDeptByItemId(itemId);
+        //删除部门评价表
+        baseDao.deleteItemEvaluateByItemId(itemId);
+        return new Result();
     }
 
 

esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 mybatis-plus:
-  mapper-locations: classpath:/mapper/**/*.xml
+  mapper-locations: classpath*:/mapper/**/*.xml
   #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.elink.esua.epdc.modules.*.entity
+  typeAliasesPackage: com.elink.esua.epdc.maintain.modules.*.entity
   global-config:
     #数据库相关配置
     db-config:
@@ -17,4 +17,4 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
     call-setters-on-nulls: true
-    jdbc-type-for-null: 'null'
+    jdbc-type-for-null: 'null'

esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/MaintainEpdcIssueDao.xml

@@ -17,6 +17,6 @@
         <if test="issueContent != null and issueContent != ''">
             AND ei.ISSUE_CONTENT like concat('%', #{issueContent}, '%')
         </if>
-        ORDER BY itemCount  DESC,createdTime desc;
+        ORDER BY itemCount  DESC,createdTime desc
     </select>
 </mapper>

esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/MaintainEpdcItemDao.xml

@@ -2,13 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.maintain.modules.item.dao.MaintainEpdcItemDao">
+    <update id="deleteItemDeptByItemId">
+        update epdc_item_dept set DEL_FLAG = '1',UPDATED_TIME = now() where ITEM_ID =  #{itemId}
+    </update>
+    <update id="deleteItemEvaluateByItemId">
+        update epdc_item_evaluate_dept set DEL_FLAG = '1',UPDATED_TIME = now() where ITEM_ID =  #{itemId}
+    </update>
     <select id="selectListOfItem" resultType="com.elink.esua.epdc.maintain.modules.item.dto.ItemSummaryDTO">
         SELECT
         ei.id,
         ei.nick_Name AS nickName,
         ei.ITEM_CONTENT AS itemContent,
         ei.CREATED_TIME AS createdTime,
-        ei.ITEM_STATE
+        ei.ITEM_STATE,
+        ei.EVENT_ID
         FROM
         epdc_item ei
         WHERE
@@ -16,6 +23,6 @@
         <if test="itemContent != null and itemContent != ''">
             AND ei.ITEM_CONTENT like concat('%', #{itemContent}, '%')
         </if>
-        ORDER BY createdTime  DESC;
+        ORDER BY createdTime  DESC
     </select>
 </mapper>

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml

@@ -68,7 +68,7 @@ management:
       show-details: ALWAYS
 
 mybatis-plus:
-  mapper-locations: classpath:/mapper/**/*.xml
+  mapper-locations: classpath*:/mapper/**/*.xml
   #实体扫描，多个package用逗号或者分号分隔
   typeAliasesPackage: com.elink.esua.epdc.modules.*.entity
   global-config:

esua-epdc/pom.xml

@@ -21,7 +21,6 @@
         <module>epdc-auth</module>
         <module>epdc-admin</module>
         <module>epdc-module</module>
-        <module>epdc-events-summarizing</module>
     </modules>
 
     <properties>