改为连表查询

龚焕茏

2024-04-30 e41f7a8cb42d189d7af204499e64f12a9ac553b7

改为连表查询

 ycl-server/src/main/java/com/ycl/platform/mapper/ReportMapper.java

@@ -1,5 +1,6 @@
package com.ycl.platform.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.platform.domain.entity.Report;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.query.ReportQuery;
@@ -7,6 +8,7 @@
import com.ycl.platform.domain.form.ReportForm;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * 报备 Mapper 接口
@@ -17,5 +19,5 @@
@Mapper
public interface ReportMapper extends BaseMapper<Report> {

    List<ReportVO> page(ReportQuery query);
    IPage<ReportVO> page(IPage page, @Param("query") ReportQuery query);
}

 ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java

@@ -20,8 +20,8 @@
@Mapper
public interface WorkOrderMapper extends BaseMapper<WorkOrder> {

    IPage page(IPage page, @Param("query") WorkOrderQuery query);
    IPage<WorkOrderVO> page(IPage page, @Param("query") WorkOrderQuery query);

    List<WorkOrderVO> distributePage(@Param("query") DistributeWorkOrderQuery query);
    IPage<WorkOrderVO> distributePage(IPage page, @Param("query") DistributeWorkOrderQuery query);

}

 ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java

@@ -11,6 +11,7 @@
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.mapper.ReportMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
@@ -116,8 +117,9 @@
     */
    @Override
    public Result page(ReportQuery query) {
        List<ReportVO> page = baseMapper.page(query);
        return Result.ok().data(page).total(page.size());
        IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
        baseMapper.page(page, query);
        return Result.ok().data(page).total(page.getTotal());
    }

    /**

 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java

@@ -220,8 +220,9 @@

    @Override
    public Result distributePage(DistributeWorkOrderQuery query) {
        List<WorkOrderVO> page = baseMapper.distributePage(query);
        return Result.ok().data(page).total(page.size());
        IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
        baseMapper.distributePage(page, query);
        return Result.ok().data(page).total(page.getTotal());
    }

    @Override

 ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml

@@ -26,17 +26,17 @@
        LEFT JOIN t_yw_point pt ON r.point_id = pt.id and pt.deleted = '0'
        where
        r.deleted = '0'
        <if test="reportType != null and reportType != ''">
            AND r.report_type = #{reportType}
        <if test="query.reportType != null and query.reportType != ''">
            AND r.report_type = #{query.reportType}
        </if>
        <if test="beginCreateTime != null">
            AND r.create_time between #{beginCreateTime} and #{endCreateTime}
        <if test="query.beginCreateTime != null">
            AND r.create_time between #{query.beginCreateTime} and #{query.endCreateTime}
        </if>
        <if test="pointId != null and pointId != ''">
            AND pt.point_name like concat('%', #{pointId}, '%')
        <if test="query.pointId != null and query.pointId != ''">
            AND pt.point_name like concat('%', #{query.pointId}, '%')
        </if>
        <if test="peopleId != null and peopleId != ''">
            AND p.yw_person_name like concat('%', #{peopleId}, '%')
        <if test="query.peopleId != null and query.peopleId != ''">
            AND p.yw_person_name like concat('%', #{query.peopleId}, '%')
        </if>
        ORDER BY r.create_time DESC
    </select>