From 1fd438d09672618a7b08fcfdac683d2bc4ad6b55 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Tue, 06 Aug 2024 16:57:04 +0800
Subject: [PATCH] 湖北水库：项目根据区域筛选、统计
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 2 +-
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java | 7 +++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java | 12 ++++++------
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
index 05677e7..e589f0f 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
@@ -1,5 +1,6 @@
package cn.gistack.sm.sg.DTO;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -48,4 +49,10 @@
private Integer isBegin;
+ @ApiModelProperty("当前页")
+ private Integer current;
+ @ApiModelProperty("每页的数量")
+ private Integer size;
+
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
index 480e067..9e0ee55 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
@@ -17,10 +17,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -42,8 +39,11 @@
/**
* 分页列表查询
*/
- @GetMapping(value = "/list")
- public R queryPageList(ProjectSearchDTO searchDTO, Query query) {
+ @PostMapping(value = "/list")
+ public R queryPageListPage(@RequestBody ProjectSearchDTO searchDTO) {
+ Query query = new Query();
+ query.setCurrent(searchDTO.getCurrent());
+ query.setSize(searchDTO.getSize());
IPage<SgProjectInfoDO> page = sgProjectInfoService.queryPageList(Condition.getPage(query), searchDTO);
return R.data(page);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
index ad255da..c3d4e6e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -270,7 +270,7 @@
( pro.countyCode = a."guid" )
OR ( pro.cityCode = a."guid" )
OR ( pro.provinceCode = a."guid" ))
- WHERE 1=1 and a."p_ad_code" = #{dto.adCode}
+ WHERE 1=1 and (a."p_ad_code" = #{dto.adCode} or a."ad_code" = #{dto.adCode})
<if test="dto.status != null">
and pro.status = #{dto.status}
</if>
@@ -334,7 +334,7 @@
( pro.countyCode = a."guid" )
OR ( pro.cityCode = a."guid" )
OR ( pro.provinceCode = a."guid" ))
- WHERE 1=1 and a."p_ad_code" = #{dto.adCode}
+ WHERE 1=1 and (a."p_ad_code" = #{dto.adCode} or a."ad_code" = #{dto.adCode})
<if test="dto.projectId != null and dto.projectId != ''">
and pro.id = #{dto.projectId}
</if>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
index b4442f5..11efd52 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -163,7 +163,7 @@
public List<SgProjectInfoVO> progressList(ProjectSearchDTO searchDTO) {
List<SgProjectInfoVO> list = new ArrayList<>();
List<SgProjectInfoDO> projectProgress = new ArrayList<>();
- if(!searchDTO.getAdCode().isEmpty()){
+ if(StringUtils.isNotBlank(searchDTO.getAdCode())){
projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
}else {
projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
--
Gitblit v1.9.3