优化 和修改bug

liujie

2025-07-18 e7b6f31ee55a23d614d61e6f9bc96c15ea3d8143

优化 和修改bug

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/DepartmentController.java

@@ -145,7 +145,7 @@
    @OperLog(operModul = "西区纪委后台",operType = 0, businessType = "获取单位列表")
    public R<Page<Department>> getDeptList(String name,int pageNum,int pageSize){
        SystemUserVo loginUserInfoWest = getLoginUserInfoWest();
        if(loginUserInfoWest.getSystemRoleId()!=1){
        if(loginUserInfoWest.getSystemRoleId()>2){
            return  R.ok(new Page<>());
        }
        Integer accountLevel = loginUserInfoWest.getAccountLevel();

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java

@@ -361,8 +361,8 @@
            // 处理页面颜色展示和倒计时
            Date nowLevelTime = record.getNowLevelTime();
            if (record.getNowLevel() == 2) {
                Integer HandlingTime = config.getDistrictHandlingTime();
                Integer DeadlineReminder = config.getDistrictDeadlineReminder();
                Long HandlingTime = config.getDistrictHandlingTime().longValue();
                Long DeadlineReminder = config.getDistrictDeadlineReminder().longValue();
                // 判断是超时 还是  临期
                if (nowLevelTime.getTime() + HandlingTime * 24 * 60 * 60 * 1000 < date.getTime()) {
                    record.setRemindStatus(2);
@@ -374,8 +374,8 @@
                BigDecimal result = new BigDecimal(days).setScale(1, RoundingMode.HALF_UP); // 保留1位小数
                record.setRemindTime(result.doubleValue());
            } else if (record.getNowLevel() == 3) {
                Integer HandlingTime = config.getStreetHandlingTime();
                Integer DeadlineReminder = config.getStreetDeadlineReminder();
                Long HandlingTime = config.getStreetHandlingTime().longValue();
                Long DeadlineReminder = config.getStreetDeadlineReminder().longValue();
                // 判断是超时 还是  临期
                if (nowLevelTime.getTime() + HandlingTime * 24 * 60 * 60 * 1000 < date.getTime()) {
                    record.setRemindStatus(2);
@@ -387,8 +387,8 @@
                BigDecimal result = new BigDecimal(days).setScale(1, RoundingMode.HALF_UP); // 保留1位小数
                record.setRemindTime(result.doubleValue());
            } else if (record.getNowLevel() == 4) {
                Integer HandlingTime = config.getCommunityHandlingTime();
                Integer DeadlineReminder = config.getCommunityDeadlineReminder();
                Long HandlingTime = config.getCommunityHandlingTime().longValue();
                Long DeadlineReminder = config.getCommunityDeadlineReminder().longValue();
                // 判断是超时 还是  临期
                if (nowLevelTime.getTime() + HandlingTime * 24 * 60 * 60 * 1000 < date.getTime()) {
                    record.setRemindStatus(2);
@@ -406,21 +406,26 @@
            if (count > 0) {
                record.setEvaluateButtonStatus(1);
            } else {
                if (systemUser != null) {
                    if (record.getStatus() == 3 && systemUser.getAccountLevel() == record.getNowLevel()) {
                        record.setEvaluateButtonStatus(0);
                    } else if (record.getCreateBy().equals(loginUserInfoVO.getUserId()) && record.getStatus() == 3) {
                        record.setEvaluateButtonStatus(0);
                    } else {
                        record.setEvaluateButtonStatus(1);
                    }
                } else {
                    if (record.getStatus() == 3 && loginUserInfoVO.getUserId().equals(record.getCreateBy())) {
                        record.setEvaluateButtonStatus(0);
                    } else {
                        record.setEvaluateButtonStatus(1);
                    }
                if(record.getStatus()==3){
                    record.setEvaluateButtonStatus(0);
                }else {
                    record.setEvaluateButtonStatus(1);
                }
//                if (systemUser != null) {
//                    if (record.getStatus() == 3 && systemUser.getAccountLevel() == record.getNowLevel()) {
//                        record.setEvaluateButtonStatus(0);
//                    } else if (record.getCreateBy().equals(loginUserInfoVO.getUserId()) && record.getStatus() == 3) {
//                        record.setEvaluateButtonStatus(0);
//                    } else {
//                        record.setEvaluateButtonStatus(1);
//                    }
//                } else {
//                    if (record.getStatus() == 3 && loginUserInfoVO.getUserId().equals(record.getCreateBy())) {
//                        record.setEvaluateButtonStatus(0);
//                    } else {
//                        record.setEvaluateButtonStatus(1);
//                    }
//                }
            }

        }
@@ -707,56 +712,56 @@
        if (systemUser != null) {
            ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, id).eq(ComplaintAuditRecord::getLatestFlag, 1).last("limit 1"));
            if (systemUser.getAccountLevel() == 2) {
                if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getNowLevel() == 2 && detail.getAssignStatus() == 0 && ((one != null && one.getAuditStatus() == 1)||(one != null && one.getAuditStatus() == 3)  || one==null )) {
                    detail.setStatus(-1);
                }else if (systemUser.getSystemRoleId() == 0) {
                    // 查是否是当前层级处理  不是则都是正在办理
                    if (detail.getNowLevel() != 4 && detail.getStatus() != 3 && detail.getStatus() != 8) {
                if(detail.getStatus()!=5) {
                    if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getNowLevel() == 2 && detail.getAssignStatus() == 0 && ((one != null && one.getAuditStatus() == 1) || (one != null && one.getAuditStatus() == 3) || one == null)) {
                        detail.setStatus(-1);
                    } else if (systemUser.getSystemRoleId() == 0) {
                        // 查是否是当前层级处理  不是则都是正在办理
                        if (detail.getNowLevel() != 4 && detail.getStatus() != 3 && detail.getStatus() != 8) {
                            detail.setStatus(0);
                        }
                    } else if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getFirstStatus() == 0 && detail.getNowLevel() == 2) {
                        detail.setStatus(5);
                    } else if (detail.getStatus() == 3 || detail.getStatus() == 8) {
                        detail.setStatus(detail.getStatus());
                    } else {
                        detail.setStatus(0);
                    }
                }else if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getFirstStatus() == 0 && detail.getNowLevel()==2) {
                    detail.setStatus(5);
                }else if(detail.getStatus()==3 || detail.getStatus()==8){
                    detail.setStatus(detail.getStatus());
                }else {
                    detail.setStatus(0);

                }



            }
            if (systemUser.getAccountLevel() == 3) {
                if (detail.getStatus() != 3 && detail.getStatus() != 8 &&  detail.getNowLevel() == 3 && detail.getAssignStatus() == 0 && ((one != null && one.getAuditStatus() == 1)||(one != null && one.getAuditStatus() == 3)  || one==null )) {
                    detail.setStatus(-1);
                }else if (systemUser.getSystemRoleId() == 0) {
                    // 查是否是当前层级处理  不是则都是正在办理
                    if (detail.getNowLevel() != 3 && detail.getStatus() != 3 && detail.getStatus() != 8) {
                if(detail.getStatus()!=5) {
                    if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getNowLevel() == 3 && detail.getAssignStatus() == 0 && ((one != null && one.getAuditStatus() == 1) || (one != null && one.getAuditStatus() == 3) || one == null)) {
                        detail.setStatus(-1);
                    } else if (systemUser.getSystemRoleId() == 0) {
                        // 查是否是当前层级处理  不是则都是正在办理
                        if (detail.getNowLevel() != 3 && detail.getStatus() != 3 && detail.getStatus() != 8) {
                            detail.setStatus(0);
                        }
                    } else if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getFirstStatus() == 0 && detail.getNowLevel() == 3) {
                        detail.setStatus(5);
                    } else if (detail.getStatus() == 3 || detail.getStatus() == 8) {
                        detail.setStatus(detail.getStatus());
                    } else {
                        detail.setStatus(0);
                    }
                }else if (detail.getStatus() != 3 && detail.getStatus() != 8 &&  detail.getFirstStatus() == 0  && detail.getNowLevel()==3) {
                    detail.setStatus(5);
                }else if(detail.getStatus()==3 || detail.getStatus()==8){
                    detail.setStatus(detail.getStatus());
                }else {
                    detail.setStatus(0);
                }

                }

            }
            if (systemUser.getAccountLevel() == 4) {
                if (detail.getStatus() != 3 && detail.getStatus() != 8 &&  detail.getNowLevel() == 4 && detail.getAssignStatus() == 0 &&  ((one != null && one.getAuditStatus() == 1)||(one != null && one.getAuditStatus() == 3)  || one==null )) {
                    detail.setStatus(-1);
                }else if (systemUser.getSystemRoleId() == 0) {
                    // 查是否是当前层级处理  不是则都是正在办理
                    if (detail.getNowLevel() != 4 && detail.getStatus() != 3 && detail.getStatus() != 8) {
                if(detail.getStatus()!=5){
                    if (detail.getStatus() != 3 && detail.getStatus() != 8 &&  detail.getNowLevel() == 4 && detail.getAssignStatus() == 0 &&  ((one != null && one.getAuditStatus() == 1)||(one != null && one.getAuditStatus() == 3)  || one==null )) {
                        detail.setStatus(-1);
                     }else if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getFirstStatus() == 0 && detail.getNowLevel()==4) {
                        detail.setStatus(5);
                    }else if(detail.getStatus()==3 || detail.getStatus()==8){
                        detail.setStatus(detail.getStatus());
                    }else {
                        detail.setStatus(0);
                    }
                }else if (detail.getStatus() != 3 && detail.getStatus() != 8 &&  detail.getFirstStatus() == 0  && detail.getNowLevel()==4) {
                    detail.setStatus(5);
                }else if(detail.getStatus()==3 || detail.getStatus()==8){
                    detail.setStatus(detail.getStatus());
                }else {
                    detail.setStatus(0);
                }


@@ -803,15 +808,9 @@
        ComplaintComment comment = complaintCommentService.lambdaQuery().eq(ComplaintComment::getComplaintId, id).last("LIMIT 1").one();
        detail.setComplaintComment(comment);
        if (detail.getStatus() == 3 && 0 == count) {
            if (systemUserByPhone.isPresent()) {
                if (accountLevel.compareTo(detail.getNowLevel()) == 0) {
                    detail.setEvaluateButtonStatus(0);
                }
            } else {
                if (detail.getCreateBy().equals(loginUserInfoVO.getUserId())) {
                    detail.setEvaluateButtonStatus(0);
                }
            }
                detail.setEvaluateButtonStatus(0);
        }else {
            detail.setEvaluateButtonStatus(1);
        }


@@ -1642,7 +1641,7 @@
            if (count > 0) {
                record.setEvaluateButtonStatus(1);
            } else {
                if (record.getStatus() == 3 && loginUserInfo.getAccountLevel() == record.getNowLevel()) {
                if (record.getStatus() == 3 ) {
                    record.setEvaluateButtonStatus(0);
                } else {
                    record.setEvaluateButtonStatus(1);