From 30829fb04a57b84112217c21a69b7286cd9634a0 Mon Sep 17 00:00:00 2001 From: fangcheng Date: Fri, 7 Apr 2017 14:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=8A=E6=96=AD=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E3=80=81=E5=9F=BA=E7=A1=80=E8=AF=8A=E6=96=AD=E9=A1=B9?= =?UTF-8?q?=E3=80=81=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AF=8A=E6=96=AD=E9=A1=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/base/common/entity/conf/DiagnoseConf.java | 2 +- .../lyms/base/common/entity/conf/DiagnoseMaps.java | 2 +- .../base/common/entity/conf/DiagnoseSource.java | 12 +- .../base/common/entity/conf/DiagnoseVersion.java | 16 ++- .../service/conf/DiagnoseVersionService.java | 11 ++ .../conf/impl/DiagnoseVersionServiceImpl.java | 27 +++++ .../cm/controller/conf/DiagnoseConfController.java | 127 ++++++++++++++++++++ .../controller/conf/DiagnoseSourceController.java | 122 +++++++++++++++++++ .../controller/conf/DiagnoseVersionController.java | 133 +++++++++++++++++++++ .../cm/controller/conf/HighriskConfController.java | 1 + .../controller/conf/HighriskSourceController.java | 1 + .../controller/conf/HighriskVersionController.java | 2 +- .../WEB-INF/views/conf/diagnose/conf_edit.html | 85 +++++++++++++ .../WEB-INF/views/conf/diagnose/conf_list.html | 100 ++++++++++++++++ .../WEB-INF/views/conf/diagnose/source_edit.html | 65 ++++++++++ .../WEB-INF/views/conf/diagnose/source_list.html | 93 ++++++++++++++ .../WEB-INF/views/conf/diagnose/version_edit.html | 55 +++++++++ .../WEB-INF/views/conf/diagnose/version_list.html | 102 ++++++++++++++++ .../WEB-INF/views/conf/highrisk/conf_edit.html | 2 +- .../WEB-INF/views/conf/highrisk/source_edit.html | 2 +- .../WEB-INF/views/conf/highrisk/source_list.html | 2 +- .../WEB-INF/views/conf/highrisk/version_list.html | 2 +- 22 files changed, 955 insertions(+), 9 deletions(-) create mode 100644 parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseConfController.java create mode 100644 parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseSourceController.java create mode 100644 parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseVersionController.java create mode 100644 parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html create mode 100644 parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html create mode 100644 parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/source_edit.html create mode 100644 parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/source_list.html create mode 100644 parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/version_edit.html create mode 100644 parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/version_list.html diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java index 596c127..306cbfc 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java @@ -21,7 +21,7 @@ public class DiagnoseConf implements Serializable { /** * */ - @TableId(value="ID") + @TableId(value="ID") private String id; /** * 高危项定义资源表ID diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseMaps.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseMaps.java index 0e6bb3e..6a560fa 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseMaps.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseMaps.java @@ -21,7 +21,7 @@ public class DiagnoseMaps implements Serializable { /** * */ - @TableField(value="ID") + @TableId(value="ID") private String id; /** * 诊断ID 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 cdc8dab..0914621 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 @@ -21,7 +21,7 @@ public class DiagnoseSource implements Serializable { /** * */ - @TableField(value="ID") + @TableId(value="ID") private String id; /** * 诊断项名称 @@ -38,6 +38,8 @@ public class DiagnoseSource implements Serializable { */ @TableField(value="ENABLE") private Integer enable; + @TableField(value="ITEMORDER") + private Integer itemorder; public String getId() { @@ -72,4 +74,12 @@ public class DiagnoseSource implements Serializable { 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/entity/conf/DiagnoseVersion.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseVersion.java index 996a6a6..0036891 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseVersion.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseVersion.java @@ -21,7 +21,7 @@ public class DiagnoseVersion implements Serializable { /** * */ - @TableField(value="ID") + @TableId(value="ID") private String id; /** * 高危版本名称 @@ -33,6 +33,11 @@ public class DiagnoseVersion implements Serializable { */ @TableField(value="ENABLE") private Integer enable; + /** + * 是否删除 + */ + @TableField(value="IFDEL") + private Integer ifdel; public String getId() { @@ -59,4 +64,13 @@ public class DiagnoseVersion implements Serializable { this.enable = enable; } + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + + } 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 409c319..293feb4 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 @@ -59,4 +59,15 @@ public interface DiagnoseVersionService extends BaseService { */ public String createVersion(DiagnoseVersion version) throws SystemException; + /** + *
  • @Description:复制一个版本 + *
  • @param id + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年4月7日 + *
  • 修改人： + *
  • 修改时间： + */ + public Integer copy(Serializable id); + } 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 8d8301c..dde545d 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 @@ -5,14 +5,20 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.conf.DiagnoseConfMapper; import com.lyms.base.common.dao.conf.DiagnoseVersionMapper; +import com.lyms.base.common.entity.conf.DiagnoseConf; import com.lyms.base.common.entity.conf.DiagnoseVersion; +import com.lyms.base.common.entity.conf.HighriskConf; +import com.lyms.base.common.entity.conf.HighriskVersion; import com.lyms.base.common.enums.StatusEnum; import com.lyms.base.common.service.conf.DiagnoseVersionService; import com.lyms.exception.SystemException; +import com.lyms.util.DateTimeUtils; import com.lyms.util.StrUtils; /** @@ -28,6 +34,8 @@ public class DiagnoseVersionServiceImpl extends ServiceImpl= 1 ? id : null; } + + @Override + @Transactional + public Integer copy(Serializable id) { + DiagnoseVersion version = baseMapper.selectById(id); + DiagnoseVersion newVersion = new DiagnoseVersion(); + String time = DateTimeUtils.getDateTime("yyyy_MM_dd_HH_mm_ss"); + String versionId = time; + newVersion.setId(versionId); + newVersion.setName(version.getName()+time); + Integer tag = baseMapper.insert(newVersion); + List confList = confMapper.selectList(new EntityWrapper().where("version_id={0}", version.getId())); + for(DiagnoseConf conf : confList){ + conf.setId(StrUtils.uuid()); + conf.setVersionId(versionId); + confMapper.insert(conf); + } + return tag; + } } 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 new file mode 100644 index 0000000..11a8c41 --- /dev/null +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseConfController.java @@ -0,0 +1,127 @@ +package com.lyms.cm.controller.conf; + +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +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.service.conf.DiagnoseConfService; +import com.lyms.constants.OperationName; +import com.lyms.util.StrUtils; +import com.lyms.web.bean.AjaxResult; +import com.lyms.web.controller.BaseController; + +/** + *

    + * 前端控制器 + *

    + * + * @author fangcheng + * @since 2017-04-07 + */ +@Controller +@RequestMapping("/diagnoseConf") +public class DiagnoseConfController extends BaseController { + + @Autowired + private DiagnoseConfService diagnoseConfService; + + + /** + * 跳转到列表页面 + * + * @return + */ + @RequestMapping(value = "/toList", method = { RequestMethod.GET }) + public String toList() { + return "/conf/diagnose/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"); + String searchName = getParameter("name"); + if (StrUtils.isNotEmpty(searchName)) { + ew.and("name like {0}", searchName.trim() + "%"); + } + if (StrUtils.isNotEmpty(versionId)) { + ew.and("version_id like {0}", versionId.trim() + "%"); + } + ew.orderBy("grouporder,itemorder"); + page = diagnoseConfService.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)) { + DiagnoseConf entity = diagnoseConfService.selectById(id); + model.addAttribute("conf", entity); + } + return "/conf/diagnose/conf_edit"; + } + + /** + * 创建 + *

    + * TODO + * + * @param user + * @return + */ + @RequestMapping(value = "/create", method = RequestMethod.POST) + @ResponseBody + public AjaxResult create(DiagnoseConf DiagnoseConf, AjaxResult ajaxResult) { + DiagnoseConf.setId(StrUtils.uuid()); + boolean tag = diagnoseConfService.insert(DiagnoseConf); + return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + } + + /** + * 修改信息 + */ + @RequestMapping(value = "/update", method = { RequestMethod.POST }) + @ResponseBody + public AjaxResult update(DiagnoseConf DiagnoseConf, AjaxResult ajaxResult) { + boolean tag = diagnoseConfService.updateById(DiagnoseConf); + 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 = diagnoseConfService.deleteLogicById(id); + return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); + } + +} diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseSourceController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseSourceController.java new file mode 100644 index 0000000..a4d5c85 --- /dev/null +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseSourceController.java @@ -0,0 +1,122 @@ +package com.lyms.cm.controller.conf; + +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +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.DiagnoseSource; +import com.lyms.base.common.service.conf.DiagnoseSourceService; +import com.lyms.constants.OperationName; +import com.lyms.util.StrUtils; +import com.lyms.web.bean.AjaxResult; +import com.lyms.web.controller.BaseController; + +/** + *

    + * 前端控制器 + *

    + * + * @author fangcheng + * @since 2017-04-07 + */ +@Controller +@RequestMapping("/diagnoseSource") +public class DiagnoseSourceController extends BaseController { + + @Autowired + private DiagnoseSourceService diagnoseSourceService; + + + /** + * 跳转到列表页面 + * + * @return + */ + @RequestMapping(value = "/toList", method = { RequestMethod.GET }) + public String toList() { + return "/conf/diagnose/source_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 searchName = getParameter("name"); + if (StrUtils.isNotEmpty(searchName)) { + ew.and("name like {0}", searchName.trim() + "%"); + } + ew.orderBy("itemorder"); + page = diagnoseSourceService.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)) { + DiagnoseSource entity = diagnoseSourceService.selectById(id); + model.addAttribute("source", entity); + } + return "/conf/diagnose/source_edit"; + } + + /** + * 创建用户 + *

    + * TODO + * + * @param user + * @return + */ + @RequestMapping(value = "/create", method = RequestMethod.POST) + @ResponseBody + public AjaxResult create(DiagnoseSource DiagnoseSource, AjaxResult ajaxResult) { + DiagnoseSource.setId(StrUtils.uuid()); + boolean tag = diagnoseSourceService.insert(DiagnoseSource); + return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + } + + /** + * 修改信息 + */ + @RequestMapping(value = "/update", method = { RequestMethod.POST }) + @ResponseBody + public AjaxResult update(DiagnoseSource DiagnoseSource, AjaxResult ajaxResult) { + boolean tag = diagnoseSourceService.updateById(DiagnoseSource); + 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 = diagnoseSourceService.deleteLogicById(id); + return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); + } + +} diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseVersionController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseVersionController.java new file mode 100644 index 0000000..9fe6b8b --- /dev/null +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseVersionController.java @@ -0,0 +1,133 @@ +package com.lyms.cm.controller.conf; + +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +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.DiagnoseVersion; +import com.lyms.base.common.service.conf.DiagnoseVersionService; +import com.lyms.constants.OperationName; +import com.lyms.util.StrUtils; +import com.lyms.web.bean.AjaxResult; +import com.lyms.web.controller.BaseController; + +/** + *

    + * 前端控制器 + *

    + * + * @author fangcheng + * @since 2017-04-07 + */ +@Controller +@RequestMapping("/diagnoseVersion") +public class DiagnoseVersionController extends BaseController { + + @Autowired + private DiagnoseVersionService diagnoseVersionService; + + + /** + * 跳转到列表页面 + * + * @return + */ + @RequestMapping(value = "/toList", method = { RequestMethod.GET }) + public String toList() { + return "/conf/diagnose/version_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(); + ew.where("ifDel=0"); + String searchName = getParameter("name"); + if (StrUtils.isNotEmpty(searchName)) { + ew.and("name like {0}", searchName.trim() + "%"); + } + page = diagnoseVersionService.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)) { + DiagnoseVersion entity = diagnoseVersionService.selectById(id); + model.addAttribute("version", entity); + } + return "/conf/diagnose/version_edit"; + } + + /** + * 创建用户 + *

    + * TODO + * + * @param user + * @return + */ + @RequestMapping(value = "/create", method = RequestMethod.POST) + @ResponseBody + public AjaxResult create(DiagnoseVersion DiagnoseVersion, AjaxResult ajaxResult) { + boolean tag = diagnoseVersionService.insert(DiagnoseVersion); + return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + } + + /** + * 修改信息 + */ + @RequestMapping(value = "/update", method = { RequestMethod.POST }) + @ResponseBody + public AjaxResult update(DiagnoseVersion DiagnoseVersion, AjaxResult ajaxResult) { + boolean tag = diagnoseVersionService.updateById(DiagnoseVersion); + 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 = diagnoseVersionService.deleteLogicById(id); + return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); + } + + /** + * 复制 + * + * @return + */ + @RequestMapping(value = "/{id}/copy", method = { RequestMethod.GET, RequestMethod.POST }) + @ResponseBody + public AjaxResult copy(@PathVariable String id, AjaxResult ajaxResult){ + int tag = diagnoseVersionService.copy(id); + return handleAjaxResult(ajaxResult, tag, "复制"); + } + +} 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 189f5c9..c9d851c 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 @@ -97,6 +97,7 @@ public class HighriskConfController extends BaseController { @RequestMapping(value = "/create", method = RequestMethod.POST) @ResponseBody public AjaxResult create(HighriskConf HighriskConf, AjaxResult ajaxResult) { + HighriskConf.setId(StrUtils.uuid()); boolean tag = highriskConfService.insert(HighriskConf); return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskSourceController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskSourceController.java index 59bc501..a1a5d7e 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskSourceController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskSourceController.java @@ -94,6 +94,7 @@ public class HighriskSourceController extends BaseController { @RequestMapping(value = "/create", method = RequestMethod.POST) @ResponseBody public AjaxResult create(HighriskSource HighriskSource, AjaxResult ajaxResult) { + HighriskSource.setId(StrUtils.uuid()); boolean tag = highriskSourceService.insert(HighriskSource); return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskVersionController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskVersionController.java index f957e73..62e43f4 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskVersionController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskVersionController.java @@ -37,7 +37,7 @@ public class HighriskVersionController extends BaseController { /** - * 跳转到用户列表页面 + * 跳转到列表页面 * * @return */ 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 new file mode 100644 index 0000000..6af887a --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html @@ -0,0 +1,85 @@ +#override("body") +

    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +#end +#extends("/common/base_list.html") \ No newline at end of file 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 new file mode 100644 index 0000000..25fc10a --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html @@ -0,0 +1,100 @@ +#override("body") +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + 查询 +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +#end +#override("js") + +#end +#extends("/common/base_list.html") + diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/source_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/source_edit.html new file mode 100644 index 0000000..d931747 --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/source_edit.html @@ -0,0 +1,65 @@ +#override("body") +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +#end +#extends("/common/base_list.html") \ No newline at end of file diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/source_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/source_list.html new file mode 100644 index 0000000..c747c81 --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/source_list.html @@ -0,0 +1,93 @@ +#override("body") +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + 查询 +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +#end +#override("js") + +#end +#extends("/common/base_list.html") + diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/version_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/version_edit.html new file mode 100644 index 0000000..411434e --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/version_edit.html @@ -0,0 +1,55 @@ +#override("body") +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +#end +#extends("/common/base_list.html") \ No newline at end of file diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/version_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/version_list.html new file mode 100644 index 0000000..72e838c --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/version_list.html @@ -0,0 +1,102 @@ +#override("body") +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + 查询 +
    +
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    +#end +#override("js") + +#end +#extends("/common/base_list.html") + 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 dff97fc..3f6acdb 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 @@ -5,7 +5,7 @@
    - +
    diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/source_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/source_edit.html index d2d9c59..6480def 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/source_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/source_edit.html @@ -5,7 +5,7 @@
    - +
    diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/source_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/source_list.html index ce53cfe..55fa29b 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/source_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/source_list.html @@ -77,7 +77,7 @@ var default_dataColumns = [{ return '女性高危' }else if(value == 2){ return '男性高危' - }else if(value == 1){ + }else if(value == 3){ return '儿童高危' } } diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/version_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/version_list.html index 83ba1f5..4b8d343 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/version_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/version_list.html @@ -62,7 +62,7 @@ function copy() { url = APP.PATH + controllerRequestMappint + val + "/copy"; ajaxPost(url,null,function(r){ if(r.success){ - reloadGrid(gridId); + reloadGrid("dataTable"); } msg(r.message); }); -- 1.8.3.1