取消同步老系统大中型订单

biz-base/src/main/java/com/dayou/controller/FinanceClaimController.java

@@ -4,10 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dayou.annotation.IgnoreAuth;
 import com.dayou.dto.RealFundAssetsStatDTO;
 import com.dayou.exception.ErrorCode;
-import com.dayou.vo.AssetsRepertoryVo;
-import com.dayou.vo.FinanceClaimVO;
-import com.dayou.vo.RealFundAssetsStatVO;
-import com.dayou.vo.RealFundMajorStatVO;
+import com.dayou.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -169,5 +166,23 @@ public class FinanceClaimController extends BaseController {
             exportPlus(response, "资产实收款统计_" + dateFormat.format(new Date()),list, RealFundAssetsStatVO.class);
         }
     }
+
+    /**
+     * 个贷实收款统计列表
+     */
+    @GetMapping("/personal/stat")
+    public RestResponse<Page<RealFundPersonalVO>> personalStat(RealFundPersonalVO personalVO, Page page){
+        Page<RealFundPersonalVO> pages=financeClaimService.personalStat(page,personalVO);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 个贷实收款统计列表导出
+     */
+    @GetMapping("/personal/stat/export")
+    public void personalStatExport(RealFundPersonalVO personalVO, HttpServletResponse response) throws IOException {
+        List<RealFundPersonalVO> list = financeClaimService.personalStatExport(personalVO);
+        exportPlus(response, "个贷实收款统计", list, RealFundPersonalVO.class);
+    }
 }
 

biz-base/src/main/java/com/dayou/controller/HistoryOrderController.java

@@ -49,16 +49,16 @@ public class HistoryOrderController {
         return RestResponse.data(pages);
     }
 
-    /**
-     * 同步大中型订单
-     * @param id
-     * @return
-     */
-    @GetMapping("/fetch/major/{id}")
-    public RestResponse<Boolean> fetchAboutMajor(@PathVariable("id") String id){
-        Boolean ret = dyoaHistoryService.fetchAboutMajor(id);
-        return RestResponse.data(ret);
-    }
+//    /**
+//     * 同步大中型订单
+//     * @param id
+//     * @return
+//     */
+//    @GetMapping("/fetch/major/{id}")
+//    public RestResponse<Boolean> fetchAboutMajor(@PathVariable("id") String id){
+//        Boolean ret = dyoaHistoryService.fetchAboutMajor(id);
+//        return RestResponse.data(ret);
+//    }
 
     /**
      * 获取老系统资产订单

biz-base/src/main/resources/application-local.yml

@@ -3,48 +3,28 @@ server:
 
 spring:
   datasource:
-    dynamic:
-      primary: mbs
-      datasource:
-        mbs:
-          url: jdbc:mysql://localhost:3306/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          username: root
-          password: 914851221
-          initialSize: 10 #初始化连接数D
-          minIdle: 10 #最小空闲连接数
-          max-active: 100 #最大连接数
-          maxWait: 60000 #最大等待时间ms(获取不到连接后多久超时)
-          hikari:
-            minimum-idle: 5
-            maximum-pool-size: 200
-            connection-timeout: 30000
-            idle-timeout: 600000
-            max-lifetime: 1800000
-        dyoa:
-          url: jdbc:mysql://localhost:3306/dyoa?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          username: root
-          password: 914851221
-          initialSize: 10 #初始化连接数D
-          minIdle: 10 #最小空闲连接数
-          max-active: 100 #最大连接数
-          maxWait: 60000 #最大等待时间ms(获取不到连接后多久超时)
-          hikari:
-            minimum-idle: 5
-            maximum-pool-size: 200
-            connection-timeout: 30000
-            idle-timeout: 600000
-            max-lifetime: 1800000
+    url: jdbc:mysql://localhost:3306/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    username: root
+    password: 914851221
+    initialSize: 10 #初始化连接数
+    minIdle: 10 #最小空闲连接数
+    max-active: 100 #最大连接数
+    maxWait: 60000 #最大等待时间ms(获取不到连接后多久超时)
+    hikari:
+      minimum-idle: 5
+      maximum-pool-size: 200
+      connection-timeout: 30000
+      idle-timeout: 600000
+      max-lifetime: 1800000
 
 
 dfs:
-  path: E:\upload
-  domain: E:\upload
+  path: /Users/wuwei/opt
+  domain: /dfs
   domainName: https://kps.scdayou.com/dfs
-  code: \code
-  domainRoot: localhost
-  luceneDir: E:\luceneIndex
+  code: /code
+  domainRoot: https://kps.scdayou.com/admin
+  luceneDir: /Users/wuwei/luceneDir
 
 advice:
   file:

biz-base/src/test/java/TestAssets.java

@@ -1,38 +1,38 @@
-import java.lang.reflect.Field;
-
-public class TestAssets {
-
-    public static Object getFieldValueByName(Object obj, String fieldName) {
-        Object fieldValue = null;
-        try {
-            // 获取对象的Class对象
-            Class<?> clazz = obj.getClass();
-            // 通过反射获取指定名称的字段
-            Field field = clazz.getDeclaredField(fieldName);
-            // 设置字段可访问，以便能够访问私有字段
-            field.setAccessible(true);
-            // 获取字段值
-            fieldValue = field.get(obj);
-        } catch (NoSuchFieldException e) {
-            System.out.println("字段 " + fieldName + " 在类 " + obj.getClass().getName() + " 中不存在.");
-        } catch (IllegalAccessException e) {
-            System.out.println("无法访问字段 " + fieldName + " 的值.");
-        }
-        return fieldValue;
-    }
-
-
-
-    public static void main(String[] args) {
-        Object person = new Object() {
-            private String name = "John Doe";
-            private int age = 30;
-        };
-
-        Object nameValue = getFieldValueByName(person, "name");
-        Object ageValue = getFieldValueByName(person, "age");
-
-        System.out.println("name = " + nameValue);
-        System.out.println("age = " + ageValue);
-    }
-}
+//import java.lang.reflect.Field;
+//
+//public class TestAssets {
+//
+//    public static Object getFieldValueByName(Object obj, String fieldName) {
+//        Object fieldValue = null;
+//        try {
+//            // 获取对象的Class对象
+//            Class<?> clazz = obj.getClass();
+//            // 通过反射获取指定名称的字段
+//            Field field = clazz.getDeclaredField(fieldName);
+//            // 设置字段可访问，以便能够访问私有字段
+//            field.setAccessible(true);
+//            // 获取字段值
+//            fieldValue = field.get(obj);
+//        } catch (NoSuchFieldException e) {
+//            System.out.println("字段 " + fieldName + " 在类 " + obj.getClass().getName() + " 中不存在.");
+//        } catch (IllegalAccessException e) {
+//            System.out.println("无法访问字段 " + fieldName + " 的值.");
+//        }
+//        return fieldValue;
+//    }
+//
+//
+//
+//    public static void main(String[] args) {
+//        Object person = new Object() {
+//            private String name = "John Doe";
+//            private int age = 30;
+//        };
+//
+//        Object nameValue = getFieldValueByName(person, "name");
+//        Object ageValue = getFieldValueByName(person, "age");
+//
+//        System.out.println("name = " + nameValue);
+//        System.out.println("age = " + ageValue);
+//    }
+//}

biz-base/src/test/java/dyoa/DyoaHistoryDataTest.java

@@ -1,31 +1,31 @@
-package dyoa;
-
-import com.dayou.BaseApplication;
-import com.dayou.dyoa.IDyoaHistoryService;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.Map;
-
-@Slf4j
-@SpringBootTest(classes = BaseApplication.class)
-@RunWith(value = SpringJUnit4ClassRunner.class)
-public class DyoaHistoryDataTest {
-
-    @Autowired
-    private IDyoaHistoryService dyoaHistoryService;
-
-    @Test
-    public void getMajorOrder(){
-        Map<String, Object> resultMap = dyoaHistoryService.queryMajorOrder("597848672822104064");
-        for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
-           log.info(entry.getKey() + "=" + entry.getValue());
-        }
-    }
-
-
-}
+//package dyoa;
+//
+//import com.dayou.BaseApplication;
+//import com.dayou.dyoa.IDyoaHistoryService;
+//import lombok.extern.slf4j.Slf4j;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//
+//import java.util.Map;
+//
+//@Slf4j
+//@SpringBootTest(classes = BaseApplication.class)
+//@RunWith(value = SpringJUnit4ClassRunner.class)
+//public class DyoaHistoryDataTest {
+//
+//    @Autowired
+//    private IDyoaHistoryService dyoaHistoryService;
+//
+//    @Test
+//    public void getMajorOrder(){
+//        Map<String, Object> resultMap = dyoaHistoryService.queryMajorOrder("597848672822104064");
+//        for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
+//           log.info(entry.getKey() + "=" + entry.getValue());
+//        }
+//    }
+//
+//
+//}

biz-base/src/test/java/history/SyncHistoryTest.java

@@ -1,118 +1,118 @@
-package history;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONException;
-import com.alibaba.fastjson.JSONObject;
-import com.dayou.BaseApplication;
-import com.dayou.dto.history.HisMajorOrder;
-import com.dayou.dyoa.IDyoaHistoryService;
-import com.dayou.utils.HttpKit;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 类说明：
- *
- * @author: wucl
- * @since: 2024/5/7
- * created with IntelliJ IDEA.
- */
-@Slf4j
-@SpringBootTest(classes = BaseApplication.class)
-@RunWith(value = SpringJUnit4ClassRunner.class)
-public class SyncHistoryTest {
-
-    private static final String HISTORY_MAJOR_ORDER_URL = "http://noa.scdayou.com/dyoa/order/pageQuery";
-
-    private static final String HISTORY_LOGIN_URL = "http://noa.scdayou.com/login";
-
-    private static String COOKIE ;
-
-    @Autowired
-    private IDyoaHistoryService dyoaHistoryService;
-
-
-    public static void main(String[] args) {
-        COOKIE = historySystemLogin();
-        syncMajorOrderTest();
+//package history;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONArray;
+//import com.alibaba.fastjson.JSONException;
+//import com.alibaba.fastjson.JSONObject;
+//import com.dayou.BaseApplication;
+//import com.dayou.dto.history.HisMajorOrder;
+//import com.dayou.dyoa.IDyoaHistoryService;
+//import com.dayou.utils.HttpKit;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.http.HttpEntity;
+//import org.apache.http.HttpResponse;
+//import org.apache.http.client.HttpClient;
+//import org.apache.http.client.methods.HttpGet;
+//import org.apache.http.client.methods.HttpPost;
+//import org.apache.http.impl.client.DefaultHttpClient;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//
+//import java.io.BufferedReader;
+//import java.io.IOException;
+//import java.io.InputStreamReader;
+//import java.io.PrintWriter;
+//import java.net.HttpURLConnection;
+//import java.net.URL;
+//import java.net.URLConnection;
+//import java.util.Arrays;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.regex.Matcher;
+//import java.util.regex.Pattern;
+//
+///**
+// * 类说明：
+// *
+// * @author: wucl
+// * @since: 2024/5/7
+// * created with IntelliJ IDEA.
+// */
+//@Slf4j
+//@SpringBootTest(classes = BaseApplication.class)
+//@RunWith(value = SpringJUnit4ClassRunner.class)
+//public class SyncHistoryTest {
+//
+//    private static final String HISTORY_MAJOR_ORDER_URL = "http://noa.scdayou.com/dyoa/order/pageQuery";
+//
+//    private static final String HISTORY_LOGIN_URL = "http://noa.scdayou.com/login";
+//
+//    private static String COOKIE ;
+//
+//    @Autowired
+//    private IDyoaHistoryService dyoaHistoryService;
+//
+//
+//    public static void main(String[] args) {
+//        COOKIE = historySystemLogin();
+//        syncMajorOrderTest();
+////        try {
+////            JSONObject jsonObject = JSON.parseObject("<!DOCTYPE html>\n" +"<html>");
+////        } catch (JSONException e) {
+////            log.error("JSONException");
+////        }
+//    }
+//
+//    public static void syncMajorOrderTest(){
+//        Map<String,Object> params = new HashMap<>();
+//        params.put("limit","15");
+//        params.put("orderBy","-createdDatetime");
+//        params.put("start","0");
+//        String respond = HttpKit.sendPost(HISTORY_MAJOR_ORDER_URL, params,COOKIE);
+//        JSONObject jsonObject = JSON.parseObject(respond);
+//        JSONObject data = jsonObject.getJSONObject("data");
+//        JSONArray data1 = data.getJSONArray("data");
+//        List<HisMajorOrder> hisMajorOrders = data1.toJavaList(HisMajorOrder.class);
+//        log.info(hisMajorOrders.toString());
+//    }
+//
+//    public static String historySystemLogin(){
+//
 //        try {
-//            JSONObject jsonObject = JSON.parseObject("<!DOCTYPE html>\n" +"<html>");
-//        } catch (JSONException e) {
-//            log.error("JSONException");
+//            // 创建HttpClient对象
+//            HttpClient httpClient = new DefaultHttpClient();
+//
+//            // 创建HttpGet请求对象
+//            HttpPost httpPost = new HttpPost(HISTORY_LOGIN_URL+"?loginName=admin&password=ABC666000");
+//
+//            // 发送请求并获取响应
+//            HttpResponse response = httpClient.execute(httpPost);
+//
+//            // 获取cookie
+//            String cookies = Arrays.toString(response.getHeaders("Set-Cookie"));
+//            if (cookies != null) {
+//                String pattern = "(JSESSIONID)(.*?)( )";
+//                Pattern r = Pattern.compile(pattern);
+//                // 创建 matcher 对象
+//                Matcher m = r.matcher(cookies);
+//                if (m.find()) {
+//                    return m.group(0);
+//                }
+//            }
+//            // 关闭连接
+//            httpClient.getConnectionManager().shutdown();
+//        } catch (Exception e) {
+//            e.printStackTrace();
 //        }
-    }
-
-    public static void syncMajorOrderTest(){
-        Map<String,Object> params = new HashMap<>();
-        params.put("limit","15");
-        params.put("orderBy","-createdDatetime");
-        params.put("start","0");
-        String respond = HttpKit.sendPost(HISTORY_MAJOR_ORDER_URL, params,COOKIE);
-        JSONObject jsonObject = JSON.parseObject(respond);
-        JSONObject data = jsonObject.getJSONObject("data");
-        JSONArray data1 = data.getJSONArray("data");
-        List<HisMajorOrder> hisMajorOrders = data1.toJavaList(HisMajorOrder.class);
-        log.info(hisMajorOrders.toString());
-    }
-
-    public static String historySystemLogin(){
-
-        try {
-            // 创建HttpClient对象
-            HttpClient httpClient = new DefaultHttpClient();
-
-            // 创建HttpGet请求对象
-            HttpPost httpPost = new HttpPost(HISTORY_LOGIN_URL+"?loginName=admin&password=ABC666000");
-
-            // 发送请求并获取响应
-            HttpResponse response = httpClient.execute(httpPost);
-
-            // 获取cookie
-            String cookies = Arrays.toString(response.getHeaders("Set-Cookie"));
-            if (cookies != null) {
-                String pattern = "(JSESSIONID)(.*?)( )";
-                Pattern r = Pattern.compile(pattern);
-                // 创建 matcher 对象
-                Matcher m = r.matcher(cookies);
-                if (m.find()) {
-                    return m.group(0);
-                }
-            }
-            // 关闭连接
-            httpClient.getConnectionManager().shutdown();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    @Test
-    public void getLandTargetMajorTest() throws NoSuchFieldException, IllegalAccessException {
-       // dyoaHistoryService.doCreateMajorTarget("房地产","1331400911615954944",78L);
-    }
-}
+//        return null;
+//    }
+//
+//    @Test
+//    public void getLandTargetMajorTest() throws NoSuchFieldException, IllegalAccessException {
+//       // dyoaHistoryService.doCreateMajorTarget("房地产","1331400911615954944",78L);
+//    }
+//}

dao/src/main/java/com/dayou/mapper/FinanceClaimMapper.java

@@ -7,6 +7,7 @@ import com.dayou.dao.CustomBaseMapper;
 import com.dayou.vo.FinanceClaimVO;
 import com.dayou.vo.RealFundAssetsStatVO;
 import com.dayou.vo.RealFundMajorStatVO;
+import com.dayou.vo.RealFundPersonalVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -46,4 +47,8 @@ public interface FinanceClaimMapper extends CustomBaseMapper<FinanceClaim> {
      * @return Page<RealFundAssetsStatVO>
      */
     List<RealFundAssetsStatVO> assetsSateExport(@Param("dto") RealFundAssetsStatDTO dto);
+
+    Page<RealFundPersonalVO> personalStat(Page page, @Param("dto")RealFundPersonalVO personalVO);
+
+    List<RealFundPersonalVO> personalStatExport(@Param("dto") RealFundPersonalVO personalVO);
 }

dao/src/main/resources/mapper/FinanceClaimMapper.xml

@@ -259,4 +259,80 @@
         <include refid="assetsStatQuery" />
     </select>
 
+
+    <sql id="personalStatSql">
+        SELECT
+            fc.*,
+            f.should_amount,
+            p.order_id,
+            p.location,
+            u.NAME AS clientManager,
+            cc1.NAME AS clientName,
+            cc2.NAME AS clientSubName,
+            frf.pay_datetime,
+            u2.NAME AS claimUser,
+            p.bailorA,
+            ( pt.amount / 10000 ) AS amount,
+            p.if_save_file,
+            (
+                SELECT
+                    GROUP_CONCAT( NAME SEPARATOR '、' )
+                FROM
+                    department
+                WHERE
+                    id IN (
+                        SELECT
+                            department_id
+                        FROM
+                            post
+                        WHERE
+                            id IN ( SELECT post_id FROM user_post WHERE user_id = u.id ))) AS marketDepartment
+        FROM
+            (
+                SELECT
+                    orderFund.id AS oId,
+                    orderFund.business_id,
+                    orderFund.order_id,
+                    orderFund.should_amount
+                FROM
+                    order_fund orderFund
+                WHERE
+                    orderFund.business_type = 'PERSONAL_BUSINESS'
+                  AND orderFund.deleted = 0
+            ) f
+                INNER JOIN finance_claim fc ON fc.order_fund_id = f.oId
+                LEFT JOIN personal p ON f.business_id = p.id
+                LEFT JOIN USER u ON u.id = p.client_manager_id
+                LEFT JOIN customer_company cc1 ON cc1.id = p.clientele_id
+                LEFT JOIN customer_company cc2 ON cc2.id = p.clientele_sub_id
+                LEFT JOIN finance_real_fund frf ON frf.id = fc.real_fund_id
+                LEFT JOIN USER u2 ON u2.id = fc.claim_user_id
+                LEFT JOIN personal_target pt ON pt.personal_id = p.id
+        WHERE
+            p.deleted = 0
+        <if test="dto != null and dto.orderId != null and dto.orderId != ''">
+            AND p.order_id = #{dto.orderId}
+        </if>
+        <if test="dto != null and dto.claimUser != null and dto.claimUser != ''">
+            AND u2.NAME like concat ('%',#{dto.claimUser},'%')
+        </if>
+        <if test="dto != null and dto.claimAmount != null and dto.claimAmount != ''">
+            AND fc.claim_amount = #{dto.claimAmount}
+        </if>
+        <if test="dto != null and dto.ifSaveFile != null">
+            AND p.if_save_file = #{dto.ifSaveFile}
+        </if>
+        <if test="dto != null and dto.startTime != null and dto.endTime!= null">
+            AND (fc.claim_datetime BETWEEN #{dto.startTime} AND #{dto.endTime})
+        </if>
+        ORDER BY
+            fc.claim_datetime DESC
+    </sql>
+    <select id="personalStat" parameterType="com.dayou.vo.RealFundPersonalVO" resultType="com.dayou.vo.RealFundPersonalVO">
+        <include refid="personalStatSql" />
+    </select>
+
+    <select id="personalStatExport" parameterType="com.dayou.vo.RealFundPersonalVO" resultType="com.dayou.vo.RealFundPersonalVO">
+        <include refid="personalStatSql" />
+    </select>
 </mapper>

dao/src/main/resources/mapper/FinanceRealFundMapper.xml

@@ -825,10 +825,10 @@
         LEFT JOIN customer_company cc1 ON cc1.id = p.clientele_id
         LEFT JOIN customer_company cc2 ON cc2.id = p.clientele_sub_id
         LEFT JOIN customer_linkman cl1 ON cl1.id = p.clientele_contact_id
-        LEFT JOIN USER u ON u.id = p.client_manager_id
-        LEFT JOIN USER u1 ON u1.id = p.outward_staff
-        LEFT JOIN USER u2 ON u2.id = p.inward_staff
-        LEFT JOIN USER u3 ON u3.id = p.pricing_staff
+        LEFT JOIN `user` u ON u.id = p.client_manager_id
+        LEFT JOIN `user` u1 ON u1.id = p.outward_staff
+        LEFT JOIN `user` u2 ON u2.id = p.inward_staff
+        LEFT JOIN `user` u3 ON u3.id = p.pricing_staff
         WHERE
         DATEDIFF(
         CURDATE(),

domain/src/main/java/com/dayou/vo/RealFundPersonalVO.java

@@ -0,0 +1,68 @@
+package com.dayou.vo;
+
+
+import com.dayou.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+@Data
+public class RealFundPersonalVO {
+
+    private Long id;
+
+    @Excel(name = "归档状况",readConverterExp="true=已归档,false=未归档")
+    private Boolean ifSaveFile;
+
+    @Excel(name = "项目编号")
+    private String orderId;
+
+    @Excel(name = "项目名称")
+    private String location;
+
+    @Excel(name = "所属部门")
+    private String marketDepartment;
+
+    @Excel(name = "客户经理")
+    private String clientManager;
+
+    @Excel(name = "入账日期")
+    private LocalDate payDatetime;
+
+    @Excel(name = "认领日期")
+    private LocalDate claimDatetime;
+
+    @Excel(name = "实收款金额")
+    private BigDecimal claimAmount;
+
+    @Excel(name = "认领人")
+    private String claimUser;
+
+    @Excel(name = "客户名称")
+    private String clientName;
+
+    @Excel(name = "业务来源")
+    private String clientSubName;
+
+    @Excel(name = "委托人")
+    private String bailorA;
+
+    @Excel(name = "评估价值(万)")
+    private BigDecimal amount;
+
+    /**
+     * 筛选开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
+
+    /**
+     * 筛选结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
+
+}

service/pom.xml

@@ -108,10 +108,10 @@
             <version>8.0.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
 
     </dependencies>
     <build>

service/src/main/java/com/dayou/dyoa/IDyoaHistoryService.java

@@ -15,9 +15,9 @@ public interface IDyoaHistoryService {
 
     String getEverCookie();
 
-    Map<String,Object> queryMajorOrder(String majorId);
-
-    Boolean fetchAboutMajor(String id);
+//    Map<String,Object> queryMajorOrder(String majorId);
+//
+//    Boolean fetchAboutMajor(String id);
 
     /**
      * 获取老系统资产订单

service/src/main/java/com/dayou/service/IFinanceClaimService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.vo.FinanceClaimVO;
 import com.dayou.vo.RealFundAssetsStatVO;
 import com.dayou.vo.RealFundMajorStatVO;
+import com.dayou.vo.RealFundPersonalVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
@@ -77,4 +78,8 @@ public interface IFinanceClaimService extends IService<FinanceClaim> {
      * @return Page<RealFundAssetsStatVO>
      */
     List<RealFundAssetsStatVO> assetsSateExport(RealFundAssetsStatDTO dto);
+
+    Page<RealFundPersonalVO> personalStat(Page page, RealFundPersonalVO personalVO);
+
+    List<RealFundPersonalVO> personalStatExport(RealFundPersonalVO personalVO);
 }

service/src/main/java/com/dayou/service/impl/DepartmentServiceImpl.java

@@ -1,6 +1,5 @@
 package com.dayou.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dayou.common.BaseEntity;
@@ -39,7 +38,6 @@ import com.dayou.enums.BatchTaskTypeEnum;
  * @author wucl
  * @since 2022-11-29
  */
-@DS("mbs")
 @Service
 public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements IDepartmentService {
 

service/src/main/java/com/dayou/service/impl/DyoaRecordServiceImpl.java

@@ -1,6 +1,5 @@
 package com.dayou.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dayou.entity.DyoaRecord;
 import com.dayou.enums.MainBusinessEnum;
@@ -22,7 +21,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  * @author wucl
  * @since 2024-07-25
  */
-@DS("mbs")
 @Service
 public class DyoaRecordServiceImpl extends ServiceImpl<DyoaRecordMapper, DyoaRecord> implements IDyoaRecordService {
 

service/src/main/java/com/dayou/service/impl/FinanceClaimServiceImpl.java

@@ -22,6 +22,7 @@ import com.dayou.utils.LoginContext;
 import com.dayou.vo.FinanceClaimVO;
 import com.dayou.vo.RealFundAssetsStatVO;
 import com.dayou.vo.RealFundMajorStatVO;
+import com.dayou.vo.RealFundPersonalVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -203,6 +205,16 @@ public class FinanceClaimServiceImpl extends ServiceImpl<FinanceClaimMapper, Fin
         return financeClaimMapper.assetsSateExport(dto);
     }
 
+    @Override
+    public Page<RealFundPersonalVO> personalStat(Page page, RealFundPersonalVO personalVO) {
+        return financeClaimMapper.personalStat(page,personalVO);
+    }
+
+    @Override
+    public List<RealFundPersonalVO> personalStatExport(RealFundPersonalVO personalVO) {
+        return financeClaimMapper.personalStatExport(personalVO);
+    }
+
 
     @Override
     public synchronized BigDecimal checkFinanceFound(Long financeFundId) {

service/src/main/java/com/dayou/service/impl/MajorProductionServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.common.BaseEntity;
@@ -46,7 +45,6 @@ import static com.dayou.message.MessageTypeEnum.*;
  * @author wucl
  * @since 2023-11-06
  */
-@DS("mbs")
 @Slf4j
 @Service
 public class MajorProductionServiceImpl extends ServiceImpl<MajorProductionMapper, MajorProduction> implements IMajorProductionService {

service/src/main/java/com/dayou/service/impl/MajorServiceImpl.java

@@ -3,7 +3,6 @@ package com.dayou.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dayou.common.BaseEntity;
 import com.dayou.dto.*;
@@ -43,7 +42,6 @@ import static com.dayou.common.Constants.BY_TURNS;
  * @author wucl
  * @since 2023-10-30
  */
-@DS("mbs")
 @Service
 public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements IMajorService {
 

service/src/main/java/com/dayou/service/impl/MajorTargetServiceImpl.java

@@ -2,7 +2,6 @@ package com.dayou.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.dayou.common.BaseEntity;
 import com.dayou.dto.TakeNumberDTO;
@@ -34,7 +33,6 @@ import java.util.stream.Collectors;
  * @author wucl
  * @since 2023-11-03
  */
-@DS("mbs")
 @Service
 public class MajorTargetServiceImpl extends ServiceImpl<MajorTargetMapper, MajorTarget> implements IMajorTargetService {
 

service/src/main/java/com/dayou/service/impl/UserServiceImpl.java

@@ -2,7 +2,6 @@ package com.dayou.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -66,7 +65,6 @@ import static com.dayou.exception.ErrorCode.*;
  * @author wucl
  * @since 2022-11-29
  */
-@DS("mbs")
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
 

service/src/main/java/com/dayou/service/workflow/WorkFlowNodeInstanceServiceImpl.java

@@ -2,7 +2,6 @@ package com.dayou.service.workflow;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dayou.common.BaseEntity;
 import com.dayou.common.FixedWorkNode;
@@ -41,7 +40,6 @@ import static com.dayou.enums.workflow.WorkflowNodeEnum.*;
  * @author wucl
  * @since 2023-10-17
  */
-@DS("mbs")
 @Service
 public class WorkFlowNodeInstanceServiceImpl extends ServiceImpl<WorkFlowNodeInstanceMapper, WorkFlowNodeInstance> implements IWorkFlowNodeInstanceService {
 

service/src/main/java/com/dayou/service/workflow/WorkFlowServiceImpl.java

@@ -1,18 +1,14 @@
 package com.dayou.service.workflow;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dayou.common.BaseEntity;
-import com.dayou.dto.HandlerPermissionDTO;
 import com.dayou.dto.WorkNodeCommit;
 import com.dayou.dto.WorkNodeDTO;
 import com.dayou.dto.WorkNodeInstanceTaskDTO;
 import com.dayou.entity.WorkFlow;
 import com.dayou.entity.WorkFlowNodeInstance;
 import com.dayou.entity.WorkNodeTask;
-import com.dayou.entity.WorkTaskRecord;
 import com.dayou.enums.MainBusinessEnum;
 import com.dayou.enums.workflow.NodeLogEnum;
 import com.dayou.enums.workflow.NodeStateEnum;
@@ -22,12 +18,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.mapper.WorkTaskRecordMapper;
 import com.dayou.utils.LoginContext;
 import com.dayou.vo.NameCodeVO;
-import com.dayou.vo.WorkTaskRecordVO;
 import com.dayou.workflow.handler.AssetsNodeHandler;
 import com.dayou.workflow.handler.MajorNodeHandler;
 import com.dayou.workflow.config.WorkNodeProcessable;
 import com.dayou.workflow.handler.PersonalNodeHandler;
-import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,7 +42,6 @@ import static com.dayou.enums.workflow.NodeLogEnum.*;
  * @author wucl
  * @since 2023-10-17
  */
-@DS("mbs")
 @Service
 public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> implements IWorkFlowService {
 

service/src/main/java/com/dayou/service/workflow/WorkNodeServiceImpl.java

@@ -2,7 +2,6 @@ package com.dayou.service.workflow;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dayou.common.BaseEntity;
@@ -45,7 +44,6 @@ import static com.dayou.enums.workflow.WorkflowNodeEnum.*;
  * @author wucl
  * @since 2023-10-17
  */
-@DS("mbs")
 @Service
 public class WorkNodeServiceImpl extends ServiceImpl<WorkNodeMapper, WorkNode> implements IWorkNodeService {
 

service/src/main/java/com/dayou/service/workflow/WorkNodeTaskServiceImpl.java

@@ -1,6 +1,5 @@
 package com.dayou.service.workflow;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dayou.common.BaseEntity;
 import com.dayou.entity.WorkNodeTask;
@@ -27,7 +26,6 @@ import java.util.stream.Collectors;
  * @author wucl
  * @since 2023-10-17
  */
-@DS("mbs")
 @Service
 public class WorkNodeTaskServiceImpl extends ServiceImpl<WorkNodeTaskMapper, WorkNodeTask> implements IWorkNodeTaskService {
 

service/src/main/java/com/dayou/service/workflow/WorkTaskRecordServiceImpl.java

@@ -2,7 +2,6 @@ package com.dayou.service.workflow;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.dayou.bo.SimpleParentModel;
 import com.dayou.dto.AssetsSelectDTO;
 import com.dayou.dto.HandlerPermissionDTO;
@@ -32,7 +31,6 @@ import java.util.stream.Collectors;
  * @author wucl
  * @since 2023-10-17
  */
-@DS("mbs")
 @Service
 public class WorkTaskRecordServiceImpl extends ServiceImpl<WorkTaskRecordMapper, WorkTaskRecord> implements IWorkTaskRecordService {
 

sql/update_sql.sql

@@ -578,27 +578,3 @@ ALTER TABLE `personal_production` ADD is_online bit(1) NULL COMMENT '是否是
     未更新到test-env
  */
 ALTER TABLE major MODIFY COLUMN clientele_contact_id bigint(20) NULL;
-
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
-/**
-    日期：2024-07-29
-    修改人:吴长林
-    未更新到test-env
- */
-DROP TABLE IF EXISTS `dyoa_record`;
-CREATE TABLE `dyoa_record` (
-                               `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-                               `mbs_type` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '业务',
-                               `mbs_id` bigint NOT NULL COMMENT 'mbsId',
-                               `dyoa_id` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL COMMENT 'dyoaId',
-                               `user_id` bigint NOT NULL COMMENT '操作人',
-                               `modified` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '修改时间',
-                               `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                               `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '逻辑删除标识:1:删除 0:未删除',
-                               PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='数据同步记录';
-
-SET FOREIGN_KEY_CHECKS = 1;