jiangjiazhi / regional-platform | GitLab

Commit 07bcbf5141233bdf28738a5b15c6adf3e048ef09

Authored by dongqin over 6 years ago

1 parent 114f1bdb07

Exists in master and in 6 other branches

添加无服务，全部字段

Showing 3 changed files with 7 additions and 4 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java
platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java

...	...	@@ -27,7 +27,9 @@
27	27	ALL(103,"全部",100),
28	28	ALL_OPEN(7,"开通",100),
29	29	ALL_NO_OPEN(8,"不开通",100),
30		- ALL_OVERDUE(9,"过期",100);
	30	+ ALL_OVERDUE(9,"过期",100),
	31	+
	32	+ NO_SERVICE(10, "全部", 5);
31	33
32	34	private ServiceStatusEnums(int id, String name,int pid){
33	35	this.name=name;

...	...	@@ -53,7 +53,8 @@
53	53	YFXXJSTX(39,"孕妇学校课程结束提醒",21,"1,3"),
54	54	TZTX(40,"体重测量提醒",21,"1"),
55	55	XTTX(41,"血糖测量提醒",21,"1"),
56		- XYTX(42,"血压测量提醒",21,"1");
	56	+ XYTX(42,"血压测量提醒",21,"1"),
	57	+ NOSERVICE(43,"无服务",0,"0,1,2,3,4");
57	58
58	59	private SmsServiceEnums(int id,String name,int pid,String serviceObj){
59	60	this.id = id;

...	...	@@ -238,8 +238,8 @@
238	238	@RequestMapping(value = "/getServiceStatusByPid/{pid}", method = RequestMethod.GET)
239	239	@ResponseBody
240	240	public List<Map<String,String>> getServiceStatusByPid(@PathVariable("pid") Integer pid) {
241		- // 0-围产小助理/孕期产检提醒服务 100-全部
242		- if (pid != 0 && pid != 100){
	241	+ // 0-围产小助理/孕期产检提醒服务 100-全部 5-无服务
	242	+ if (pid != 0 && pid != 100 && pid != 5){
243	243	pid = 1;
244	244	}
245	245	List<Map<String,String>> list = ServiceStatusEnums.getServiceStatusByPid(pid);