From bc1edd287a1c25b4c41979c0bf9ad77e383eaa58 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 20 Feb 2024 11:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseInternalPurchaseService.java          |  3 ++
 .../LoanAttachTypeEnum.java                   |  4 +--
 .../LoanHomevisitInvestigateService.java      |  6 ++--
 .../LoanRepaymentPlanDetailsMapper.xml        | 34 ++++++++++++-------
 .../risk/vehclearance/VehClearanceFeign.java  |  2 +-
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
index 6daf28f4a7..630683db2c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
@@ -288,6 +288,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             baseInternalPurchaseVehicle1.setRecallStateValue(VehicleState.RecallState.UN_RECALL.getRemarks());
             baseInternalPurchaseVehicle1.setIsAccadj("0");
             baseInternalPurchaseVehicle1.setIsInvoicing("0");
+            baseInternalPurchaseVehicle1.setInitialWitPinMoney(baseInternalPurchaseVehicle1.getWitPinMoney());
+            baseInternalPurchaseVehicle1.setCallInBuyerOrgSid(baseInternalPurchase.getCallInBuyerOrgSid());
+            baseInternalPurchaseVehicle1.setCallInBuyerOrgName(baseInternalPurchase.getCallInBuyerOrgName());
             baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
         }
         return rb.success().setMsg("修改成功").setData(dtoSid);
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java
index 0538a1dcf2..029251b733 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java
@@ -8,8 +8,8 @@ package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile;
 public enum LoanAttachTypeEnum {
 
     DWXX("001", "定位信息"),
-    FWZP("002", "房屋照片"),
-    MKZP("003", "门口照片"),
+    FWZP("002", "小区/村口照片"),
+    MKZP("003", "住所照片"),
     KTWSZP("004", "客厅卧室照片"),
     HYZD("005", "合影照等"),
     DKRSFZ("006", "贷款人身份证"),
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 6d5ca21f00..92062d37a2 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
@@ -538,9 +538,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomeVisitInvestigateInitInformationStateVo loanHomeVisitInvestigateInitInformationStateVo = new LoanHomeVisitInvestigateInitInformationStateVo();
         //定位信息
         List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
-        //房屋照片
+        //小区/村口照片
         List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
-        //门口照片
+        //住所照片
         List<LoanHomevisitInvestigateFileDetailsVo> mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType());
         //客厅卧室照片
         List<LoanHomevisitInvestigateFileDetailsVo> ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType());
@@ -577,8 +577,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
         } else if (mkzpImages == null || mkzpImages.size() == 0) {
             loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
-        } else if (ktwszpImages == null || ktwszpImages.size() == 0) {
-            loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
         } else if (hyzdImages == null || hyzdImages.size() == 0) {
             loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
         } else {
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
index 8d7a52db53..93862cacff 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
@@ -43,19 +43,27 @@
     </select>
 
     <select id="selBeMoney" resultType="java.lang.String">
-        SELECT (
-                   lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
-                   ) AS yq_total
-        FROM `loan_repayment_plan_details` lrpd
-                 LEFT JOIN `loan_repayment_history` lrh
-                           ON lrh.planDetailSid = lrpd.`sid`
-        WHERE lrpd.vinNo = #{no}
-          AND lrpd.period = #{period}
-          AND lrpd.bankContractNo = #{bankContractNo}
-          AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
-          AND lrh.`updateState` = '1'
-        GROUP BY lrpd.`sid`
-        HAVING (yq_total > 0)
+        SELECT
+                (
+                        a.yq_total - IFNULL(a.actualMoney, 0)
+                        ) AS yq_total
+        FROM
+                (SELECT
+                         lrpd.`dueMoney` AS yq_total,
+                         (SELECT
+                                  SUM(IFNULL(lrh.actualMoney, 0))
+                          FROM
+                                  loan_repayment_history lrh
+                          WHERE lrh.planDetailSid = lrpd.`sid`
+                            AND lrh.`updateState` = '1') AS actualMoney
+                 FROM
+                         `loan_repayment_plan_details` lrpd
+                 WHERE lrpd.vinNo = #{no}
+                   AND lrpd.period = #{period}
+                   AND lrpd.bankContractNo = #{bankContractNo}
+                   AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
+                 GROUP BY lrpd.`sid`
+                 HAVING (yq_total > 0)) a
     </select>
 
     <select id="details" resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayDetails">
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/vehclearance/VehClearanceFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/vehclearance/VehClearanceFeign.java
index 698ad9c676..4528c4b0a0 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/vehclearance/VehClearanceFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/vehclearance/VehClearanceFeign.java
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
  * @Date
  * @Description
  */
-@Api(tags = "逾期垫款催收")
+@Api(tags = "车辆远程解控")
 @FeignClient(
         contextId = "terminal-VehClearance",
         name = "anrui-terminal",