From 2f10ca63b173d7abfa5dba60609ca3128d25582a Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 25 Sep 2024 20:37:33 +0800
Subject: [PATCH] 白蚁提防水库普查、提防普查填报增加季度
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 fa564e3..d410e91 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();
@@ -78,7 +78,7 @@
state.setCreateTime(entity.getCreateTime());
state.setCreateUser(entity.getCreateUser());
} else {
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
+ if (state.getCheckState() > 1) {
return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
}
}
@@ -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) {
//无填报状态记录则新建
@@ -119,7 +120,7 @@
state.setCreateUser(entity.getCreateUser());
} else {
//查看填报状态，只有0填报中才可以一直填报
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
+ if (state.getCheckState() <= 3) {
return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
}
}
@@ -211,7 +212,7 @@
}
@Override
- public List<ResGentionVO> downZipCopy(IPage<AttResBaseGeneralInvestigationVO> page,String type) {
+ public List<ResGentionVO> downZipCopy(IPage<AttResBaseGeneralInvestigationVO> page,String type,AttResBaseGeneralInvestigationVO attResBase) {
//获取已审批的数据
List<ResGentionVO> iamgeAndVideoUrlcopy = baseMapper.getIamgeAndVideoUrlcopy();
@@ -239,9 +240,9 @@
//分页情况下
if(type.equals("1")){
//获取分页信息
- AttResBaseGeneralInvestigationVO attResBaseGeneralInvestigationVO = new AttResBaseGeneralInvestigationVO();
- attResBaseGeneralInvestigationVO.setTbYear(2024);
- List<AttResBaseGeneralInvestigationVO> attResBaseGeneralInvestigationVOS = attResBaseMapper.selectAttResBaseGeneralInvestigation(page, attResBaseGeneralInvestigationVO);
+// AttResBaseGeneralInvestigationVO attResBaseGeneralInvestigationVO = new AttResBaseGeneralInvestigationVO();
+// attResBaseGeneralInvestigationVO.setTbYear(2024);
+ List<AttResBaseGeneralInvestigationVO> attResBaseGeneralInvestigationVOS = attResBaseMapper.selectAttResBaseGeneralInvestigation(page, attResBase);
List<String> resCode = new ArrayList<>();
for (AttResBaseGeneralInvestigationVO imageAndVideoVO : attResBaseGeneralInvestigationVOS) {
--
Gitblit v1.9.3