湖北水库：审批角色添加

shenyijian

2024-09-23 f839933a53d10bf33d8da728394238574e76d517

湖北水库：审批角色添加

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

@@ -238,10 +238,10 @@
        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());
            //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());
            //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
        }else {
             sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
            deviceType = sgDeviceDO.getDeviceType();
@@ -258,9 +258,7 @@
//        }
        //Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));
        //新增审批记录
        if (gxDeviceId != 998 && gxDeviceId != 999){
            sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(Long.parseLong(AuthUtil.getUser().getRoleId())).approvalStatus(0).approvalOrder(0).approvalTime(now).build());
        }
        for (SgGxConfigDO sgGxConfigDO : sgGxConfigDOS) {
            //sgGxConfigDO.setUser(userMap.get(Long.parseLong(sgGxConfigDO.getRoleId())));
            sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong(sgGxConfigDO.getRoleId())).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());
@@ -651,6 +649,9 @@
                roleId = l;
            }
        }
        if (Objects.isNull(roleId)){
            roleId = Long.parseLong(userRole.get(0));
        }
        return roleId;
    }


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

@@ -802,7 +802,7 @@
    private void setAdCode(ProjectSearchDTO dto) {
        String deptId = AuthUtil.getDeptId();
        Long roleId = sgProgressReportService.getRoleId();
        if(!roleId.equals(1811657352658042882L)){
        if(roleId.equals(1811657352658042882L)){
            dto.setAdCode(deptId);
        }
    }