From dbaee59a4cc2b5498af17eda8bb14eb0020e4063 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 23 五月 2025 22:41:02 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintRejectServiceImpl.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintRejectServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintRejectServiceImpl.java
index 17b0bb3..0c21102 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintRejectServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintRejectServiceImpl.java
@@ -11,6 +11,8 @@
import com.panzhihua.sangeshenbian.service.IComplaintRejectService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* <p>
* 诉求驳回表 服务实现类
@@ -41,4 +43,24 @@
}
return this.baseMapper.getComplaintRejectList(page,applyStartTime,applyEndTime,examineStartTime,examineEndTime,query);
}
+
+ @Override
+ public IPage<ComplaintRejectVo> getComplaintRejectListOther(ComplaintRejectQuery query, List<String> finalDistrictsCodes, List<String> finalStreetIds, List<Long> finalCommunityIds) {
+ Page<ComplaintRejectVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+ String applyStartTime=null;
+ String applyEndTime=null;
+ String examineStartTime=null;
+ String examineEndTime=null;
+ if(StringUtils.isNotEmpty(query.getApplyTime())){
+ String[] split = query.getApplyTime().split(" - ");
+ applyStartTime=split[0]+" 00:00:00";
+ applyEndTime=split[1]+" 23:59:59";
+ }
+ if(StringUtils.isNotEmpty(query.getExamineTime())){
+ String[] split = query.getExamineTime().split(" - ");
+ examineStartTime=split[0]+" 00:00:00";
+ examineEndTime=split[1]+" 23:59:59";
+ }
+ return this.baseMapper.getComplaintRejectListOther(page,applyStartTime,applyEndTime,examineStartTime,examineEndTime,query,finalDistrictsCodes,finalStreetIds,finalCommunityIds);
+ }
}
--
Gitblit v1.7.1