客户信息导出优化、解抵管理优化2

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java

@@ -10,8 +10,8 @@ import lombok.Data;
  */
 @Data
 public class CrmCustomerTempExportVo {
-//    private String staffSid;
-//    private String createOrgSid;
+    private String staffSid;
+    private String createOrgSid;
     @ExportEntityMap(CnName = "序号", EnName = "rankNo")
     private Integer rankNo;
     @ExportEntityMap(CnName = "创建日期", EnName = "createTime")

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -258,9 +258,10 @@
         cct.customerNo,
         so.`name` AS createOrgName,
         st.NAME AS staffName,
-        org.orgName AS deptName,
+        cct.staffSid,
         cct.`name`,
         cct.customerType,
+--         org.orgName AS deptName,
         cct.mobile,
         cct.weixin,
         cct.`level`,
@@ -275,7 +276,7 @@
         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 and so.psid = org.orgSid
         ) as a,(SELECT @row_number:=0) AS t
         <where>
             ${ew.sqlSegment}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -62,6 +62,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.function.Predicate;
 
 /**
  * Project: anrui-crm(客户管理) <br/>
@@ -1276,7 +1277,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             qw.like("a.mobile", query.getMobile());
         }
         if (StringUtils.isNotBlank(query.getStaffName())) {
-            qw.like("a.name", query.getStaffName());
+            qw.like("a.staffName", query.getStaffName());
         }
         String remindStartDay = query.getRemindStartDay();
         String remindEndDay = query.getRemindEndDay();
@@ -1289,33 +1290,21 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                 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");
-//        int id = 1;
-//        if (!records.isEmpty()) {
-//            for (CrmCustomerTempExportVo record : records) {
-//                try {
-//                    Date date = sdf.parse(record.getCreateTime());
-//                    record.setCreateTime(sdf.format(date));
-//                } catch (ParseException e) {
-//                    e.printStackTrace();
-//                }
-//                String createOrgSid = record.getCreateOrgSid();
-//                String staffSid = record.getStaffSid();
-//                String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
-//                record.setCreateOrgName(createOrgName);
-//                List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
-//                for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
-//                    SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData();
-//                    String psid = sysOrganizationVo.getPsid();
-//                    if (psid.equals(createOrgSid)) {
-//                        String orgName = sysStaffOrgVo.getOrgName();
-//                        record.setDeptName(orgName);
-//                    }
-//                }
-//                record.setRankNo(id);
-//                id = id + 1;
-//            }
-//        }
+        if (!records.isEmpty()) {
+            records.stream().forEach(r -> {
+                String createOrgSid = r.getCreateOrgSid();
+                String staffSid = r.getStaffSid();
+                List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
+                sysStaffOrgVos.stream().forEach(s -> {
+                    SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(s.getOrgSid()).getData();
+                    String psid = sysOrganizationVo.getPsid();
+                    if (psid.equals(createOrgSid)) {
+                        String orgName = s.getOrgName();
+                        r.setDeptName(orgName);
+                    }
+                });
+            });
+        }
         return records;
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageService.java

@@ -75,42 +75,46 @@ 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())) {
             qw.like("`state`", pagerQuery.getState());
         }
+        //销售专员
+        if (StringUtils.isNotBlank(pagerQuery.getSalesman())) {
+            qw.like("salesman", pagerQuery.getSalesman());
+        }
         //分公司
         if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) {
             qw.like("useOrgName", pagerQuery.getUseOrgName());