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
c80ceee0
You need to sign in or sign up before continuing.
Commit
c80ceee0
authored
Oct 31, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单自定义提示优化
parent
b574951c
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
34 additions
and
16 deletions
+34
-16
TEmpChangeInfoController.java
...v1/yifu/archives/controller/TEmpChangeInfoController.java
+4
-4
TCustomerInfoMapper.java
...oud/plus/v1/yifu/archives/mapper/TCustomerInfoMapper.java
+2
-1
TCustomerInfoService.java
...d/plus/v1/yifu/archives/service/TCustomerInfoService.java
+1
-1
TEmpChangeInfoService.java
.../plus/v1/yifu/archives/service/TEmpChangeInfoService.java
+4
-2
TCustomerInfoServiceImpl.java
.../yifu/archives/service/impl/TCustomerInfoServiceImpl.java
+2
-2
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+13
-5
TCustomerInfoMapper.xml
...ves-biz/src/main/resources/mapper/TCustomerInfoMapper.xml
+8
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpChangeInfoController.java
View file @
c80ceee0
...
...
@@ -139,8 +139,8 @@ public class TEmpChangeInfoController {
@Operation
(
summary
=
"获取所有项目名称"
,
description
=
"获取所有项目名称"
)
@SysLog
(
"获取所有项目名称"
)
@GetMapping
(
"/getAllDept"
)
public
R
<
List
<
TSettleDomain
>>
getAllDept
()
{
return
tEmpChangeInfoService
.
getAllDept
();
public
R
<
List
<
TSettleDomain
>>
getAllDept
(
@RequestParam
(
required
=
false
,
name
=
"customerName"
)
String
customerName
)
{
return
tEmpChangeInfoService
.
getAllDept
(
customerName
);
}
/**
...
...
@@ -152,8 +152,8 @@ public class TEmpChangeInfoController {
@Operation
(
summary
=
"获取所有单位名称"
,
description
=
"获取所有单位名称"
)
@SysLog
(
"获取所有单位名称"
)
@GetMapping
(
"/getAllUint"
)
public
R
<
List
<
TCustomerInfo
>>
getAllUint
()
{
return
tEmpChangeInfoService
.
getAllUint
();
public
R
<
List
<
TCustomerInfo
>>
getAllUint
(
@RequestParam
(
required
=
false
,
name
=
"customerName"
)
String
customerName
)
{
return
tEmpChangeInfoService
.
getAllUint
(
customerName
);
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TCustomerInfoMapper.java
View file @
c80ceee0
...
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -32,5 +33,5 @@ import java.util.List;
@Mapper
public
interface
TCustomerInfoMapper
extends
BaseMapper
<
TCustomerInfo
>
{
List
<
TCustomerInfo
>
getAllUnit
();
List
<
TCustomerInfo
>
getAllUnit
(
@Param
(
"customerName"
)
String
customerName
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TCustomerInfoService.java
View file @
c80ceee0
...
...
@@ -30,5 +30,5 @@ import java.util.List;
*/
public
interface
TCustomerInfoService
extends
IService
<
TCustomerInfo
>
{
List
<
TCustomerInfo
>
getAllUnit
();
List
<
TCustomerInfo
>
getAllUnit
(
String
customerName
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpChangeInfoService.java
View file @
c80ceee0
...
...
@@ -57,16 +57,18 @@ public interface TEmpChangeInfoService extends IService<TEmpChangeInfo> {
* @return R
* @Author huyc
* @Date 2022-06-22
* @param customerName
*/
R
<
List
<
TSettleDomain
>>
getAllDept
();
R
<
List
<
TSettleDomain
>>
getAllDept
(
String
customerName
);
/**
* 获取所有单位名称
* @return R
* @Author huyc
* @Date 2022-06-22
* @param customerName
*/
R
<
List
<
TCustomerInfo
>>
getAllUint
();
R
<
List
<
TCustomerInfo
>>
getAllUint
(
String
customerName
);
IPage
<
TSettleDomain
>
getAllDeptPage
(
Page
page
,
String
deptName
,
String
customerId
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCustomerInfoServiceImpl.java
View file @
c80ceee0
...
...
@@ -34,7 +34,7 @@ import java.util.List;
public
class
TCustomerInfoServiceImpl
extends
ServiceImpl
<
TCustomerInfoMapper
,
TCustomerInfo
>
implements
TCustomerInfoService
{
@Override
public
List
<
TCustomerInfo
>
getAllUnit
()
{
return
baseMapper
.
getAllUnit
();
public
List
<
TCustomerInfo
>
getAllUnit
(
String
customerName
)
{
return
baseMapper
.
getAllUnit
(
customerName
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
c80ceee0
...
...
@@ -276,11 +276,18 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
* @return R
* @Author huyc
* @Date 2022-06-22
* @param customerName
*/
@Override
public
R
<
List
<
TSettleDomain
>>
getAllDept
()
{
List
<
TSettleDomain
>
list
=
tSettleDomainMapper
.
selectList
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
().
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
public
R
<
List
<
TSettleDomain
>>
getAllDept
(
String
customerName
)
{
List
<
TSettleDomain
>
list
=
null
;
if
(
Common
.
isNotNull
(
customerName
)){
list
=
tSettleDomainMapper
.
selectList
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
().
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
STATUS_NORMAL
).
eq
(
TSettleDomain:
:
getCustomerName
,
customerName
));
}
else
{
list
=
tSettleDomainMapper
.
selectList
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
().
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
STATUS_NORMAL
));
}
return
R
.
ok
(
list
);
}
...
...
@@ -289,11 +296,12 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
* @return R
* @Author huyc
* @Date 2022-06-22
* @param customerName
*/
@Override
public
R
<
List
<
TCustomerInfo
>>
getAllUint
()
{
public
R
<
List
<
TCustomerInfo
>>
getAllUint
(
String
customerName
)
{
//List<TCustomerInfo> list = tCustomerInfoService.list(Wrappers.<TCustomerInfo>query().lambda().eq(TCustomerInfo::getDeleteFlag, CommonConstants.STATUS_NORMAL));
List
<
TCustomerInfo
>
list
=
tCustomerInfoService
.
getAllUnit
();
List
<
TCustomerInfo
>
list
=
tCustomerInfoService
.
getAllUnit
(
customerName
);
return
R
.
ok
(
list
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCustomerInfoMapper.xml
View file @
c80ceee0
...
...
@@ -62,6 +62,13 @@
</resultMap>
<select
id=
"getAllUnit"
resultMap=
"tCustomerInfoMap"
>
select a.CUSTOMER_ID AS "ID",a.CUSTOMER_NAME AS "CUSTOMER_NAME",a.CUSTOMER_NO AS "CUSTOMER_CODE" from t_settle_domain a GROUP BY A.CUSTOMER_NO
select a.CUSTOMER_ID AS "ID",a.CUSTOMER_NAME AS "CUSTOMER_NAME",a.CUSTOMER_NO AS "CUSTOMER_CODE" from t_settle_domain a
<where>
1=1
<if
test=
"customerName != null and customerName != null"
>
and a.CUSTOMER_NAME like concat(#{customerName},'%')
</if>
</where>
GROUP BY A.CUSTOMER_NO
</select>
</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