From 593f6e8c03db96ad93aa9dd5f6868a26ff3d7092 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 25 Sep 2024 19:18:07 +0800
Subject: [PATCH] 白蚁提防水库普查、提防普查填报增加季度

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
index cb89900..d0917c9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
@@ -68,7 +68,7 @@
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("\"res_guid\"", entity.getResGuid());
 		queryWrapper.eq("\"tb_year\"", entity.getTbYear());
-//		queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
+		queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
 		TbResGeneralInvestigationState state = tbResGeneralInvestigationStateService.getOne(queryWrapper);
 		if (null == state) {
 			state = new TbResGeneralInvestigationState();
@@ -108,6 +108,7 @@
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("\"res_guid\"", entity.getResGuid());
 		queryWrapper.eq("\"tb_year\"", entity.getTbYear());
+		queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
 		TbResGeneralInvestigationState state = tbResGeneralInvestigationStateService.getOne(queryWrapper);
 		if (null == state) {
 			//无填报状态记录则新建

--
Gitblit v1.9.3