From ee0f57d1de5174c9290373ec38b3032ce8f4bc74 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 11 Mar 2024 17:44:59 +0800
Subject: [PATCH] 水库白蚁普查pc端状态调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 145a28b..5e9ff10 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
@@ -60,6 +60,10 @@
queryWrapper.like("\"res_guid\"", param.getResGuid());
if (!StringUtil.isBlank(param.getCreateUser()))
queryWrapper.like("\"create_user\"", param.getCreateUser());
+ if (null != param.getTbYear())
+ queryWrapper.like("\"tb_year\"", param.getTbYear());
+ if (!StringUtil.isBlank(param.getTbQuarter()))
+ queryWrapper.like("\"tb_quarter\"", param.getTbQuarter());
return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query), queryWrapper));
}
@@ -88,7 +92,7 @@
if (tbResGeneralInvestigation.getGuid() == null) {
tbResGeneralInvestigation.setCreateTime(new Date());
}
- return R.status(tbResGeneralInvestigationService.saveOrUpdate(tbResGeneralInvestigation));
+ return tbResGeneralInvestigationService.saveOrUpdateBy(tbResGeneralInvestigation);
}
@PostMapping("/remove")
--
Gitblit v1.9.3