湖北水库：所有项目添加测量定位工序

shenyijian

2024-10-28 4782396e7fa406f3920c9697cd70624b1eba399c

湖北水库：所有项目添加测量定位工序

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgDeviceMapper.xml

@@ -17,7 +17,7 @@
        <if test="dto.deviceType != null and dto.deviceType != ''">
            and ds.device_type = #{dto.deviceType}
        </if>
        order by TO_NUMBER (ds.price) asc NULLS LAST
        order by dict.sort, TO_NUMBER (ds.price) asc NULLS LAST
    </select>
    <select id="getSgDeviceById" resultType="cn.gistack.sm.sg.DO.SgDeviceDO">
        select ds.*,project.project_name as programName,dict."DICT_VALUE" as typeName from YWXT."SG_DEVICE" as ds left join YWXT."SG_PROJECT_INFO"  as project  on ds.program_id=project.id

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

@@ -56,10 +56,10 @@
        queryWrapper.eq("program_id", programId);
        SgDeviceDO sg1 = new SgDeviceDO();
        sg1.setId((long) 999);
        sg1.setDeviceName("施工准备");
        sg1.setDeviceType("sgzb");
        sg1.setDeviceName("测量定位");
        sg1.setDeviceType("cldw");
        sg1.setStatus(0);
//        list.add(sg1);
        list.add(sg1);

        List<SgDeviceDO> sgDeviceDOS = baseMapper.selectList(queryWrapper);
        if (CollectionUtils.isNotEmpty(sgDeviceDOS)) {

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

@@ -175,7 +175,7 @@

        }
        QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
        wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "施工准备");
        wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "测量定位");
        List<SgProgressReportDO> sgProgressReportDOS1 = sgProgressReportMapper.selectList(wrappers);

        if(sgProgressReportDO.getGxDeviceId()==998){
@@ -194,15 +194,15 @@

        }

//        if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
//            for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
//                if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3)  {
//                    throw new ServiceException("请先完成施工准备的审批!");
//                }
//            }
//        } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("施工准备"))) {
//            throw new ServiceException("请先发起施工准备的审批!");
//        }
        if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
            for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
                if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3)  {
                    throw new ServiceException("请先完成测量定位的审批!");
                }
            }
        } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("测量定位"))) {
            throw new ServiceException("请先发起测量定位的审批!");
        }
        Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
        Long gxStepId = sgProgressReportDO.getGxStepId();
        SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
@@ -246,10 +246,10 @@
        sgProgressReportMapper.insert(sgProgressReportDO);
        String deviceType ="";
        SgDeviceDO sgDeviceDO = new SgDeviceDO();
//        if (gxDeviceId == 999){
//             deviceType = "sgzb";
//            //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
//        }else
        if (gxDeviceId == 999){
             deviceType = "cldw";
            //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
        }else
            if(gxDeviceId == 998){
            deviceType = "sgys";
            //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
@@ -285,7 +285,7 @@
        }

        //加个项目及设备的状态判断 方便统计计算
        if(//gxStepId != 25 &&
        if(gxStepId != 32 &&
            gxStepId != 26 ) {
            if (sgDeviceDO != null && sgDeviceDO.getStatus() == 0) {
                sgDeviceDO.setStatus(1);