From 5542789d5c0ed0935db0a5ed3a9b2b4d43bee6f6 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Sun, 4 Feb 2024 08:07:24 +0800 Subject: [PATCH] =?UTF-8?q?#=E4=BC=98=E5=8C=96=E7=A7=A6=E7=9A=87=E5=B2=9B?= =?UTF-8?q?=E4=BA=8C=E9=99=A2=E9=AB=98=E5=8D=B1=E5=9B=A0=E7=B4=A0=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5=E8=AF=A2=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/dao/master/ProjectWayMapper.java | 4 +++- .../com/lyms/platform/permission/model/FactorProject.java | 10 ++++++++++ .../platform/permission/service/FactorProjectService.java | 1 + .../lyms/platform/permission/service/ProjectWayService.java | 1 + .../permission/service/impl/FactorProjectServiceImpl.java | 13 ++++++++++++- .../permission/service/impl/ProjectWayServiceImpl.java | 5 +++++ .../src/main/resources/mainOrm/master/ProjectWayMapper.xml | 8 +++++--- .../operate/web/controller/FactorProjectController.java | 10 ++++++++++ 8 files changed, 47 insertions(+), 5 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWayMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWayMapper.java index 46f3bd7..c24ad92 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWayMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWayMapper.java @@ -1,6 +1,7 @@ package com.lyms.platform.permission.dao.master; import com.lyms.platform.permission.model.ProjectWay; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -8,7 +9,8 @@ public interface ProjectWayMapper { List getList(List ids); void add(ProjectWay factorProject); void update(ProjectWay factorProject); - void del(List ids); + void del(@Param("list") List list); + void delOne(Integer id); ProjectWay selectById(Integer id); void insertBatch(List list); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProject.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProject.java index f93937a..edb57ce 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProject.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProject.java @@ -14,6 +14,8 @@ public class FactorProject { private Date created; @Transient private List wayList; + @Transient + private List delIds; public Integer getId() { return id; @@ -70,4 +72,12 @@ public class FactorProject { public void setWayList(List wayList) { this.wayList = wayList; } + + public List getDelIds() { + return delIds; + } + + public void setDelIds(List delIds) { + this.delIds = delIds; + } } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/FactorProjectService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/FactorProjectService.java index 924055f..7dfcccf 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/FactorProjectService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/FactorProjectService.java @@ -11,6 +11,7 @@ public interface FactorProjectService { void add(FactorProject factorProject); void update(FactorProject factorProject); void del(Integer id); + void delCheck(Integer id); FactorProject selectById(Integer id); FactorProjectEntity selectByWeek(Integer hospitalId,String week); FactorProject selectInfo(Integer id); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWayService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWayService.java index f805fc5..f4423f2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWayService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWayService.java @@ -9,6 +9,7 @@ public interface ProjectWayService { void add(ProjectWay projectWay); void update(ProjectWay projectWay); void del(List ids); + void delOne(Integer id); void insertBatch(List list); ProjectWay selectById(Integer id); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/FactorProjectServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/FactorProjectServiceImpl.java index 06b4bdb..e59ea0e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/FactorProjectServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/FactorProjectServiceImpl.java @@ -61,15 +61,21 @@ public class FactorProjectServiceImpl implements FactorProjectService { public void update(FactorProject factorProject) { List wayList = factorProject.getWayList(); if (CollectionUtils.isNotEmpty(wayList)) { + List delIds= factorProject.getDelIds(); for (int i = 0, j = wayList.size(); i < j; i++) { ProjectWay projectWay = wayList.get(i); if (projectWay.getId() != null) { projectWayService.update(projectWay); + }else { + projectWay.setFactorId(factorProject.getId()); + projectWayService.add(projectWay); } } + if (CollectionUtils.isNotEmpty(delIds)){ + projectWayService.del(delIds); + } factorProjectMapper.update(factorProject); } - } @Override @@ -90,6 +96,11 @@ public class FactorProjectServiceImpl implements FactorProjectService { } @Override + public void delCheck(Integer id) { + projectWayService.delOne(id); + } + + @Override public FactorProject selectById(Integer id) { return factorProjectMapper.selectById(id); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWayServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWayServiceImpl.java index 3f7dfac..28faa8a 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWayServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWayServiceImpl.java @@ -34,6 +34,11 @@ public class ProjectWayServiceImpl implements ProjectWayService { } @Override + public void delOne(Integer id) { + projectWayMapper.delOne(id); + } + + @Override public void insertBatch(List list) { projectWayMapper.insertBatch(list); } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/ProjectWayMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/ProjectWayMapper.xml index dd41073..7e1e263 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/ProjectWayMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/ProjectWayMapper.xml @@ -62,11 +62,13 @@ delete from lyms_project_way where id in - - + #{item} - + + + + delete from lyms_project_way where id = #{id,jdbcType=INTEGER}