Merge remote-tracking branch 'origin/master'

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
       }

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 }}

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 }}

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 }}

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 }}

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 }}

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;
 }

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;
 }

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;
 }

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("客户名称")

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")

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());

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());
         }

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;
 }

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);
 

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) {

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;
 }