From 6997b4bbc33092c8421cd6b2715010ff415a9ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BD=AD?= Date: Thu, 19 Sep 2024 21:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E3=80=81=E7=94=A8=E6=88=B7=E6=94=B6=E5=85=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/core/domain/http/Customer.java | 5 +++++ .../java/com/ruoyi/common/core/domain/http/Merchant.java | 4 ++++ .../com/ruoyi/file/service/LocalSysFileServiceImpl.java | 1 + .../src/main/resources/mapper/system/CustomerMapper.xml | 7 ++++++- .../src/main/resources/mapper/system/MerchantMapper.xml | 7 ++++++- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java index 637dc64f..441bbdd8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java @@ -130,4 +130,9 @@ public class Customer extends BaseEntity private Integer zhiMa; + /** 月收入 */ + @Excel(name = "月收入") + private Integer income; + + } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java index 873aa67e..607b7da4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java @@ -82,6 +82,10 @@ public class Merchant extends BaseEntity @Excel(name = "手机号禁入号段英文逗号分隔") private String phoneLimit; + /** 标签 */ + @Excel(name = "标签") + private String label; + /** 无社保 */ @Excel(name = "无社保") private Boolean socialSecurityNo; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index 3247e9bc..150a1deb 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -45,6 +45,7 @@ public class LocalSysFileServiceImpl implements ISysFileService { String name = FileUploadUtils.upload(localFilePath, file); String url = domain + localFilePrefix + name; + return url; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml index 1552efda..2a2af287 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml @@ -30,12 +30,13 @@ + - select id, channel_id, age, sex, name, acturl_name, phone, phone_md5, is_auth, city, city_code, first_login_time, last_login_time, last_login_ip, status, social_security, car, guarantee_slip, education, accumulation_fund, hourse, career, hua_bei, bai_tiao, zhi_ma, create_time, update_time from customer + select id, channel_id, age, sex, name, acturl_name, phone, phone_md5, is_auth, city, city_code, first_login_time, last_login_time, last_login_ip, status, social_security, car, guarantee_slip, education, accumulation_fund, hourse, career, hua_bei, bai_tiao, zhi_ma, income, create_time, update_time from customer @@ -100,6 +102,7 @@ hua_bei, bai_tiao, zhi_ma, + income, create_time, update_time, @@ -128,6 +131,7 @@ #{huaBei}, #{baiTiao}, #{zhiMa}, + #{income}, #{createTime}, #{updateTime}, @@ -160,6 +164,7 @@ hua_bei = #{huaBei}, bai_tiao = #{baiTiao}, zhi_ma = #{zhiMa}, + income = #{income}, create_time = #{createTime}, update_time = #{updateTime}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml index 3c299529..cae16013 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml @@ -18,6 +18,7 @@ + @@ -59,7 +60,7 @@ - select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type, channel_limit_type, age_limit_start, age_limit_end, phone_limit, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant + select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type, channel_limit_type, age_limit_start, age_limit_end, phone_limit,label, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant select id, merchant_name from merchant @@ -80,6 +81,7 @@ and age_limit_start = #{ageLimitStart} and age_limit_end = #{ageLimitEnd} and phone_limit = #{phoneLimit} + and label = #{label} and social_security_no = #{socialSecurityNo} and social_security_low = #{socialSecurityLow} and social_security_high = #{socialSecurityHigh} @@ -134,6 +136,7 @@ age_limit_start, age_limit_end, phone_limit, + label, social_security_no, social_security_low, social_security_high, @@ -182,6 +185,7 @@ #{ageLimitStart}, #{ageLimitEnd}, #{phoneLimit}, + #{label}, #{socialSecurityNo}, #{socialSecurityLow}, #{socialSecurityHigh}, @@ -234,6 +238,7 @@ age_limit_start = #{ageLimitStart}, age_limit_end = #{ageLimitEnd}, phone_limit = #{phoneLimit}, + label = #{label}, social_security_no = #{socialSecurityNo}, social_security_low = #{socialSecurityLow}, social_security_high = #{socialSecurityHigh},