diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FactorProjectMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FactorProjectMapper.java new file mode 100644 index 0000000..764685b --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FactorProjectMapper.java @@ -0,0 +1,15 @@ +package com.lyms.platform.permission.dao.master; + +import com.lyms.platform.permission.model.FactorProject; +import com.lyms.platform.permission.model.FactorProjectQuery; + +import java.util.List; + +public interface FactorProjectMapper { + List getList(FactorProjectQuery factorProjectQuery); + int queryFactorProjectCount(FactorProjectQuery factorProjectQuery); + void add(FactorProject factorProject); + void update(FactorProject factorProject); + void del(Integer id); + FactorProject selectById(Integer id); +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java index 0511d91..b43fe20 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java @@ -17,4 +17,6 @@ public interface MasterCheckItemMapper { void updateCheckItem(CheckItem checkItem); void deleteCheckItem(Integer id); + + List selectByIds(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 new file mode 100644 index 0000000..fd6e174 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProject.java @@ -0,0 +1,69 @@ +package com.lyms.platform.permission.model; + +import java.util.Date; + +public class FactorProject { + private Integer id; + private String riskFactorIds; + private String riskFactorName; + private String weekProjectId; + private String week; + private Integer hospitalId; + private Date created; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getRiskFactorIds() { + return riskFactorIds; + } + + public void setRiskFactorIds(String riskFactorIds) { + this.riskFactorIds = riskFactorIds; + } + + public String getRiskFactorName() { + return riskFactorName; + } + + public void setRiskFactorName(String riskFactorName) { + this.riskFactorName = riskFactorName; + } + + public String getWeekProjectId() { + return weekProjectId; + } + + public void setWeekProjectId(String weekProjectId) { + this.weekProjectId = weekProjectId; + } + + public String getWeek() { + return week; + } + + public void setWeek(String week) { + this.week = week; + } + + public Integer getHospitalId() { + return hospitalId; + } + + public void setHospitalId(Integer hospitalId) { + this.hospitalId = hospitalId; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java new file mode 100644 index 0000000..5c015e5 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java @@ -0,0 +1,33 @@ +package com.lyms.platform.permission.model; + +import java.util.List; + +public class FactorProjectEntity { + private String week; + private List healthItemList; + private List riskItemList; + + public String getWeek() { + return week; + } + + public void setWeek(String week) { + this.week = week; + } + + public List getHealthItemList() { + return healthItemList; + } + + public void setHealthItemList(List healthItemList) { + this.healthItemList = healthItemList; + } + + public List getRiskItemList() { + return riskItemList; + } + + public void setRiskItemList(List riskItemList) { + this.riskItemList = riskItemList; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectManage.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectManage.java new file mode 100644 index 0000000..43781b0 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectManage.java @@ -0,0 +1,43 @@ +package com.lyms.platform.permission.model; + +import java.util.Date; +import java.util.List; + +public class FactorProjectManage { + private Integer id; + private String riskFactorName; + private String week; + private List checkItemList; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getRiskFactorName() { + return riskFactorName; + } + + public void setRiskFactorName(String riskFactorName) { + this.riskFactorName = riskFactorName; + } + + public String getWeek() { + return week; + } + + public void setWeek(String week) { + this.week = week; + } + + public List getCheckItemList() { + return checkItemList; + } + + public void setCheckItemList(List checkItemList) { + this.checkItemList = checkItemList; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectQuery.java new file mode 100644 index 0000000..d0bf003 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectQuery.java @@ -0,0 +1,35 @@ +package com.lyms.platform.permission.model; + +import com.lyms.platform.common.dao.BaseQuery; + +import java.util.List; + +public class FactorProjectQuery extends BaseQuery { + private Integer hospitalId; + private String week; + private List riskFactorIds; + + public Integer getHospitalId() { + return hospitalId; + } + + public void setHospitalId(Integer hospitalId) { + this.hospitalId = hospitalId; + } + + public String getWeek() { + return week; + } + + public void setWeek(String week) { + this.week = week; + } + + public List getRiskFactorIds() { + return riskFactorIds; + } + + public void setRiskFactorIds(List riskFactorIds) { + this.riskFactorIds = riskFactorIds; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java index 90af2c8..721f0c3 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java @@ -20,4 +20,6 @@ public interface CheckItemService { void updateCheckItem(CheckItem checkItem); void deleteCheckItem(Integer id); + + List selectByIds(List list); } 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 new file mode 100644 index 0000000..6a1c06d --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/FactorProjectService.java @@ -0,0 +1,18 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.FactorProject; +import com.lyms.platform.permission.model.FactorProjectEntity; +import com.lyms.platform.permission.model.FactorProjectManage; +import com.lyms.platform.permission.model.FactorProjectQuery; + +import java.util.List; + +public interface FactorProjectService { + List getList(FactorProjectQuery factorProjectQuery); + void add(FactorProject factorProject); + void update(FactorProject factorProject); + void del(Integer id); + FactorProject selectById(Integer id); + FactorProjectManage selectInfo(Integer id); + FactorProjectEntity selectByWeek(FactorProjectQuery factorProjectQuery); +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java index 36a52b1..b4346a9 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java @@ -37,6 +37,11 @@ public class CheckItemServiceImpl implements CheckItemService { } @Override + public List selectByIds(List list) { + return checkItemMapper.selectByIds(list); + } + + @Override public String getOne(Integer id) { return checkItemMapper.getOne(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 new file mode 100644 index 0000000..c674904 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/FactorProjectServiceImpl.java @@ -0,0 +1,112 @@ +package com.lyms.platform.permission.service.impl; + + +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.permission.dao.master.FactorProjectMapper; +import com.lyms.platform.permission.model.*; +import com.lyms.platform.permission.service.CheckItemService; +import com.lyms.platform.permission.service.FactorProjectService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +@Service("factorProjectService") +public class FactorProjectServiceImpl implements FactorProjectService { + @Autowired + private FactorProjectMapper factorProjectMapper; + @Autowired + private CheckItemService checkItemService; + + @Override + public List getList(FactorProjectQuery factorProjectQuery) { + if (factorProjectQuery.getNeed() != null) { + factorProjectQuery.mysqlBuild(factorProjectMapper.queryFactorProjectCount(factorProjectQuery)); + } + return factorProjectMapper.getList(factorProjectQuery); + } + + @Override + public void add(FactorProject factorProject) { + factorProjectMapper.add(factorProject); + } + + @Override + public void update(FactorProject factorProject) { + factorProjectMapper.update(factorProject); + } + + @Override + public void del(Integer id) { + factorProjectMapper.del(id); + } + + @Override + public FactorProject selectById(Integer id) { + return factorProjectMapper.selectById(id); + } + + @Override + public FactorProjectManage selectInfo(Integer id) { + FactorProject factorProject= factorProjectMapper.selectById(id); + if (factorProject!=null){ + FactorProjectManage factorProjectManage=new FactorProjectManage(); + factorProjectManage.setId(id); + factorProjectManage.setRiskFactorName(factorProject.getRiskFactorName()); + factorProjectManage.setWeek(factorProject.getWeek()); + String weekProjectIds= factorProject.getWeekProjectId(); + if (StringUtils.isNotEmpty(weekProjectIds)){ + String [] ids= weekProjectIds.split(","); + if (ids.length>0){ + List list=new ArrayList<>(); + for (int i = 0,j=ids.length; i < j ; i++) { + Integer projectId= Integer.valueOf(ids[i]); + list.add(projectId); + } + List checkItemList= checkItemService.selectByIds(list); + factorProjectManage.setCheckItemList(checkItemList); + } + } + return factorProjectManage; + } + return null; + } + + @Override + public FactorProjectEntity selectByWeek(FactorProjectQuery factorProjectQuery) { + List projectList= factorProjectMapper.getList(factorProjectQuery); + if (CollectionUtils.isNotEmpty(projectList)){ + FactorProjectEntity factorProjectManage=new FactorProjectEntity(); + factorProjectManage.setWeek(factorProjectQuery.getWeek()); + List healthList = new ArrayList<>(); + List riskList = new ArrayList<>(); + for (int i = 0,j=projectList.size(); i < j; i++) { + FactorProject factorProject= projectList.get(i); + String weekProjectIds= factorProject.getWeekProjectId(); + String [] ids= weekProjectIds.split(","); + if (ids.length>0) { + if ("健康".equals(factorProject.getRiskFactorName())){ + for (int a = 0, b = ids.length; a < b; a++) { + Integer projectId = Integer.valueOf(ids[a]); + healthList.add(projectId); + } + }else { + for (int a = 0, b = ids.length; a < b; a++) { + Integer projectId = Integer.valueOf(ids[a]); + riskList.add(projectId); + } + } + } + } + if (CollectionUtils.isNotEmpty(healthList)){ + factorProjectManage.setHealthItemList(checkItemService.selectByIds(healthList)); + } + if (CollectionUtils.isNotEmpty(riskList)){ + factorProjectManage.setRiskItemList(checkItemService.selectByIds(riskList)); + } + return factorProjectManage; + } + return null; + } +} diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FactorProjectMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FactorProjectMapper.xml new file mode 100644 index 0000000..c0464a6 --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/master/FactorProjectMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + order by ${sort} + + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + + update lyms_factor_project + + + risk_factor_ids = #{riskFactorIds,jdbcType=VARCHAR}, + + + risk_factor_name = #{riskFactorName,jdbcType=VARCHAR}, + + + week_project_id = #{weekProjectId,jdbcType=VARCHAR}, + + + hospital_id = #{hospitalId,jdbcType=INTEGER}, + + + week = #{week,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + + delete from lyms_factor_project where id = #{id,jdbcType=INTEGER} + + + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml index 5b24a5f..f3d6f93 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml @@ -60,4 +60,11 @@ delete from lyms_week_project where id = #{id,jdbcType=INTEGER} + +