项目进度上报-新增上报-子项和工序添加施工相关

yxm

2024-07-13 a5fe75c1d2ce5a65c921eb46e37ef7a6cb1985f3

项目进度上报-新增上报-子项和工序添加施工相关

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java

@@ -2,16 +2,20 @@

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.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.Arrays;
import java.util.List;

/**
@@ -26,6 +30,10 @@
public class SgDeviceServiceImpl extends ServiceImpl<SgDeviceMapper, SgDeviceDO> implements SgDeviceService {
    @Autowired
    private SgGxStepMapper sgGxStepMapper;

    @Autowired
    private SgProgressReportMapper sgProgressReportMapper;

    @Override
    public IPage<SgDeviceDO> queryPageList(IPage<SgDeviceDO> page, SgDeviceSearchDTO searchDTO) {
        List<SgDeviceDO> sgDeviceDOS = baseMapper.queryPageList(page,searchDTO);
@@ -41,7 +49,8 @@
    @Override
    public List<SgDeviceDO> getDeviceList(String programId) {
        QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("program_id",programId);
        queryWrapper.eq("program_id",programId).or()
            .in("device_type", Arrays.asList("sgys", "sgzb")).orderByAsc("create_time");
        return baseMapper.selectList(queryWrapper);
    }

@@ -52,6 +61,14 @@

    @Override
    public List<SgGxStepDO> queryStepList(String deviceId) {
        return sgGxStepMapper.queryStepList(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);
        }
        return sgGxStepMapper.selectList(queryWrapper);
    }
}