Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
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
Administrator
dsk-cr20g
Commits
82c7cf68
Commit
82c7cf68
authored
Aug 03, 2023
by
lcl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
u
parent
ad91e8d8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
7 deletions
+11
-7
ContactInfo.java
...main/java/com/dsk/system/domain/customer/ContactInfo.java
+1
-1
ContactInfoSearchDto.java
.../dsk/system/domain/customer/dto/ContactInfoSearchDto.java
+1
-1
ContactInfoListVo.java
.../com/dsk/system/domain/customer/vo/ContactInfoListVo.java
+5
-1
ContactInfoMapper.xml
...in/resources/mapper/system/customer/ContactInfoMapper.xml
+4
-4
No files found.
dsk-system/src/main/java/com/dsk/system/domain/customer/ContactInfo.java
View file @
82c7cf68
...
...
@@ -32,7 +32,7 @@ public class ContactInfo implements Serializable {
/**
* 项目id
*/
private
Integer
project
Id
;
private
Integer
business
Id
;
/**
* 姓名
*/
...
...
dsk-system/src/main/java/com/dsk/system/domain/customer/dto/ContactInfoSearchDto.java
View file @
82c7cf68
...
...
@@ -13,7 +13,7 @@ public class ContactInfoSearchDto implements Serializable {
/**
* 项目id
*/
private
Integer
project
Id
;
private
Integer
business
Id
;
/**
* 企业名称
*/
...
...
dsk-system/src/main/java/com/dsk/system/domain/customer/vo/ContactInfoListVo.java
View file @
82c7cf68
...
...
@@ -29,7 +29,7 @@ public class ContactInfoListVo implements Serializable {
/**
* 项目id
*/
private
Integer
project
Id
;
private
Integer
business
Id
;
/**
* 项目名称
*/
...
...
@@ -66,6 +66,10 @@ public class ContactInfoListVo implements Serializable {
* 企业名称
*/
private
String
companyName
;
/**
* 备注
*/
private
String
remark
;
/**
* 更新人
*/
...
...
dsk-system/src/main/resources/mapper/system/customer/ContactInfoMapper.xml
View file @
82c7cf68
...
...
@@ -4,14 +4,14 @@
<select
id=
"selectPageList"
resultType=
"com.dsk.system.domain.customer.vo.ContactInfoListVo"
>
select
cc.id, cc.customer_id, cc.
project
_id, bi.project_name, cc.name, cc.sex, cc.role,
cc.position, cc.contact_information, cc.company_id, cc.uip_id, cc.company_name,
cc.id, cc.customer_id, cc.
business
_id, bi.project_name, cc.name, cc.sex, cc.role,
cc.position, cc.contact_information, cc.company_id, cc.uip_id, cc.company_name,
cc.remark,
cc.update_by
from contact_info cc
left join business_info bi on cc.
project
_id = bi.id
left join business_info bi on cc.
business
_id = bi.id
<where>
<if
test=
"customerId != null and customerId !='' "
>
and (cc.customer_id = #{customerId} or bi.customer_id = #{customerId})
</if>
<if
test=
"
projectId != null "
>
and cc.project_id = #{project
Id}
</if>
<if
test=
"
businessId != null "
>
and cc.business_id = #{business
Id}
</if>
</where>
order by cc.create_time desc
</select>
...
...
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