Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ComplaintMapper.java

@@ -7,6 +7,7 @@
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO;
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.warpper.MgtComplaintQuery;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -35,11 +36,10 @@
     * 工单列表
     * @param page
     * @param query
     * @param targetId
     * @param isSuperior
     * @return
     */
    Page<ComplaintVO> selectComplaintPage1(Page<ComplaintVO> page, @Param("query") ComplaintQuery query, @Param("accountLevel") Integer accountLevel, @Param("targetId") String targetId);
    Page<ComplaintVO> selectComplaintPage1(Page<ComplaintVO> page, @Param("query") ComplaintQuery query,
                                           @Param("accountLevel") Integer accountLevel, @Param("targetId") Long targetId);



@@ -48,7 +48,7 @@
     * @param id
     * @return
     */
    ComplaintVO getDetail(@Param("id") Long id,@Param("targetId") String targetId, @Param("isSuperior") Integer isSuperior);
    ComplaintVO getDetail(@Param("id") Long id);

    /**
     * 获取待办诉求
@@ -58,6 +58,13 @@
     * @return
     */
    Page<ComplaintTodoVO> getTodoList(Page<ComplaintTodoVO> page, @Param("targetId") String targetId, @Param("isSuperior") int isSuperior);
    
    
    /**
     * 获取超时未评价的数据
     * @return
     */
    List<Complaint> getTimeoutAndNotComment();

    /**
     * 诉求分页列表
@@ -66,12 +73,19 @@
     * @param loginUserInfo
     * @return
     */
    Page<ComplaintVO> pageList(Page<ComplaintVO> page, @Param("query") ComplaintQuery query, @Param("loginUserInfo") SystemUserVo loginUserInfo);
    Page<ComplaintVO> pageList(Page<ComplaintVO> page, @Param("query") MgtComplaintQuery query, @Param("loginUserInfo") SystemUserVo loginUserInfo);

    /**
     * 诉求列表
     * @param query
     * @param loginUserInfo
     */
    List<ComplaintVO> getList(ComplaintQuery query, SystemUserVo loginUserInfo);
    List<ComplaintVO> getList( @Param("query") MgtComplaintQuery query, @Param("loginUserInfo") SystemUserVo loginUserInfo);

    /**
     * 管理后台-获取诉求详情
     * @param id
     * @return
     */
    ComplaintVO getDetailBg(Long id);
}