巡检-指标项、巡查类型模糊查询

guoshilong

2023-03-30 128d4a0c2aafb2be6bc15d9f690d548518760812

巡检-指标项、巡查类型模糊查询

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTypeController.java

@@ -43,8 +43,8 @@
    @ApiOperation(value="巡查类型-分页列表查询", notes="巡查类型-分页列表查询")
    @GetMapping(value = "/list")
    public R queryPageList(PatrolType patrolType,Query query) {
//        IPage<PatrolType> pageList = patrolTypeService.selectPatrolType(Condition.getPage(query),patrolType);
        IPage<PatrolType> pageList = patrolTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolType));
        IPage<PatrolType> pageList = patrolTypeService.selectPatrolType(Condition.getPage(query),patrolType);
//        IPage<PatrolType> pageList = patrolTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolType));
        return R.data(pageList);
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolConfig.java

@@ -23,7 +23,10 @@
    /**巡查类型*/
    @ApiModelProperty(value = "巡查类型")
    private String patrolTypeId;
    /**工程名称*/
    /**工程id*/
    @ApiModelProperty(value = "工程id")
    private String projectId;
    /**指标组ids*/
    @ApiModelProperty(value = "工程id")
    private String groupIds;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.xml

@@ -7,5 +7,11 @@
        <if test="patrolGroupItem.groupId != null and patrolGroupItem.groupId != '' ">
            and group_id = #{patrolGroupItem.groupId}
        </if>
        <if test="patrolGroupItem.itemsName !=null and patrolGroupItem.itemsName !=''">
            AND items_name LIKE CONCAT('%',#{patrolGroupItem.itemsName},'%')
        </if>
        <if test="patrolGroupItem.name !=null and patrolGroupItem.name !=''">
            AND name LIKE CONCAT('%',#{patrolGroupItem.name},'%')
        </if>
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTypeMapper.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.patrol.entity.PatrolType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -10,5 +11,5 @@
 */
public interface PatrolTypeMapper extends BaseMapper<PatrolType> {

    List<PatrolType> selectPatrolType(PatrolType patrolType);
    List<PatrolType> selectPatrolType(@Param("patrolType") PatrolType patrolType);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTypeMapper.xml

@@ -2,5 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.gistack.sm.patrol.mapper.PatrolTypeMapper">

    <select id="selectPatrolType" resultType="cn.gistack.sm.patrol.entity.PatrolType"></select>
    <select id="selectPatrolType" resultType="cn.gistack.sm.patrol.entity.PatrolType">
        SELECT id,name,create_time
        FROM SM_PATROL_TYPE
        WHERE is_deleted = 0
        <if test="patrolType.name !=null and patrolType.name !='' ">
            AND name LIKE CONCAT('%',#{patrolType.name},'%')
        </if>
    </select>
</mapper>