From 9be8bbb37df5acb845838acf5d7bf2d4469946c0 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 02 二月 2021 15:18:47 +0800
Subject: [PATCH] update

---
 src/main/java/com/fgkj/controller/User_jiejiariController.java |   43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/fgkj/controller/User_jiejiariController.java b/src/main/java/com/fgkj/controller/User_jiejiariController.java
index 156fac8..67247e8 100644
--- a/src/main/java/com/fgkj/controller/User_jiejiariController.java
+++ b/src/main/java/com/fgkj/controller/User_jiejiariController.java
@@ -7,10 +7,12 @@
 import com.fgkj.services.User_jiejiariService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 
 @RequestMapping("holiday")
 @RestController
@@ -22,26 +24,37 @@
 	//4.3鑺傚亣鏃ョ鐞�(澧炲姞)
 	@PostMapping("/")
 	@ApiOperation(notes = "",value="鑺傚亣鏃ョ鐞�(澧炲姞)")
-	public ServiceModel add(@RequestBody User_jiejiari ujjr) {
-		ServiceModel model=service.add(ujjr);
-		
+	public ServiceModel add(@RequestParam Integer jiejiari_type, @ApiParam(value = "鏃堕棿 鏍煎紡2021/01/06 09:25:50",required = true)@RequestParam Date jiejiari_date, @RequestParam String note) {
+		User_jiejiari ujjr = new User_jiejiari();
+		ujjr.setJiejiari_type(jiejiari_type);
+		ujjr.setJiejiari_date(jiejiari_date);
+		ujjr.setNote(note);
+		ServiceModel model = service.add(ujjr);
+
 		return model;
 	}
 	//4.3鑺傚亣鏃ョ鐞�(淇敼)
 	@PutMapping("/")
 	@ApiOperation(notes = "",value="鑺傚亣鏃ョ鐞�(淇敼)")
-	public ServiceModel update(@RequestBody User_jiejiari ujjr) {
+	public ServiceModel update(@RequestParam Integer num, @RequestParam Integer jiejiari_type, @ApiParam(value = "鏃堕棿 鏍煎紡2021/01/06 09:25:50",required = true) @RequestParam Date jiejiari_date, @RequestParam String note) {
+		User_jiejiari ujjr = new User_jiejiari();
+		ujjr.setNum(num);
+		ujjr.setJiejiari_type(jiejiari_type);
+		ujjr.setJiejiari_date(jiejiari_date);
+		ujjr.setNote(note);
 		ServiceModel model=service.update(ujjr);
 		
 		return model;
 	}
-	
+
 	//4.3鑺傚亣鏃ョ鐞�(鍒犻櫎)
 	@DeleteMapping("/")
-	@ApiOperation(notes = "",value="鑺傚亣鏃ョ鐞�(鍒犻櫎)")
-	public ServiceModel delete(@RequestBody User_jiejiari ujjr) {
-		ServiceModel model=service.delete(ujjr);
-		
+	@ApiOperation(notes = "", value = "鑺傚亣鏃ョ鐞�(鍒犻櫎)")
+	public ServiceModel delete(@RequestParam Integer num) {
+		User_jiejiari ujjr = new User_jiejiari();
+		ujjr.setNum(num);
+		ServiceModel model = service.delete(ujjr);
+
 		return model;
 	}
 	
@@ -53,13 +66,15 @@
 				
 		return model;
 	}
-	
+
 	//鏍规嵁鍏巻鍜屽啘鍘嗕互鍙婂叏閮ㄦ煡璇㈣妭鍋囨棩
 	@PostMapping("byCondition")
-	@ApiOperation(notes = "",value="鍏巻鍜屽啘鍘嗕互鍙婂叏閮ㄦ煡璇㈣妭鍋囨棩")
-	public ServiceModel serchByCondition(@RequestBody User_jiejiari ujjr){
-		ServiceModel model=service.serchByCondition(ujjr);
-		
+	@ApiOperation(notes = "", value = "鍏巻鍜屽啘鍘嗕互鍙婂叏閮ㄦ煡璇㈣妭鍋囨棩")
+	public ServiceModel serchByCondition(@RequestParam Integer jiejiari_type) {
+		User_jiejiari ujjr = new User_jiejiari();
+		ujjr.setJiejiari_type(jiejiari_type);
+		ServiceModel model = service.serchByCondition(ujjr);
+
 		return model;
 	}
 	

--
Gitblit v1.9.1