ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -2,6 +2,12 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.ruoyi.utils.result.Results; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +35,7 @@ */ @RestController @RequestMapping("/app/appPatrolplan") @Api(tags = "app巡检计划") public class ArdAppPatrolplanController extends BaseController { @Autowired @@ -39,11 +46,12 @@ */ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:list')") @GetMapping("/list") public TableDataInfo list(ArdAppPatrolplan ardAppPatrolplan) @ApiOperation("查询全部巡检列表") public Results list(ArdAppPatrolplan ardAppPatrolplan) { startPage(); PageHelper.startPage(ardAppPatrolplan.getPageNum(),ardAppPatrolplan.getPageSize()); List<ArdAppPatrolplan> list = ardAppPatrolplanService.selectArdAppPatrolplanList(ardAppPatrolplan); return getDataTable(list); return Results.succeed(new PageInfo<>(list)); } /** ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java
@@ -25,7 +25,7 @@ * @param ardAppPatrolplan app巡检计划 * @return app巡检计划集合 */ public List<ArdAppPatrolplan> selectArdAppPatrolplanList(ArdAppPatrolplan ardAppPatrolplan); public List<ArdAppPatrolplan> selectArdAppPatrolplanList(ArdAppPatrolplan ardAppPatrolplan); /** * 新增app巡检计划 ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -21,11 +21,11 @@ <select id="selectArdAppPatrolplanList" parameterType="ArdAppPatrolplan" resultMap="ArdAppPatrolplanResult"> <include refid="selectArdAppPatrolplanVo"/> <where> <if test="patroEndTime != null and patroEndTime != ''"> and patro_end_time = #{patroEndTime}</if> <if test="userId != null and userId != ''"> and user_id = #{userId}</if> <if test="cycle != null and cycle != ''"> and cycle = #{cycle}</if> <if test="planName != null and planName != ''"> and plan_name like '%'||#{planName}||'%'</if> <if test="patroBeginTime != null and patroBeginTime != ''"> and patro_begin_time = #{patroBeginTime}</if> <if test="patroBeginTime != null and patroBeginTime != ''"> and patro_begin_time >= #{patroBeginTime}</if> <if test="patroEndTime != null and patroEndTime != ''"> and patro_end_time <= #{patroEndTime}</if> </where> </select>