From 25af90135a6cc824749cde818946a29a454d1278 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Mon, 26 May 2025 14:20:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../riskcenter/api/loancaseprogress/LoanCaseProgress.java | 2 ++
 .../api/loancaseprogress/LoanCaseProgressDetailsVo.java   | 2 ++
 .../api/loancaseprogress/LoanCaseProgressDto.java         | 2 ++
 .../api/loancaseprogress/LoanCaseProgressQuery.java       | 2 ++
 .../api/loancaseprogress/LoanCaseProgressVo.java          | 3 ++-
 .../riskcenter/api/loancaseprogress/PushCaseDto.java      | 2 ++
 .../biz/loancaseprogress/LoanCaseProgressMapper.xml       | 8 ++++----
 .../biz/loancaseprogress/LoanCaseProgressService.java     | 6 +++++-
 .../biz/loanlawsuitapply/LoanLawsuitApplyService.java     | 1 +
 9 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java
index 213cbef677..209bc07092 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java
@@ -91,5 +91,7 @@ public class LoanCaseProgress extends BaseEntity {
     private String salesOrderSid;
     @ApiModelProperty("诉讼主体")
     private String lawsuitSubject;
+    @ApiModelProperty("是否转诉讼")
+    private String isZfull;
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java
index 14917c121c..f3fef69fd2 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java
@@ -74,6 +74,8 @@ public class LoanCaseProgressDetailsVo implements Vo {
     private String caseTache;
     @ApiModelProperty("诉讼时效")
     private String sueAging;
+    @ApiModelProperty("是否转诉讼")
+    private String isZfull;
     private List<DetailsVeh> veh = new ArrayList<>(); //车辆信息
     private List<DetailsFees> fees = new ArrayList(); //相关费用
     private List<DetailsGuarantor> guarantor = new ArrayList(); //担保人
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java
index 05f406e588..6d93753923 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java
@@ -72,6 +72,8 @@ public class LoanCaseProgressDto implements Dto {
 //    private String caseTache;
     @ApiModelProperty("诉讼时效")
     private String sueAging;
+    @ApiModelProperty("是否转诉讼")
+    private String isZfull;
     private List<DetailsVeh> veh = new ArrayList<>(); //车辆信息
     private List<DetailsFees> fees = new ArrayList(); //相关费用
     private List<DetailsGuarantor> guarantor = new ArrayList(); //担保人
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java
index a5fc39d0b6..294c597f0e 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java
@@ -48,6 +48,8 @@ public class LoanCaseProgressQuery implements Query {
     private String lawer;
     @ApiModelProperty("是否全额诉讼")
     private String full;
+    @ApiModelProperty("是否转诉讼")
+    private String isZfull;
 
 
     @ApiModelProperty("组织全路径")
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java
index 567c8bff4c..6e5d24971f 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java
@@ -53,5 +53,6 @@ public class LoanCaseProgressVo implements Vo {
     private String lawer;
     @ApiModelProperty("是否全额诉讼")
     private String full;
-
+    @ApiModelProperty("是否转诉讼")
+    private String isZfull;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java
index 5eb41900e5..b16f91796e 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java
@@ -52,6 +52,8 @@ public class PushCaseDto {
     private String salesOrderSid;
     @ApiModelProperty("诉讼主体")
     private String lawsuitSubject;
+    @ApiModelProperty("是否转诉讼")
+    private String isZfull;
     @ApiModelProperty("欠款合计")
     private String amountAll;
     private List<PushCaseVehDto> vehList = new ArrayList<>();
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml
index a5e03e02b7..02cbffebf1 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml
@@ -14,7 +14,7 @@
         SELECT COUNT(*)
         FROM loan_be_collection_veh lv
                  LEFT JOIN loan_be_collection_apply la
-                           ON lv.`mainSid` = la.`sid`
+                           ON lv.mainSid = la.sid
         WHERE lv.saleVehSid = #{busVinSid}
           AND lv.lockCarState = 1
 
@@ -45,7 +45,7 @@
         p.caseStage,
         p.caseTache,
         p.useDays,
-        p.`full`
+        p.full
         FROM
         loan_case_progress AS p
         LEFT JOIN ( SELECT * FROM loan_case_entrust_lawyer_apply AS b WHERE b.nodeState = '已办结' ) AS a ON p.sid =
@@ -80,7 +80,7 @@
     </select>
     <select id="getLegalStaffS" resultType="com.yxt.anrui.riskcenter.api.loancaseprogress.LegalStaffVo">
         SELECT
-            i.`name`,
+            i.name,
             u.sid as userSid
         FROM
             anrui_portal.sys_organization as s
@@ -88,7 +88,7 @@
                 LEFT JOIN anrui_portal.sys_staffinfo as i on i.sid = o.staffSid
                 LEFT JOIN anrui_portal.sys_user as u ON i.sid = u.staffSid
         WHERE s.psid = 'ec6f5ded-2025-4b24-be86-cc8bcdfdf5aa'
-          and s.`name` = '法务部'
+          and s.name = '法务部'
     </select>
     <select id="selShangSuApplyBySid"
             resultType="com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ShangSuApplyVo">
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java
index 6926a5f2b1..cc2a0ec143 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java
@@ -329,7 +329,11 @@ public class LoanCaseProgressService extends MybatisBaseService<LoanCaseProgress
         }
         //是否全额诉讼
         if (StringUtils.isNotBlank(pagerQuery.getFull())) {
-            qw.like("p.`full`", pagerQuery.getFull());
+            qw.like("p.full", pagerQuery.getFull());
+        }
+        //是否转诉讼
+        if (StringUtils.isNotBlank(pagerQuery.getIsZfull())) {
+            qw.like("p.isZfull", pagerQuery.getIsZfull());
         }
         qw.eq("p.isDelete", 0);
         qw.orderByDesc("p.createTime");
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java
index 9fd5854e29..ce260605fc 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java
@@ -720,6 +720,7 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
                 LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(lawsuitApply.getLoanSid());
                 pushCaseDto.setLoanId(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber());
                 pushCaseDto.setLoanAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
+                pushCaseDto.setIsZfull("0");
                 loanCaseProgressService.pushCase(pushCaseDto);
             } else {
                 //极光推送