liang.cheng
/
weaver-hrm-organization
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !6 from reset/feature/cl

Browse Source
pull/6/MERGE
reset 3 years ago committed by Gitee
parent 2d53588d39 2f54556afd
commit e840cddb4c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
src/com/engine/organization/entity/TopTab.java
Unescape Escape View File

@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
public class TopTab { public class TopTab {
private String color; private String color;
private String groupId; private String groupId;
private Boolean showCount; private Boolean showcount;
private String title; private String title;
private String viewCondition; private String viewCondition;
@ -27,7 +27,7 @@ public class TopTab {
return "TopTab{" + return "TopTab{" +
"color='" + color + '\'' + "color='" + color + '\'' +
", groupid='" + groupId + '\'' + ", groupid='" + groupId + '\'' +
", showcount='" + showCount + '\'' + ", showcount='" + showcount + '\'' +
", title='" + title + '\'' + ", title='" + title + '\'' +
", viewcondition='" + viewCondition + '\'' + ", viewcondition='" + viewCondition + '\'' +
'}'; '}';

6
src/com/engine/organization/service/impl/GradeServiceImpl.java
Unescape Escape View File

@ -136,9 +136,9 @@ public class GradeServiceImpl extends Service implements GradeService {
public Map<String, Object> getTabInfo() { public Map<String, Object> getTabInfo() {
Map<String, Object> apiDatas = new HashMap<>(); Map<String, Object> apiDatas = new HashMap<>();
List<TopTab> topTabs = new ArrayList<>(); List<TopTab> topTabs = new ArrayList<>();
topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showCount(true).title("全部").viewCondition("-1").build()); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build());
topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showCount(true).title("启用").viewCondition("0").build()); topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title("启用").viewCondition("0").build());
topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showCount(true).title("禁用").viewCondition("1").build()); topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title("禁用").viewCondition("1").build());
apiDatas.put("topTabs", topTabs); apiDatas.put("topTabs", topTabs);
HashMap<String, Integer> countMap = new HashMap<>(); HashMap<String, Integer> countMap = new HashMap<>();

6
src/com/engine/organization/service/impl/LevelServiceImpl.java
Unescape Escape View File

@ -136,9 +136,9 @@ public class LevelServiceImpl extends Service implements LevelService {
public Map<String, Object> getTabInfo() { public Map<String, Object> getTabInfo() {
Map<String, Object> apiDatas = new HashMap<>(); Map<String, Object> apiDatas = new HashMap<>();
List<TopTab> topTabs = new ArrayList<>(); List<TopTab> topTabs = new ArrayList<>();
topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showCount(true).title("全部").viewCondition("-1").build()); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build());
topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showCount(true).title("启用").viewCondition("0").build()); topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title("启用").viewCondition("0").build());
topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showCount(true).title("禁用").viewCondition("1").build()); topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title("禁用").viewCondition("1").build());
apiDatas.put("topTabs", topTabs); apiDatas.put("topTabs", topTabs);
HashMap<String, Integer> countMap = new HashMap<>(); HashMap<String, Integer> countMap = new HashMap<>();

Write Preview
Loading…
Cancel
Save