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}