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
275cbff4
Commit
275cbff4
authored
Aug 25, 2023
by
huangjie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev20230707' of
http://192.168.60.201/root/dsk-operate-sys
into dev20230707
parents
ac2303a6
dd169a86
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
34 deletions
+10
-34
EnterpriseBussinessSupplierProjectPageBody.java
...ain/model/EnterpriseBussinessSupplierProjectPageBody.java
+1
-1
BusinessSearchDto.java
...com/dsk/system/domain/business/dto/BusinessSearchDto.java
+2
-13
CustomerSearchDto.java
...com/dsk/system/domain/customer/dto/CustomerSearchDto.java
+2
-14
BusinessFollowRecordMapper.xml
.../resources/mapper/business/BusinessFollowRecordMapper.xml
+3
-3
BusinessInfoMapper.xml
...src/main/resources/mapper/business/BusinessInfoMapper.xml
+1
-2
CustomerFollowRecordMapper.xml
...ces/mapper/system/customer/CustomerFollowRecordMapper.xml
+1
-1
No files found.
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierProjectPageBody.java
View file @
275cbff4
...
@@ -30,7 +30,7 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
...
@@ -30,7 +30,7 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
* 供应商企业
* 供应商企业
*/
*/
@NotNull
(
message
=
"企业不能为空"
)
@NotNull
(
message
=
"企业不能为空"
)
private
Integer
companyName
;
private
String
companyName
;
/**
/**
* 查询关键字
* 查询关键字
...
...
dsk-system/src/main/java/com/dsk/system/domain/business/dto/BusinessSearchDto.java
View file @
275cbff4
package
com
.
dsk
.
system
.
domain
.
business
.
dto
;
package
com
.
dsk
.
system
.
domain
.
business
.
dto
;
import
com.dsk.common.core.domain.BaseEntity
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
...
@@ -14,7 +15,7 @@ import java.util.Map;
...
@@ -14,7 +15,7 @@ import java.util.Map;
*/
*/
@Data
@Data
@NoArgsConstructor
@NoArgsConstructor
public
class
BusinessSearchDto
implements
Serializable
{
public
class
BusinessSearchDto
extends
BaseEntity
implements
Serializable
{
/**
/**
* 用户id
* 用户id
*/
*/
...
@@ -24,18 +25,6 @@ public class BusinessSearchDto implements Serializable {
...
@@ -24,18 +25,6 @@ public class BusinessSearchDto implements Serializable {
*/
*/
private
Integer
status
;
private
Integer
status
;
/**
* 数据权限
*/
private
Map
<
String
,
Object
>
params
;
public
Map
<
String
,
Object
>
getParams
()
{
if
(
params
==
null
)
{
params
=
new
HashMap
<>();
}
return
params
;
}
public
BusinessSearchDto
(
Long
userId
)
{
public
BusinessSearchDto
(
Long
userId
)
{
this
.
userId
=
userId
;
this
.
userId
=
userId
;
}
}
...
...
dsk-system/src/main/java/com/dsk/system/domain/customer/dto/CustomerSearchDto.java
View file @
275cbff4
package
com
.
dsk
.
system
.
domain
.
customer
.
dto
;
package
com
.
dsk
.
system
.
domain
.
customer
.
dto
;
import
com.dsk.common.core.domain.BaseEntity
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
...
@@ -14,7 +15,7 @@ import java.util.Map;
...
@@ -14,7 +15,7 @@ import java.util.Map;
*/
*/
@Data
@Data
@NoArgsConstructor
@NoArgsConstructor
public
class
CustomerSearchDto
implements
Serializable
{
public
class
CustomerSearchDto
extends
BaseEntity
implements
Serializable
{
/**
/**
* 企业id
* 企业id
*/
*/
...
@@ -67,17 +68,4 @@ public class CustomerSearchDto implements Serializable {
...
@@ -67,17 +68,4 @@ public class CustomerSearchDto implements Serializable {
* 信资等级
* 信资等级
*/
*/
private
List
<
String
>
creditLevels
;
private
List
<
String
>
creditLevels
;
/**
* 数据权限
*/
private
Map
<
String
,
Object
>
params
;
public
Map
<
String
,
Object
>
getParams
()
{
if
(
params
==
null
)
{
params
=
new
HashMap
<>();
}
return
params
;
}
}
}
dsk-system/src/main/resources/mapper/business/BusinessFollowRecordMapper.xml
View file @
275cbff4
...
@@ -71,11 +71,11 @@
...
@@ -71,11 +71,11 @@
left join sys_dept d on u.dept_id = d.dept_id
left join sys_dept d on u.dept_id = d.dept_id
<where>
<where>
<if
test=
"userId != null"
>
and (f.user_id = #{userId} or i.is_private = 1)
</if>
<if
test=
"userId != null"
>
and (f.user_id = #{userId} or i.is_private = 1)
</if>
<if
test=
"startTime != null and startTime != '' "
>
and f.
crea
t_time
>
= #{startTime}
</if>
<if
test=
"startTime != null and startTime != '' "
>
and f.
visi
t_time
>
= #{startTime}
</if>
<if
test=
"endTime != null and endTime != '' "
>
and f.
crea
t_time
<
= #{endTime}
</if>
<if
test=
"endTime != null and endTime != '' "
>
and f.
visi
t_time
<
= #{endTime}
</if>
${params.dataScope}
${params.dataScope}
</where>
</where>
ORDER BY f.
crea
t_time DESC
ORDER BY f.
visi
t_time DESC
</select>
</select>
<select
id=
"selectRelateProject"
resultType=
"com.dsk.system.domain.business.vo.BusinessListVo"
>
<select
id=
"selectRelateProject"
resultType=
"com.dsk.system.domain.business.vo.BusinessListVo"
>
select i.id,i.project_name as projectName
select i.id,i.project_name as projectName
...
...
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @
275cbff4
...
@@ -314,10 +314,9 @@
...
@@ -314,10 +314,9 @@
</delete>
</delete>
<delete
id=
"deleteBusinessInfoByIds"
parameterType=
"Long"
>
<delete
id=
"deleteBusinessInfoByIds"
parameterType=
"Long"
>
delete i,b,
co,
f,l,r,u
delete i,b,f,l,r,u
from business_info i
from business_info i
left join business_backlog b on b.business_id = i.id
left join business_backlog b on b.business_id = i.id
left join business_contacts co on co.business_id = i.id
left join business_follow_record f on f.business_id = i.id
left join business_follow_record f on f.business_id = i.id
left join business_label l on l.business_id = i.id
left join business_label l on l.business_id = i.id
left join business_relate_company r on r.business_id = i.id
left join business_relate_company r on r.business_id = i.id
...
...
dsk-system/src/main/resources/mapper/system/customer/CustomerFollowRecordMapper.xml
View file @
275cbff4
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<!-- 数据范围过滤 -->
<!-- 数据范围过滤 -->
<if
test=
"params.dataScope != null and params.dataScope != '' "
>
${params.dataScope}
</if>
<if
test=
"params.dataScope != null and params.dataScope != '' "
>
${params.dataScope}
</if>
</where>
</where>
order by cfr.
create
_time desc
order by cfr.
visit
_time desc
</select>
</select>
</mapper>
</mapper>
...
...
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