湖北水库：施工：项目审核人员配置

shenyijian

2024-06-28 f8d4daf8fd92a43b103948fd3f2c0515209a6aca

湖北水库：施工：项目审核人员配置

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

@@ -35,7 +35,7 @@
            , bu.real_name as userName
        FROM
            ywxt.sg_project_info pro
                LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
                inner JOIN ywxt.sg_device d ON pro.id = d.program_id
                Left JOIN ywxt.sg_gx_config sgc ON d.device_type = sgc.gx_device_type
                left join ywxt.blade_role ro on    ro.id = sgc.role_id
                left join ywxt.sg_project_person_config sppc  on sgc.role_id = sppc.rold_id and sppc.program_id = pro.id

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

@@ -183,17 +183,23 @@
        Long userId = approvalDTO.getUserId();
        Long id = approvalDTO.getId();
        SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectById(id);
        List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).eq(SgReportUserDO::getIsHis,0)
            .eq(SgReportUserDO::getApprovalStatus, 0).orderByDesc(SgReportUserDO::getApprovalOrder).list();
        List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).ne(SgReportUserDO::getApprovalOrder,0).eq(SgReportUserDO::getIsHis,0)
            .orderByAsc(SgReportUserDO::getApprovalOrder).list();
        //审批者
        SgReportUserDO sgReportUserDO = list.stream().filter(s -> s.getUserId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
        SgReportUserDO sgReportUserDO = new SgReportUserDO();
        if (isReject==1 && sgProgressReportDO.getStatus().equals(2)){
            sgReportUserDO = sgReportUserDOS.get(0);
        }else {
            sgReportUserDOS.stream().filter(s -> s.getUserId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
        }
        Date date = new Date();
        LambdaUpdateChainWrapper<SgProgressReportDO> updateChainWrapper = new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId, id);
        LambdaUpdateChainWrapper<SgReportUserDO> userUpdate = new LambdaUpdateChainWrapper<>(sgReportUserMapper)
            .eq(SgReportUserDO::getId, sgReportUserDO.getId()).set(SgReportUserDO::getApprovalContent,approvalDTO.getApprovalContent()).set(SgReportUserDO::getApprovalTime,date);
        if (approvalDTO.getStatus()==1){
            Integer approvalOrder = sgReportUserDO.getApprovalOrder();
            userUpdate.set(SgReportUserDO::getApprovalStatus,1).update();
            if (sgReportUserDO.getId()==list.get(0).getId()){
            if (sgReportUserDO.getId()==sgReportUserDOS.get(0).getId()){
                updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();


@@ -209,13 +215,11 @@


            }else {
                SgReportUserDO nextUser = list.stream().filter(s -> s.getApprovalOrder()==sgReportUserDO.getApprovalOrder()+1).findFirst().get();
                SgReportUserDO nextUser = sgReportUserDOS.stream().filter(s -> s.getApprovalOrder()==approvalOrder+1).findFirst().get();
                updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
            }
        }else {
            updateChainWrapper.set(SgProgressReportDO::getStatus,3);
            List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).eq(SgReportUserDO::getIsHis,0)
                .orderByAsc(SgReportUserDO::getApprovalOrder).list()
//                .stream().distinct()
//                .stream().filter(s->s.getApprovalOrder()!=0 && s.getApprovalOrder()<= sgReportUserDO.getApprovalOrder()).collect(Collectors.toList())
                ;
@@ -228,10 +232,7 @@
                if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
                    //更新为历史数据
                    new LambdaUpdateChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getId,reportUserDO.getId()).set(SgReportUserDO::getIsHis,1).update();
                    reportUserDO.setId(null);
                    reportUserDO.setApprovalStatus(0);
                    reportUserDO.setIsHis(0);
                    reportUserDO.setApprovalTime(date);
                    setReportUser(date, reportUserDO);
                    sgReportUserMapper.insert(reportUserDO);
                    try {
                        Thread.sleep(100);
@@ -240,10 +241,7 @@
                    }
                }else if (reportUserDO.getApprovalOrder()>sgReportUserDO.getApprovalOrder()){
                    sgReportUserMapper.deleteById(reportUserDO.getId());
                    reportUserDO.setId(null);
                    reportUserDO.setApprovalStatus(0);
                    reportUserDO.setIsHis(0);
                    reportUserDO.setApprovalTime(date);
                    setReportUser(date, reportUserDO);
                    sgReportUserMapper.insert(reportUserDO);
                    try {
                        Thread.sleep(100);
@@ -261,6 +259,14 @@

    }

    private  void setReportUser(Date date, SgReportUserDO reportUserDO) {
        reportUserDO.setId(null);
        reportUserDO.setApprovalStatus(0);
        reportUserDO.setIsHis(0);
        reportUserDO.setApprovalTime(date);
        reportUserDO.setApprovalContent(null);
    }


    public void  setProgramAndDeviceStatus(Long projectId){
        //查询所有的项目

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

@@ -43,16 +43,23 @@
    public void add(AddSgProjectPersonConfigDTO dto) {
        for (SgProjectPersonConfigDO sgProjectPersonConfigDO : dto.getData()) {
            Long id = sgProjectPersonConfigDO.getId();
            Long userId = sgProjectPersonConfigDO.getUserId();
            if (Objects.isNull(id)){
                projectPersonConfigMapper.insert(sgProjectPersonConfigDO);
            }else {
                SgProjectPersonConfigDO old = projectPersonConfigMapper.selectById(id);
                if (old.getUserId()!=sgProjectPersonConfigDO.getUserId()){
                if (!new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getProframId,old.getProgramId()).list().isEmpty()){
                    throw new ServiceException("此项目配置存在审批，不允许修改");
                boolean isReport = !new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getProframId, old.getProgramId()).list().isEmpty();
                if (Objects.isNull(userId)){
                    if (isReport){
                        throw new ServiceException("此项目配置存在审批，不允许修改");
                    }
                    projectPersonConfigMapper.deleteById(id);
                }else if (!old.getUserId().equals(sgProjectPersonConfigDO.getUserId())){
                    if (isReport){
                        throw new ServiceException("此项目配置存在审批，不允许修改");
                    }
                    projectPersonConfigMapper.updateById(sgProjectPersonConfigDO);
                }
                }
                projectPersonConfigMapper.updateById(sgProjectPersonConfigDO);
            }
        }
    }