修改接口

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/AcceptanceMapper.java

@@ -6,6 +6,8 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface AcceptanceMapper extends BaseMapper<BaseEntity> {
     /**
      * 分页查询验收列表数据
@@ -14,8 +16,8 @@ public interface AcceptanceMapper extends BaseMapper<BaseEntity> {
      * @param acceptanceDto 查询参数
      * @return 分页结果
      */
-    IPage<AcceptanceDto> page(
-            @Param("page") IPage<AcceptanceDto> page,
+    List<AcceptanceDto> page(
+
             @Param("param") AcceptanceDto acceptanceDto
     );
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IAcceptanceService.java

 package com.yeejoin.amos.boot.module.hygf.api.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
 
@@ -14,7 +15,7 @@ public interface IAcceptanceService {
      * @param acceptanceDto 查询参数
      * @return 分页结果
      */
-    IPage<AcceptanceDto> page(IPage<AcceptanceDto> page, AcceptanceDto acceptanceDto);
+    Page<AcceptanceDto> page(Integer current, Integer size, AcceptanceDto acceptanceDto);
 
     /**
      * 根据sequenceNbr查询验收详情（线下验收）

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
@@ -32,7 +33,7 @@ public class AcceptanceController  extends BaseController {
     @PostMapping(value = "/page")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "Get", value = "获取验收单列表", notes = "获取验收单列表")
-    public ResponseModel<IPage<AcceptanceDto>> page(
+    public ResponseModel<Page<AcceptanceDto>> page(
             @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
             @RequestParam(value = "size", required = false, defaultValue = "20") Integer size,
             @RequestBody AcceptanceDto param
@@ -43,10 +44,8 @@ public class AcceptanceController  extends BaseController {
             param.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
         }
 
-        IPage<AcceptanceDto> page = new Page<>(current, size);
-        page = acceptanceService.page(page, param);
 
-        return ResponseHelper.buildResponse(page);
+        return ResponseHelper.buildResponse( acceptanceService.page(current, size, param));
     }
 
     @GetMapping("/acceptance-details")

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java

@@ -289,8 +289,8 @@ public class TdHygfJpInverterWarnController extends BaseController {
 			if (nameMaps.containsKey(map.getThirdStationId())){
 				map.setStationName(nameMaps.get(map.getThirdStationId()));
 			}
-			map.setTimeLongFormat(TimeUtil
-					.longFormat(map.getTimeLong()));
+          String te=  map.getTimeLong()!=null?TimeUtil.longFormat(map.getTimeLong()):"";
+			map.setTimeLongFormat(te);
 		}
 
 		result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content));

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceServiceImpl.java

@@ -2,11 +2,15 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckItemMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
@@ -44,7 +48,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
      * @return 分页结果
      */
     @Override
-    public IPage<AcceptanceDto> page(IPage<AcceptanceDto> page, AcceptanceDto acceptanceDto) {
+    public Page<AcceptanceDto> page(Integer current, Integer size,  AcceptanceDto acceptanceDto) {
         if (Objects.nonNull(acceptanceDto)) {
 
             // 处理提交日期
@@ -57,9 +61,16 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
                 }
             }
         }
-        IPage<AcceptanceDto> resultPage = acceptanceMapper.page(page, acceptanceDto);
 
-        return resultPage;
+        PageHelper.startPage(current,  size);
+        List<AcceptanceDto> resultPage = acceptanceMapper.page(acceptanceDto);
+        PageInfo<AcceptanceDto> page = new PageInfo(resultPage);
+        Page<AcceptanceDto> pagenew = new Page<AcceptanceDto>();
+        pagenew.setCurrent(current);
+        pagenew.setTotal(page.getTotal());
+        pagenew.setSize(size);
+        pagenew.setRecords(page.getList());
+        return pagenew;
     }
 
     /**