1.批次结算查询

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

@@ -1,16 +1,17 @@
 package com.ydtech.modules.fnc.controller;
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesSumService;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
-import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesVo;
+import com.ydtech.modules.order.entity.BasePageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 @RestController
 @Api(tags = "开票批次表结算")
@@ -26,4 +27,10 @@ public class SettlementDocumentaryFeesSumController {
         HttpResult<Object>  result= settlementDocumentaryFeesSumService.voidInvoicing(settlementDocumentaryFeesSumVo);
         return HttpResult.ok(result);
     }
+    @PostMapping("/query")
+    @ApiOperation(value = "[1]保司费用查询new")
+    public HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> query(@RequestBody @Valid SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
+        HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> result = settlementDocumentaryFeesSumService.queryNew(settlementDocumentaryFeesSumVo);
+        return result;
+    }
 }

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

@@ -3,8 +3,13 @@ package com.ydtech.modules.fnc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
+import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface SettlementDocumentaryFeesSumMapper extends BaseMapper<SettlementDocumentaryFeesSumEntity> {
+    List<SettlementDocumentaryFeesSumEntity> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
+
 }

src/main/java/com/ydtech/modules/fnc/entity/SettlementDocumentaryFeesSumEntity.java

@@ -71,8 +71,8 @@ public class SettlementDocumentaryFeesSumEntity   implements Serializable {
     private BigDecimal invoicedSettledAmount;
 
     @ApiModelProperty("已开票未结算")
-    @TableField("Invoiced_not_settled_amount")
-    private BigDecimal InvoicedNotSettledAmount;
+    @TableField("invoiced_not_settled_amount")
+    private BigDecimal invoicedNotSettledAmount;
 
     @ApiModelProperty("结清状态")
     @TableField("completion_status")

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

@@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
+import com.ydtech.modules.order.entity.BasePageResult;
 
 public interface SettlementDocumentaryFeesSumService extends IService<SettlementDocumentaryFeesSumEntity> {
     HttpResult<Object> voidInvoicing(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
+
+    HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
+
 }

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

@@ -525,6 +525,7 @@ handlingProportion,
                 if (!CollectionUtils.isEmpty(incomeIds)) {
                     params.put("incomeIds", incomeIds);
                     params.remove("handlingFeesStatus");
+                    params.remove("id");
                 }
             }
             List<InsPlyIncome> list = this.baseMapper.queryNew(params);

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

@@ -4,18 +4,25 @@ 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.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.fnc.dao.SettlementDocumentaryFeesSumMapper;
+import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesService;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesSumService;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.HashMap;
 import java.util.List;
 
 @Service
@@ -45,4 +52,21 @@ public class SettlementDocumentaryFeesSumServiceImpl extends ServiceImpl<Settlem
         }
         return HttpResult.ok();
     }
+
+    @Override
+    public HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
+        try {
+            PageInfo<List<SettlementDocumentaryFeesSumEntity>> pageHelper = null;
+
+            List<SettlementDocumentaryFeesSumEntity> list = this.baseMapper.queryNew(settlementDocumentaryFeesSumVo);
+
+            pageHelper = new PageInfo(list);
+            BasePageResult<SettlementDocumentaryFeesSumEntity> pageResult = new BasePageResult<SettlementDocumentaryFeesSumEntity>(settlementDocumentaryFeesSumVo.getPageNum(),
+                    settlementDocumentaryFeesSumVo.getPageSize(), pageHelper.getTotal(), pageHelper.getPages(), list);
+            return HttpResult.ok(pageResult);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return HttpResult.error("查询异常");
+        }
+    }
 }

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

@@ -3,7 +3,55 @@
 <mapper namespace="com.ydtech.modules.fnc.dao.SettlementDocumentaryFeesSumMapper">
 
 
+    <sql id="income_com">
+                a.id as  "id",
+                a.total_amount  as  "totalAmount",
+                a.create_time  as  "createTime"
+                a.company_id  as  "companyId",
+                a.settlement_status  as  "settlementStatus",
+                a.user_id  as  "userId",
+                a.invoicing_method  as  "invoicingMethod",
+                a.invoice_id  as  "invoicId",
+                a.is_not_car  as  "isNotCar",
+                a.partner_companies_id  as  "partnerCompaniesId",
+                a.invoiced_settled_amount  as  "invoicedSettledAmount",
+                a.invoiced_not_settled_amount  as  "invoicedNotSettledAmount",
+                a.completion_status  as  "completionStatus"
+    </sql>
 
+    <select id="queryNew" resultType="com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity">
+        select
+        <include refid="income_com"/>
+        from
+        settlement_documentary_fees_sum a
+        <where>
+            1=1
+            <if test="companyId  !=null  and  companyId  !=''">
+                AND a.company_id =#{companyId}
+            </if>
+            <if test="settlementStatus  !=null  and  settlementStatus  !=''">
+                AND a.settlement_status =#{settlementStatus}
+            </if>
+            <if test="invoicingMethod  !=null  and  invoicingMethod  !=''">
+                AND a.invoicing_method =#{invoicingMethod}
+            </if>
+            <if test="invoicId  !=null  and  invoicId  !=''">
+                AND a.invoice_id =#{invoicId}
+            </if>
+            <if test="isNotCar  !=null  and  isNotCar  !=''">
+                AND a.is_not_car =#{isNotCar}
+            </if>
+            <if test="partnerCompaniesId  !=null  and  partnerCompaniesId  !=''">
+                AND a.partner_companies_id =#{partnerCompaniesId}
+            </if>
+          <if test="partnerCompaniesId  !=null  and  partnerCompaniesId  !=''">
+                AND a.partner_companies_id =#{partnerCompaniesId}
+            </if>
+        <if test="completionStatus  !=null  and  completionStatus  !=''">
+                AND a.completion_status =#{completionStatus}
+            </if>
+        </where>
+    </select>
 
 
 </mapper>