财务 应收管理 应收应付功能修改

src/main/java/com/ydtech/modules/inv/model/vo/ReceivableAndSettlementQueryVo.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.inv.model.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
@@ -13,9 +14,20 @@ import lombok.Data;
 public class ReceivableAndSettlementQueryVo extends PageRequest {
     @ApiModelProperty(value = "运营团队")
     private String operationsTeam; // 操作团队
+    @ApiModelProperty(value = "保司机构")
+    private String insuranceDept; // 保司机构
+    @ApiModelProperty(value = "险种")
+    private String insuranceType;
+    @ApiModelProperty(value = "交强保单号")
+    private String jqPolicyId;
+
+    @ApiModelProperty(value = "商业保单号")
+    private String syPolicyId;
+    @ApiModelProperty(value = "非车保单号")
+    private String nonCarPolicyId;
     @ApiModelProperty(value = "渠道分类")
     private String channelClassification; // 渠道分类
-    @ApiModelProperty(value = "签约日期开始")
+    @ApiModelProperty(value = "签单日期开始")
     private String signDateStartTime; // 签约日期开始
     @ApiModelProperty(value = "签约日期结束")
     private String signDateEndTime; // 签约日期结束
@@ -35,4 +47,6 @@ public class ReceivableAndSettlementQueryVo extends PageRequest {
     private String agencySettlementTimeEndTime; // 代理结算时间结束
     @ApiModelProperty(value = "结算状态")
     private String clearingState; // 结算状态
+    @ApiModelProperty(value = "保司结算状态")
+    private String insuranceClearingState;
 }

src/main/java/com/ydtech/modules/inv/service/impl/InvReceivableServiceImpl.java

@@ -388,6 +388,9 @@ public class InvReceivableServiceImpl implements InvReceivableService {
             String[] split = invSourceQueryVo.getSigningTime().split(",");
             queryWrapper.between(InvSource::getSigningTime,split[0],split[1]);
         }
+        if(invSourceQueryVo.getInsuranceDept() != null && !"".equals(invSourceQueryVo.getInsuranceDept())){
+            queryWrapper.eq(InvSource::getInsuranceDept,invSourceQueryVo.getInsuranceDept());
+        }
         if(invSourceQueryVo.getClearingState() != null && !"".equals(invSourceQueryVo.getClearingState()))
         {
             queryWrapper.eq(InvSource::getClearingState,invSourceQueryVo.getClearingState());
@@ -445,6 +448,9 @@ public class InvReceivableServiceImpl implements InvReceivableService {
             String[] split = invSourceQueryVo.getClearingTime().split(",");
             queryWrapper.between(InvSource::getClearingTime,split[0],split[1]);
         }
+        if(invSourceQueryVo.getInsuranceDept() != null && !"".equals(invSourceQueryVo.getInsuranceDept())){
+            queryWrapper.eq(InvSource::getInsuranceDept,invSourceQueryVo.getInsuranceDept());
+        }
         if(invSourceQueryVo.getSigningTime() != null && !"".equals(invSourceQueryVo.getSigningTime())){
             String[] split = invSourceQueryVo.getSigningTime().split(",");
             queryWrapper.between(InvSource::getSigningTime,split[0],split[1]);
@@ -539,6 +545,22 @@ public class InvReceivableServiceImpl implements InvReceivableService {
             String[] split = invSettlementSourceQueryVo.getSignDate().split(",");
             queryWrapper.between(InvSettlementSource::getSignDate,split[0],split[1]);
         }
+        if(invSettlementSourceQueryVo.getAgencySettlementTime() != null && !"".equals(invSettlementSourceQueryVo.getAgencySettlementTime()))
+        {
+            String[] split = invSettlementSourceQueryVo.getAgencySettlementTime().split(",");
+            queryWrapper.between(InvSettlementSource::getAgencySettlementTime,split[0],split[1]);
+        }
+        if(invSettlementSourceQueryVo.getChannel() != null && !"".equals(invSettlementSourceQueryVo.getChannel()))
+        {
+            queryWrapper.eq(InvSettlementSource::getChannel,invSettlementSourceQueryVo.getChannel());
+        }
+        if(invSettlementSourceQueryVo.getChannelClassification() != null && !"".equals(invSettlementSourceQueryVo.getChannelClassification()))
+        {
+            queryWrapper.eq(InvSettlementSource::getChannelClassification,invSettlementSourceQueryVo.getChannelClassification());
+        }
+        if(invSettlementSourceQueryVo.getInsuredName() != null && !"".equals(invSettlementSourceQueryVo.getInsuredName())){
+            queryWrapper.like(InvSettlementSource::getInsuredName,invSettlementSourceQueryVo.getInsuredName());
+        }
         Page pageData = invSettlementSourceMapper.selectPage(page, queryWrapper);
 
         return pageData;
@@ -599,7 +621,7 @@ public class InvReceivableServiceImpl implements InvReceivableService {
     @Override
     public Page<ReceivableAndSettlementVo> getReceivableAndSettlementPage(ReceivableAndSettlementQueryVo receivableAndSettlementQueryVo) {
         Page page = new Page();
-        page.setPages(receivableAndSettlementQueryVo.getPageNum());
+        page.setCurrent(receivableAndSettlementQueryVo.getPageNum());
         page.setSize(receivableAndSettlementQueryVo.getPageSize());
         Page<ReceivableAndSettlementVo> receivableAndSettlementPage = invReceivableMapper.getReceivableAndSettlementPage(page, receivableAndSettlementQueryVo);
         return receivableAndSettlementPage;

src/main/resources/mapper/modules/inv/InvReceivableMapper.xml

@@ -266,9 +266,31 @@
             <if test="param.insuranceDeptId != null and param.insuranceDeptId != ''">
                 and ivs.insurance_dept_id = #{param.insuranceDeptId}
             </if>
-            <if test="param.clearingState != null and param.clearingState != ''">
-                and ivs.clearing_state = #{param.clearingState}
-            </if>
+        <if test="param.clearingState != null and param.clearingState != ''">
+            and ivs.clearing_state = #{param.clearingState}
+        </if>
+        <if test="param.insuranceClearingState != null and param.insuranceClearingState != ''">
+            and ivs.insurance_clearing_state = #{param.insuranceClearingState}
+        </if>
+        <if test="param.insuranceDept != null and param.insuranceDept != ''">
+            and ivs.insurance_dept = #{param.insuranceDept}
+        </if>
+        <if test="param.operationsTeam != null and param.operationsTeam != ''">
+            and iss.operations_team = #{param.operationsTeam}
+        </if>
+        <if test="param.insuranceType != null and param.insuranceType != ''">
+            and ivs.risk = #{param.insuranceType}
+        </if>
+        <if test="param.jqPolicyId != null and param.jqPolicyId != ''">
+            and ivs.jq_policy_id = #{param.jqPolicyId}
+        </if>
+        <if test="param.syPolicyId != null and param.syPolicyId != ''">
+            and ivs.sy_policy_id = #{param.syPolicyId}
+        </if>
+        <if test="param.nonCarPolicyId != null and param.nonCarPolicyId != ''">
+            and ivs.non_car_policy_id = #{param.nonCarPolicyId}
+        </if>
+
     </select>
 
     <delete id="deleteReceivable">