From 6c31ac6260bbf0869631ab9d81f9b1b3f27a82eb Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 13 Mar 2021 10:22:16 +0800
Subject: [PATCH] 1.警情
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/entity/Jingdan.java | 1 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java | 6 +++---
3 files changed, 5 insertions(+), 4 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 5762618..ba885da 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
@@ -119,7 +119,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入jingdan")
- public R submit(@Valid @RequestBody Jingdan jingdan) {
+ public R submit(@RequestBody Jingdan jingdan) {
//return R.status(jingdanService.saveOrUpdate(jingdan));
if ("".equals(jingdan.getType())) {
jingdan.setType("0");
@@ -184,11 +184,11 @@
* @return
*/
@PostMapping("/selectList")
- public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam 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 district, 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(waringType, beginTime, endTime, addvcd, type));
+ return R.data(jingdanService.selectList(waringType, beginTime, endTime, district, type));
}
/**
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/entity/Jingdan.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/entity/Jingdan.java
index 702a9d3..c5d56b3 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/entity/Jingdan.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/entity/Jingdan.java
@@ -23,6 +23,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.io.Serializable;
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java
index e7b3e62..e07e03f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java
@@ -47,7 +47,7 @@
* @param endTime
* @return
*/
- List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String addvcd, String type);
+ List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String district, String type);
List<JingdanVO> selectLists(String handleP, String type);
/**
--
Gitblit v1.9.3