From 350c8c98dd6c435df0f8bb46c513e6e3422a58d4 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Sat, 13 Jul 2024 17:16:31 +0800
Subject: [PATCH] 项目进度上报点击图标上报逻辑优化v0.3
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 18cb370..6c1be4f 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
@@ -1,14 +1,23 @@
package cn.gistack.sm.sg.service.impl;
import cn.gistack.sm.sg.DO.SgDeviceDO;
+import cn.gistack.sm.sg.DO.SgGxStepDO;
+import cn.gistack.sm.sg.DO.SgProgressReportDO;
import cn.gistack.sm.sg.DTO.SgDeviceSearchDTO;
import cn.gistack.sm.sg.mapper.SgDeviceMapper;
+import cn.gistack.sm.sg.mapper.SgGxStepMapper;
+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;
/**
@@ -21,6 +30,9 @@
*/
@Service
public class SgDeviceServiceImpl extends ServiceImpl<SgDeviceMapper, SgDeviceDO> implements SgDeviceService {
+ @Autowired
+ private SgGxStepMapper sgGxStepMapper;
+
@Override
public IPage<SgDeviceDO> queryPageList(IPage<SgDeviceDO> page, SgDeviceSearchDTO searchDTO) {
@@ -36,13 +48,39 @@
*/
@Override
public List<SgDeviceDO> getDeviceList(String programId) {
+ List<SgDeviceDO> list = new ArrayList<>();
QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("program_id",programId);
- 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("xmys");
+ sg2.setStatus(0);
+ list.add(sg2);
+
+ return list;
}
@Override
public SgDeviceDO getSgDeviceById(String id) {
return baseMapper.getSgDeviceById(id);
}
+
+ @Override
+ public List<SgGxStepDO> queryStepList(String deviceId) {
+ List<SgGxStepDO> sgGxStepDOS = sgGxStepMapper.queryStepList(deviceId);
+ return sgGxStepDOS;
+ }
}
--
Gitblit v1.9.3