diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ProcessProgressConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ProcessProgressConstant.java new file mode 100644 index 00000000..01623eec --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ProcessProgressConstant.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.constant; + +/** + * 处理进展常量 + * + * @author work@yujt.net.cn + * @date 2022/01/21 10:30 + */ +public interface ProcessProgressConstant { + + /** + * 事件 + */ + String EVENT = "event"; + + /** + * 事件转议题 + */ + String EVENT_ISSUE = "event-issue"; + + /** + * 议题 + */ + String ISSUE = "issue"; + + /** + * 议题转项目 + */ + String ISSUE_PROJECT = "issue-project"; + + /** + * 项目 + */ + String PROJECT = "project"; + + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/ImagesDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/ImagesDTO.java new file mode 100644 index 00000000..fa7774aa --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/ImagesDTO.java @@ -0,0 +1,13 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ImagesDTO implements Serializable { + + private String name; + + private String url; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/BatchHandleImagesDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/BatchHandleImagesDTO.java new file mode 100644 index 00000000..cca00e02 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/BatchHandleImagesDTO.java @@ -0,0 +1,47 @@ +/** + * 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 . + */ + +package com.elink.esua.epdc.dto.events; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 图片批处理 + **/ +@Data +public class BatchHandleImagesDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 引用 ID + */ + private String referenceId; + + /** + * 图片类型 + */ + private String imgType; + + /** + * 图片URL + */ + private List images; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EventRelationshipIdDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EventRelationshipIdDTO.java new file mode 100644 index 00000000..a1d76a66 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EventRelationshipIdDTO.java @@ -0,0 +1,44 @@ +/** + * 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 . + */ + +package com.elink.esua.epdc.dto.events; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +@Data +public class EventRelationshipIdDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 事件 ID + */ + private String eventId; + + /** + * 议题 ID + */ + private String issueId; + + /** + * 项目 ID + */ + private String itemId; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/EditProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/EditProgressResultDTO.java index 8a170e82..f73aa941 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/EditProgressResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/EditProgressResultDTO.java @@ -1,9 +1,11 @@ package com.elink.esua.epdc.dto.issue.result; +import com.elink.esua.epdc.dto.ImagesDTO; import com.elink.esua.epdc.dto.item.ItemDeptDTO; import lombok.Data; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -18,10 +20,7 @@ public class EditProgressResultDTO implements Serializable { private static final long serialVersionUID = 2739821096656995025L; /** - * 处理进展类型： 事件 init - * 议题 issue - * issue-project - * 项目 project + * 处理进展类型： 事件、议题、项目 ： ProcessProgressConstant */ private String handleType; @@ -43,7 +42,7 @@ public class EditProgressResultDTO implements Serializable { /** * 时间 */ - private String createdTime; + private Date createdTime; /** * 项目处理意见（内部意见）（项目有） @@ -63,31 +62,20 @@ public class EditProgressResultDTO implements Serializable { /** * 处理图片（内部处理图片） */ - private List images; + private List images; /** * 回复居民图片（外部处理图片） */ - // todo 回复居民图片（外部处理图片） - private List outImages; + private List outImages; /** * 事件ID */ -// private String eventId; + private String eventId; /** * 事件内容 */ private String eventContent; - - /** - * 议题ID - */ -// private String issueId; - - /** - * 项目ID - */ -// private String itemId; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java index af35c15c..639d04cd 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java @@ -205,4 +205,13 @@ public interface EpdcEventsDao extends BaseDao { */ void rejectEventsImgInfo(@Param("relationId") String relationId); + /** + * 查询事件关联的 议题id、项目id + * + * @param eventId + * @return com.elink.esua.epdc.dto.events.EventRelationshipIdDTO + * @Author zhangyong + * @Date 16:54 2022-01-11 + **/ + EventRelationshipIdDTO getEventRelationshipId(@Param("eventId") String eventId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/ImgDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/ImgDao.java index 7af17568..66928f05 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/ImgDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/ImgDao.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.events.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.events.entity.ImgEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 党建系统图片表 党建系统图片表 @@ -30,4 +31,14 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ImgDao extends BaseDao { + /** + * 图片删除 + * + * @param referenceId + * @param imgType + * @return void + * @Author zhangyong + * @Date 15:25 2022-01-12 + **/ + void modifyImagesByReferenceIdAndImgType(@Param("referenceId") String referenceId, @Param("imgType") String imgType); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index b558afc4..2d2bf042 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java @@ -264,4 +264,14 @@ public interface EpdcEventsService extends BaseService { * @since 2020/9/2 15:06 */ List listOfEventTags(); + + /** + * 查询事件关联的 议题id、项目id + * + * @param eventId + * @return com.elink.esua.epdc.dto.events.EventRelationshipIdDTO + * @Author zhangyong + * @Date 16:54 2022-01-11 + **/ + EventRelationshipIdDTO getEventRelationshipId(String eventId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ImgService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ImgService.java index c432b4ad..7db467b3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ImgService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ImgService.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.events.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.dto.events.BatchHandleImagesDTO; import com.elink.esua.epdc.modules.events.entity.ImgEntity; import java.util.List; @@ -48,4 +49,25 @@ public interface ImgService extends BaseService { * @Date: 2019/9/8 17:12 */ boolean saveImages(List images, String referenceId, String imgType); + + /** + * 图片删除 + * + * @param referenceId + * @param imgType + * @return void + * @Author zhangyong + * @Date 15:25 2022-01-12 + **/ + void modifyImagesByReferenceIdAndImgType(String referenceId, String imgType); + + /** + * 图片批量删除 + * + * @param images + * @return void + * @Author zhangyong + * @Date 15:25 2022-01-12 + **/ + void modifyBatchImagesByReferenceIdAndImgType(List images); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 171fb302..424f1e01 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -808,4 +808,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl implement return insertBatch(imgEntities); } + @Override + public void modifyImagesByReferenceIdAndImgType(String referenceId, String imgType) { + baseDao.modifyImagesByReferenceIdAndImgType(referenceId, imgType); + } + + @Override + public void modifyBatchImagesByReferenceIdAndImgType(List images) { + for (BatchHandleImagesDTO image : images) { + baseDao.modifyImagesByReferenceIdAndImgType(image.getReferenceId(), image.getImgType()); + } + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 20bb0e55..db395b86 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -250,4 +250,17 @@ public class ItemController { List data = itemService.getProcessProgress(id); return new Result>().ok(data); } + + /** + * 编辑 处理进展列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:25 2022-01-11 + **/ + @PostMapping("editProcessProgressList") + public Result editProcessProgressList(@RequestBody List formDto) { + return itemService.editProcessProgressList(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 49502b6f..f0cf2a37 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -429,4 +429,14 @@ public interface ItemService extends BaseService { * @Date 13:39 2022-01-10 **/ List getProcessProgress(String id); + + /** + * 编辑 处理进展列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:25 2022-01-11 + **/ + Result editProcessProgressList(List formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 57c38214..a9d7affb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; +import com.elink.esua.epdc.commons.tools.convert.DateConverter; import com.elink.esua.epdc.commons.tools.enums.InterfaceLogBusinessTypeEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; @@ -44,7 +45,9 @@ import com.elink.esua.epdc.constant.*; import com.elink.esua.epdc.constants.MenuCodeConstant; import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; +import com.elink.esua.epdc.dto.events.BatchHandleImagesDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; +import com.elink.esua.epdc.dto.events.EventRelationshipIdDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; @@ -55,6 +58,7 @@ import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum; import com.elink.esua.epdc.enums.ItemHandleCategoryEnum; +import com.elink.esua.epdc.constant.ProcessProgressConstant; import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi; import com.elink.esua.epdc.gird.shibei.constant.CommonConstants; import com.elink.esua.epdc.gird.shibei.contants.ApiConstants; @@ -68,6 +72,7 @@ import com.elink.esua.epdc.gird.shibei.util.XstreamUtil; import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.events.dao.ImgDao; +import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import com.elink.esua.epdc.modules.events.entity.ImgEntity; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import com.elink.esua.epdc.modules.events.service.ImgService; @@ -76,6 +81,9 @@ import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.UserFeignClient; import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogEntity; import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogService; +import com.elink.esua.epdc.modules.issue.entity.IssueEntity; +import com.elink.esua.epdc.modules.issue.entity.IssueHandleEntity; +import com.elink.esua.epdc.modules.issue.service.IssueHandleService; import com.elink.esua.epdc.modules.issue.service.IssueService; import com.elink.esua.epdc.modules.item.dao.GridPlatformHandleLogDao; import com.elink.esua.epdc.modules.item.dao.ItemDao; @@ -170,6 +178,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private ContentSecurityFeignClient contentSecurityFeign; + @Autowired + private IssueHandleService issueHandleService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -1603,12 +1614,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 获取项目处理进度 List result = baseDao.selectListOfEditItemHandleProgressByWork(id); // 项目处理表中第一条数据，为 议题转项目 - this.firstDataHandleType(result, "issue-project"); + this.firstDataHandleType(result, ProcessProgressConstant.ISSUE_PROJECT); // 获取议题处理进度 List issueList = issueService.listEditIssueProgress(entity.getIssueId()); - // 议题处理表中第一条数据，为 事件审核通过 - this.firstDataHandleType(issueList, "init"); + // 议题处理表中第一条数据，为 事件审核通过，即转议题 + this.firstDataHandleType(issueList, ProcessProgressConstant.EVENT_ISSUE); result.addAll(issueList); // 事件信息 @@ -1637,13 +1648,123 @@ public class ItemServiceImpl extends BaseServiceImpl implem private EditProgressResultDTO packageEventInfo(String eventId) { EditProgressResultDTO result = new EditProgressResultDTO(); Result event = issueService.getEventDetail(eventId); - result.setCreatedTime(event.getData().getDistributeTime()); - result.setOutAdvice(event.getData().getAdvice()); - result.setOutAdvice(event.getData().getAdvice()); + DateConverter converter = new DateConverter(); + result.setCreatedTime(converter.parseDate(event.getData().getDistributeTime(), DateUtils.DATE_TIME_PATTERN)); + result.setAdvice(event.getData().getAdvice()); result.setEventContent(event.getData().getContent()); - result.setHandleType("init"); - // 不显示状态 - result.setState(NumConstant.ONE_HUNDRED); + result.setHandleType(ProcessProgressConstant.EVENT); + result.setEventId(eventId); return result; } + + /** + * 组装要新增的图片信息 + * + * @param referenceId, imgType, images + * @return com.elink.esua.epdc.dto.events.BatchHandleImagesDTO + * @Author zhangyong + * @Date 15:41 2022-01-12 + **/ + private BatchHandleImagesDTO packageImagesInfo(String referenceId, String imgType, List images) { + BatchHandleImagesDTO result = new BatchHandleImagesDTO(); + result.setReferenceId(referenceId); + result.setImgType(imgType); + List urls = new ArrayList<>(); + for (ImagesDTO image : images) { + urls.add(image.getUrl()); + } + result.setImages(urls); + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result editProcessProgressList(List formDto) { + if (null == formDto || NumConstant.ZERO == formDto.size()) { + return new Result(); + } + List itemHandleProcessEntities = new ArrayList<>(); + List issueHandleEntities = new ArrayList<>(); + EpdcEventsEntity eventEntity = new EpdcEventsEntity(); + // 图片批量处理 + List batchHandleImages = new ArrayList<>(); + Date issueToProjectTime = null; + Date eventToIssueTime = null; + Date distributeTime = null; + String eventId = ""; + + for (EditProgressResultDTO dto : formDto) { + // 1、组装 项目处理进展表 信息 + if (ProcessProgressConstant.PROJECT.equals(dto.getHandleType()) || ProcessProgressConstant.ISSUE_PROJECT.equals(dto.getHandleType())) { + ItemHandleProcessEntity entity = new ItemHandleProcessEntity(); + entity.setCreatedTime(dto.getCreatedTime()); + entity.setHandleAdvice(dto.getAdvice()); + entity.setOutHandleAdvice(dto.getOutAdvice()); + entity.setId(dto.getId()); + itemHandleProcessEntities.add(entity); + if (ProcessProgressConstant.ISSUE_PROJECT.equals(dto.getHandleType())) { + issueToProjectTime = dto.getCreatedTime(); + } + // 组装 项目图片 信息 + batchHandleImages.add(this.packageImagesInfo(dto.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE, dto.getImages())); + batchHandleImages.add(this.packageImagesInfo(dto.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE, dto.getOutImages())) ; + } + + // 2、组装 议题处理进展 信息 + if (ProcessProgressConstant.ISSUE.equals(dto.getHandleType()) || ProcessProgressConstant.EVENT_ISSUE.equals(dto.getHandleType())) { + IssueHandleEntity entity = new IssueHandleEntity(); + entity.setCreatedTime(dto.getCreatedTime()); + entity.setAdvice(dto.getAdvice()); + entity.setId(dto.getId()); + issueHandleEntities.add(entity); + if (ProcessProgressConstant.EVENT_ISSUE.equals(dto.getHandleType())) { + eventToIssueTime = dto.getCreatedTime(); + } + // 组装 议题图片 信息 + batchHandleImages.add(this.packageImagesInfo(dto.getId(), ImageConstant.TYPE_IMAGE_BIZ_ISSUE_HANDLE, dto.getImages())); + } + // 3、组装 事件表 信息 + if (ProcessProgressConstant.EVENT.equals(dto.getHandleType())) { + eventEntity.setCreatedTime(dto.getCreatedTime()); + eventEntity.setAdvice(dto.getAdvice()); + eventEntity.setId(dto.getEventId()); + + distributeTime = dto.getCreatedTime(); + eventId = dto.getEventId(); + } + } + + // 4、处理图片 + imgService.modifyBatchImagesByReferenceIdAndImgType(batchHandleImages); + for (BatchHandleImagesDTO insertImage : batchHandleImages) { + imgService.saveImages(insertImage.getImages(), insertImage.getReferenceId(), insertImage.getImgType()); + } + + EventRelationshipIdDTO relationshipId = epdcEventsService.getEventRelationshipId(eventId); + + if (NumConstant.ZERO < itemHandleProcessEntities.size()) { + itemHandleProcessService.updateBatchById(itemHandleProcessEntities); + // 5、处理项目表 + ItemEntity itemEntity = new ItemEntity(); + itemEntity.setCreatedTime(issueToProjectTime); + itemEntity.setLastHandleTime(formDto.get(NumConstant.ZERO).getCreatedTime()); + itemEntity.setDistributeTime(distributeTime); + itemEntity.setId(relationshipId.getItemId()); + baseDao.updateById(itemEntity); + } + + if (NumConstant.ZERO < issueHandleEntities.size()) { + issueHandleService.updateBatchById(issueHandleEntities); + // 6、处理议题表 + IssueEntity issueEntity = new IssueEntity(); + issueEntity.setCreatedTime(eventToIssueTime); + issueEntity.setDistributeTime(distributeTime); + issueEntity.setId(relationshipId.getIssueId()); + issueService.updateById(issueEntity); + } + + // 7、处理事件表 + epdcEventsService.updateById(eventEntity); + return new Result(); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 1d845155..5503835d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -389,4 +389,16 @@ where REFERENCE_ID=#{relationId} + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/ImgDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/ImgDao.xml new file mode 100644 index 00000000..835ebcb8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/ImgDao.xml @@ -0,0 +1,10 @@ + + + + + + + update epdc_img set DEL_FLAG = 1 where REFERENCE_ID = #{referenceId} and IMG_TYPE = #{imgType} + + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 52d8690a..3e08cb1b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -667,8 +667,9 @@ - - + + + @@ -1078,11 +1083,15 @@ hp.HANDLER_DEPT, hp.STATE, itemDept.DEPT_NAME, - img.IMG_URL + img.IMG_URL, + img.ID as imageId, + outImg.IMG_URL AS OUT_IMG_URL, + outImg.ID as outImageId FROM epdc_item_handle_process hp LEFT JOIN epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID - LEFT JOIN epdc_img img ON hp.ID = img. REFERENCE_ID AND IMG_TYPE = 'itemHandle' AND img.DEL_FLAG = '0' + LEFT JOIN epdc_img img ON hp.ID = img. REFERENCE_ID AND img.IMG_TYPE = 'itemHandle' AND img.DEL_FLAG = '0' + LEFT JOIN epdc_img outImg ON hp.ID = outImg.REFERENCE_ID AND outImg.IMG_TYPE = 'itemOutHandle' AND outImg.DEL_FLAG = '0' WHERE hp.DEL_FLAG = '0' AND hp.ITEM_ID = #{itemId} ORDER BY createdTime DESC