Merge branch 'dev-2.0' of http://120.76.84.145:10101/gitblit/r/java/zhihuis...

mitao

2025-03-18 af7766f2983181bd31d271a2547c3ca875a2cbc2

Merge branch 'dev-2.0' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into dev-2.0

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java

@@ -231,8 +231,11 @@
        vo.setEvaluateButtonStatus(1);
        vo.setAuditButtonStatus(1);

        ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                .ne(ComplaintAuditRecord::getAuditType, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
        ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
                .eq(ComplaintAuditRecord::getComplaintId, vo.getId())
//                .ne(ComplaintAuditRecord::getAuditType, 1)
                .orderByDesc(ComplaintAuditRecord::getSort)
                .last(" limit 0, 1"));
        //没有审核数据，且正在办理，则按钮权限是添加人员的
        if (null == one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2)) {
            if (systemUserByPhone.isPresent()) {
@@ -251,8 +254,10 @@
        }
        //有审核数据，且正在办理
        if (null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2 || vo.getStatus() == 6)) {


            //区分是上报数据还是下派数据
            if (one.getAuditType() == 2) {
            if (one.getAuditType() == 2 || one.getAuditType() == 1) {
                //判断当前审核状态
                if (one.getAuditStatus() == 1) {
                    //审核状态为通过，则权限给到上报审核的这一层
@@ -267,8 +272,12 @@
                    }
                } else {
                    //没有审核通过，则需要查询上一条审核通过的数据，如果没有则给到添加诉求的人
                    ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                            .eq(ComplaintAuditRecord::getAuditType, 2).eq(ComplaintAuditRecord::getAuditStatus, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
                    ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
                            .eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                            .eq(ComplaintAuditRecord::getAuditType, 2)
                            .eq(ComplaintAuditRecord::getAuditStatus, 1)
                            .orderByDesc(ComplaintAuditRecord::getSort)
                            .last(" limit 0, 1"));
                    if (null != one1) {
                        if (systemUserByPhone.isPresent()) {
                            SystemUser systemUser = systemUserByPhone.get();
@@ -388,7 +397,8 @@
                        break;
                }

                ComplaintAuditRecord one2 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                ComplaintAuditRecord one2 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
                        .eq(ComplaintAuditRecord::getComplaintId, vo.getId())
                        .eq(ComplaintAuditRecord::getLatestFlag, 1));
                Integer isAdmin = systemUserByPhone.get().getIsAdmin();
                if (one2.getReportType().equals(accountLevel) && one2.getSuperiorId().toString().equals(targetId) && 1 == isAdmin) {
@@ -899,7 +909,7 @@
                .eq(ComplaintAuditRecord::getAuditType, 1)
                .eq(ComplaintAuditRecord::getLatestFlag, 1)
                .eq(ComplaintAuditRecord::getAuditStatus, 0)
                .ne(ComplaintAuditRecord::getSuperiorId, superiorId)
                .eq(ComplaintAuditRecord::getSuperiorId, superiorId)
                .eq(ComplaintAuditRecord::getReportType, accountLevel)
                .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
                .last("LIMIT 1"));