diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java index 28eea24..3483a81 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java @@ -656,7 +656,11 @@ public class PtxhyyClient extends CommonHttpClient { @Override public BaseResponse getDeviceBusinessProject(DeviceBusinessProject deviceBusinessProject){ - List deviceBusinessProjects = deviceBusinessProjectMapper.selectList(deviceBusinessProject); - return ResultVOUtils.success(deviceBusinessProjects); + IPage page = new Page<>(deviceBusinessProject.getPage(), deviceBusinessProject.getLimit()); + IPage deviceBusinessProjects = deviceBusinessProjectMapper.selectList(page,deviceBusinessProject); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(deviceBusinessProjects.getTotal()); + pageSimpleResponse.setList(deviceBusinessProjects.getRecords()); + return ResultVOUtils.success(pageSimpleResponse); } } diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DeviceBusinessProject.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DeviceBusinessProject.java index 034c92a..4067651 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DeviceBusinessProject.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DeviceBusinessProject.java @@ -3,6 +3,8 @@ package com.glxp.mipsdl.client.ptxhyy.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.glxp.mipsdl.req.base.ListPageRequest; import lombok.Data; import java.io.Serializable; @@ -10,12 +12,13 @@ import java.math.BigDecimal; import java.util.Date; @Data -public class DeviceBusinessProject { +public class DeviceBusinessProject extends ListPageRequest { /** * 收费时间 */ @TableField(value = "chargTime") + @JsonFormat(pattern = "yyyy-MM-dd") private Date chargTime; /** @@ -54,5 +57,7 @@ public class DeviceBusinessProject { @TableField(value = "deptName") private String deptName; + private String startChargTime; + private String endChargTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/mipsdl/thirddao/dtxyy/DeviceBusinessProjectMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/dtxyy/DeviceBusinessProjectMapper.java index 950e3ea..4734afd 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/dtxyy/DeviceBusinessProjectMapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/dtxyy/DeviceBusinessProjectMapper.java @@ -2,10 +2,12 @@ package com.glxp.mipsdl.thirddao.dtxyy; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.glxp.mipsdl.client.ptxhyy.entity.DeviceBusinessProject; import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,6 +15,6 @@ import java.util.List; @DS("dtxyysql") public interface DeviceBusinessProjectMapper extends BaseMapper { - List selectList(DeviceBusinessProject deviceBusinessProject); + IPage selectList(@Param("page") IPage page, @Param("deviceBusinessProject") DeviceBusinessProject deviceBusinessProject); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 56d884d..4057e0b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: pro servlet: multipart: max-file-size: 100MB diff --git a/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml b/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml index 220f91d..73bfc34 100644 --- a/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml +++ b/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml @@ -6,11 +6,23 @@ select rq AS chargTime,sfxm,sfmc,je,sfmz from udi_sbfybb - - AND sfxm = #{sfxm} + + AND sfxm = #{deviceBusinessProject.sfxm} - - AND CONVERT(DATE, rq) = CONVERT(DATE, #{chargTime}, 120) + + + + + = CONVERT(DATE, #{deviceBusinessProject.startChargTime}, 120) + ]]> + + + order by CONVERT(DATETIME, rq, 120) desc