params);
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/events/dto/EpdcEventsSummaryDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/events/dto/EpdcEventsSummaryDTO.java
new file mode 100644
index 00000000..0f30dad9
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/events/dto/EpdcEventsSummaryDTO.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * @Description 事件列表
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return com.elink.esua.epdc.commons.tools.page.PageData
+ **/
+ PageData listOfEvents(Map params);
+
+ /**
+ * @Description 删除事件
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [eventsId]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ **/
+ Result deleteEvents(String eventsId);
}
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 ce0d3b54..da1dca29 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
@@ -1,14 +1,52 @@
package com.elink.esua.epdc.maintain.modules.events.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
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;
import com.elink.esua.epdc.maintain.modules.events.dao.MaintainEpdcEventsDao;
+import com.elink.esua.epdc.maintain.modules.events.dto.EpdcEventsSummaryDTO;
import com.elink.esua.epdc.maintain.modules.events.entity.MaintainEpdcEventsEntity;
import com.elink.esua.epdc.maintain.modules.events.service.MaintainEpdcEventsService;
+import com.elink.esua.epdc.maintain.modules.issue.dao.MaintainEpdcIssueDao;
+import com.elink.esua.epdc.maintain.modules.issue.entity.MaintainEpdcIssueEntity;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Liuchuang
*/
@Service
public class MaintainEpdcEventsServiceImpl extends BaseServiceImpl implements MaintainEpdcEventsService {
+
+ @Autowired
+ private MaintainEpdcEventsDao maintainEpdcEventsDao;
+
+ @Autowired
+ private MaintainEpdcIssueDao maintainEpdcIssueDao;
+
+
+ @Override
+ public PageData listOfEvents(Map params) {
+ IPage page = getPage(params);
+ List list = baseDao.selectListOfEvents(params);
+ return new PageData<>(list, page.getTotal());
+ }
+
+
+ @Override
+ public Result deleteEvents(String eventsId) {
+ Map params = new HashMap<>();
+ params.put("EVENTS_ID",eventsId);
+ List issueSummaryEntities = maintainEpdcIssueDao.selectByMap(params);
+ if(issueSummaryEntities!=null && issueSummaryEntities.size()>0){
+ return new Result().error("该事件下存在议题，请先删除对应议题");
+ }
+ return new Result().ok(baseDao.deleteById(eventsId));
+ }
+
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/controller/MaintainEpdcIssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/controller/MaintainEpdcIssueController.java
index df5dcfa8..de67d654 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/controller/MaintainEpdcIssueController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/controller/MaintainEpdcIssueController.java
@@ -1,9 +1,57 @@
package com.elink.esua.epdc.maintain.modules.issue.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
+import com.elink.esua.epdc.maintain.modules.issue.dto.IssueSummaryDTO;
+import com.elink.esua.epdc.maintain.modules.issue.service.MaintainEpdcIssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
@RestController
@RequestMapping("maintainissue")
public class MaintainEpdcIssueController {
+
+ @Autowired
+ private MaintainEpdcIssueService maintainEpdcIssueService;
+
+ /**
+ * @Description 事件对应的议题列表
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ **/
+ @GetMapping("pageIssues")
+ public Result> pageIssues(@RequestParam Map params){
+ PageData page = maintainEpdcIssueService.listOfIssues(params);
+ return new Result>().ok(page);
+ }
+
+ /**
+ * @Description 议题对应的处理流程列表
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ **/
+ @GetMapping("pageIssuesHandle")
+ public Result> pageIssuesHandle(@RequestParam Map params){
+ PageData page = maintainEpdcIssueService.listOfIssuesHandle(params);
+ return new Result>().ok(page);
+ }
+
+ /**
+ * @Description 删除议题
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [eventsId]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ **/
+ @DeleteMapping("deleteIssues")
+ public Result deleteIssues(@RequestBody String[] ids){
+ return maintainEpdcIssueService.deleteIssue(ids[0]);
+ }
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/dao/IssueSummaryHandleDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/dao/IssueSummaryHandleDao.java
new file mode 100644
index 00000000..baf6738d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/dao/IssueSummaryHandleDao.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * @Description 议题处理流程
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return java.util.List
+ **/
+ List selectListOfIssuesHandle(Map params);
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/dao/MaintainEpdcIssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/dao/MaintainEpdcIssueDao.java
index e92b184e..ce733308 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/dao/MaintainEpdcIssueDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/dao/MaintainEpdcIssueDao.java
@@ -1,12 +1,24 @@
package com.elink.esua.epdc.maintain.modules.issue.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.maintain.modules.issue.dto.IssueSummaryDTO;
import com.elink.esua.epdc.maintain.modules.issue.entity.MaintainEpdcIssueEntity;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Liuchuang
*/
@Mapper
public interface MaintainEpdcIssueDao extends BaseDao {
+ /**
+ * @Description 议题列表
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return java.util.List
+ **/
+ List selectListOfIssues(Map params);
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/dto/IssueSummaryDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/dto/IssueSummaryDTO.java
new file mode 100644
index 00000000..17c315a3
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/issue/dto/IssueSummaryDTO.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+ /**
+ * @Description 议题列表
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return com.elink.esua.epdc.commons.tools.page.PageData
+ **/
+ PageData listOfIssues(Map params);
+
+ /**
+ * @Description 议题处理流程
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return com.elink.esua.epdc.commons.tools.page.PageData
+ **/
+ PageData listOfIssuesHandle(Map params);
+ /**
+ * @Description 删除议题
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [eventsId]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ **/
+ Result deleteIssue(String issueId);
}
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 77a85285..9bdf4a78 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,14 +1,61 @@
package com.elink.esua.epdc.maintain.modules.issue.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
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;
+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.MaintainEpdcIssueEntity;
import com.elink.esua.epdc.maintain.modules.issue.service.MaintainEpdcIssueService;
+import com.elink.esua.epdc.maintain.modules.item.dao.MaintainEpdcItemDao;
+import com.elink.esua.epdc.maintain.modules.item.entity.MaintainEpdcItemEntity;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Liuchuang
*/
@Service
public class MaintainEpdcIssueServiceImpl extends BaseServiceImpl implements MaintainEpdcIssueService {
+
+ @Autowired
+ private MaintainEpdcIssueDao maintainEpdcIssueDao;
+ @Autowired
+ private MaintainEpdcItemDao maintainEpdcItemDao;
+ @Autowired
+ private IssueSummaryHandleDao issueSummaryHandleDao;
+
+ @Override
+ public PageData listOfIssues(Map params) {
+ IPage page = getPage(params);
+ List list = maintainEpdcIssueDao.selectListOfIssues(params);
+ return new PageData<>(list, page.getTotal());
+ }
+
+
+ @Override
+ public PageData listOfIssuesHandle(Map params) {
+ IPage page = getPage(params);
+ List list = issueSummaryHandleDao.selectListOfIssuesHandle(params);
+ return new PageData<>(list, page.getTotal());
+ }
+
+ @Override
+ public Result deleteIssue(String issueId) {
+ Map params = new HashMap<>();
+ params.put("ISSUE_ID",issueId);
+ List itemSummaryEntities = maintainEpdcItemDao.selectByMap(params);
+ if(itemSummaryEntities!=null && itemSummaryEntities.size()>0){
+ return new Result().error("该议题下存在项目，请先删除对应项目");
+ }
+ return new Result().ok(maintainEpdcIssueDao.deleteById(issueId));
+ }
+
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/controller/MaintainEpdcItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/controller/MaintainEpdcItemController.java
index 8f5c299e..c10d7696 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/controller/MaintainEpdcItemController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/controller/MaintainEpdcItemController.java
@@ -1,7 +1,14 @@
package com.elink.esua.epdc.maintain.modules.item.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
+import com.elink.esua.epdc.maintain.modules.item.dto.ItemSummaryDTO;
+import com.elink.esua.epdc.maintain.modules.item.service.MaintainEpdcItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
/**
* @author Liuchuang
@@ -9,4 +16,46 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("maintainitem")
public class MaintainEpdcItemController {
+
+ @Autowired
+ private MaintainEpdcItemService maintainEpdcItemService;
+
+ /**
+ * @Description 议题对应的项目列表
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ **/
+ @GetMapping("pageItems")
+ public Result> pageItems(@RequestParam Map params){
+ PageData page = maintainEpdcItemService.listOfItems(params);
+ return new Result>().ok(page);
+ }
+
+ /**
+ * @Description 项目对应的流程处理列表
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ **/
+ @GetMapping("pageItemsHandle")
+ public Result> pageItemsHandle(@RequestParam Map params){
+ PageData page = maintainEpdcItemService.listOfItemsHandle(params);
+ return new Result>().ok(page);
+ }
+
+ /**
+ * @Description 删除项目
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [eventsId]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ **/
+ @DeleteMapping("deleteItems")
+ public Result deleteItems(@RequestBody String[] ids){
+ return maintainEpdcItemService.deleteItem(ids[0]);
+ }
+
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dao/ItemSummaryDeptDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dao/ItemSummaryDeptDao.java
new file mode 100644
index 00000000..90c25a7b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dao/ItemSummaryDeptDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dao/ItemSummaryHandleProcessDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dao/ItemSummaryHandleProcessDao.java
new file mode 100644
index 00000000..02d76d7a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dao/ItemSummaryHandleProcessDao.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * @Description 项目处理流程
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return java.util.List
+ **/
+ List selectListOfItemsHandle(Map params);
+}
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 24b18c7d..9e06eb9e 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
@@ -1,12 +1,25 @@
package com.elink.esua.epdc.maintain.modules.item.dao;
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 java.util.List;
+import java.util.Map;
+
/**
* @author Liuchuang
*/
@Mapper
public interface MaintainEpdcItemDao extends BaseDao {
+
+ /**
+ * @Description 项目列表
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return java.util.List
+ **/
+ List selectListOfItem(Map params);
}
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
new file mode 100644
index 00000000..ad9dd7ab
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/java/com/elink/esua/epdc/maintain/modules/item/dto/ItemSummaryDTO.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+ /**
+ * @Description 项目列表
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return com.elink.esua.epdc.commons.tools.page.PageData
+ **/
+ PageData listOfItems(Map params);
+
+ /**
+ * @Description 项目对应的议题处理流程
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [params]
+ * @return com.elink.esua.epdc.commons.tools.page.PageData
+ **/
+ PageData listOfItemsHandle(Map params);
+
+
+ /**
+ * @Description 删除项目
+ * @Author songyunpeng
+ * @Date 2021/1/18
+ * @Param [eventsId]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ **/
+ Result deleteItem(String itemId);
}
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 4928ab04..dab425e4 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,14 +1,52 @@
package com.elink.esua.epdc.maintain.modules.item.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
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;
+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.MaintainEpdcItemEntity;
import com.elink.esua.epdc.maintain.modules.item.service.MaintainEpdcItemService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Liuchuang
*/
@Service
public class MaintainEpdcItemServiceImpl extends BaseServiceImpl implements MaintainEpdcItemService {
+
+ @Autowired
+ private MaintainEpdcItemDao maintainEpdcItemDao;
+
+
+ @Autowired
+ private ItemSummaryHandleProcessDao itemSummaryHandleProcessDao;
+
+ @Override
+ public PageData listOfItems(Map params) {
+ IPage page = getPage(params);
+ List list = maintainEpdcItemDao.selectListOfItem(params);
+ return new PageData<>(list, page.getTotal());
+ }
+
+ @Override
+ public PageData listOfItemsHandle(Map params) {
+ IPage page = getPage(params);
+ List list = itemSummaryHandleProcessDao.selectListOfItemsHandle(params);
+ return new PageData<>(list, page.getTotal());
+ }
+
+ @Override
+ public Result deleteItem(String itemId) {
+ return new Result().ok(maintainEpdcItemDao.deleteById(itemId));
+ }
+
+
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/events/MaintainEpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/events/MaintainEpdcEventsDao.xml
index 2cabfaf2..34fccd8b 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/events/MaintainEpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/events/MaintainEpdcEventsDao.xml
@@ -2,5 +2,21 @@
-
+
+ SELECT
+ temp.id,
+ temp.nick_Name AS nickName,
+ temp.event_content AS eventContent,
+ temp.CREATED_TIME AS createdTime,
+ (select count(1) from epdc_issue ei where ei.DEL_FLAG ='0' and ei.EVENT_ID = temp.ID)issueCount,
+ temp.EVENT_STATE
+ FROM
+ epdc_events temp
+ WHERE
+ temp.DEL_FLAG = '0'
+
+ AND temp.event_content like concat('%', #{eventContent}, '%')
+
+ ORDER BY issueCount DESC,createdTime desc
+
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml
new file mode 100644
index 00000000..bc2b3b29
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+ SELECT
+ hd.ID,
+ hd.STATE,
+ hd.CREATED_TIME,
+ hd.ADVICE,
+ hd.HANDLER_DEPT,
+ hd.MOBILE,
+ hd.GROUP_NAME
+ FROM
+ epdc_issue_handle hd
+ WHERE
+ hd.DEL_FLAG = '0'
+ AND hd.ISSUE_ID = #{issueId}
+ ORDER BY
+ hd.CREATED_TIME DESC
+
+
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 f3c3fee0..184ef484 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
@@ -2,5 +2,21 @@
-
+
+ SELECT
+ ei.id,
+ ei.nick_Name AS nickName,
+ ei.ISSUE_CONTENT AS issueContent,
+ ei.CREATED_TIME AS createdTime,
+ (select count(1) from epdc_item ei2 where ei2.DEL_FLAG ='0' and ei2.ISSUE_ID = ei.ID)itemCount,
+ ei.ISSUE_STATE
+ FROM
+ epdc_issue ei
+ WHERE
+ ei.DEL_FLAG = '0' and ei.EVENT_ID = #{eventId}
+
+ AND ei.ISSUE_CONTENT like concat('%', #{issueContent}, '%')
+
+ ORDER BY itemCount DESC,createdTime desc;
+
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryDeptDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryDeptDao.xml
new file mode 100644
index 00000000..211f3b5d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryDeptDao.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml
new file mode 100644
index 00000000..0c5487ff
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+ SELECT
+ hp.ID,
+ hp.CREATED_TIME AS createdTime,
+ hp.HANDLE_ADVICE AS advice,
+ hp.HANDLER_DEPT AS handlerDept,
+ hp.STATE
+ FROM
+ epdc_item_handle_process hp
+ WHERE
+ hp.DEL_FLAG = '0'
+ AND hp.ITEM_ID = #{itemId}
+ ORDER BY
+ 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 a83f76ae..7b3ddda6 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,5 +2,20 @@
-
+
+ SELECT
+ ei.id,
+ ei.nick_Name AS nickName,
+ ei.ITEM_CONTENT AS itemContent,
+ ei.CREATED_TIME AS createdTime,
+ ei.ITEM_STATE
+ FROM
+ epdc_item ei
+ WHERE
+ ei.DEL_FLAG = '0' and ei.ISSUE_ID = #{issueId}
+
+ AND ei.ITEM_CONTENT like concat('%', #{itemContent}, '%')
+
+ ORDER BY createdTime DESC;
+
diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml
index 748435f6..64d6e083 100644
--- a/esua-epdc/pom.xml
+++ b/esua-epdc/pom.xml
@@ -21,6 +21,7 @@
epdc-auth
epdc-admin
epdc-module
+ epdc-events-summarizing
From b0f64b40511549206cb6e6e96733823066a82555 Mon Sep 17 00:00:00 2001
From: songyunpeng
Date: Fri, 5 Mar 2021 17:20:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E7=AE=A1=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}
+
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 @@
AND ei.ITEM_CONTENT like concat('%', #{itemContent}, '%')
- ORDER BY createdTime DESC;
+ ORDER BY createdTime DESC
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
From 77e25a78acb5f628a344044904a2af0979d1e00d Mon Sep 17 00:00:00 2001
From: songyunpeng
Date: Mon, 8 Mar 2021 15:49:35 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../esua/epdc/dto/issue/result/IssueProgressResultDTO.java | 5 +++++
.../epdc/dto/item/result/ItemHandleProgressResultDTO.java | 4 ++++
.../main/resources/mapper/issue/IssueSummaryHandleDao.xml | 7 +++++--
.../resources/mapper/item/ItemSummaryHandleProcessDao.xml | 7 +++++--
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
index 722ba728..d7207e46 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
@@ -52,4 +52,9 @@ public class IssueProgressResultDTO implements Serializable {
* 来源社群
*/
private String groupName;
+
+ /**
+ * 事件ID
+ */
+ private String eventId;
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java
index a0a90c95..d4f0d083 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java
@@ -36,6 +36,10 @@ public class ItemHandleProgressResultDTO implements Serializable {
* 操作人部门
*/
private String handlerDept;
+ /**
+ * 议题ID
+ */
+ private String issueId;
/**
* 吹哨部门
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml
index bc2b3b29..18634095 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml
@@ -11,6 +11,7 @@
SELECT
@@ -20,11 +21,13 @@
hd.ADVICE,
hd.HANDLER_DEPT,
hd.MOBILE,
- hd.GROUP_NAME
+ hd.GROUP_NAME,
+ ei.EVENT_ID
FROM
epdc_issue_handle hd
+ left join epdc_issue ei on ei.ID = hd.ISSUE_ID
WHERE
- hd.DEL_FLAG = '0'
+ hd.DEL_FLAG = '0' and ei.DEL_FLAG = '0'
AND hd.ISSUE_ID = #{issueId}
ORDER BY
hd.CREATED_TIME DESC
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml
index 0c5487ff..d2b427df 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml
@@ -8,6 +8,7 @@
SELECT
@@ -15,11 +16,13 @@
hp.CREATED_TIME AS createdTime,
hp.HANDLE_ADVICE AS advice,
hp.HANDLER_DEPT AS handlerDept,
- hp.STATE
+ hp.STATE,
+ ei.ISSUE_ID
FROM
epdc_item_handle_process hp
+ left join epdc_item ei on ei.ID = hp.ITEM_ID
WHERE
- hp.DEL_FLAG = '0'
+ hp.DEL_FLAG = '0' and ei.DEL_FLAG = '0'
AND hp.ITEM_ID = #{itemId}
ORDER BY
createdTime DESC