From daf4ede1b07dd92aa3e5cbc80c401a56cb74d7ec Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 08 Aug 2024 14:53:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 5 +-
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java | 17 ++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 35 +++++++++++------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java | 12 +++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 12 ++++++
5 files changed, 60 insertions(+), 21 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..931554a 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,20 @@
private Integer isBegin;
+ @ApiModelProperty("当前页")
+ private Integer current;
+ @ApiModelProperty("每页的数量")
+ private Integer size;
+
+ /**
+ * 上报时间
+ */
+ private String reportTime;
+
+
+ /**
+ * 项目排序 0状态 ， 1进度 ，2注册码
+ */
+ private Integer projectSort;
+
}
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/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index 3573102..615ac00 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -25,6 +25,12 @@
<if test="dto.reportPerson != null ">
and report.report_user = #{dto.reportPerson}
</if>
+ <if test="dto.startTime != null and dto.startTime !='' ">
+ and report.report_time >= #{dto.startTime}
+ </if>
+ <if test="dto.endTime != null and dto.endTime !='' ">
+ and report.report_time <= #{dto.endTime}
+ </if>
</select>
<select id="queryPageListAll" resultType="cn.gistack.sm.sg.VO.SgProgressReportVO">
@@ -101,6 +107,12 @@
</if>
AND userR.approval_order != 0
</if>
+ <if test="dto.startTime != null and dto.startTime !='' ">
+ and report.report_time >= #{dto.startTime}
+ </if>
+ <if test="dto.endTime != null and dto.endTime !='' ">
+ and report.report_time <= #{dto.endTime}
+ </if>
<choose >
<when test="dto.approvalStatus != null and dto.approvalStatus == 0">
and report.audit_person = #{dto.userId} and (report."STATUS" = 0 or report."STATUS" = 1)
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..0efb6c0 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
@@ -42,7 +42,12 @@
#{id}
</foreach>
</if>
- ORDER BY info.status desc
+ <if test="dto.projectSort == null or dto.projectSort ==0">
+ ORDER BY info.status desc
+ </if>
+ <if test="dto.projectSort != null and dto.projectSort ==2">
+ ORDER BY info.sk_id asc
+ </if>
</select>
<select id="queryStepByProject" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
@@ -117,7 +122,7 @@
1 = 1
<if test="grad == 0">
AND
- dria."bas_name" = #{code}
+ info.lot = #{code}
</if>
<if test="grad == 2">
AND
@@ -170,10 +175,11 @@
FROM
YWXT.SG_PROJECT_INFO info
LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = info.sk_id
- WHERE
+ WHERE
1 = 1
- AND
- dria."bas_name" =#{code}
+ <if test="code != null and code != ''">
+ AND info.lot =#{code}
+ </if>
Group By dria."city_cd",dria."city_nm"
HAVING
dria."city_cd" IS NOT NULL AND
@@ -182,8 +188,10 @@
<select id="getsgStatisticsOne" resultType="cn.gistack.sm.sg.VO.SgStatisProVO">
SELECT
- dria."bas_name" AS code,
- dria."bas_guid" AS name,
+<!-- dria."bas_name" AS code,
+ dria."bas_guid" AS name,-->
+ info.lot as code,
+ info.lot as name,
sum( CASE WHEN info.STATUS IN ( 1, 2 ) THEN 1 ELSE 0 END ) AS commenceNum,
count( info.STATUS ) AS projectSum
FROM
@@ -192,11 +200,12 @@
WHERE
1 = 1
GROUP BY
- dria."bas_guid",
- dria."bas_name"
+ info.lot
+ <!-- dria."bas_guid", dria."bas_name" -->
HAVING
- dria."bas_guid" IS NOT NULL AND
- dria."bas_name" IS NOT NULL
+ <!-- dria."bas_guid" IS NOT NULL AND
+ dria."bas_name" IS NOT NULL -->
+ info.lot is not null
</select>
<select id="getProjectId" resultType="java.lang.String">
@@ -270,7 +279,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 +343,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..b1c9ec2 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));
@@ -251,7 +251,8 @@
//片区
if (ywxtAdDetail == null) {
sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsZero(code);
- String getname = sgProjectInfoMapper.getname(code);
+// String getname = sgProjectInfoMapper.getname(code);
+ String getname = code;
updateProjectProgress(sgStatisProVOS, code, getname, "2");
} else if (ywxtAdDetail.getAdGrad().equals("1")) {//默认
sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsOne(code);
--
Gitblit v1.9.3