From b0f64b40511549206cb6e6e96733823066a82555 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Fri, 5 Mar 2021 17:20:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=BB=9F=E4=B8=80=E7=AE=A1?= =?UTF-8?q?=E7=90=86bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-events/epdc-events-maintain/pom.xml | 16 ++++++++++--- .../impl/MaintainEpdcEventsServiceImpl.java | 2 +- .../impl/MaintainEpdcIssueServiceImpl.java | 15 +++++++++++- .../modules/item/dao/MaintainEpdcItemDao.java | 17 ++++++++++++++ .../modules/item/dto/ItemSummaryDTO.java | 5 ++++ .../impl/MaintainEpdcItemServiceImpl.java | 23 ++++++++++++++++++- .../src/main/resources/application.yml | 6 ++--- .../mapper/issue/MaintainEpdcIssueDao.xml | 2 +- .../mapper/item/MaintainEpdcItemDao.xml | 11 +++++++-- .../src/main/resources/application.yml | 2 +- esua-epdc/pom.xml | 1 - 11 files changed, 86 insertions(+), 14 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/pom.xml index a31b03b4..3e7ce03e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/pom.xml @@ -27,13 +27,23 @@ com.esua.epdc epdc-commons-mybatis - 1.0.0 + ${project.version} com.esua.epdc epdc-commons-api-version-control ${project.version} + + org.projectlombok + lombok + provided + + + org.springframework.boot + spring-boot-autoconfigure + compile + org.springframework.boot spring-boot-starter-web @@ -45,7 +55,6 @@ org.apache.rocketmq rocketmq-spring-boot-starter - 2.0.2 @@ -79,10 +88,11 @@ true ${basedir}/src/main/resources - **/application*.yml + application.yml **/*.properties logback-spring.xml registry.conf + mapper/**/*.xml diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/events/service/impl/MaintainEpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/events/service/impl/MaintainEpdcEventsServiceImpl.java index da1dca29..67cfb01a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/events/service/impl/MaintainEpdcEventsServiceImpl.java +++ b/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 params = new HashMap<>(); - params.put("EVENTS_ID",eventsId); + params.put("EVENT_ID",eventsId); List issueSummaryEntities = maintainEpdcIssueDao.selectByMap(params); if(issueSummaryEntities!=null && issueSummaryEntities.size()>0){ return new Result().error("该事件下存在议题，请先删除对应议题"); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/service/impl/MaintainEpdcIssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/service/impl/MaintainEpdcIssueServiceImpl.java index 9bdf4a78..76a4a432 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/service/impl/MaintainEpdcIssueServiceImpl.java +++ b/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 BaseServiceImpl0){ return new Result().error("该议题下存在项目，请先删除对应项目"); } - return new Result().ok(maintainEpdcIssueDao.deleteById(issueId)); + maintainEpdcIssueDao.deleteById(issueId); + //删除议题处理流程表 + Map params2 = new HashMap<>(); + params2.put("ISSUE_ID",issueId); + List issueSummaryHandleEntities = issueSummaryHandleDao.selectByMap(params2); + if(issueSummaryHandleEntities.size()!=0){ + List ids = issueSummaryHandleEntities.stream().map(BaseEpdcEntity::getId).collect(Collectors.toList()); + //删除项目处理流程表 + issueSummaryHandleDao.deleteBatchIds(ids); + } + return new Result(); } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dao/MaintainEpdcItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dao/MaintainEpdcItemDao.java index 9e06eb9e..2488ab8e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dao/MaintainEpdcItemDao.java +++ b/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 { * @return java.util.List **/ List selectListOfItem(Map 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); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dto/ItemSummaryDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dto/ItemSummaryDTO.java index ad9dd7ab..75270e79 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dto/ItemSummaryDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/service/impl/MaintainEpdcItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/service/impl/MaintainEpdcItemServiceImpl.java index dab425e4..3cbabf4d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/service/impl/MaintainEpdcItemServiceImpl.java +++ b/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 params = new HashMap<>(); + params.put("ITEM_ID",itemId); + List itemSummaryHandleProcessEntities = itemSummaryHandleProcessDao.selectByMap(params); + if(itemSummaryHandleProcessEntities.size()!=0){ + List ids = itemSummaryHandleProcessEntities.stream().map(BaseEpdcEntity::getId).collect(Collectors.toList()); + //删除项目处理流程表 + itemSummaryHandleProcessDao.deleteBatchIds(ids); + } + //删除流程对应部门表 + baseDao.deleteItemDeptByItemId(itemId); + //删除部门评价表 + baseDao.deleteItemEvaluateByItemId(itemId); + return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/application.yml index c5de728b..320469f8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/application.yml +++ b/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' \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/MaintainEpdcIssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/MaintainEpdcIssueDao.xml index 184ef484..246cf840 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/MaintainEpdcIssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/MaintainEpdcIssueDao.xml @@ -17,6 +17,6 @@ AND ei.ISSUE_CONTENT like concat('%', #{issueContent}, '%') - ORDER BY itemCount DESC,createdTime desc; + ORDER BY itemCount DESC,createdTime desc diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/MaintainEpdcItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/MaintainEpdcItemDao.xml index 7b3ddda6..69a8462d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/MaintainEpdcItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/MaintainEpdcItemDao.xml @@ -2,13 +2,20 @@ + + update epdc_item_dept set DEL_FLAG = '1',UPDATED_TIME = now() where ITEM_ID = #{itemId} + + + update epdc_item_evaluate_dept set DEL_FLAG = '1',UPDATED_TIME = now() where ITEM_ID = #{itemId} + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml index 459b80f5..0bc50381 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml +++ b/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: diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml index 441a456c..6fb239c0 100644 --- a/esua-epdc/pom.xml +++ b/esua-epdc/pom.xml @@ -21,7 +21,6 @@ epdc-auth epdc-admin epdc-module - epdc-events-summarizing