From 6df70dea2bc8d53f05862a4425e23692866e7023 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 6 May 2022 15:43:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=88=9B=E5=BB=BA=E6=97=B6=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=20=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IProjectTaskInventoryEOService.java | 6 +++ .../ProjectLawsInventoryEOServiceImpl.java | 38 ++++++++++++++----- .../ProjectTaskInventoryEOServiceImpl.java | 7 ++++ 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java index b13e63b72..7d6ed3cc9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java @@ -76,4 +76,10 @@ public interface IProjectTaskInventoryEOService extends IService remindDispose(JSONObject jsonObject); + + /** + * 根据法规清单id，删除数据 + * @param projectLawsInventoryIds + */ + void deleteByProjectLawsInventoryIds(List projectLawsInventoryIds); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index b80ab4903..e0001a929 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -22,10 +22,7 @@ import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.message.websocket.WebSocket; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.project.entity.ProjectLawsInventoryEO; -import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.project.entity.ProjectNameInfoEO; -import com.jero.modules.project.entity.ProjectRelatedPersonnel; +import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.InventoryAffirmStatusEnum; import com.jero.modules.project.enums.MsgTypeEnum; import com.jero.modules.project.enums.OperatorResultEnum; @@ -33,11 +30,9 @@ import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.project.enums.TaskAffirmStatusEnum; -import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; -import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; -import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; -import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; +import com.jero.modules.project.mapper.*; import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectTaskInventoryEOService; import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; @@ -116,6 +111,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectTaskInventoryEOList = new ArrayList<>(); //法规清单所有的数据 LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId,projectLawsInventoryEO.getProjectLibraryId()); @@ -181,6 +181,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); + String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); + projectTaskInventoryEO.setId(projectTaskInventoryId); + projectTaskInventoryEO.setProjectLawsInventoryId(lawsInventory.getId()); + projectTaskInventoryEOList.add(projectTaskInventoryEO); + }); } } } @@ -217,20 +224,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = new ArrayList<>(); + for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) { ProjectLawsInventoryEO projectLawsInventoryTemp = new ProjectLawsInventoryEO(); BeanUtils.copyProperties(bussDocumentLibraryEO, projectLawsInventoryTemp); - String id = UUID.randomUUID().toString().replace("-", ""); - projectLawsInventoryTemp.setId(id); + String projectLawsInventoryId = UUID.randomUUID().toString().replace("-", ""); + projectLawsInventoryTemp.setId(projectLawsInventoryId); projectLawsInventoryTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId()); projectLawsInventoryTemp.setCreateTime(new Date()); projectLawsInventoryTemp.setUpdateTime(new Date()); projectLawsInventoryTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue()); projectLawsInventoryTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue()); list.add(projectLawsInventoryTemp); + + ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); + String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); + projectTaskInventoryEO.setId(projectTaskInventoryId); + projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryId); + projectTaskInventoryEOList.add(projectTaskInventoryEO); } super.saveBatch(list); } + //项目任务清单数据初始化。 + this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); } /** @@ -270,6 +286,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().success("提醒办理成功！"); } + @Override + public void deleteByProjectLawsInventoryIds(List projectLawsInventoryIds) { + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryIds); + this.baseMapper.delete(deleteWrapper); + } + /** * 创建任务清单列表数据 * @param projectTaskInventoryEOList