msb-public-java
/
RuoYi-Cloud
mirror of https://gitee.com/y_project/RuoYi-Cloud.git
1
0
Code Issues Projects Releases Wiki Activity

添加商户标签、用户收入字段

Browse Source
pull/379/head
吴彭 1 year ago
parent 2cf242edee
commit 6997b4bbc3
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File

5
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java
Unescape View File

@ -130,4 +130,9 @@ public class Customer extends BaseEntity
private Integer zhiMa;
/** 月收入 */
@Excel(name = "月收入")
private Integer income;
}

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java
Unescape View File

@ -82,6 +82,10 @@ public class Merchant extends BaseEntity
@Excel(name = "手机号禁入号段英文逗号分隔")
private String phoneLimit;
/** 标签 */
@Excel(name = "标签")
private String label;
/** 无社保 */
@Excel(name = "无社保")
private Boolean socialSecurityNo;

1
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
Unescape View File

@ -45,6 +45,7 @@ public class LocalSysFileServiceImpl implements ISysFileService
{
String name = FileUploadUtils.upload(localFilePath, file);
String url = domain + localFilePrefix + name;
return url;
}
}

7
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml
Unescape View File

@ -30,12 +30,13 @@
<result property="huaBei" column="hua_bei" />
<result property="baiTiao" column="bai_tiao" />
<result property="zhiMa" column="zhi_ma" />
<result property="income" column="income" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectCustomerVo">
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
</sql>
<select id="selectCustomerList" parameterType="com.ruoyi.common.core.domain.http.Customer" resultMap="CustomerResult">
@ -65,6 +66,7 @@
<if test="huaBei != null "> and hua_bei = #{huaBei}</if>
<if test="baiTiao != null "> and bai_tiao = #{baiTiao}</if>
<if test="zhiMa != null "> and zhi_ma = #{zhiMa}</if>
<if test="income != null "> and income = #{income}</if>
</where>
</select>
@ -100,6 +102,7 @@
<if test="huaBei != null">hua_bei,</if>
<if test="baiTiao != null">bai_tiao,</if>
<if test="zhiMa != null">zhi_ma,</if>
<if test="income != null">income,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
</trim>
@ -128,6 +131,7 @@
<if test="huaBei != null">#{huaBei},</if>
<if test="baiTiao != null">#{baiTiao},</if>
<if test="zhiMa != null">#{zhiMa},</if>
<if test="income != null">#{income},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
@ -160,6 +164,7 @@
<if test="huaBei != null">hua_bei = #{huaBei},</if>
<if test="baiTiao != null">bai_tiao = #{baiTiao},</if>
<if test="zhiMa != null">zhi_ma = #{zhiMa},</if>
<if test="income != null">income = #{income},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>

7
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml
Unescape View File

@ -18,6 +18,7 @@
<result property="ageLimitStart" column="age_limit_start" />
<result property="ageLimitEnd" column="age_limit_end" />
<result property="phoneLimit" column="phone_limit" />
<result property="label" column="label" />
<result property="socialSecurityNo" column="social_security_no" />
<result property="socialSecurityLow" column="social_security_low" />
<result property="socialSecurityHigh" column="social_security_high" />
@ -59,7 +60,7 @@
<result property="merchantName" column="merchant_name" />
</resultMap>
<sql id="selectMerchantVo">
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
</sql>
<sql id="findAllMerchant">
select id, merchant_name from merchant
@ -80,6 +81,7 @@
<if test="ageLimitStart != null "> and age_limit_start = #{ageLimitStart}</if>
<if test="ageLimitEnd != null "> and age_limit_end = #{ageLimitEnd}</if>
<if test="phoneLimit != null and phoneLimit != ''"> and phone_limit = #{phoneLimit}</if>
<if test="label != null and label != ''"> and label = #{label}</if>
<if test="socialSecurityNo != null "> and social_security_no = #{socialSecurityNo}</if>
<if test="socialSecurityLow != null "> and social_security_low = #{socialSecurityLow}</if>
<if test="socialSecurityHigh != null "> and social_security_high = #{socialSecurityHigh}</if>
@ -134,6 +136,7 @@
<if test="ageLimitStart != null">age_limit_start,</if>
<if test="ageLimitEnd != null">age_limit_end,</if>
<if test="phoneLimit != null">phone_limit,</if>
<if test="label != null">label,</if>
<if test="socialSecurityNo != null">social_security_no,</if>
<if test="socialSecurityLow != null">social_security_low,</if>
<if test="socialSecurityHigh != null">social_security_high,</if>
@ -182,6 +185,7 @@
<if test="ageLimitStart != null">#{ageLimitStart},</if>
<if test="ageLimitEnd != null">#{ageLimitEnd},</if>
<if test="phoneLimit != null">#{phoneLimit},</if>
<if test="label != null">#{label},</if>
<if test="socialSecurityNo != null">#{socialSecurityNo},</if>
<if test="socialSecurityLow != null">#{socialSecurityLow},</if>
<if test="socialSecurityHigh != null">#{socialSecurityHigh},</if>
@ -234,6 +238,7 @@
<if test="ageLimitStart != null">age_limit_start = #{ageLimitStart},</if>
<if test="ageLimitEnd != null">age_limit_end = #{ageLimitEnd},</if>
<if test="phoneLimit != null">phone_limit = #{phoneLimit},</if>
<if test="label != null">label = #{label},</if>
<if test="socialSecurityNo != null">social_security_no = #{socialSecurityNo},</if>
<if test="socialSecurityLow != null">social_security_low = #{socialSecurityLow},</if>
<if test="socialSecurityHigh != null">social_security_high = #{socialSecurityHigh},</if>

Write Preview
Loading…
Cancel
Save