增加排序字段（线上环境时间会回拨）

mitao

2025-02-26 bdd4863bf8b067b48e3747a16acdf71efd5aebc1

增加排序字段（线上环境时间会回拨）

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java

@@ -106,4 +106,8 @@
    @TableField("superior_id")
    private Long superiorId;

    @ApiModelProperty(value = "排序")
    @TableField("sort")
    private Integer sort;

}

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

@@ -1,5 +1,6 @@
package com.panzhihua.sangeshenbian.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.sangeshenbian.model.entity.ComplaintAuditRecord;
import com.panzhihua.sangeshenbian.dao.ComplaintAuditRecordMapper;
@@ -24,6 +25,7 @@

    @Override
    public void createComplaintAuditRecord(Long complaintId, Integer auditType, String comment, LoginUserInfoVO loginUserInfoVO, SystemUser adminUser) {
        int count = count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaintId));
        ComplaintAuditRecord auditRecord = new ComplaintAuditRecord();
        auditRecord.setComplaintId(complaintId);
        auditRecord.setLatestFlag(true);
@@ -34,6 +36,7 @@
        auditRecord.setCreateTime(new Date());
        auditRecord.setUpdateBy(loginUserInfoVO.getUserId());
        auditRecord.setUpdateTime(new Date());
        auditRecord.setSort(count + 1);

        String departmentName = "";
        String reporter = loginUserInfoVO.getNickName();

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

@@ -135,6 +135,7 @@
        complaint.setClosingTime(new Date(System.currentTimeMillis() + config.getDemandProcessingTime() * 24 * 60 * 60 * 1000));
        // 保存诉求记录
        save(complaint);
        int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
        //保存记录
        ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
        complaintAuditRecord.setComplaintId(complaint.getId());
@@ -147,6 +148,7 @@
        complaintAuditRecord.setUpdateTime(new Date(System.currentTimeMillis()));
        complaintAuditRecord.setReportType(accountLevel);
        complaintAuditRecord.setSuperiorId(superiorId);
        complaintAuditRecord.setSort(count + 1);
        complaintAuditRecordService.save(complaintAuditRecord);
    }

@@ -372,20 +374,21 @@

        // 添加审核记录
        //complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 2, dto.getComment(), loginUserInfoVO,adminUser);

        int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
        ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
        complaintAuditRecord.setComplaintId(complaint.getId());
        complaintAuditRecord.setLatestFlag(true);
        complaintAuditRecord.setAuditType(2);
        complaintAuditRecord.setAuditStatus(0);
        complaintAuditRecord.setCreateBy(loginUserInfoVO.getUserId());
        complaintAuditRecord.setCreateTime(new Date(System.currentTimeMillis()));
        complaintAuditRecord.setCreateTime(new Date());
        complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
        complaintAuditRecord.setUpdateTime(new Date(System.currentTimeMillis()));
        complaintAuditRecord.setUpdateTime(new Date());
        complaintAuditRecord.setReporter(loginUserInfoVO.getNickName());
        complaintAuditRecord.setReportType(Objects.isNull(adminUser) ? 5 : adminUser.getAccountLevel());
        complaintAuditRecord.setSuperiorId(currentId);
        complaintAuditRecord.setComment(dto.getComment());
        complaintAuditRecord.setSort(count + 1);
        complaintAuditRecordService.save(complaintAuditRecord);


@@ -395,13 +398,14 @@
        complaintAuditRecord2.setAuditType(2);
        complaintAuditRecord2.setAuditStatus(0);
        complaintAuditRecord2.setCreateBy(loginUserInfoVO.getUserId());
        complaintAuditRecord2.setCreateTime(new Date(System.currentTimeMillis()));
        complaintAuditRecord2.setCreateTime(new Date());
        complaintAuditRecord2.setUpdateBy(loginUserInfoVO.getUserId());
        complaintAuditRecord2.setUpdateTime(new Date(System.currentTimeMillis()));
        complaintAuditRecord2.setUpdateTime(new Date());
        complaintAuditRecord2.setReporter(loginUserInfoVO.getNickName());
        complaintAuditRecord2.setReportType(reportType);
        complaintAuditRecord2.setSuperiorId(superiorId);
        complaintAuditRecord2.setComment(dto.getComment());
        complaintAuditRecord.setSort(count + 2);
        complaintAuditRecordService.save(complaintAuditRecord2);
    }

@@ -439,7 +443,7 @@
        complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
                .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
                .set(ComplaintAuditRecord::getLatestFlag, false));

        int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
        ComplaintAuditRecord record = new ComplaintAuditRecord();
        record.setComplaintId(complaint.getId());
        record.setLatestFlag(true);
@@ -452,6 +456,7 @@
        record.setReporter(loginUserInfoVO.getNickName());
        record.setReportType(accountLevel);
        record.setSuperiorId(dto.getDispatchId());
        record.setSort(count + 1);
        complaintAuditRecordService.save(record);
    }

@@ -504,6 +509,7 @@
                .set(ComplaintAuditRecord::getLatestFlag, false));

        if (complaintReporAuditDTO.getAuditResult().equals(1)) {
            int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
            ComplaintAuditRecord record = new ComplaintAuditRecord();
            record.setComplaintId(complaint.getId());
            record.setLatestFlag(true);
@@ -511,12 +517,13 @@
            record.setAuditType(0);
            record.setAuditStatus(1);
            record.setCreateBy(loginUserInfoVO.getUserId());
            record.setCreateTime(new Date(System.currentTimeMillis()));
            record.setCreateTime(new Date());
            record.setUpdateBy(loginUserInfoVO.getUserId());
            record.setUpdateTime(new Date(System.currentTimeMillis()));
            record.setUpdateTime(new Date());
            record.setReporter(complaintAuditRecord.getReporter());
            record.setReportType(complaintAuditRecord.getReportType());
            record.setSuperiorId(superiorId);
            record.setSort(count + 1);
            complaintAuditRecordService.save(record);


@@ -545,7 +552,7 @@
                    superiorId = complaint.getCreateBy();
                    break;
            }

            int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
            ComplaintAuditRecord record2 = new ComplaintAuditRecord();
            record2.setComplaintId(complaint.getId());
            record2.setLatestFlag(true);
@@ -553,13 +560,14 @@
            record2.setAuditorId(loginUserInfoVO.getUserId());
            record2.setAuditStatus(2);
            record2.setCreateBy(loginUserInfoVO.getUserId());
            record2.setCreateTime(new Date(System.currentTimeMillis()));
            record2.setCreateTime(new Date());
            record2.setUpdateBy(loginUserInfoVO.getUserId());
            record2.setUpdateTime(new Date(System.currentTimeMillis()));
            record2.setUpdateTime(new Date());
            record2.setReporter(complaintAuditRecord.getReporter());
            record2.setReportType(systemUser.getAccountLevel() + 1);
            record2.setSuperiorId(superiorId);
            record2.setRejectReason(complaintReporAuditDTO.getRejectReason());
            record2.setSort(count + 1);
            complaintAuditRecordService.save(record2);
        }
    }
@@ -617,7 +625,7 @@
        complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
                .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
                .set(ComplaintAuditRecord::getLatestFlag, false));

        int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
        ComplaintAuditRecord record1 = new ComplaintAuditRecord();
        record1.setComplaintId(complaint.getId());
        record1.setLatestFlag(true);
@@ -630,6 +638,7 @@
        record1.setReporter(loginUserInfoVO.getNickName());
        record1.setReportType(systemUser.getAccountLevel());
        record1.setSuperiorId(currentId);
        record1.setSort(count + 1);
        complaintAuditRecordService.save(record1);

        ComplaintAuditRecord record2 = new ComplaintAuditRecord();
@@ -644,6 +653,7 @@
        record2.setReporter(loginUserInfoVO.getNickName());
        record2.setReportType(systemUser.getAccountLevel() - 1);
        record2.setSuperiorId(superiorId);
        record2.setSort(count + 2);
        complaintAuditRecordService.save(record2);
    }

@@ -694,7 +704,7 @@
        complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
                .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
                .set(ComplaintAuditRecord::getLatestFlag, false));

        int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, dto.getId()));
        ComplaintAuditRecord record1 = new ComplaintAuditRecord();
        record1.setComplaintId(dto.getComplaintId());
        record1.setLatestFlag(true);
@@ -708,6 +718,7 @@
        record1.setReporter(complaintAuditRecord.getReporter());
        record1.setReportType(systemUser.getAccountLevel());
        record1.setSuperiorId(cunrrentId);
        record1.setSort(count + 1);
        complaintAuditRecordService.save(record1);
    }


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

@@ -231,12 +231,12 @@
        scar.department_name,
        scar.department_id,
        scar.comment,
        ifnull((select a.create_time from sgsb_complaint_audit_record a where a.audit_status != 0 and a.complaint_id = #{id} order by a.create_time 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.create_time desc limit 0, 1), "") as rejectReason,
        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,
        su.phone,
        ifnull((select b.nick_name from sgsb_complaint_audit_record a left join sys_user b on (a.create_by = b.user_id) where a.audit_status != 0 and a.complaint_id = #{id} order by a.create_time desc limit 0, 1), "") AS auditorName,
        ifnull((select b.phone from sgsb_complaint_audit_record a left join sys_user b on (a.create_by = b.user_id) where a.audit_status != 0 and a.complaint_id = #{id} order by a.create_time desc limit 0, 1), "") AS auditorPhone
        ifnull((select b.nick_name from sgsb_complaint_audit_record a left join sys_user b on (a.create_by = b.user_id) where a.audit_status != 0 and a.complaint_id = #{id} order by a.sort desc limit 0, 1), "") AS auditorName,
        ifnull((select b.phone from sgsb_complaint_audit_record a left join sys_user b on (a.create_by = b.user_id) where a.audit_status != 0 and a.complaint_id = #{id} order by a.sort desc limit 0, 1), "") AS auditorPhone
        FROM sgsb_complaint sc
        LEFT JOIN sys_user su ON su.user_id = sc.create_by
        LEFT JOIN sgsb_complaint_audit_record scar ON scar.complaint_id = sc.id and scar.latest_flag = 1 and scar.superior_id = #{targetId}