解决冲突

mitao

2025-02-24 879ce4e66b36daf44f79b17eb02d3578148e4545

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

@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import java.util.Date;

/**
 * <p>
 * 诉求上报、延期申请审核表 服务实现类
@@ -27,9 +29,9 @@
        auditRecord.setAuditStatus(0);
        auditRecord.setComment(comment);
        auditRecord.setCreateBy(userId);
        auditRecord.setCreateTime(DateUtils.getCurrentDate());
        auditRecord.setCreateTime(new Date());
        auditRecord.setUpdateBy(userId);
        auditRecord.setUpdateTime(DateUtils.getCurrentDate());
        auditRecord.setUpdateTime(new Date());
        save(auditRecord);
    }

@@ -42,7 +44,7 @@
        auditRecord.setAuditStatus(auditResult);
        auditRecord.setRejectReason(rejectReason);
        auditRecord.setUpdateBy(userId);
        auditRecord.setUpdateTime(DateUtils.getCurrentDate());
        auditRecord.setUpdateTime(new Date());
        save(auditRecord);
    }
}