From 33f90ab44eeb56424872313be023f4c874daa6bb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 05 Jan 2024 18:24:17 +0800
Subject: [PATCH] 白蚁普查
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java | 8 ++++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java | 19 +++++++++++++++++++
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
index 70f85d2..f9007f2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
@@ -15,6 +15,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -48,8 +49,11 @@
@ApiOperation(value = "分页", notes = "白蚁普查分页")
public R list(@ApiIgnore TbResGeneralInvestigation param, Query query) {
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("\"check_state\"", param.getCheckState());
- return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query),queryWrapper));
+ if (null != param.getCheckState())
+ queryWrapper.eq("\"check_state\"", param.getCheckState());
+ if (!StringUtil.isBlank(param.getResName()))
+ queryWrapper.like("\"res_name\"", "%" + param.getCheckState() + "%");
+ return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query), queryWrapper));
}
@ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java
index 80a5143..467d0cf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java
@@ -56,6 +56,25 @@
private String investigationVariety;
/**
+ * 是否蚁患
+ */
+ @ApiModelProperty(value = "是否蚁患")
+ @TableField(value = "\"is_ant_infestation\"", fill = FieldFill.UPDATE)
+ private String isAntInfestation;
+ /**
+ * 是否蚁源
+ */
+ @ApiModelProperty(value = "是否蚁源")
+ @TableField(value = "\"is_ant_source\"", fill = FieldFill.UPDATE)
+ private String isAntSource;
+ /**
+ * 部位
+ */
+ @ApiModelProperty(value = "部位")
+ @TableField(value = "\"part_place\"", fill = FieldFill.UPDATE)
+ private String partPlace;
+
+ /**
* 普查面积
*/
@ApiModelProperty(value = "普查面积")
--
Gitblit v1.9.3