1.私有跟单开票未结算详情查询接口

src/main/java/com/ydtech/modules/fnc/controller/SettlementDocumentaryFeesSumController.java

@@ -1,6 +1,8 @@
 package com.ydtech.modules.fnc.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.dto.TaskStatisticsDto;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesSumService;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
@@ -29,8 +31,8 @@ public class SettlementDocumentaryFeesSumController {
     }
     @PostMapping("/query")
     @ApiOperation(value = "[1]保司费用查询new")
-    public HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> query(@RequestBody @Valid SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
-        HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> result = settlementDocumentaryFeesSumService.queryNew(settlementDocumentaryFeesSumVo);
+    public HttpResult<IPage<SettlementDocumentaryFeesSumEntity>> query(@RequestBody @Valid SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
+        HttpResult<IPage<SettlementDocumentaryFeesSumEntity>> result = settlementDocumentaryFeesSumService.queryNew(settlementDocumentaryFeesSumVo);
         return result;
     }
 }

src/main/java/com/ydtech/modules/fnc/dao/SettlementDocumentaryFeesSumMapper.java

@@ -2,14 +2,17 @@ package com.ydtech.modules.fnc.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface SettlementDocumentaryFeesSumMapper extends BaseMapper<SettlementDocumentaryFeesSumEntity> {
-    List<SettlementDocumentaryFeesSumEntity> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
+    IPage<SettlementDocumentaryFeesSumEntity> queryNew(@Param("page") Page page,@Param("settlementDocumentaryFeesSumVo") SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
 
 }

src/main/java/com/ydtech/modules/fnc/service/SettlementDocumentaryFeesSumService.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.fnc.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
@@ -9,6 +10,6 @@ import com.ydtech.modules.order.entity.BasePageResult;
 public interface SettlementDocumentaryFeesSumService extends IService<SettlementDocumentaryFeesSumEntity> {
     HttpResult<Object> voidInvoicing(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
 
-    HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
+    HttpResult<IPage<SettlementDocumentaryFeesSumEntity>> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
 
 }

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesSumServiceImpl.java

@@ -3,11 +3,15 @@ package com.ydtech.modules.fnc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.model.vo.TaskStatisticsVo;
+import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.fnc.dao.SettlementDocumentaryFeesSumMapper;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity;
@@ -54,16 +58,18 @@ public class SettlementDocumentaryFeesSumServiceImpl extends ServiceImpl<Settlem
     }
 
     @Override
-    public HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
+    public HttpResult<IPage<SettlementDocumentaryFeesSumEntity>> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
         try {
-            PageInfo<List<SettlementDocumentaryFeesSumEntity>> pageHelper = null;
+            PageVo<SettlementDocumentaryFeesSumEntity> pageVo = new PageVo<>();
+            Page page = new Page(settlementDocumentaryFeesSumVo.getPageNum(), settlementDocumentaryFeesSumVo.getPageSize());
 
-            List<SettlementDocumentaryFeesSumEntity> list = this.baseMapper.queryNew(settlementDocumentaryFeesSumVo);
+            pageVo.setPageNum(settlementDocumentaryFeesSumVo.getPageNum());
+            pageVo.setPageSize(settlementDocumentaryFeesSumVo.getPageSize());
 
-            pageHelper = new PageInfo(list);
-            BasePageResult<SettlementDocumentaryFeesSumEntity> pageResult = new BasePageResult<SettlementDocumentaryFeesSumEntity>(settlementDocumentaryFeesSumVo.getPageNum(),
-                    settlementDocumentaryFeesSumVo.getPageSize(), pageHelper.getTotal(), pageHelper.getPages(), list);
-            return HttpResult.ok(pageResult);
+
+            IPage<SettlementDocumentaryFeesSumEntity> list = this.baseMapper.queryNew(page,settlementDocumentaryFeesSumVo);
+
+            return HttpResult.ok(list);
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResult.error("查询异常");

src/main/java/com/ydtech/modules/fnc/vo/SettlementDocumentaryFeesSumVo.java

@@ -69,6 +69,6 @@ public class SettlementDocumentaryFeesSumVo implements Serializable {
 
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")
-    private int pageNum=1;
+    private int pageNum;
 
 }

src/main/resources/mapper/modules/fnc/SettlementDocumentaryFeesSumMapper.xml

@@ -26,26 +26,26 @@
         settlement_documentary_fees_sum a
         <where>
             1=1
-            <if test="companyId  !=null  and  companyId  !=''">
-                AND a.company_id =#{companyId}
+            <if test="settlementDocumentaryFeesSumVo.companyId  !=null  and  settlementDocumentaryFeesSumVo.companyId  !=''">
+                AND a.company_id =#{settlementDocumentaryFeesSumVo.companyId}
             </if>
-            <if test="settlementStatus  !=null  and  settlementStatus  !=''">
-                AND a.settlement_status =#{settlementStatus}
+            <if test="settlementDocumentaryFeesSumVo.settlementStatus  !=null  and  settlementDocumentaryFeesSumVo.settlementStatus  !=''">
+                AND a.settlement_status =#{settlementDocumentaryFeesSumVo.settlementStatus}
             </if>
-            <if test="invoicingMethod  !=null  and  invoicingMethod  !=''">
-                AND a.invoicing_method =#{invoicingMethod}
+            <if test="settlementDocumentaryFeesSumVo.invoicingMethod  !=null  and  settlementDocumentaryFeesSumVo.invoicingMethod  !=''">
+                AND a.invoicing_method =#{settlementDocumentaryFeesSumVo.invoicingMethod}
             </if>
-            <if test="invoicId  !=null  and  invoicId  !=''">
-                AND a.invoice_id =#{invoicId}
+            <if test="settlementDocumentaryFeesSumVo.invoicId  !=null  and  settlementDocumentaryFeesSumVo.invoicId  !=''">
+                AND a.invoice_id =#{settlementDocumentaryFeesSumVo.invoicId}
             </if>
-            <if test="isNotCar  !=null  and  isNotCar  !=''">
-                AND a.is_not_car =#{isNotCar}
+            <if test="settlementDocumentaryFeesSumVo.isNotCar  !=null  and  settlementDocumentaryFeesSumVo.isNotCar  !=''">
+                AND a.is_not_car =#{settlementDocumentaryFeesSumVo.isNotCar}
             </if>
-            <if test="partnerCompaniesId  !=null  and  partnerCompaniesId  !=''">
-                AND a.partner_companies_id =#{partnerCompaniesId}
+            <if test="settlementDocumentaryFeesSumVo.partnerCompaniesId  !=null  and  settlementDocumentaryFeesSumVo.partnerCompaniesId  !=''">
+                AND a.partner_companies_id =#{settlementDocumentaryFeesSumVo.partnerCompaniesId}
             </if>
-          <if test="completionStatus  !=null  and  completionStatus  !=''">
-                AND a.completion_status =#{completionStatus}
+          <if test="settlementDocumentaryFeesSumVo.completionStatus  !=null  and  settlementDocumentaryFeesSumVo.completionStatus  !=''">
+                AND a.completion_status =#{settlementDocumentaryFeesSumVo.completionStatus}
             </if>
         </where>
     </select>