迭代：4.11版本

luofl

2025-04-14 6718c3b53e6f5d5fae16f9f01af03771405836c5

迭代：4.11版本

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java

@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;
import java.util.List;
@@ -17,6 +18,7 @@
 * @author mitao
 * @date 2025/2/23
 */
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel("工单视图对象")
public class ComplaintVO extends Complaint {
@@ -25,7 +27,9 @@
    private String reporter;

    @ApiModelProperty(value = "上报人id")
    Long reporterId;
    private Long reporterId;

    private Long superiorId2;

    private Long auditCreateBy;


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

@@ -252,13 +252,16 @@
        //page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior);
        page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId);

        page.getRecords().forEach(s -> {
        for (ComplaintVO s : page.getRecords()) {
            buttonPermission(s, systemUserByPhone, loginUserInfoVO);
            Integer auditButtonStatus = s.getAuditButtonStatus();
            if (auditButtonStatus == 1 && s.getStatus() == 5 && !Objects.equals(s.getAuditCreateBy(), loginUserInfoVO.getUserId())){

            Long reporterId = s.getReporterId();
            Long superiorId = s.getSuperiorId2();
            if (!targetId.equals(reporterId) && !targetId.equals(superiorId) && (s.getStatus() == 5)) {
                s.setStatus(0);
            }
        });
        }
        return page;
    }

@@ -505,23 +508,21 @@
        List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id)
                .orderByAsc(ComplaintProgress::getCreateTime).list();
        detail.setComplaintProgresses(list);
//        detail.setAuditButtonStatus(1);
//        detail.setEvaluateButtonStatus(1);
//        if((detail.getStatus() == 5 || detail.getStatus() == 7) && systemUserByPhone.isPresent()){
//            ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, detail.getId())
//                    .eq(ComplaintAuditRecord::getLatestFlag, 1));
//            Integer isAdmin = systemUserByPhone.get().getIsAdmin();
//            if(one.getReportType().equals(accountLevel) && one.getSuperiorId().toString().equals(targetId) && 1 == isAdmin){
//                detail.setAuditButtonStatus(0);
//            }
//        }


        buttonPermission(detail, systemUserByPhone, loginUserInfoVO);
        Integer auditButtonStatus = detail.getAuditButtonStatus();
        if (auditButtonStatus == 1 && detail.getStatus() == 5 && !Objects.equals(detail.getAuditCreateBy(), loginUserInfoVO.getUserId())){
        Long reporterId = detail.getReporterId();
        Long superiorId = detail.getSuperiorId2();
        if (!String.valueOf(reporterId).equals(targetId) && !String.valueOf(superiorId).equals(targetId) && detail.getStatus() == 5) {
            detail.setStatus(0);
        }


//        if (auditButtonStatus == 1 && detail.getStatus() == 5 && !Objects.equals(detail.getAuditCreateBy(), loginUserInfoVO.getUserId())){
//            detail.setStatus(0);
//        }




//        //已办结，显示评价按钮
@@ -624,7 +625,6 @@
        return complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, complaintId)
                .orderByAsc(ComplaintProgress::getCreateTime).list();
    }



    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintMapper.xml

@@ -119,6 +119,7 @@
        scar.create_by as auditCreateBy,
        scar.reporter,
        scar.reporter_id,
        scar.superior_id superiorId2,
        scar.department_name,
        scar.department_id
        FROM sgsb_complaint sc
@@ -214,6 +215,8 @@
        scar.comment,
        scar.auditor_name,
        scar.auditor_phone,
        scar.reporter_id,
        scar.superior_id superiorId2,
        ifnull((select a.create_time from sgsb_complaint_audit_record a where a.audit_status != 0 and a.complaint_id = #{id} order by a.sort desc limit 0, 1), "") AS auditTime,
        ifnull((select a.reject_reason from sgsb_complaint_audit_record a where a.audit_status != 0 and a.complaint_id = #{id} order by a.sort desc limit 0, 1), "") as rejectReason,
        su.nick_name,