From a6add09b7829df3c6af9553b61f001c0dd6b6ac5 Mon Sep 17 00:00:00 2001 From: fangcheng Date: Thu, 25 May 2017 19:54:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E3=80=81=E8=AF=8A=E6=96=AD?= =?UTF-8?q?=E9=A1=B9=E6=B7=BB=E5=8A=A0select=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/common/entity/conf/DiagnoseSource.java | 10 -- .../service/conf/DiagnoseVersionService.java | 10 ++ .../service/conf/HighriskVersionService.java | 11 ++ .../conf/impl/DiagnoseVersionServiceImpl.java | 7 + .../conf/impl/HighriskVersionServiceImpl.java | 7 + .../cm/controller/conf/DiagnoseConfController.java | 23 +++- .../cm/controller/conf/HighriskConfController.java | 146 ++++++++++++--------- .../WEB-INF/views/conf/diagnose/conf_edit.html | 8 +- .../WEB-INF/views/conf/diagnose/conf_list.html | 17 +-- .../WEB-INF/views/conf/highrisk/conf_edit.html | 8 +- .../WEB-INF/views/conf/highrisk/conf_list.html | 19 ++- 11 files changed, 164 insertions(+), 102 deletions(-) diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseSource.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseSource.java index 0914621..7fd9110 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseSource.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseSource.java @@ -38,8 +38,6 @@ public class DiagnoseSource implements Serializable { */ @TableField(value="ENABLE") private Integer enable; - @TableField(value="ITEMORDER") - private Integer itemorder; public String getId() { @@ -73,13 +71,5 @@ public class DiagnoseSource implements Serializable { public void setEnable(Integer enable) { this.enable = enable; } - - public Integer getItemorder() { - return itemorder; - } - - public void setItemorder(Integer itemorder) { - this.itemorder = itemorder; - } } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseVersionService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseVersionService.java index 6f4c7b3..aebbe6b 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseVersionService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseVersionService.java @@ -46,6 +46,16 @@ public interface DiagnoseVersionService extends BaseService { *
  • 修改时间： */ public List getEnableDiagnoseVersionBy(Serializable id) throws SystemException; + + /** + *
  • @Description:获取所有可用高危版本 + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年5月25日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getEnableDiagnoseVersionList(); /** *
  • @Description:添加版本号 diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java index fe14840..2d8ae3c 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java @@ -46,6 +46,17 @@ public interface HighriskVersionService extends BaseService { *
  • 修改时间： */ public List getEnableHighriskVersionBy(Serializable id) throws SystemException; + + /** + *
  • @Description:获取所有可用高危版本 + *
  • @return + *
  • @throws SystemException + *
  • 创建人：方承 + *
  • 创建时间：2017年5月25日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getEnableHighriskVersionList() throws SystemException; /** *
  • @Description:添加版本号 diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseVersionServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseVersionServiceImpl.java index 071d7b1..d580cd4 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseVersionServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseVersionServiceImpl.java @@ -164,4 +164,11 @@ public class DiagnoseVersionServiceImpl extends ServiceImpl getEnableDiagnoseVersionList() { + EntityWrapper wrapper = new EntityWrapper(); + wrapper.where("enable={0}", StatusEnum.ENABLED.getStatus()).and("ifDel=0"); + return diagnoseVersionMapper.selectList(wrapper); + } } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java index 627acde..35356f2 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java @@ -166,4 +166,11 @@ public class HighriskVersionServiceImpl extends ServiceImpl getEnableHighriskVersionList() throws SystemException { + EntityWrapper wrapper = new EntityWrapper(); + wrapper.where("enable={0}", StatusEnum.ENABLED.getStatus()).and("ifDel=0"); + return versionMapper.selectList(wrapper); + } + } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseConfController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseConfController.java index 11a8c41..78d1f82 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseConfController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseConfController.java @@ -1,5 +1,6 @@ package com.lyms.cm.controller.conf; +import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; @@ -14,7 +15,11 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.lyms.base.common.entity.conf.DiagnoseConf; +import com.lyms.base.common.entity.conf.DiagnoseSource; +import com.lyms.base.common.entity.conf.DiagnoseVersion; import com.lyms.base.common.service.conf.DiagnoseConfService; +import com.lyms.base.common.service.conf.DiagnoseSourceService; +import com.lyms.base.common.service.conf.DiagnoseVersionService; import com.lyms.constants.OperationName; import com.lyms.util.StrUtils; import com.lyms.web.bean.AjaxResult; @@ -34,6 +39,10 @@ public class DiagnoseConfController extends BaseController { @Autowired private DiagnoseConfService diagnoseConfService; + @Autowired + private DiagnoseVersionService diagnoseVersionService; + @Autowired + private DiagnoseSourceService diagnoseSourceService; /** @@ -42,7 +51,11 @@ public class DiagnoseConfController extends BaseController { * @return */ @RequestMapping(value = "/toList", method = { RequestMethod.GET }) - public String toList() { + public String toList(Model model) { + List versionList = diagnoseVersionService.getEnableDiagnoseVersionList(); + List sourceList = diagnoseSourceService.getDiagnoseSource(); + model.addAttribute("versionList", versionList); + model.addAttribute("sourceList", sourceList); return "/conf/diagnose/conf_list"; } @@ -60,6 +73,7 @@ public class DiagnoseConfController extends BaseController { EntityWrapper ew = new EntityWrapper(); String versionId = getParameter("versionId"); + String sourceId = getParameter("sourceId"); String searchName = getParameter("name"); if (StrUtils.isNotEmpty(searchName)) { ew.and("name like {0}", searchName.trim() + "%"); @@ -67,6 +81,9 @@ public class DiagnoseConfController extends BaseController { if (StrUtils.isNotEmpty(versionId)) { ew.and("version_id like {0}", versionId.trim() + "%"); } + if (StrUtils.isNotEmpty(sourceId)) { + ew.and("source_id like {0}", sourceId.trim() + "%"); + } ew.orderBy("grouporder,itemorder"); page = diagnoseConfService.selectPage(page,ew); return toGridData(page); @@ -83,6 +100,10 @@ public class DiagnoseConfController extends BaseController { DiagnoseConf entity = diagnoseConfService.selectById(id); model.addAttribute("conf", entity); } + List versionList = diagnoseVersionService.getEnableDiagnoseVersionList(); + List sourceList = diagnoseSourceService.getDiagnoseSource(); + model.addAttribute("versionList", versionList); + model.addAttribute("sourceList", sourceList); return "/conf/diagnose/conf_edit"; } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskConfController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskConfController.java index c9d851c..aa61497 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskConfController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskConfController.java @@ -1,5 +1,6 @@ package com.lyms.cm.controller.conf; +import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; @@ -14,7 +15,11 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.lyms.base.common.entity.conf.HighriskConf; +import com.lyms.base.common.entity.conf.HighriskSource; +import com.lyms.base.common.entity.conf.HighriskVersion; import com.lyms.base.common.service.conf.HighriskConfService; +import com.lyms.base.common.service.conf.HighriskSourceService; +import com.lyms.base.common.service.conf.HighriskVersionService; import com.lyms.constants.OperationName; import com.lyms.util.StrUtils; import com.lyms.web.bean.AjaxResult; @@ -32,61 +37,78 @@ import com.lyms.web.controller.BaseController; @RequestMapping("/highriskConf") public class HighriskConfController extends BaseController { - @Autowired - private HighriskConfService highriskConfService; + @Autowired + private HighriskConfService highriskConfService; + @Autowired + private HighriskVersionService highriskVersionService; + @Autowired + private HighriskSourceService highriskSourceService; - /** - * 跳转到列表页面 - * - * @return - */ - @RequestMapping(value = "/toList", method = { RequestMethod.GET }) - public String toList() { - return "/conf/highrisk/conf_list"; - } + /** + * 跳转到列表页面 + * + * @return + */ + @RequestMapping(value = "/toList", method = { RequestMethod.GET }) + public String toList(Model model) { + List versionList = highriskVersionService.getEnableHighriskVersionList(); + List sourceList = highriskSourceService.getHighriskSource(); + model.addAttribute("versionList", versionList); + model.addAttribute("sourceList", sourceList); + return "/conf/highrisk/conf_list"; + } - /** - * 列表 - * - * @param page - * @param model - * @return - */ - @RequestMapping(value = "/list", method = { RequestMethod.POST, RequestMethod.GET }) - @ResponseBody - public Map list(Model model) { - Page page = getPage(); - EntityWrapper ew = new EntityWrapper(); - - String versionId = getParameter("versionId"); + /** + * 列表 + * + * @param page + * @param model + * @return + */ + @RequestMapping(value = "/list", method = { RequestMethod.POST, RequestMethod.GET }) + @ResponseBody + public Map list(Model model) { + Page page = getPage(); + EntityWrapper ew = new EntityWrapper(); + + String versionId = getParameter("versionId"); String searchName = getParameter("name"); + String sourceId = getParameter("sourceId"); + if (StrUtils.isNotEmpty(searchName)) { ew.and("name like {0}", searchName.trim() + "%"); } if (StrUtils.isNotEmpty(versionId)) { ew.and("version_id like {0}", versionId.trim() + "%"); } + if (StrUtils.isNotEmpty(sourceId)) { + ew.and("source_id like {0}", sourceId.trim() + "%"); + } ew.orderBy("grouporder,itemorder"); - page = highriskConfService.selectPage(page,ew); - return toGridData(page); - } + page = highriskConfService.selectPage(page, ew); + return toGridData(page); + } - /** - * 跳转到编辑页面 - * - * @return - */ - @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) - public String toEdit(@PathVariable String id, Model model) { - if (!StringUtils.isBlank(id) && !"0".equals(id)) { - HighriskConf entity = highriskConfService.selectById(id); - model.addAttribute("conf", entity); - } - return "/conf/highrisk/conf_edit"; - } - - /** + /** + * 跳转到编辑页面 + * + * @return + */ + @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) + public String toEdit(@PathVariable String id, Model model) { + if (!StringUtils.isBlank(id) && !"0".equals(id)) { + HighriskConf entity = highriskConfService.selectById(id); + model.addAttribute("conf", entity); + } + List versionList = highriskVersionService.getEnableHighriskVersionList(); + List sourceList = highriskSourceService.getHighriskSource(); + model.addAttribute("versionList", versionList); + model.addAttribute("sourceList", sourceList); + return "/conf/highrisk/conf_edit"; + } + + /** * 创建 *

    * TODO @@ -102,26 +124,26 @@ public class HighriskConfController extends BaseController { return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); } - /** - * 修改信息 - */ - @RequestMapping(value = "/update", method = { RequestMethod.POST }) - @ResponseBody - public AjaxResult update(HighriskConf HighriskConf, AjaxResult ajaxResult) { - boolean tag = highriskConfService.updateById(HighriskConf); + /** + * 修改信息 + */ + @RequestMapping(value = "/update", method = { RequestMethod.POST }) + @ResponseBody + public AjaxResult update(HighriskConf HighriskConf, AjaxResult ajaxResult) { + boolean tag = highriskConfService.updateById(HighriskConf); return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); - } + } - /** - * 删除 - * - * @return - */ - @RequestMapping(value = "/{id}/delete", method = { RequestMethod.GET, RequestMethod.POST }) - @ResponseBody - public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) { - int tag = highriskConfService.deleteLogicById(id); - return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); - } + /** + * 删除 + * + * @return + */ + @RequestMapping(value = "/{id}/delete", method = { RequestMethod.GET, RequestMethod.POST }) + @ResponseBody + public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) { + int tag = highriskConfService.deleteLogicById(id); + return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); + } } diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html index 37c21d8..24e855c 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html @@ -9,15 +9,15 @@

    - +
    - + #selector("sourceId" "sourceId" $sourceList $!conf.sourceId)
    - +
    - + #selector("versionId" "versionId" $versionList $!conf.versionId)
    diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html index dcb8238..3a738c2 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html @@ -4,7 +4,12 @@
    - + 诊断版本： + #selector("versionIdSearch" "versionId" $versionList) +
    +
    + 诊断基础项： + #selector("sourceIdSearch" "sourceId" $sourceList)
    @@ -39,6 +44,7 @@ function search(){ var queryParams = { query:{ versionId: $("#versionIdSearch").val(), + sourceId: $("#sourceIdSearch").val(), name:$("#nameSearch").val() } } @@ -68,15 +74,6 @@ var default_dataColumns = [{ title: '', checkbox: true },{ - field: 'id', - title: '编号' - },{ - field: 'sourceId', - title: 'source_id' - },{ - field: 'versionId', - title: 'version_id' - },{ field: 'name', title: '自定义诊断项名称' },{ diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/conf_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/conf_edit.html index 3f6acdb..ba78dad 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/conf_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/conf_edit.html @@ -9,15 +9,15 @@
    - +
    - + #selector("sourceId" "sourceId" $sourceList $!conf.sourceId)
    - +
    - + #selector("versionId" "versionId" $versionList $!conf.versionId)
    diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/conf_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/conf_list.html index 120e59e..b9bdaa0 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/conf_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/conf_list.html @@ -4,7 +4,12 @@
    - + 高危版本： + #selector("versionId" "versionId" $versionList) +
    +
    + 基础高危项： + #selector("sourceId" "sourceId" $sourceList)
    @@ -39,7 +44,8 @@ function search(){ var queryParams = { query:{ versionId: $("#versionIdSearch").val(), - name:$("#nameSearch").val() + name:$("#nameSearch").val(), + sourceId: $("#sourceId").val() } } $('#dataTable').bootstrapTable('refresh', queryParams ); @@ -68,15 +74,6 @@ var default_dataColumns = [{ title: '', checkbox: true },{ - field: 'id', - title: '编号' - },{ - field: 'sourceId', - title: 'source_id' - },{ - field: 'versionId', - title: 'version_id' - },{ field: 'name', title: '自定义高危项名称' },{ -- 1.8.3.1