From 1dd81c9eab3ff15c82ca548ddbba050b25f3aa5a Mon Sep 17 00:00:00 2001 From: fangcheng Date: Sat, 27 May 2017 14:09:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=96=E9=AA=8C=E9=A1=B9=E6=B7=BB=E5=8A=A0se?= =?UTF-8?q?lector=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dao/conf/AssayCustomerConfMapper.java | 1 + .../common/dao/conf/AssaySourceConfMapper.java | 4 ++ .../base/common/dao/conf/AssaySourceConfMapper.xml | 50 ++++++++++++++-------- .../base/common/entity/conf/AssaySourceConf.java | 12 ++++++ .../service/conf/AssayCustomerConfService.java | 5 +++ .../service/conf/AssaySourceConfService.java | 15 +++++++ .../common/service/conf/AssaySourceService.java | 8 ++++ .../conf/impl/AssayCustomerConfServiceImpl.java | 25 +++++++++++ .../conf/impl/AssaySourceConfServiceImpl.java | 23 +++++++++- .../service/conf/impl/AssaySourceServiceImpl.java | 9 +++- .../conf/AssayCustomerConfController.java | 31 +++++++++++--- .../controller/conf/AssaySourceConfController.java | 14 ++++-- .../webapp/WEB-INF/views/conf/assay/conf_edit.html | 4 +- .../WEB-INF/views/conf/assay/customer_edit.html | 14 ++---- .../WEB-INF/views/conf/assay/customer_list.html | 7 ++- 15 files changed, 178 insertions(+), 44 deletions(-) diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssayCustomerConfMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssayCustomerConfMapper.java index 0446107..6d86c27 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssayCustomerConfMapper.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssayCustomerConfMapper.java @@ -21,4 +21,5 @@ public interface AssayCustomerConfMapper extends BaseMapper { public List getCustomerConf(Serializable orgId); + } \ No newline at end of file diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssaySourceConfMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssaySourceConfMapper.java index b71c4fd..03d0e0d 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssaySourceConfMapper.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssaySourceConfMapper.java @@ -4,6 +4,8 @@ import com.lyms.base.common.entity.conf.AssaySourceConf; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.springframework.stereotype.Repository; import java.io.Serializable; +import java.util.List; + /** *

* Mapper接口 @@ -17,4 +19,6 @@ public interface AssaySourceConfMapper extends BaseMapper { public Integer deleteLogicById(Serializable id); + public List getAllEnableSourceConf(); + } \ No newline at end of file diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssaySourceConfMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssaySourceConfMapper.xml index 175e466..618d0e2 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssaySourceConfMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/AssaySourceConfMapper.xml @@ -2,27 +2,39 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - ID AS id, SOURCE_ID AS sourceId, SAMPLE_SOUCE AS sampleSouce, SAMPLE_DESC AS sampleDesc, SAMPLE_TARGET AS sampleTarget, UNIT AS unit, DANGER_CHAR AS dangerChar, DANGER_UPPER AS dangerUpper, DANGER_UPPER_PRO AS dangerUpperPro, DANGER_UPPER_SERVICE AS dangerUpperService, DANGER_LOWER AS dangerLower, DANGER_LOWER_PRO AS dangerLowerPro, DANGER_LOWER_SERVICE AS dangerLowerService, ENABLE AS enable, IFDEL AS ifdel + ID AS id, SOURCE_ID AS sourceId, NAME AS name, SAMPLE_SOUCE AS sampleSouce, SAMPLE_DESC AS sampleDesc, SAMPLE_TARGET AS sampleTarget, UNIT AS unit, DANGER_CHAR AS dangerChar, DANGER_UPPER AS dangerUpper, DANGER_UPPER_PRO AS dangerUpperPro, DANGER_UPPER_SERVICE AS dangerUpperService, DANGER_LOWER AS dangerLower, DANGER_LOWER_PRO AS dangerLowerPro, DANGER_LOWER_SERVICE AS dangerLowerService, ENABLE AS enable, IFDEL AS ifdel + + + diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/AssaySourceConf.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/AssaySourceConf.java index c4e7668..40f5598 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/AssaySourceConf.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/AssaySourceConf.java @@ -93,6 +93,11 @@ public class AssaySourceConf implements Serializable { */ @TableField(value="IFDEL") private Integer ifdel; + /** + * 方化验项名称，联查获取 + */ + @TableField(exist = false) + private String name; public String getId() { @@ -215,4 +220,11 @@ public class AssaySourceConf implements Serializable { this.ifdel = ifdel; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssayCustomerConfService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssayCustomerConfService.java index 0a548b4..98c35d6 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssayCustomerConfService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssayCustomerConfService.java @@ -34,4 +34,9 @@ public interface AssayCustomerConfService extends BaseService */ public List getCustomerConf(Serializable orgId); + + public boolean insertCustomerConf(AssayCustomerConf assayCustomerConf); + + public boolean updateCustomerConf(AssayCustomerConf assayCustomerConf); + } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssaySourceConfService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssaySourceConfService.java index c0cbb79..b854e49 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssaySourceConfService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssaySourceConfService.java @@ -3,6 +3,7 @@ package com.lyms.base.common.service.conf; import com.lyms.base.common.entity.conf.AssaySourceConf; import com.lyms.web.service.BaseService; import java.io.Serializable; +import java.util.List; /** *

@@ -20,5 +21,19 @@ public interface AssaySourceConfService extends BaseService { *

  • @return 大于0修改成功，否则为失败 */ public Integer deleteLogicById(Serializable id); + + /** + * 方法描述：获取所有启用化验项配置 + * @return + * @since 2017-05-27 + */ + public List getAllEnableSourceConf(); + + /** + * 方法描述： + * @return + * @since 2017-05-27 + */ + public String getSourceIdByConfId(String confId); } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssaySourceService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssaySourceService.java index fd7f3eb..1c9840d 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssaySourceService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/AssaySourceService.java @@ -3,6 +3,7 @@ package com.lyms.base.common.service.conf; import com.lyms.base.common.entity.conf.AssaySource; import com.lyms.web.service.BaseService; import java.io.Serializable; +import java.util.List; /** *

    @@ -20,6 +21,13 @@ public interface AssaySourceService extends BaseService { *

  • @return 大于0修改成功，否则为失败 */ public Integer deleteLogicById(Serializable id); + + /** + * 方法描述：获取所有没有删除化验基础项 + * @return + * @since 2017-05-27 + */ + public List getAllSource(); } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssayCustomerConfServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssayCustomerConfServiceImpl.java index 91304fe..1871cdd 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssayCustomerConfServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssayCustomerConfServiceImpl.java @@ -1,11 +1,15 @@ package com.lyms.base.common.service.conf.impl; import com.lyms.base.common.entity.conf.AssayCustomerConf; +import com.lyms.base.common.entity.conf.AssaySource; import com.lyms.base.common.entity.conf.AssaySourceConf; import com.lyms.base.common.dao.conf.AssayCustomerConfMapper; import com.lyms.base.common.service.conf.AssayCustomerConfService; +import com.lyms.base.common.service.conf.AssaySourceConfService; +import com.lyms.base.common.service.conf.AssaySourceService; import com.lyms.util.StrUtils; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.List; @@ -20,6 +24,9 @@ import java.util.List; */ @Service public class AssayCustomerConfServiceImpl extends ServiceImpl implements AssayCustomerConfService { + + @Autowired + private AssaySourceConfService assaySourceConfService; public Integer deleteLogicById(Serializable id){ return baseMapper.deleteLogicById(id); @@ -37,4 +44,22 @@ public class AssayCustomerConfServiceImpl extends ServiceImpl getCustomerConf(Serializable orgId) { return baseMapper.getCustomerConf(orgId); } + + @Override + public boolean insertCustomerConf(AssayCustomerConf assayCustomerConf) { + String sourceId = assaySourceConfService.getSourceIdByConfId(assayCustomerConf.getConfId()); + if(StrUtils.isNotEmpty(sourceId)){ + assayCustomerConf.setSourceId(sourceId); + } + return baseMapper.insert(assayCustomerConf) > 0 ; + } + + @Override + public boolean updateCustomerConf(AssayCustomerConf assayCustomerConf) { + String sourceId = assaySourceConfService.getSourceIdByConfId(assayCustomerConf.getConfId()); + if(StrUtils.isNotEmpty(sourceId)){ + assayCustomerConf.setSourceId(sourceId); + } + return baseMapper.updateById(assayCustomerConf) > 0 ; + } } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssaySourceConfServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssaySourceConfServiceImpl.java index bd3022e..a224bb2 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssaySourceConfServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssaySourceConfServiceImpl.java @@ -1,13 +1,16 @@ package com.lyms.base.common.service.conf.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.lyms.base.common.entity.conf.AssaySource; import com.lyms.base.common.entity.conf.AssaySourceConf; import com.lyms.base.common.dao.conf.AssaySourceConfMapper; import com.lyms.base.common.service.conf.AssaySourceConfService; import com.lyms.util.StrUtils; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.Serializable; +import java.util.List; /** *

    @@ -19,15 +22,31 @@ import java.io.Serializable; */ @Service public class AssaySourceConfServiceImpl extends ServiceImpl implements AssaySourceConfService { - + + public Integer deleteLogicById(Serializable id){ return baseMapper.deleteLogicById(id); } - @Override + + @Override + public List getAllEnableSourceConf() { + return baseMapper.getAllEnableSourceConf(); + } + + @Override public boolean insert(AssaySourceConf entity) { if(StrUtils.isEmpty(entity.getId())){ entity.setId(StrUtils.uuid()); } return super.insert(entity); } + + @Override + public String getSourceIdByConfId(String confId){ + AssaySourceConf assaySourceConf = baseMapper.selectById(confId); + if(assaySourceConf != null){ + return assaySourceConf.getSourceId(); + } + return null; + } } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssaySourceServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssaySourceServiceImpl.java index 31e61d5..63ea322 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssaySourceServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/AssaySourceServiceImpl.java @@ -1,5 +1,6 @@ package com.lyms.base.common.service.conf.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.lyms.base.common.entity.conf.AssaySource; import com.lyms.base.common.dao.conf.AssaySourceMapper; import com.lyms.base.common.service.conf.AssaySourceService; @@ -7,6 +8,7 @@ import com.lyms.util.StrUtils; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.io.Serializable; +import java.util.List; /** *

    @@ -22,7 +24,12 @@ public class AssaySourceServiceImpl extends ServiceImpl getAllSource() { + return baseMapper.selectList(new EntityWrapper().where("IFDEL=0")); + } + @Override public boolean insert(AssaySource entity) { if(StrUtils.isEmpty(entity.getId())){ diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/AssayCustomerConfController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/AssayCustomerConfController.java index a21da74..25423d3 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/AssayCustomerConfController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/AssayCustomerConfController.java @@ -1,7 +1,11 @@ package com.lyms.cm.controller.conf; +import java.util.List; import java.util.Map; +import com.lyms.base.common.entity.organ.Organizations; +import com.lyms.base.common.service.conf.AssaySourceService; +import com.lyms.base.common.service.organ.OrganizationsService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -36,6 +40,13 @@ import com.lyms.web.controller.BaseController; public class AssayCustomerConfController extends BaseController { @Autowired private AssayCustomerConfService assayCustomerConfService; + @Autowired + private OrganizationsService organizationsService; + @Autowired + private AssaySourceService assaySourceService; + @Autowired + private AssaySourceConfService assaySourceConfService; + /** @@ -44,14 +55,15 @@ public class AssayCustomerConfController extends BaseController { * @return */ @RequestMapping(value = "/toList", method = { RequestMethod.GET }) - public String toList() { - return "/conf/assay/customer_list"; + public String toList(Model model) { + List orgs = organizationsService.getAllEnableOrg(); + model.addAttribute("orgs",orgs); + return "/conf/assay/customer_list"; } /** * 列表 * - * @param page * @param model * @return */ @@ -61,9 +73,13 @@ public class AssayCustomerConfController extends BaseController { Page page = getPage(); EntityWrapper ew = new EntityWrapper(); String searchName = getParameter("name"); + String orgId = getParameter("orgId"); if (StrUtils.isNotEmpty(searchName)) { ew.and("source_Id like {0}", searchName.trim() + "%"); } + if (StrUtils.isNotEmpty(orgId)) { + ew.and("orgId = {0}", orgId.trim()); + } page = assayCustomerConfService.selectPage(page,ew); return toGridData(page); } @@ -79,6 +95,10 @@ public class AssayCustomerConfController extends BaseController { AssayCustomerConf entity = assayCustomerConfService.selectById(id); model.addAttribute("conf", entity); } + List orgs = organizationsService.getAllEnableOrg(); + model.addAttribute("orgs",orgs); + List confList = assaySourceConfService.getAllEnableSourceConf(); + model.addAttribute("confList",confList); return "/conf/assay/customer_edit"; } @@ -87,13 +107,12 @@ public class AssayCustomerConfController extends BaseController { *

    * TODO * - * @param user * @return */ @RequestMapping(value = "/create", method = RequestMethod.POST) @ResponseBody public AjaxResult create(AssayCustomerConf AssayCustomerConf, AjaxResult ajaxResult) { - boolean tag = assayCustomerConfService.insert(AssayCustomerConf); + boolean tag = assayCustomerConfService.insertCustomerConf(AssayCustomerConf); return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); } @@ -103,7 +122,7 @@ public class AssayCustomerConfController extends BaseController { @RequestMapping(value = "/update", method = { RequestMethod.POST }) @ResponseBody public AjaxResult update(AssayCustomerConf AssayCustomerConf, AjaxResult ajaxResult) { - boolean tag = assayCustomerConfService.updateById(AssayCustomerConf); + boolean tag = assayCustomerConfService.updateCustomerConf(AssayCustomerConf); return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/AssaySourceConfController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/AssaySourceConfController.java index b34fd9c..81ad3a7 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/AssaySourceConfController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/AssaySourceConfController.java @@ -1,7 +1,10 @@ package com.lyms.cm.controller.conf; +import java.util.List; import java.util.Map; +import com.lyms.base.common.entity.conf.AssaySource; +import com.lyms.base.common.service.conf.AssaySourceService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -34,6 +37,11 @@ public class AssaySourceConfController extends BaseController { @Autowired private AssaySourceConfService assaySourceConfService; + + @Autowired + private AssaySourceService assaySourceService; + + /** @@ -49,7 +57,6 @@ public class AssaySourceConfController extends BaseController { /** * 列表 * - * @param page * @param model * @return */ @@ -77,15 +84,16 @@ public class AssaySourceConfController extends BaseController { AssaySourceConf entity = assaySourceConfService.selectById(id); model.addAttribute("conf", entity); } + List sourceList = assaySourceService.getAllSource(); + model.addAttribute("sourceList",sourceList); return "/conf/assay/conf_edit"; } /** - * 创建用户 + * 创建 *

    * TODO * - * @param user * @return */ @RequestMapping(value = "/create", method = RequestMethod.POST) diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/conf_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/conf_edit.html index 6c09457..1218cde 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/conf_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/conf_edit.html @@ -9,9 +9,9 @@

    - +
    - + #selector("sourceId" "sourceId" $sourceList $!conf.sourceId)
    diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/customer_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/customer_edit.html index f3005a4..93454e4 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/customer_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/customer_edit.html @@ -9,21 +9,15 @@
    - +
    - + #selector("confId" "confId" $confList $!conf.confId )
    - +
    - -
    -
    -
    - -
    - + #selector("orgId" "orgId" $orgs $!conf.orgId )
    diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/customer_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/customer_list.html index f537b93..3ee5b16 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/customer_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/assay/customer_list.html @@ -6,6 +6,10 @@
    +
    + 医院： + #selector("searchOrgId" "searchOrgId" $orgs ) +
    @@ -33,7 +37,8 @@ function search(){ var queryParams = { query:{ - name: $("#nameSearch").val() + name: $("#nameSearch").val(), + orgId: $("#searchOrgId").val() } } $('#dataTable').bootstrapTable('refresh', queryParams ); -- 1.8.3.1