解决冲突

mitao

2025-02-24 17848d94d06a5e362c03c020735476f1f2295b95

解决冲突

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java

@@ -55,7 +55,7 @@
     * @param dto
     * @param loginUserInfoVO
     */
    void saveResult(ComplaintCompletionDTO dto);
    void saveResult(ComplaintCompletionDTO dto, LoginUserInfoVO loginUserInfoVO);

    /**
     * 诉求上报
@@ -85,7 +85,6 @@
    void delayAudit(ComplaintDelayAuditDTO complaintDelayAuditDTO, LoginUserInfoVO loginUserInfoVO);

    List<DispatchVO> getDispatchList(LoginUserInfoVO loginUserInfoVO);
    void saveResult(ComplaintCompletionDTO dto, LoginUserInfoVO loginUserInfoVO);

    /**
     * 获取待办诉求

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

@@ -187,8 +187,6 @@
        this.updateById(complaint);
    }

    }

    @Override
    public void saveReport(ComplaintReportDTO dto, LoginUserInfoVO loginUserInfoVO) {
        String phone = loginUserInfoVO.getPhone();
@@ -358,9 +356,10 @@
            throw new ServiceException("未知的账号等级");
        }
        return dispatchVOList;
    }
    /**
     * 获取待办诉求
     * @param page
     * @param basePage
     * @param loginUserInfo
     * @return
     */
@@ -399,5 +398,6 @@
        Page<ComplaintTodoVO> page = baseMapper.getTodoList(new Page<>(basePage.getPageNum(), basePage.getPageSize()), targetId,isSuperior);
        return page;
    }

}