下发分页增加关键词、状态搜索

xiangpei

2024-07-19 8076c8149bbbe517cf3986faecbc07dd3df25b07

下发分页增加关键词、状态搜索

 ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java

@@ -4,6 +4,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.platform.base.AbsQuery;
import enumeration.general.FastDistributeTypeEnum;
import enumeration.general.WorkOrderStatusEnum;
import io.swagger.annotations.ApiModel;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
@@ -36,5 +37,15 @@
    @JsonProperty("ids")
    private List<Integer> ids;

    /**
     * 关键词
     */
    private String keyword;

    /**
     * 工单状态
     */
    private String status;

}


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

@@ -268,6 +268,7 @@
    @Override
    public Result distributePage(DistributeWorkOrderQuery query) {
        IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
        // todo 关键词搜索
        baseMapper.distributePage(page, query);
        return Result.ok().data(page).total(page.getTotal());
    }

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

@@ -52,10 +52,12 @@
        LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = '0'
        where
        wo.deleted = '0'
        and wo.status = 'WAIT_DISTRIBUTE'
        <if test="query.unitId != null">
            AND wo.unit_id = #{query.unitId}
        </if>
        <if test="query.status != null and query.status != ''">
            AND wo.status = #{query.status}
        </if>
        ORDER BY wo.create_time DESC
    </select>