jiangjiazhi / center

Download as
Browse Code »

Commit a6add09b7829df3c6af9553b61f001c0dd6b6ac5

Authored by fangcheng
1 parent 24e1e45a80
Exists in master

高危、诊断项添加select选择

Showing 11 changed files with 164 additions and 102 deletions

parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseSource.java View file @ a6add09
... ... @@ -38,8 +38,6 @@
38 38 */
39 39 @TableField(value="ENABLE")
40 40 private Integer enable;
41   - @TableField(value="ITEMORDER")
42   - private Integer itemorder;
43 41  
44 42  
45 43 public String getId() {
... ... @@ -73,14 +71,6 @@
73 71 public void setEnable(Integer enable) {
74 72 this.enable = enable;
75 73 }
76   -
77   - public Integer getItemorder() {
78   - return itemorder;
79   - }
80   -
81   - public void setItemorder(Integer itemorder) {
82   - this.itemorder = itemorder;
83   - }
84 74  
85 75 }
parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseVersionService.java View file @ a6add09
... ... @@ -46,6 +46,16 @@
46 46 * <li>修改时间：
47 47 */
48 48 public List<DiagnoseVersion> getEnableDiagnoseVersionBy(Serializable id) throws SystemException;
  49 +
  50 + /**
  51 + * <li>@Description:获取所有可用高危版本
  52 + * <li>@return
  53 + * <li>创建人：方承
  54 + * <li>创建时间：2017年5月25日
  55 + * <li>修改人：
  56 + * <li>修改时间：
  57 + */
  58 + public List<DiagnoseVersion> getEnableDiagnoseVersionList();
49 59  
50 60 /**
51 61 * <li>@Description:添加版本号
parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java View file @ a6add09
... ... @@ -46,6 +46,17 @@
46 46 * <li>修改时间：
47 47 */
48 48 public List<HighriskVersion> getEnableHighriskVersionBy(Serializable id) throws SystemException;
  49 +
  50 + /**
  51 + * <li>@Description:获取所有可用高危版本
  52 + * <li>@return
  53 + * <li>@throws SystemException
  54 + * <li>创建人：方承
  55 + * <li>创建时间：2017年5月25日
  56 + * <li>修改人：
  57 + * <li>修改时间：
  58 + */
  59 + public List<HighriskVersion> getEnableHighriskVersionList() throws SystemException;
49 60  
50 61 /**
51 62 * <li>@Description:添加版本号
parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseVersionServiceImpl.java View file @ a6add09
... ... @@ -164,5 +164,12 @@
164 164 }
165 165 return tag;
166 166 }
  167 +
  168 + @Override
  169 + public List<DiagnoseVersion> getEnableDiagnoseVersionList() {
  170 + EntityWrapper<DiagnoseVersion> wrapper = new EntityWrapper<DiagnoseVersion>();
  171 + wrapper.where("enable={0}", StatusEnum.ENABLED.getStatus()).and("ifDel=0");
  172 + return diagnoseVersionMapper.selectList(wrapper);
  173 + }
167 174 }
parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java View file @ a6add09
... ... @@ -166,5 +166,12 @@
166 166 return tag;
167 167 }
168 168  
  169 + @Override
  170 + public List<HighriskVersion> getEnableHighriskVersionList() throws SystemException {
  171 + EntityWrapper<HighriskVersion> wrapper = new EntityWrapper<HighriskVersion>();
  172 + wrapper.where("enable={0}", StatusEnum.ENABLED.getStatus()).and("ifDel=0");
  173 + return versionMapper.selectList(wrapper);
  174 + }
  175 +
169 176 }
parent/center.manager/src/main/java/com/lyms/cm/controller/conf/DiagnoseConfController.java View file @ a6add09
1 1 package com.lyms.cm.controller.conf;
2 2  
  3 +import java.util.List;
3 4 import java.util.Map;
4 5  
5 6 import org.apache.commons.lang3.StringUtils;
6 7  
... ... @@ -14,7 +15,11 @@
14 15 import com.baomidou.mybatisplus.mapper.EntityWrapper;
15 16 import com.baomidou.mybatisplus.plugins.Page;
16 17 import com.lyms.base.common.entity.conf.DiagnoseConf;
  18 +import com.lyms.base.common.entity.conf.DiagnoseSource;
  19 +import com.lyms.base.common.entity.conf.DiagnoseVersion;
17 20 import com.lyms.base.common.service.conf.DiagnoseConfService;
  21 +import com.lyms.base.common.service.conf.DiagnoseSourceService;
  22 +import com.lyms.base.common.service.conf.DiagnoseVersionService;
18 23 import com.lyms.constants.OperationName;
19 24 import com.lyms.util.StrUtils;
20 25 import com.lyms.web.bean.AjaxResult;
... ... @@ -34,6 +39,10 @@
34 39  
35 40 @Autowired
36 41 private DiagnoseConfService diagnoseConfService;
  42 + @Autowired
  43 + private DiagnoseVersionService diagnoseVersionService;
  44 + @Autowired
  45 + private DiagnoseSourceService diagnoseSourceService;
37 46  
38 47  
39 48 /**
... ... @@ -42,7 +51,11 @@
42 51 * @return
43 52 */
44 53 @RequestMapping(value = "/toList", method = { RequestMethod.GET })
45   - public String toList() {
  54 + public String toList(Model model) {
  55 + List<DiagnoseVersion> versionList = diagnoseVersionService.getEnableDiagnoseVersionList();
  56 + List<DiagnoseSource> sourceList = diagnoseSourceService.getDiagnoseSource();
  57 + model.addAttribute("versionList", versionList);
  58 + model.addAttribute("sourceList", sourceList);
46 59 return "/conf/diagnose/conf_list";
47 60 }
48 61  
... ... @@ -60,6 +73,7 @@
60 73 EntityWrapper<DiagnoseConf> ew = new EntityWrapper<DiagnoseConf>();
61 74  
62 75 String versionId = getParameter("versionId");
  76 + String sourceId = getParameter("sourceId");
63 77 String searchName = getParameter("name");
64 78 if (StrUtils.isNotEmpty(searchName)) {
65 79 ew.and("name like {0}", searchName.trim() + "%");
... ... @@ -67,6 +81,9 @@
67 81 if (StrUtils.isNotEmpty(versionId)) {
68 82 ew.and("version_id like {0}", versionId.trim() + "%");
69 83 }
  84 + if (StrUtils.isNotEmpty(sourceId)) {
  85 + ew.and("source_id like {0}", sourceId.trim() + "%");
  86 + }
70 87 ew.orderBy("grouporder,itemorder");
71 88 page = diagnoseConfService.selectPage(page,ew);
72 89 return toGridData(page);
... ... @@ -83,6 +100,10 @@
83 100 DiagnoseConf entity = diagnoseConfService.selectById(id);
84 101 model.addAttribute("conf", entity);
85 102 }
  103 + List<DiagnoseVersion> versionList = diagnoseVersionService.getEnableDiagnoseVersionList();
  104 + List<DiagnoseSource> sourceList = diagnoseSourceService.getDiagnoseSource();
  105 + model.addAttribute("versionList", versionList);
  106 + model.addAttribute("sourceList", sourceList);
86 107 return "/conf/diagnose/conf_edit";
87 108 }
88 109  
parent/center.manager/src/main/java/com/lyms/cm/controller/conf/HighriskConfController.java View file @ a6add09
1 1 package com.lyms.cm.controller.conf;
2 2  
  3 +import java.util.List;
3 4 import java.util.Map;
4 5  
5 6 import org.apache.commons.lang3.StringUtils;
6 7  
... ... @@ -14,7 +15,11 @@
14 15 import com.baomidou.mybatisplus.mapper.EntityWrapper;
15 16 import com.baomidou.mybatisplus.plugins.Page;
16 17 import com.lyms.base.common.entity.conf.HighriskConf;
  18 +import com.lyms.base.common.entity.conf.HighriskSource;
  19 +import com.lyms.base.common.entity.conf.HighriskVersion;
17 20 import com.lyms.base.common.service.conf.HighriskConfService;
  21 +import com.lyms.base.common.service.conf.HighriskSourceService;
  22 +import com.lyms.base.common.service.conf.HighriskVersionService;
18 23 import com.lyms.constants.OperationName;
19 24 import com.lyms.util.StrUtils;
20 25 import com.lyms.web.bean.AjaxResult;
21 26  
22 27  
23 28  
24 29  
25 30  
26 31  
27 32  
... ... @@ -32,61 +37,78 @@
32 37 @RequestMapping("/highriskConf")
33 38 public class HighriskConfController extends BaseController {
34 39  
35   - @Autowired
36   - private HighriskConfService highriskConfService;
  40 + @Autowired
  41 + private HighriskConfService highriskConfService;
  42 + @Autowired
  43 + private HighriskVersionService highriskVersionService;
37 44  
  45 + @Autowired
  46 + private HighriskSourceService highriskSourceService;
38 47  
39   - /**
40   - * 跳转到列表页面
41   - *
42   - * @return
43   - */
44   - @RequestMapping(value = "/toList", method = { RequestMethod.GET })
45   - public String toList() {
46   - return "/conf/highrisk/conf_list";
47   - }
  48 + /**
  49 + * 跳转到列表页面
  50 + *
  51 + * @return
  52 + */
  53 + @RequestMapping(value = "/toList", method = { RequestMethod.GET })
  54 + public String toList(Model model) {
  55 + List<HighriskVersion> versionList = highriskVersionService.getEnableHighriskVersionList();
  56 + List<HighriskSource> sourceList = highriskSourceService.getHighriskSource();
  57 + model.addAttribute("versionList", versionList);
  58 + model.addAttribute("sourceList", sourceList);
  59 + return "/conf/highrisk/conf_list";
  60 + }
48 61  
49   - /**
50   - * 列表
51   - *
52   - * @param page
53   - * @param model
54   - * @return
55   - */
56   - @RequestMapping(value = "/list", method = { RequestMethod.POST, RequestMethod.GET })
57   - @ResponseBody
58   - public Map<String, Object> list(Model model) {
59   - Page<HighriskConf> page = getPage();
60   - EntityWrapper<HighriskConf> ew = new EntityWrapper<HighriskConf>();
61   -
62   - String versionId = getParameter("versionId");
  62 + /**
  63 + * 列表
  64 + *
  65 + * @param page
  66 + * @param model
  67 + * @return
  68 + */
  69 + @RequestMapping(value = "/list", method = { RequestMethod.POST, RequestMethod.GET })
  70 + @ResponseBody
  71 + public Map<String, Object> list(Model model) {
  72 + Page<HighriskConf> page = getPage();
  73 + EntityWrapper<HighriskConf> ew = new EntityWrapper<HighriskConf>();
  74 +
  75 + String versionId = getParameter("versionId");
63 76 String searchName = getParameter("name");
  77 + String sourceId = getParameter("sourceId");
  78 +
64 79 if (StrUtils.isNotEmpty(searchName)) {
65 80 ew.and("name like {0}", searchName.trim() + "%");
66 81 }
67 82 if (StrUtils.isNotEmpty(versionId)) {
68 83 ew.and("version_id like {0}", versionId.trim() + "%");
69 84 }
  85 + if (StrUtils.isNotEmpty(sourceId)) {
  86 + ew.and("source_id like {0}", sourceId.trim() + "%");
  87 + }
70 88 ew.orderBy("grouporder,itemorder");
71   - page = highriskConfService.selectPage(page,ew);
72   - return toGridData(page);
73   - }
  89 + page = highriskConfService.selectPage(page, ew);
  90 + return toGridData(page);
  91 + }
74 92  
75   - /**
76   - * 跳转到编辑页面
77   - *
78   - * @return
79   - */
80   - @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET)
81   - public String toEdit(@PathVariable String id, Model model) {
82   - if (!StringUtils.isBlank(id) && !"0".equals(id)) {
83   - HighriskConf entity = highriskConfService.selectById(id);
84   - model.addAttribute("conf", entity);
85   - }
86   - return "/conf/highrisk/conf_edit";
87   - }
88   -
89   - /**
  93 + /**
  94 + * 跳转到编辑页面
  95 + *
  96 + * @return
  97 + */
  98 + @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET)
  99 + public String toEdit(@PathVariable String id, Model model) {
  100 + if (!StringUtils.isBlank(id) && !"0".equals(id)) {
  101 + HighriskConf entity = highriskConfService.selectById(id);
  102 + model.addAttribute("conf", entity);
  103 + }
  104 + List<HighriskVersion> versionList = highriskVersionService.getEnableHighriskVersionList();
  105 + List<HighriskSource> sourceList = highriskSourceService.getHighriskSource();
  106 + model.addAttribute("versionList", versionList);
  107 + model.addAttribute("sourceList", sourceList);
  108 + return "/conf/highrisk/conf_edit";
  109 + }
  110 +
  111 + /**
90 112 * 创建
91 113 * <p>
92 114 * TODO
93 115  
94 116  
... ... @@ -102,27 +124,27 @@
102 124 return handleAjaxResult(ajaxResult, tag, OperationName.CREATE);
103 125 }
104 126  
105   - /**
106   - * 修改信息
107   - */
108   - @RequestMapping(value = "/update", method = { RequestMethod.POST })
109   - @ResponseBody
110   - public AjaxResult update(HighriskConf HighriskConf, AjaxResult ajaxResult) {
111   - boolean tag = highriskConfService.updateById(HighriskConf);
  127 + /**
  128 + * 修改信息
  129 + */
  130 + @RequestMapping(value = "/update", method = { RequestMethod.POST })
  131 + @ResponseBody
  132 + public AjaxResult update(HighriskConf HighriskConf, AjaxResult ajaxResult) {
  133 + boolean tag = highriskConfService.updateById(HighriskConf);
112 134 return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE);
113   - }
  135 + }
114 136  
115   - /**
116   - * 删除
117   - *
118   - * @return
119   - */
120   - @RequestMapping(value = "/{id}/delete", method = { RequestMethod.GET, RequestMethod.POST })
121   - @ResponseBody
122   - public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) {
123   - int tag = highriskConfService.deleteLogicById(id);
124   - return handleAjaxResult(ajaxResult, tag, OperationName.DELETE);
125   - }
  137 + /**
  138 + * 删除
  139 + *
  140 + * @return
  141 + */
  142 + @RequestMapping(value = "/{id}/delete", method = { RequestMethod.GET, RequestMethod.POST })
  143 + @ResponseBody
  144 + public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) {
  145 + int tag = highriskConfService.deleteLogicById(id);
  146 + return handleAjaxResult(ajaxResult, tag, OperationName.DELETE);
  147 + }
126 148  
127 149 }
parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html View file @ a6add09
... ... @@ -9,15 +9,15 @@
9 9 </div>
10 10 </div>
11 11 <div class="form-group">
12   - <label class="col-sm-3 control-label">source_id:</label>
  12 + <label class="col-sm-3 control-label">基础诊断项:</label>
13 13 <div class="col-sm-8">
14   - <input type="text" placeholder="source_id" value="$!conf.sourceId" aria-required="true" required="true" class="form-control" minlength="2" name="sourceId" id="sourceId">
  14 + #selector("sourceId" "sourceId" $sourceList $!conf.sourceId)
15 15 </div>
16 16 </div>
17 17 <div class="form-group">
18   - <label class="col-sm-3 control-label">版本id:</label>
  18 + <label class="col-sm-3 control-label">诊断版本:</label>
19 19 <div class="col-sm-8">
20   - <input type="text" placeholder="version_id" value="$!conf.versionId" aria-required="true" required="true" class="form-control" minlength="2" name="versionId" id="versionId">
  20 + #selector("versionId" "versionId" $versionList $!conf.versionId)
21 21 </div>
22 22 </div>
23 23 <div class="form-group">
parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html View file @ a6add09
... ... @@ -4,9 +4,14 @@
4 4 <div style="padding-top:30px;">
5 5 <form role="form" class="form-inline">
6 6 <div class="form-group">
7   - <input type="text" placeholder="version_id" id="versionIdSearch" class="form-control">
  7 + 诊断版本：
  8 + #selector("versionIdSearch" "versionId" $versionList)
8 9 </div>
9 10 <div class="form-group">
  11 + 诊断基础项：
  12 + #selector("sourceIdSearch" "sourceId" $sourceList)
  13 + </div>
  14 + <div class="form-group">
10 15 <input type="text" placeholder="请输入自定义诊断项名称" id="nameSearch" class="form-control">
11 16 </div>
12 17 </form>
... ... @@ -39,6 +44,7 @@
39 44 var queryParams = {
40 45 query:{
41 46 versionId: $("#versionIdSearch").val(),
  47 + sourceId: $("#sourceIdSearch").val(),
42 48 name:$("#nameSearch").val()
43 49 }
44 50 }
... ... @@ -67,15 +73,6 @@
67 73 field: 'check_state',
68 74 title: '',
69 75 checkbox: true
70   - },{
71   - field: 'id',
72   - title: '编号'
73   - },{
74   - field: 'sourceId',
75   - title: 'source_id'
76   - },{
77   - field: 'versionId',
78   - title: 'version_id'
79 76 },{
80 77 field: 'name',
81 78 title: '自定义诊断项名称'
parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/conf_edit.html View file @ a6add09
... ... @@ -9,15 +9,15 @@
9 9 </div>
10 10 </div>
11 11 <div class="form-group">
12   - <label class="col-sm-3 control-label">source_id:</label>
  12 + <label class="col-sm-3 control-label">高危基础项:</label>
13 13 <div class="col-sm-8">
14   - <input type="text" placeholder="source_id" value="$!conf.sourceId" aria-required="true" required="true" class="form-control" minlength="2" name="sourceId" id="sourceId">
  14 + #selector("sourceId" "sourceId" $sourceList $!conf.sourceId)
15 15 </div>
16 16 </div>
17 17 <div class="form-group">
18   - <label class="col-sm-3 control-label">版本id:</label>
  18 + <label class="col-sm-3 control-label">高危版本:</label>
19 19 <div class="col-sm-8">
20   - <input type="text" placeholder="version_id" value="$!conf.versionId" aria-required="true" required="true" class="form-control" minlength="2" name="versionId" id="versionId">
  20 + #selector("versionId" "versionId" $versionList $!conf.versionId)
21 21 </div>
22 22 </div>
23 23 <div class="form-group">
parent/center.manager/src/main/webapp/WEB-INF/views/conf/highrisk/conf_list.html View file @ a6add09
... ... @@ -4,9 +4,14 @@
4 4 <div style="padding-top:30px;">
5 5 <form role="form" class="form-inline">
6 6 <div class="form-group">
7   - <input type="text" placeholder="version_id" id="versionIdSearch" class="form-control">
  7 + 高危版本：
  8 + #selector("versionId" "versionId" $versionList)
8 9 </div>
9 10 <div class="form-group">
  11 + 基础高危项：
  12 + #selector("sourceId" "sourceId" $sourceList)
  13 + </div>
  14 + <div class="form-group">
10 15 <input type="text" placeholder="请输入自定义高危项名称" id="nameSearch" class="form-control">
11 16 </div>
12 17 </form>
... ... @@ -39,7 +44,8 @@
39 44 var queryParams = {
40 45 query:{
41 46 versionId: $("#versionIdSearch").val(),
42   - name:$("#nameSearch").val()
  47 + name:$("#nameSearch").val(),
  48 + sourceId: $("#sourceId").val()
43 49 }
44 50 }
45 51 $('#dataTable').bootstrapTable('refresh', queryParams );
... ... @@ -67,15 +73,6 @@
67 73 field: 'check_state',
68 74 title: '',
69 75 checkbox: true
70   - },{
71   - field: 'id',
72   - title: '编号'
73   - },{
74   - field: 'sourceId',
75   - title: 'source_id'
76   - },{
77   - field: 'versionId',
78   - title: 'version_id'
79 76 },{
80 77 field: 'name',
81 78 title: '自定义高危项名称'