Commit 0eb0bf3c6975835901bb22e2b0dd6ea87e928c83

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java View file @ 0eb0bf3
... ... @@ -75,6 +75,7 @@
75 75 */
76 76 public BaseResponse updateOneBasicConfig(BasicConfigUpdateRequest basicConfigUpdateRequest) {
77 77 BasicConfig obj = new BasicConfig();
  78 + obj.setWeight(basicConfigUpdateRequest.getWeight());
78 79 obj.setModifiedDate(System.currentTimeMillis());
79 80 obj.setCode(basicConfigUpdateRequest.getCode());
80 81 obj.setName(basicConfigUpdateRequest.getName());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java View file @ 0eb0bf3
... ... @@ -14,7 +14,17 @@
14 14 private Integer score;
15 15 private String desc;
16 16 private String parentId;
  17 + //权重
  18 + private Integer weight;
17 19 private List childConfigs;
  20 +
  21 + public Integer getWeight() {
  22 + return weight;
  23 + }
  24 +
  25 + public void setWeight(Integer weight) {
  26 + this.weight = weight;
  27 + }
18 28  
19 29 public List getChildConfigs() {
20 30 return childConfigs;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java View file @ 0eb0bf3
... ... @@ -2,7 +2,6 @@
2 2  
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
4 4 import com.lyms.platform.pojo.BasicConfig;
5   -import com.lyms.platform.pojo.PuerperaModel;
6 5  
7 6 import java.util.List;
8 7  
9 8  
... ... @@ -13,7 +12,17 @@
13 12 private String parentId;
14 13 private String name;
15 14 private String desc;
  15 + //权重
  16 + private Integer weight;
16 17  
  18 + public Integer getWeight() {
  19 + return weight;
  20 + }
  21 +
  22 + public void setWeight(Integer weight) {
  23 + this.weight = weight;
  24 + }
  25 +
17 26 private List<BasicConfigResult> childConfigs;
18 27  
19 28 public List<BasicConfigResult> getChildConfigs() {
... ... @@ -73,6 +82,7 @@
73 82 setEnable(destModel.getEnable());
74 83 setName(destModel.getName());
75 84 setParentId(destModel.getParentId());
  85 + setWeight(destModel.getWeight());
76 86 return this;
77 87 }
78 88 }