From 468e5679f9d9bb6fda50fd234575f3e8d60b3a5e Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Wed, 17 Jul 2024 17:25:06 +0800
Subject: [PATCH] 项目施工审批流优化
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 374 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 320 insertions(+), 54 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 163d8e1..b4442f5 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
@@ -1,28 +1,33 @@
package cn.gistack.sm.sg.service.impl;
-import cn.gistack.sm.sg.DO.SgDeviceDO;
-import cn.gistack.sm.sg.DO.SgGxDO;
-import cn.gistack.sm.sg.DO.SgGxStepDO;
-import cn.gistack.sm.sg.DO.SgProjectInfoDO;
+import cn.gistack.sm.sg.DO.*;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
-import cn.gistack.sm.sg.VO.SgProjectInfoVO;
-import cn.gistack.sm.sg.VO.SgTypeVO;
+import cn.gistack.sm.sg.VO.*;
+import cn.gistack.sm.sg.excel.ProjectExcel;
+import cn.gistack.sm.sg.mapper.SgGxStepMapper;
+import cn.gistack.sm.sg.mapper.SgProgressReportMapper;
import cn.gistack.sm.sg.mapper.SgProjectInfoMapper;
import cn.gistack.sm.sg.service.SgProjectInfoService;
+import cn.gistack.sm.sjztmd.entity.AttAdBase;
+import cn.gistack.sm.sjztmd.service.IAttAdBaseService;
+import cn.hutool.core.lang.copier.Copier;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StopWatch;
import java.math.BigDecimal;
+import java.math.MathContext;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -37,26 +42,67 @@
public class SgProjectInfoServiceImpl extends ServiceImpl<SgProjectInfoMapper, SgProjectInfoDO> implements SgProjectInfoService {
@Autowired
private SgProjectInfoMapper sgProjectInfoMapper;
+ @Autowired
+ private IAttAdBaseService iAttAdBaseService;
+
+ @Autowired
+ private SgProgressReportMapper sgProgressReportMapper;
+
+ @Autowired
+ private SgGxStepMapper sgGxStepMapper;
+
@Override
public IPage<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
List<SgProjectInfoDO> sgProjectInfoDOS = baseMapper.queryPageList(page,searchDTO);
+ List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ if (CollectionUtils.isNotEmpty(projectProgress)){
+ Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
+ sgProjectInfoDOS.forEach(s->{
+ s.setProjectProgress(progressMap.get(s.getId()));
+ });
+ }
return page.setRecords(sgProjectInfoDOS);
}
+ /**
+ * 获取项目及项目下设备及设备下工序进度
+ * @param searchDTO
+ * @return
+ */
@Override
public List<SgProjectInfoDO> queryStepByProject(ProjectSearchDTO searchDTO) {
+ List<PreAcceVO> palist = new ArrayList<>();
List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject( searchDTO);
+ palist.add(handleQuery(25, list.get(0).getId()));
+ palist.add(handleQuery(26, list.get(0).getId()));
+ List<SgProjectInfoDO> projectProgress = getProjectProgress(list);
+ projectProgress.forEach(s->{
+ s.setPreAcce(palist);
+ });
+
+
+ return projectProgress;
+ }
+
+ /**
+ * 获取项目进度
+ * @param list
+ * @return
+ */
+ @NotNull
+ private List<SgProjectInfoDO> getProjectProgress(List<SgProjectInfoVO> list) {
//项目分组
Map<Long, List<SgProjectInfoVO>> projectMap = list.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId));
List<SgProjectInfoDO> result = new ArrayList<>();
for (Map.Entry<Long, List<SgProjectInfoVO>> entry : projectMap.entrySet()) {
+ List<SgDeviceDO> allDevice = new ArrayList<>();
Long porId = entry.getKey();
List<SgProjectInfoVO> value = entry.getValue();
if (CollectionUtils.isEmpty(value)){
continue;
}
SgProjectInfoVO sgProjectInfoVO = value.get(0);
- SgProjectInfoDO sgProjectInfoDO = SgProjectInfoDO.builder().id(porId).status(sgProjectInfoVO.getProjectStatus()).projectName(sgProjectInfoVO.getProjectName()).build();
+ SgProjectInfoDO sgProjectInfoDO = SgProjectInfoDO.builder().id(porId).lonLat(sgProjectInfoVO.getLonLat()).status(sgProjectInfoVO.getProjectStatus()).projectName(sgProjectInfoVO.getProjectName()).build();
List<SgTypeVO> sgGxDOS = new ArrayList<>();
//类型分组
Map<String, List<SgProjectInfoVO>> GxMap = value.stream().filter(s->s.getDeviceType()!=null).collect(Collectors.groupingBy(SgProjectInfoVO::getDeviceType));
@@ -76,14 +122,38 @@
SgDeviceDO sgDeviceDO = new SgDeviceDO();
sgDeviceDO.setId(dId);
sgDeviceDO.setDeviceName(deList.get(0).getDeviceName());
- sgDeviceDO.setStatus( deList.get(0).getDeviceStatus());
- sgDeviceDO.setStepDOList(deList.stream().map(s->SgGxStepDO.builder().id(s.getReportId()).gxStepNum(s.getGxStepNum()).gxStepName(s.getGxStepName()).deviceId(s.getDId()).approvalStatus(s.getReportStatus()).build()).collect(Collectors.toList()));
+ List<SgGxStepDO> stepDOS = deList.stream().filter(s->s.getReportStatus()==null || s.getReportStatus()!=4).map(s -> SgGxStepDO.builder().id(s.getStepId()).gxStepNum(s.getGxStepNum()).gxStepName(s.getGxStepName()).deviceId(s.getDId()).approvalStatus(s.getReportStatus()).build()).collect(Collectors.toList());
+ List<SgGxStepDO> stepOver = stepDOS.stream().filter(s -> s.getApprovalStatus() != null && s.getApprovalStatus() == 2).collect(Collectors.toList());
+ BigDecimal stepSize = BigDecimal.valueOf(stepDOS.size());
+ BigDecimal stepOverSize = BigDecimal.ZERO;
+ if (!stepOver.isEmpty()){
+ stepOverSize = BigDecimal.valueOf(stepOver.size());
+ }
+ BigDecimal divide = stepOverSize.divide(stepSize, 2, RoundingMode.HALF_UP);
+ sgDeviceDO.setStatus(divide.compareTo(new BigDecimal(1)) == 0?2:deList.get(0).getDeviceStatus());
+ sgDeviceDO.setProgress(divide.toString());
+ sgDeviceDO.setDeviceProgress(getBigDecimalPercent(divide));
+ sgDeviceDO.setStepDOList(stepDOS);
deviceDOS.add(sgDeviceDO);
+ allDevice.add(sgDeviceDO);
}
+ BigDecimal deviceSize = BigDecimal.valueOf(deviceDOS.size());
+ double sum = deviceDOS.stream().mapToDouble(s -> Double.parseDouble(s.getProgress())).sum();
+ BigDecimal deviceOver = BigDecimal.valueOf(sum);
+ BigDecimal divideDevice = deviceOver.divide(deviceSize, 2, RoundingMode.HALF_UP);
typeVO.setDeviceDOS(deviceDOS);
+ typeVO.setTypeProgress(getBigDecimalPercent(divideDevice));
sgGxDOS.add(typeVO);
}
- sgProjectInfoDO.setSgGxDOS(sgGxDOS);
+ BigDecimal allDeviceSize = BigDecimal.valueOf(allDevice.size());
+ if (!allDeviceSize.equals(BigDecimal.ZERO)){
+ double sum = allDevice.stream().mapToDouble(s -> Double.parseDouble(s.getProgress())).sum();
+ BigDecimal allDeviceOver = BigDecimal.valueOf(sum);
+ BigDecimal allDivideDevice = allDeviceOver.divide(allDeviceSize, 2, RoundingMode.HALF_UP);
+ sgProjectInfoDO.setSgGxDOS(sgGxDOS);
+ sgProjectInfoDO.setProjectProgress( getBigDecimalPercent(allDivideDevice));
+ sgProjectInfoDO.setProjectProgressNum(allDivideDevice);
+ }
result.add(sgProjectInfoDO);
}
return result;
@@ -91,52 +161,248 @@
@Override
public List<SgProjectInfoVO> progressList(ProjectSearchDTO searchDTO) {
- List<SgProjectInfoVO> list = sgProjectInfoMapper.progressList(searchDTO);
- Map<Long, List<SgProjectInfoVO>> map = list.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId));
- List<SgProjectInfoVO> result = new ArrayList<>();
- for (Map.Entry<Long, List<SgProjectInfoVO>> entry : map.entrySet()) {
- SgProjectInfoVO sgProjectInfoVO = new SgProjectInfoVO();
- List<SgProjectInfoVO> deviceList = entry.getValue();
- if (CollectionUtils.isEmpty(deviceList)){
- continue;
- }
- sgProjectInfoVO.setId(entry.getKey());
- sgProjectInfoVO.setProjectName(deviceList.get(0).getProjectName());
- List<SgProjectInfoVO> overList = deviceList.stream().filter(s->s.getDeviceStatus()!=null).filter(s -> s.getDeviceStatus() == 2).collect(Collectors.toList());
- BigDecimal v1 =BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(overList)){
- v1 = BigDecimal.valueOf(overList.size());
- }
- BigDecimal v2 = BigDecimal.valueOf(deviceList.size());
- BigDecimal percentage = v1.divide(v2,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
- // 如果不需要保留小数位，可以设置一个scale为0
- BigDecimal percentageRounded = percentage.setScale(0, RoundingMode.HALF_UP);
- sgProjectInfoVO.setProgressName(percentageRounded+"%");
- result.add(sgProjectInfoVO);
+ List<SgProjectInfoVO> list = new ArrayList<>();
+ List<SgProjectInfoDO> projectProgress = new ArrayList<>();
+ if(!searchDTO.getAdCode().isEmpty()){
+ projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
+ }else {
+ projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
}
- return result;
+
+ if (CollectionUtils.isNotEmpty(projectProgress)){
+ projectProgress.forEach(s->{
+ SgProjectInfoVO sgProjectInfoVO = new SgProjectInfoVO();
+ sgProjectInfoVO.setId(s.getId());
+ sgProjectInfoVO.setProjectName(s.getProjectName());
+ sgProjectInfoVO.setProjectProgress(s.getProjectProgress());
+ sgProjectInfoVO.setLonLat(s.getLonLat());
+ sgProjectInfoVO.setProjectProgressNum(s.getProjectProgressNum());
+ sgProjectInfoVO.setStatus(s.getStatus());
+ list.add(sgProjectInfoVO);
+ });}
+ return list;
+ }
+
+ /**
+ * 项目进度列表（分页）
+ * @param page
+ * @param searchDTO
+ * @return
+ */
+ @Override
+ public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) {
+ List<SgProjectInfoVO> list = new ArrayList<>();
+ if(!searchDTO.getAdCode().isEmpty()){
+ list = sgProjectInfoMapper.progressList1(page, searchDTO);
+ }else {
+ list = sgProjectInfoMapper.progressList(page, searchDTO);
+ }
+
+ List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
+ searchDTO.setProjectIds(ids);
+ List<SgProjectInfoDO> projectProgress = new ArrayList<>();
+ if(!searchDTO.getAdCode().isEmpty()){
+ projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
+ }else {
+ projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ }
+
+ if (CollectionUtils.isNotEmpty(projectProgress)){
+ Map<Long, String> progressMap = projectProgress.stream().filter(s->s!=null && s.getProjectProgress() !=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
+ list.forEach(s->{
+ s.setProjectProgress(progressMap.get(s.getId()));
+ });}
+ return page.setRecords(list);
}
@Override
- public Map<String, Long> projectCount(ProjectSearchDTO searchDTO) {
- Map<String, Long> map = new HashMap<>();
- LambdaQueryChainWrapper<SgProjectInfoDO> wrapper = new LambdaQueryChainWrapper<>(sgProjectInfoMapper);
- String projectName = searchDTO.getProjectName();
- Integer status = searchDTO.getStatus();
- if (StringUtils.isNotBlank(projectName)){
- wrapper.like(SgProjectInfoDO::getProjectName,searchDTO.getProjectName());
+ public List<SgProjectInfoDO> listAll(ProjectSearchDTO searchDTO) {
+ return sgProjectInfoMapper.queryPageList(null,searchDTO);
+ }
+
+ /**
+ * 项目统计饼状图
+ * @param code
+ * @return
+ */
+ @Override
+ public SgStatisticsVO getsgStatistics(String code) {
+ AttAdBase ywxtAdDetail = iAttAdBaseService.getYwxtAdDetail(code);
+
+ if (ywxtAdDetail == null){
+ return sgProjectInfoMapper.getSgstatiss("0",code);
}
- if (status!=null){
- wrapper.eq(SgProjectInfoDO::getStatus,searchDTO.getStatus());
+ return sgProjectInfoMapper.getSgstatiss(ywxtAdDetail.getAdGrad(),code);
+ }
+
+ /**
+ * 项目统计表格
+ * @param code
+ * @return
+ */
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public List<SgStatisProVO> getsgStatisticsList(String code) {
+ AttAdBase ywxtAdDetail = iAttAdBaseService.getYwxtAdDetail(code);
+ List<SgStatisProVO> sgStatisProVOS;
+
+
+ //片区
+ if (ywxtAdDetail == null) {
+ sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsZero(code);
+ String getname = sgProjectInfoMapper.getname(code);
+ updateProjectProgress(sgStatisProVOS, code, getname, "2");
+ } else if (ywxtAdDetail.getAdGrad().equals("1")) {//默认
+ sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsOne(code);
+ updateProjectProgress(sgStatisProVOS, ywxtAdDetail.getPAdCode(), ywxtAdDetail.getPAdName(), "0");
+ } else {//区县
+ sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsList(code);
+ updateProjectProgress(sgStatisProVOS, ywxtAdDetail.getAdCode(), ywxtAdDetail.getAdName(), "3");
}
- List<SgProjectInfoDO> list = wrapper.list();
- List<SgProjectInfoDO> pending = list.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
- List<SgProjectInfoDO> progress = list.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());
- List<SgProjectInfoDO> over = list.stream().filter(s -> s.getStatus() == 2).collect(Collectors.toList());
- map.put("all", (long) list.size());
- map.put("pending", (long) pending.size());
- map.put("progress", (long) progress.size());
- map.put("over", (long) over.size());
+ return sgStatisProVOS;
+ }
+
+ private void updateProjectProgress(List<SgStatisProVO> sgStatisProVOS, String pcode, String pname, String adGrad) {
+ ProjectSearchDTO projectSearchDTO = new ProjectSearchDTO();
+ for (SgStatisProVO s : sgStatisProVOS) {
+ if (s.getCommenceNum() == 0) {
+ s.setProjectProgress("0%");
+ s.setPcode(pcode);
+ s.setPname(pname);
+ s.setAdGrad(adGrad);
+ } else {
+ List<String> ids = sgProjectInfoMapper.getProjectId(adGrad, s.getCode());
+ List<BigDecimal> bigDecimals = new ArrayList<>();
+
+ for (String id : ids) {
+ projectSearchDTO.setProjectId(id);
+ List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
+ getProjectProgress(list).forEach(ss -> bigDecimals.add(ss.getProjectProgressNum()));
+ }
+
+ BigDecimal reduce = bigDecimals.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+ String bigDecimalPercent1 = getBigDecimalPercent(reduce.divide(BigDecimal.valueOf(s.getProjectSum()), 2, RoundingMode.HALF_UP));
+ s.setProjectProgress(s.getCommenceNum() == 0? "0%" : bigDecimalPercent1);
+ s.setPcode(pcode);
+ s.setPname(pname);
+ s.setAdGrad(adGrad);
+ }
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public List<SgStatistccVO> getsgStatisticscc(String code) {
+ AttAdBase ywxtAdDetail = iAttAdBaseService.getYwxtAdDetail(code);
+
+
+ List<String> ids = sgProjectInfoMapper.getProjectId(ywxtAdDetail == null ? "0" : ywxtAdDetail.getAdGrad(), code);
+ Map<String, Integer> mun = new HashMap<>();
+ List<SgStatistccVO> sgdevices = sgProjectInfoMapper.getSgdevices(code, ywxtAdDetail == null ? "0" : ywxtAdDetail.getAdGrad());
+ sgdevices.forEach(sgStatistccVO -> {
+ mun.put(sgStatistccVO.getTypeName(), sgStatistccVO.getDeviceNum());
+ }
+ );
+ Map<String, BigDecimal> bigDecimals = new HashMap<>();
+ ProjectSearchDTO projectSearchDTO = new ProjectSearchDTO();
+ ids.forEach(id -> {
+
+ projectSearchDTO.setProjectId(id);
+ List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
+ List<SgProjectInfoDO> projectProgress = getProjectProgress(list);
+ projectProgress.forEach(p -> {
+
+ List<SgTypeVO> sgGxDOS = p.getSgGxDOS();
+ sgGxDOS.forEach(sgTypeVO -> {
+ String typeProgress = sgTypeVO.getTypeProgress().replace("%", "");
+ BigDecimal percentageBigDecimal = new BigDecimal(typeProgress).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
+ bigDecimals.merge(sgTypeVO.getTypeName(), percentageBigDecimal, BigDecimal::add);
+ });
+
+ });
+
+ });
+
+ for (String name : bigDecimals.keySet()) {
+
+ if (mun.containsKey(name)) {
+
+ BigDecimal bigDecimal = bigDecimals.get(name);
+ Integer intValue = mun.get(name);
+ BigDecimal result = bigDecimal.divide(new BigDecimal(intValue), 2, RoundingMode.HALF_UP);
+
+ sgdevices.forEach(sgStatistccVO -> {
+ if (sgStatistccVO.getTypeName().equals(name)) {
+ sgStatistccVO.setTypeProgress(getBigDecimalPercent(result));
+ }
+ });
+ }
+
+ }
+
+ return sgdevices;
+ }
+
+ /**
+ * 获取百分比
+ * @param bigDecimal
+ * @return
+ */
+ private String getBigDecimalPercent(BigDecimal bigDecimal) {
+ BigDecimal percentage = bigDecimal.multiply(new BigDecimal("100"));
+ // 如果不需要保留小数位，可以设置一个scale为0
+ BigDecimal percentageRounded = percentage.setScale(0, RoundingMode.HALF_UP);
+ return percentageRounded+"%";
+ }
+
+ @Override
+ public Map<String, Object> projectCount(ProjectSearchDTO searchDTO) {
+ Map<String, Object> map = new HashMap<>();
+ List<SgProjectInfoVO> progressList = progressList(searchDTO);
+ BigDecimal reduce = progressList.stream().filter(s->s.getProjectProgressNum()!=null).map(SgProjectInfoDO::getProjectProgressNum).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal divide = reduce.divide(BigDecimal.valueOf(progressList.size()), 2, RoundingMode.HALF_UP);
+ List<SgProjectInfoDO> pending = progressList.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
+ List<SgProjectInfoDO> progress = progressList.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());
+ List<SgProjectInfoDO> over = progressList.stream().filter(s -> s.getStatus() == 2).collect(Collectors.toList());
+ map.put("all", progressList.size());
+ map.put("pending", pending.size());
+ map.put("progress", progress.size());
+ map.put("over", over.size());
+ map.put("projectProgress", getBigDecimalPercent(divide));
return map;
}
+
+ @Override
+ public void importProject(List<ProjectExcel> data, Boolean isCovered) {
+
+ }
+
+ // 处理查询和添加到列表的方法
+ private PreAcceVO handleQuery( int stepIdForNull, Long programId) {
+ QueryWrapper<SgProgressReportDO> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("gx_step_id", stepIdForNull)
+ .eq("profram_id", programId);
+ SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectOne(queryWrapper);
+
+ PreAcceVO preAcceVO = new PreAcceVO();
+ if (sgProgressReportDO!= null) {
+ preAcceVO.setId(sgProgressReportDO.getId().toString());
+ preAcceVO.setName(sgProgressReportDO.getGxStepName());
+ preAcceVO.setStatus((long) sgProgressReportDO.getStatus());
+ preAcceVO.setProgramId(programId);
+ preAcceVO.setGxDeviceId(sgProgressReportDO.getGxDeviceId());
+ preAcceVO.setGxStepId(sgProgressReportDO.getGxStepId());
+ } else {
+ SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(stepIdForNull);
+ preAcceVO.setName(sgGxStepDO.getGxStepName());
+ preAcceVO.setProgramId(programId);
+ preAcceVO.setGxDeviceId(stepIdForNull != 25? (long)998:(long)999);
+ preAcceVO.setGxStepId(sgGxStepDO.getId());
+
+ }
+ return preAcceVO;
+
+ }
+
}
--
Gitblit v1.9.3