From a5280d1efb665577ebecf51ebc9a436213e2e62b Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 29 Aug 2023 10:51:44 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=BA=94=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=8A=B6=E6=80=81=E5=8F=8A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinUncollectedReceivablesDetailedQuery.java               | 2 ++
 .../FinUncollectedReceivablesDetailedVo.java                  | 2 ++
 .../FinUncollectedReceivablesDetailedService.java             | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java
index d33ab7d7b4..d26727c17e 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java
@@ -50,6 +50,8 @@ import java.util.List;
 @Data
 public class FinUncollectedReceivablesDetailedQuery implements Query {
 
+    @ApiModelProperty("应收款项状态 01正常，02作废")
+    private String kxState; // 应收款项状态 01正常，02作废
     @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
     @ApiModelProperty("客户名称")
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java
index 602c35bec1..65d2534801 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java
@@ -54,6 +54,8 @@ import java.util.List;
 @Data
 public class FinUncollectedReceivablesDetailedVo implements Vo {
 
+    @ApiModelProperty("应收款项状态 01正常，02作废")
+    private String kxState; // 应收款项状态 01正常，02作废
     @ApiModelProperty("应收未收款项sid")
     private String sid; // 应收未收款项sid
     @ApiModelProperty("创建人sid")
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
index 13c403d8d6..2b6f150e09 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
@@ -438,7 +438,9 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                 }
             }
         }
-
+        if (StringUtils.isNotBlank(params.getKxState())) {
+            qw.like("kxState", params.getKxState());
+        }
         if (StringUtils.isNotBlank(params.getContractNo())) {
             qw.like("contractNo", params.getContractNo());
         }

From 3491e0ffa12c39b0f76ea6421c5efb9340fe8c71 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 29 Aug 2023 10:56:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=BE=E9=A1=B9?=
 =?UTF-8?q?=E7=BB=93=E8=BD=AC--=E7=94=B3=E8=AF=B7=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=AC=BE=E9=A1=B9=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/moneycarriedforward/moneycarriedforwardAdd.vue | 5 +++++
 .../views/moneycarriedforward/moneycarriedforwardInfo.vue    | 5 +++++
 .../kuanxiangjiezhuanFlow/moneycarriedforwardDaiBanInfo.vue  | 5 +++++
 .../kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue        | 5 +++++
 .../kuanxiangjiezhuanFlow/moneycarriedforwardYiBanInfo.vue   | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue
index e626775023..cba870fd5f 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue
@@ -88,6 +88,11 @@
                 {{ scope.row.vinNo }}
               </template>
             </el-table-column>
+            <el-table-column label="款项名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.receivablesName }}
+              </template>
+            </el-table-column>
             <el-table-column label="剩余金额" align="center">
               <template slot-scope="scope">
                 {{ scope.row.balance }}
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardInfo.vue
index c4537962e1..6581a92e9a 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardInfo.vue
@@ -115,6 +115,11 @@
               {{ scope.row.vinNo }}
             </template>
           </el-table-column>
+          <el-table-column label="款项名称" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.receivablesName }}
+            </template>
+          </el-table-column>
           <el-table-column label="剩余金额" align="center">
             <template slot-scope="scope">
               {{ scope.row.balance }}
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardDaiBanInfo.vue
index 64888e22b4..a80fa7c1e1 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardDaiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardDaiBanInfo.vue
@@ -117,6 +117,11 @@
               {{ scope.row.vinNo }}
             </template>
           </el-table-column>
+          <el-table-column label="款项名称" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.receivablesName }}
+            </template>
+          </el-table-column>
           <el-table-column label="剩余金额" align="center">
             <template slot-scope="scope">
               {{ scope.row.balance }}
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue
index 9eb4feb41c..9eb6c69ed6 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue
@@ -87,6 +87,11 @@
                 {{ scope.row.vinNo }}
               </template>
             </el-table-column>
+            <el-table-column label="款项名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.receivablesName }}
+              </template>
+            </el-table-column>
             <el-table-column label="剩余金额" align="center">
               <template slot-scope="scope">
                 {{ scope.row.balance }}
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardYiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardYiBanInfo.vue
index 5c54a26f45..b4c24559a9 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardYiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardYiBanInfo.vue
@@ -115,6 +115,11 @@
               {{ scope.row.vinNo }}
             </template>
           </el-table-column>
+          <el-table-column label="款项名称" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.receivablesName }}
+            </template>
+          </el-table-column>
           <el-table-column label="剩余金额" align="center">
             <template slot-scope="scope">
               {{ scope.row.balance }}

From a5286f0f454a923b63e2e39d2c70f96b11817dce Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 29 Aug 2023 10:59:50 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinFundsCarriedForwardVeh.java                          | 3 ++-
 .../FinFundsCarriedForwardVehDetailsVo.java                 | 2 ++
 .../FinFundsCarriedForwardVehDto.java                       | 2 ++
 .../FinFundsCarriedForwardApplyService.java                 | 1 +
 .../LoanHomeVisitInvestigateReservationDto.java             | 2 +-
 .../LoanHomevisitInvestigateMapper.java                     | 4 ++--
 .../LoanHomevisitInvestigateService.java                    | 6 +++++-
 .../AppLoanHomeVisitInvestigateReservationDto.java          | 2 +-
 8 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java
index 8330996e77..0313d40a6d 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java
@@ -72,5 +72,6 @@ public class FinFundsCarriedForwardVeh extends BaseEntity {
     private BigDecimal balance; // 剩余金额
 	@ApiModelProperty("本次使用金额")
     private BigDecimal thisUseMoney; // 本次使用金额
-
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java
index 1048c7b2f0..9060f05178 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java
@@ -71,4 +71,6 @@ public class FinFundsCarriedForwardVehDetailsVo implements Vo {
     private String thisUseMoney; // 本次使用金额
     @ApiModelProperty("联系电话")
     private String draweeMobile;
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java
index fc503ddb18..7ce296f0b3 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java
@@ -69,4 +69,6 @@ public class FinFundsCarriedForwardVehDto implements Dto {
     private String balance; // 剩余金额
 	@ApiModelProperty("本次使用金额")
     private String thisUseMoney; // 本次使用金额
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
index 2fbc644140..67c0d901cc 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
@@ -401,6 +401,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             finFundsCarriedForwardVehDetailsVo.setCustomerName(finSelectedReceivablesDetailed.getCustomerName());
             finFundsCarriedForwardVehDetailsVo.setVinNo(finSelectedReceivablesDetailed.getVIN());
             finFundsCarriedForwardVehDetailsVo.setBalance(finSelectedReceivablesDetailed.getBalance());
+            finFundsCarriedForwardVehDetailsVo.setReceivablesName(finSelectedReceivablesDetailed.getReceivablesName());
             finFundsCarriedForwardVehDetailsVos.add(finFundsCarriedForwardVehDetailsVo);
             finFundsCarriedForwardApplyDetailsVo.setPurchaseSystemSid(finSelectedReceivablesDetailed.getPurchaseSystemSid());
             finFundsCarriedForwardApplyDetailsVo.setPurchaseSystem(finSelectedReceivablesDetailed.getPurchaseSystemName());
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java
index 2d2675a6d2..b3cc19759a 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java
@@ -12,5 +12,5 @@ public class LoanHomeVisitInvestigateReservationDto implements Dto {
     @ApiModelProperty("预约时间")
     private String times;
     @ApiModelProperty("预约地址")
-    private String adress;
+    private String address;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
index 429ac8073d..c820e06060 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
@@ -68,8 +68,8 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper<LoanHomevisit
     @Update("update loan_homevisit_investigate set state = '2',investigateKey = #{investigateKey},investigateValue = #{investigateValue} where sid = #{sid}")
     void isPassThrough(@Param("sid") String sid, @Param("investigateKey") String investigateKey, @Param("investigateValue") String investigateValue);
 
-    @Update("update loan_homevisit_investigate set resHomeVisDate = #{times},homeVisAddress = #{adress} where sid = #{sid}")
-    void saveAppointmentInfo(@Param("sid") String sid, @Param("times") String times, @Param("adress") String adress);
+    @Update("update loan_homevisit_investigate set resHomeVisDate = #{times},homeVisAddress = #{address} where sid = #{sid}")
+    void saveAppointmentInfo(@Param("sid") String sid, @Param("times") String times, @Param("address") String address);
 
     LoanHomeVisitInvestigateInitCustomerVo getHomeVisitCustomerInfo(String sid);
 
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
index e7f3c4d808..6d7efad819 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
@@ -331,7 +331,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
 
     public ResultBean saveAppointmentInfo(LoanHomeVisitInvestigateReservationDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.saveAppointmentInfo(dto.getSid(), dto.getTimes(), dto.getAdress());
+        baseMapper.saveAppointmentInfo(dto.getSid(), dto.getTimes(), dto.getAddress());
         return rb.success();
     }
 
@@ -474,6 +474,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitCustomerVo.setLenderNam(busSalesOrderBorrowerDetailsVo.getBorrowerName());
             loanHomeVisitInvestigateInitCustomerVo.setIdNumber(crmCustomerTempVo.getIDNumber());
             loanHomeVisitInvestigateInitCustomerVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
+            loanHomeVisitInvestigateInitCustomerVo.setMainSid(sid);
+            return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
         }
         //银行卡附件
         List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
@@ -487,6 +489,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //其他人员
         List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
         loanHomeVisitInvestigateInitCustomerVo.setOtherPersonnel(loanHomeVisitInvestigateInitOtherPeoVos);
+        loanHomeVisitInvestigateInitCustomerVo.setMainSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
     }
 
@@ -529,6 +532,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         loanHomevisitInvestigateCustomerDto.setEmergencyMobile(dto.getEmergencyContactMobile());
         loanHomevisitInvestigateCustomerDto.setRelationshipKey(dto.getEmergencyContactTypeKey());
         loanHomevisitInvestigateCustomerDto.setRelationshipValue(dto.getEmergencyContactType());
+        loanHomevisitInvestigateCustomerDto.setMainSid(dto.getMainSid());
         loanHomevisitInvestigateCustomerService.saveOrUpdateDto(loanHomevisitInvestigateCustomerDto);
         loanHomevisitInvestigateOtherpeoService.delByMainSid(dto.getMainSid());
         for (LoanHomeVisitInvestigateSaveOtherPeoDto loanHomeVisitInvestigateSaveOtherPeoDto : otherPersonnel) {
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateReservationDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateReservationDto.java
index c4d983d482..f6ff0bbb76 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateReservationDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateReservationDto.java
@@ -12,5 +12,5 @@ public class AppLoanHomeVisitInvestigateReservationDto implements Dto {
     @ApiModelProperty("预约时间")
     private String times;
     @ApiModelProperty("预约地址")
-    private String adress;
+    private String address;
 }

From 74f11eac7da44ebef9c4133289c5a29fc465a839 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 29 Aug 2023 11:14:05 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95--=E5=A2=9E=E5=8A=A0=E5=BA=94=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerBillingDetails.vue                | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue
index 92f6eacbb0..c2afcd702d 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue
@@ -6,7 +6,7 @@
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
               <el-form-item label="客户名称:">
                 <el-input v-model="listQuery.params.customerName" placeholder="" clearable class="addinputw"/>
               </el-form-item>
@@ -19,6 +19,11 @@
               <el-form-item label="款项名称:">
                 <el-input v-model="listQuery.params.receivablesName" placeholder="" clearable class="addinputw"/>
               </el-form-item>
+              <el-form-item label="应收款项状态:">
+                <el-select v-model="listQuery.params.kxState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in kxState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
               <el-form-item label="生成时间:">
                 <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.createStartTime" clearable style="width: 160px" type="date" placeholder="开始日期"/>
                 <span style="padding: 0 8px">至</span>
@@ -67,6 +72,11 @@
                   <span>{{ scope.row.payType }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="应收款项状态" align="center" width="130">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.kxState == '01' ? '正常' : scope.row.kxState == '02' ? '作废' : '' }}</span>
+                </template>
+              </el-table-column>
               <el-table-column label="应收金额" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.reveivableMoney }}</span>
@@ -134,6 +144,16 @@ export default {
       searchxianshitit: '隐藏查询条件',
       tableKey: 0,
       list: [],
+      kxState_list: [
+        {
+          dictKey: '01',
+          dictValue: '正常'
+        },
+        {
+          dictKey: '02',
+          dictValue: '作废'
+        }
+      ],
       listLoading: false,
       listQuery: {
         current: 1,
@@ -147,7 +167,8 @@ export default {
           createEndTime: '',
           createBySid: '',
           orgPath: '',
-          menuUrl: ''
+          menuUrl: '',
+          kxState: ''
         },
         total: 0
       }
@@ -221,7 +242,8 @@ export default {
           createEndTime: '',
           createBySid: '',
           orgPath: '',
-          menuUrl: ''
+          menuUrl: '',
+          kxState: ''
         },
         total: 0
       }