Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
8be2bfe6
Commit
8be2bfe6
authored
1 month ago
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
客户服务平台-fxj
parent
27c16f1d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
3 deletions
+39
-3
TSettleDomain.java
...ifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java
+13
-0
TSettleDomainVo.java
.../yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainVo.java
+13
-0
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+12
-2
SysUserMapper.xml
...yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java
View file @
8be2bfe6
...
@@ -548,4 +548,17 @@ public class TSettleDomain extends BaseEntity {
...
@@ -548,4 +548,17 @@ public class TSettleDomain extends BaseEntity {
*/
*/
@Schema
(
description
=
"代发户状态(0否;1是代发户)"
)
@Schema
(
description
=
"代发户状态(0否;1是代发户)"
)
private
Integer
issueStatus
;
private
Integer
issueStatus
;
/**
* 前端客服
*/
@Schema
(
description
=
"前端客服"
)
private
String
csName
;
/**
* 前端客服-手机号码
*/
@Schema
(
description
=
"手机号码"
)
private
String
csPhone
;
}
}
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainVo.java
View file @
8be2bfe6
...
@@ -124,4 +124,17 @@ public class TSettleDomainVo extends TSettleDomain implements Serializable {
...
@@ -124,4 +124,17 @@ public class TSettleDomainVo extends TSettleDomain implements Serializable {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
String
>
settleDomainIds
;
private
List
<
String
>
settleDomainIds
;
/**
* 前端客服
*/
@Schema
(
description
=
"前端客服"
)
private
String
csName
;
/**
* 前端客服-手机号码
*/
@Schema
(
description
=
"手机号码"
)
private
String
csPhone
;
}
}
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
8be2bfe6
...
@@ -101,6 +101,9 @@
...
@@ -101,6 +101,9 @@
<result
property=
"division"
column=
"DIVISION"
/>
<result
property=
"division"
column=
"DIVISION"
/>
<result
property=
"issueStatus"
column=
"ISSUE_STATUS"
/>
<result
property=
"issueStatus"
column=
"ISSUE_STATUS"
/>
<result
property=
"csName"
column=
"cs_name"
/>
<result
property=
"csPhone"
column=
"cs_phone"
/>
</resultMap>
</resultMap>
<resultMap
id=
"tSettleDomainTwoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.SecondBelongVo"
>
<resultMap
id=
"tSettleDomainTwoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.SecondBelongVo"
>
...
@@ -187,7 +190,9 @@
...
@@ -187,7 +190,9 @@
a.LINE_TYPE,
a.LINE_TYPE,
a.HAS_CONTAIN_RISKS,
a.HAS_CONTAIN_RISKS,
a.NEW_LINE,
a.NEW_LINE,
a.DIVISION
a.DIVISION,
a.cs_name,
a.cs_phone
</sql>
</sql>
<resultMap
id=
"tSettleDomainSelectVoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"
>
<resultMap
id=
"tSettleDomainSelectVoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"
>
...
@@ -223,6 +228,9 @@
...
@@ -223,6 +228,9 @@
<result
property=
"hasContainRisks"
column=
"HAS_CONTAIN_RISKS"
/>
<result
property=
"hasContainRisks"
column=
"HAS_CONTAIN_RISKS"
/>
<result
property=
"newLine"
column=
"NEW_LINE"
/>
<result
property=
"newLine"
column=
"NEW_LINE"
/>
<result
property=
"division"
column=
"DIVISION"
/>
<result
property=
"division"
column=
"DIVISION"
/>
<result
property=
"csName"
column=
"cs_name"
/>
<result
property=
"csPhone"
column=
"cs_phone"
/>
</resultMap>
</resultMap>
<select
id=
"getPage"
resultMap=
"tSettleDomainMap"
>
<select
id=
"getPage"
resultMap=
"tSettleDomainMap"
>
...
@@ -420,7 +428,9 @@
...
@@ -420,7 +428,9 @@
a.LINE_TYPE,
a.LINE_TYPE,
if(a.HAS_CONTAIN_RISKS = '是','0',if(a.HAS_CONTAIN_RISKS = '否','1','')) HAS_CONTAIN_RISKS,
if(a.HAS_CONTAIN_RISKS = '是','0',if(a.HAS_CONTAIN_RISKS = '否','1','')) HAS_CONTAIN_RISKS,
a.NEW_LINE,
a.NEW_LINE,
a.DIVISION
a.DIVISION,
a.cs_name,
a.cs_phone
FROM
FROM
t_settle_domain a
t_settle_domain a
<if
test=
"userId != null and userId.trim() != '-999'"
>
<if
test=
"userId != null and userId.trim() != '-999'"
>
...
...
This diff is collapsed.
Click to expand it.
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml
View file @
8be2bfe6
...
@@ -413,7 +413,7 @@
...
@@ -413,7 +413,7 @@
</select>
</select>
<select
id=
"cspUserPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser"
>
<select
id=
"cspUserPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser"
>
select u.user_id,u.nickname,u.phone,u.create_time,u.username,p.dept_id,d.`name` as dept_name,p.user_type from sys_user u
select u.user_id,u.nickname,u.phone,u.create_time,u.username,p.dept_id,d.`name` as dept_name,p.user_type
,u.type
from sys_user u
LEFT JOIN sys_user_dept_permission p on u.user_id=p.user_id
LEFT JOIN sys_user_dept_permission p on u.user_id=p.user_id
LEFT JOIN sys_dept d on d.dept_id=p.dept_id
LEFT JOIN sys_dept d on d.dept_id=p.dept_id
where
where
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment