From c61c5910bb0573ff94472fa2c035f71a7c93bf63 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 19 Oct 2023 17:47:23 +0800
Subject: [PATCH] 10/19

---
 .../crm/biz/projectinformation/ProjectInformationMapper.xml | 4 +++-
 .../crm/biz/projectinformation/ProjectInformationQuery.java | 1 +
 .../biz/projectinformation/ProjectInformationService.java   | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml
index 87e4d1fd..6aad368a 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml
@@ -15,7 +15,8 @@
         info.endDate,
         ei.enterpriseName,
         ei.contacts as eContacts,
-        info.regulatoryLeader,info.*
+        info.regulatoryLeader,
+        sd.name as stateName ,info.*
         FROM
         project_information info
         LEFT JOIN project_type_dictionary td on td.sid=info.typeSid
@@ -23,6 +24,7 @@
         left join loan_bank_information bank on bank.sid=info.bankSid
         left join bank_manager bm on bm.sid =info.managerSid
         LEFT JOIN enterprise_information ei on ei.sid=info.enterpriseSid
+        left join project_state_dictionary sd on sd.sid = info.stateSid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java
index 2dc453ab..989f9174 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java
@@ -29,4 +29,5 @@ public class ProjectInformationQuery implements Query {
     private String remarks;
     private String projectType;
     private String bankName;
+    private String stateSid;
 }
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
index 23f102d9..d05b4824 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
@@ -80,6 +80,12 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         if (StringUtils.isNotBlank(query.getBankName())) {
             qw.like("bank.bankName", query.getBankName());
         }
+        if (StringUtils.isNotBlank(query.getBankSid())) {
+            qw.eq("info.bankSid", query.getBankSid());
+        }
+        if (StringUtils.isNotBlank(query.getStateSid())) {
+            qw.eq("info.stateSid", query.getStateSid());
+        }
         IPage<ProjectInformation> page = PagerUtil.queryToPage(pq);
         IPage<ProjectInformationVo> pagging = baseMapper.selectPageVo(page, qw);
         for(ProjectInformationVo vo:pagging.getRecords()){