From eb0760c36778d07c0d13d917c0db30dfa03aa0fd Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Mon, 15 Jul 2024 11:45:46 +0800
Subject: [PATCH] 项目进度上报逻辑优化及工序配置v0.4
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
index 823b9d7..1cb564c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
@@ -9,12 +9,14 @@
import cn.gistack.sm.sg.mapper.SgProgressReportMapper;
import cn.gistack.sm.sg.service.SgDeviceService;
import org.springblade.core.log.exception.ServiceException;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -31,8 +33,6 @@
@Autowired
private SgGxStepMapper sgGxStepMapper;
- @Autowired
- private SgProgressReportMapper sgProgressReportMapper;
@Override
public IPage<SgDeviceDO> queryPageList(IPage<SgDeviceDO> page, SgDeviceSearchDTO searchDTO) {
@@ -48,10 +48,29 @@
*/
@Override
public List<SgDeviceDO> getDeviceList(String programId) {
+ List<SgDeviceDO> list = new ArrayList<>();
QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("program_id",programId).or()
- .in("device_type", Arrays.asList("sgys", "sgzb")).orderByAsc("create_time");
- return baseMapper.selectList(queryWrapper);
+ queryWrapper.eq("program_id", programId);
+ SgDeviceDO sg1 = new SgDeviceDO();
+ sg1.setId((long) 999);
+ sg1.setDeviceName("施工准备");
+ sg1.setDeviceType("sgzb");
+ sg1.setStatus(0);
+ list.add(sg1);
+
+ List<SgDeviceDO> sgDeviceDOS = baseMapper.selectList(queryWrapper);
+ if (CollectionUtils.isNotEmpty(sgDeviceDOS)) {
+ list.addAll(sgDeviceDOS);
+ }
+
+ SgDeviceDO sg2 = new SgDeviceDO();
+ sg2.setId((long) 998);
+ sg2.setDeviceName("施工验收");
+ sg2.setDeviceType("sgys");
+ sg2.setStatus(0);
+ list.add(sg2);
+
+ return list;
}
@Override
@@ -61,14 +80,12 @@
@Override
public List<SgGxStepDO> queryStepList(String deviceId) {
- QueryWrapper<SgGxStepDO> queryWrapper = new QueryWrapper<>();
- if (deviceId.equals("36")) {
- queryWrapper.eq("gx_info_id", 9);
- } else if (deviceId.equals("37")) {
- queryWrapper.eq("gx_info_id", 10);
- } else {
- return sgGxStepMapper.queryStepList(deviceId);
+ if(deviceId.equals("998")){
+ return sgGxStepMapper.queryStepLists("sgys");
+ }else if (deviceId.equals("999")){
+ return sgGxStepMapper.queryStepLists("sgzb");
}
- return sgGxStepMapper.selectList(queryWrapper);
+ List<SgGxStepDO> sgGxStepDOS = sgGxStepMapper.queryStepList(deviceId);
+ return sgGxStepDOS;
}
}
--
Gitblit v1.9.3