From d2071423076b4e6ca22059cc27232b1c59d28e5e Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Sun, 4 Feb 2024 11:42:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BC=98=E5=8C=96=E3=80=81=E8=A7=A3=E6=8A=B5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crmcustomertemp/CrmCustomerTempMapper.xml | 33 +++++----
 .../CrmCustomerTempService.java               | 22 +++---
 .../LoanRelieveMortgageFeign.java             |  2 +-
 .../LoanRelieveMortgageService.java           | 71 ++++++++++---------
 4 files changed, 66 insertions(+), 62 deletions(-)

diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index e3cbfa7aeb..80535972b6 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -251,29 +251,32 @@
     </select>
     <select id="exportExcel" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempExportVo">
         SELECT
-        row_number() over(order by cct.id) as rankNo,
-        DATE_FORMAT(cct.createTime, '%Y-%m-%d') AS createTime,
+        @row_number:=@row_number + 1 AS rankNo
+        ,a.* FROM (
+        SELECT
+        DATE_FORMAT( cct.createTime, '%Y-%m-%d' ) AS createTime,
         cct.customerNo,
-        so.`name` as createOrgName,
-        st.name as staffName,
-        org.orgName as deptName,
+        so.`name` AS createOrgName,
+        st.NAME AS staffName,
+        org.orgName AS deptName,
         cct.`name`,
         cct.customerType,
         cct.mobile,
         cct.weixin,
         cct.`level`,
-        DATE_FORMAT(cct.remind_day, '%Y-%m-%d') AS remind_day,
-        (SELECT COUNT(*)
-        FROM crm_vehicledemand cv
-        WHERE cct.sid = cv.customerSid
-        AND states = 1) yxcounts,
-        (SELECT COUNT(*)
-        FROM crm_visit cvi
-        WHERE cct.sid = cvi.customerSid) gjcounts
-        FROM crm_customer_temp cct
+        cct.customerTypeKey,
+        cct.createOrgSid,
+        so.orgSidPath,
+        cct.levelKey,
+        DATE_FORMAT( cct.remind_day, '%Y-%m-%d' ) AS remind_day,
+        ( SELECT COUNT(*) FROM crm_vehicledemand cv WHERE cct.sid = cv.customerSid AND states = 1 ) yxcounts,
+        ( SELECT COUNT(*) FROM crm_visit cvi WHERE cct.sid = cvi.customerSid ) gjcounts
+        FROM
+        crm_customer_temp cct
         LEFT JOIN anrui_portal.sys_organization so ON cct.createOrgSid = so.sid
         LEFT JOIN anrui_portal.sys_staffinfo st ON cct.staffSid = st.sid
-        LEFT JOIN anrui_portal.sys_staff_org as org ON org.staffSid = st.sid
+        LEFT JOIN anrui_portal.sys_staff_org AS org ON org.staffSid = st.sid
+        ) as a,(SELECT @row_number:=0) AS t
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index 7f91760202..16ca1f80b9 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -1256,37 +1256,37 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         String orgLevelKey = data.getOrgLevelKey();
         if ("2".equals(orgLevelKey)) {
             orgSidPath = orgSidPath.substring(0, 73);
-            qw.like("so.orgSidPath", orgSidPath);
+            qw.like("a.orgSidPath", orgSidPath);
         } else if ("3".equals(orgLevelKey)) {
-            qw.eq("cct.createOrgSid", orgSid);
+            qw.eq("a.createOrgSid", orgSid);
         }
         if (StringUtils.isNotBlank(query.getCustomerTypeKey())) {
-            qw.eq("cct.customerTypeKey", query.getCustomerTypeKey());
+            qw.eq("a.customerTypeKey", query.getCustomerTypeKey());
         }
 
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.like("cct.name", query.getName());
+            qw.like("a.name", query.getName());
         }
 
         if (StringUtils.isNotBlank(query.getLevelKey())) {
-            qw.eq("cct.levelKey", query.getLevelKey());
+            qw.eq("a.levelKey", query.getLevelKey());
         }
 
         if (StringUtils.isNotBlank(query.getMobile())) {
-            qw.like("cct.mobile", query.getMobile());
+            qw.like("a.mobile", query.getMobile());
         }
         if (StringUtils.isNotBlank(query.getStaffName())) {
-            qw.like("st.name", query.getStaffName());
+            qw.like("a.name", query.getStaffName());
         }
         String remindStartDay = query.getRemindStartDay();
         String remindEndDay = query.getRemindEndDay();
-        qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (cct.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(remindEndDay), "date_format (cct.remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (a.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(remindEndDay), "date_format (a.remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')"
                 );
         String createStartDate = query.getCreateStartDate();
         String createEndDate = query.getCreateEndDate();
-        qw.apply(StringUtils.isNotBlank(createStartDate), "date_format (cct.createTime,'%Y-%m-%d') >= date_format('" + createStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(createEndDate), "date_format (cct.createTime,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotBlank(createStartDate), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + createStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndDate), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')"
                 );
         List<CrmCustomerTempExportVo> records = baseMapper.exportExcel(qw);
 //        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageFeign.java
index 083c00c039..fe978d4382 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageFeign.java
@@ -51,7 +51,7 @@ public interface LoanRelieveMortgageFeign {
     @ResponseBody
     public ResultBean<LoanRelieveMortgageTransferVo> transferInit(@RequestParam("sid") String sid);
 
-    @ApiOperation("办理操作")
+    @ApiOperation("移交操作")
     @PostMapping("/mortgageTransfer")
     @ResponseBody
     public ResultBean mortgageTransfer(@RequestBody LoanRelieveMortgageTransferDto dto);
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageService.java
index cb7f3692cb..bec37f115d 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageService.java
@@ -75,37 +75,37 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo
         privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
         privilegeQuery.setUserSid(pagerQuery.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-            String orgSidPath = pagerQuery.getOrgPath();
-            orgSidPath = orgSidPath + "/";
-            int i1 = orgSidPath.indexOf("/");
-            int i2 = orgSidPath.indexOf("/", i1 + 1);
-            int i3 = orgSidPath.indexOf("/", i2 + 1);
-            int i4 = orgSidPath.indexOf("/", i3 + 1);
-            String orgLevelKey = defaultIdReltBean.getData();
-            if ("1".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("orgSidPath", orgSidPath);
-            } else if ("2".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("orgSidPath", orgSidPath);
-            } else if ("3".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("orgSidPath", orgSidPath);
-            } else if ("4".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("orgSidPath", orgSidPath);
-            } else if ("5".equals(orgLevelKey)) {
-                qw.eq("createBySid", pagerQuery.getUserSid());
-            } else {
-                PagerVo<LoanRelieveMortgageVo> p = new PagerVo<>();
-                return p;
-            }
-        } else {
-            PagerVo<LoanRelieveMortgageVo> p = new PagerVo<>();
-            return p;
-        }
+//        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+//            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+//            String orgSidPath = pagerQuery.getOrgPath();
+//            orgSidPath = orgSidPath + "/";
+//            int i1 = orgSidPath.indexOf("/");
+//            int i2 = orgSidPath.indexOf("/", i1 + 1);
+//            int i3 = orgSidPath.indexOf("/", i2 + 1);
+//            int i4 = orgSidPath.indexOf("/", i3 + 1);
+//            String orgLevelKey = defaultIdReltBean.getData();
+//            if ("1".equals(orgLevelKey)) {
+//                orgSidPath = orgSidPath.substring(0, i1);
+//                qw.like("orgSidPath", orgSidPath);
+//            } else if ("2".equals(orgLevelKey)) {
+//                orgSidPath = orgSidPath.substring(0, i2);
+//                qw.like("orgSidPath", orgSidPath);
+//            } else if ("3".equals(orgLevelKey)) {
+//                orgSidPath = orgSidPath.substring(0, i3);
+//                qw.like("orgSidPath", orgSidPath);
+//            } else if ("4".equals(orgLevelKey)) {
+//                orgSidPath = orgSidPath.substring(0, i4);
+//                qw.like("orgSidPath", orgSidPath);
+//            } else if ("5".equals(orgLevelKey)) {
+//                qw.eq("createBySid", pagerQuery.getUserSid());
+//            } else {
+//                PagerVo<LoanRelieveMortgageVo> p = new PagerVo<>();
+//                return p;
+//            }
+//        } else {
+//            PagerVo<LoanRelieveMortgageVo> p = new PagerVo<>();
+//            return p;
+//        }
         //=======================
         //移交状态
         if (StringUtils.isNotBlank(pagerQuery.getState())) {
@@ -153,7 +153,7 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo
                 apply(StringUtils.isNotEmpty(endDate), "date_format (transferDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
                 );
 
-        qw.eq("a.isDelete", 0);
+        qw.eq("isDelete", 0);
         qw.orderBy(true, false, "`state`")
                 .orderBy(true, false, "createTime")
         ;
@@ -186,7 +186,7 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo
                     sb.append(trailer.getVinNo()).append("/");
                 }
                 if (sb.length() > 0) {
-                    sb.delete(sb.length(), sb.length() - 1);
+                    sb.delete(sb.length() - 1, sb.length());
                 }
                 vo.setVinNo(sb.toString());
             }
@@ -235,10 +235,11 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo
                     sb.append(s).append(",");
                 });
                 if (sb.length() > 0) {
-                    sb.delete(sb.length(), sb.length() - 1);
+                    sb.delete(sb.length() - 1, sb.length());
                 }
                 entity.setReceiveFiles(sb.toString());
             }
+            entity.setState(2);
             baseMapper.updateById(entity);
             //删除附件表中关于该linkSid的文件
             loanFileService.delByLinkSidOrType(sid, LoanFileEnum.MORTGAGE_NOTICES.getAttachType());
@@ -291,7 +292,7 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo
                     sb.append(trailer.getVinNo()).append("/");
                 }
                 if (sb.length() > 0) {
-                    sb.delete(sb.length(), sb.length() - 1);
+                    sb.delete(sb.length() - 1, sb.length());
                 }
                 vo.setVinNo(sb.toString());
             }