From 62c8530fbf44749c7fe709bf8897a791bc7f0ef4 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Tue, 16 Jul 2024 11:36:53 +0800
Subject: [PATCH] 项目进度上报逻辑优化和待办添加区域条件筛选v0.8
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
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 dc3931e..77d3496 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
@@ -138,8 +138,8 @@
}
List<PreAcceVO> palist = new ArrayList<>();
- palist.add(handleQuery(12, 25, list.get(0).getId()));
- palist.add(handleQuery(13, 26,list.get(0).getId()));
+ palist.add(handleQuery( 25, list.get(0).getId()));
+ palist.add(handleQuery(26,list.get(0).getId()));
sgProjectInfoDO.setPreAcce(palist);
BigDecimal allDeviceSize = BigDecimal.valueOf(allDevice.size());
if (!allDeviceSize.equals(BigDecimal.ZERO)){
@@ -357,9 +357,9 @@
}
// 处理查询和添加到列表的方法
- private PreAcceVO handleQuery(int gxStepId, int stepIdForNull, Long programId) {
+ private PreAcceVO handleQuery( int stepIdForNull, Long programId) {
QueryWrapper<SgProgressReportDO> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("gx_step_id", gxStepId)
+ queryWrapper.eq("gx_step_id", stepIdForNull)
.eq("profram_id", programId);
SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectOne(queryWrapper);
--
Gitblit v1.9.3