From ff9019e43ba8b80d2337cfc00468987c4642b494 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Sun, 07 Feb 2021 09:30:55 +0800
Subject: [PATCH] 健康码，警单
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
index 914a8c2..d2e08e4 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
@@ -142,11 +142,11 @@
* @return
*/
@PostMapping("/selectList")
- public R<IPage<JingdanVO>> selectList(@ApiParam(value = "主键集合", required = true) @RequestParam Query query ,String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
+ public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- return R.data(jingdanService.selectList(Condition.getPage(query),waringType, beginTime, endTime,addvcd,type));
+ return R.data(jingdanService.selectList(waringType, beginTime, endTime,addvcd,type));
}
/**
@@ -233,10 +233,7 @@
}
@PostMapping("/updateInfo")
- public R updateInfo(String id, String handleP, String handName, String handletype, String type, HttpServletResponse response) {
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ public R updateInfo(String id, String handleP, String handName, String handletype, String type) {
jingdanService.updateInfo(id, handleP, handName,handletype,type);
return R.success("修改成功");
}
--
Gitblit v1.9.3