feat: 大田县医院初始化

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<DeviceBusinessProject> deviceBusinessProjects = deviceBusinessProjectMapper.selectList(deviceBusinessProject);
+        IPage<DeviceBusinessProject> page = new Page<>(deviceBusinessProject.getPage(), deviceBusinessProject.getLimit());
-        return ResultVOUtils.success(deviceBusinessProjects);
+        IPage<DeviceBusinessProject> deviceBusinessProjects = deviceBusinessProjectMapper.selectList(page,deviceBusinessProject);
+        PageSimpleResponse<DeviceBusinessProject> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(deviceBusinessProjects.getTotal());
+        pageSimpleResponse.setList(deviceBusinessProjects.getRecords());
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 }

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;
 
 }

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<DeviceBusinessProject> {
 
-    List<DeviceBusinessProject> selectList(DeviceBusinessProject deviceBusinessProject);
+    IPage<DeviceBusinessProject>  selectList(@Param("page") IPage<DeviceBusinessProject> page, @Param("deviceBusinessProject") DeviceBusinessProject deviceBusinessProject);
 
 }

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: pro
   servlet:
     multipart:
       max-file-size: 100MB

src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml

@@ -6,11 +6,23 @@
         select rq AS chargTime,sfxm,sfmc,je,sfmz
         from udi_sbfybb
         <where>
-            <if test="sfxm != null and sfxm != ''">
+            <if test="deviceBusinessProject.sfxm != null and deviceBusinessProject.sfxm != ''">
-            AND sfxm = #{sfxm}
+            AND sfxm = #{deviceBusinessProject.sfxm}
         </if>
-        <if test="chargTime != null">
+        <if test="deviceBusinessProject.chargTime != null">
-        AND CONVERT(DATE, rq) = CONVERT(DATE, #{chargTime}, 120)
+         <![CDATA[
+        AND CONVERT(DATE, rq) = CONVERT(DATE, #{deviceBusinessProject.chargTime}, 120)
+         ]]>
+        </if>
+        <if test="deviceBusinessProject.startChargTime != null">
+        <![CDATA[
+        AND CONVERT(DATE, rq) >= CONVERT(DATE, #{deviceBusinessProject.startChargTime}, 120)
+         ]]>
+        </if>
+        <if test="deviceBusinessProject.endChargTime != null">
+        <![CDATA[
+        AND CONVERT(DATE, rq) <= CONVERT(DATE, #{deviceBusinessProject.endChargTime}, 120)
+         ]]>
         </if>
         </where>
         order by CONVERT(DATETIME, rq, 120) desc