Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit ba5389fd
authored
Jun 05, 2023
by
wangli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
请求参数类型变更
1 parent
a004ec31
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
11 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/controller/EngineerController.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/EngineerService.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/EngineerServiceImpl.java
project-order/src/main/java/com/alibaba/cloud/integration/order/controller/EngineerController.java
View file @
ba5389f
...
@@ -15,7 +15,7 @@ public class EngineerController {
...
@@ -15,7 +15,7 @@ public class EngineerController {
private
EngineerService
engineerService
;
private
EngineerService
engineerService
;
@GetMapping
(
"/engineer/info/list"
)
@GetMapping
(
"/engineer/info/list"
)
public
Result
<?>
getEngineerInfoList
(
@RequestParam
Integer
page
,
@RequestParam
Integer
size
){
public
Result
<?>
getEngineerInfoList
(
@RequestParam
long
page
,
@RequestParam
long
size
){
// 获取工程师基础信息列表
// 获取工程师基础信息列表
Result
<?>
res
=
null
;
Result
<?>
res
=
null
;
try
{
try
{
...
@@ -27,7 +27,7 @@ public class EngineerController {
...
@@ -27,7 +27,7 @@ public class EngineerController {
}
}
@GetMapping
(
"/engineer/skill/list"
)
@GetMapping
(
"/engineer/skill/list"
)
public
Result
<?>
getEngineerSkillList
(
@RequestParam
Integer
page
,
@RequestParam
Integer
size
)
{
public
Result
<?>
getEngineerSkillList
(
@RequestParam
long
page
,
@RequestParam
long
size
)
{
// 获取工程师技能信息列表
// 获取工程师技能信息列表
Result
<?>
res
=
null
;
Result
<?>
res
=
null
;
try
{
try
{
...
...
project-order/src/main/java/com/alibaba/cloud/integration/order/service/EngineerService.java
View file @
ba5389f
...
@@ -5,8 +5,8 @@ import com.alibaba.cloud.integration.common.Result;
...
@@ -5,8 +5,8 @@ import com.alibaba.cloud.integration.common.Result;
public
interface
EngineerService
{
public
interface
EngineerService
{
// 获取公司列表
// 获取公司列表
Result
<?>
getEngineerInfoList
(
Integer
page
,
Integer
size
);
Result
<?>
getEngineerInfoList
(
long
page
,
long
size
);
//获取工程师技能列表
//获取工程师技能列表
Result
<?>
getEngineerSkillList
(
Integer
page
,
Integer
size
);
Result
<?>
getEngineerSkillList
(
long
page
,
long
size
);
}
}
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/EngineerServiceImpl.java
View file @
ba5389f
...
@@ -6,7 +6,6 @@ import com.alibaba.cloud.integration.order.dao.EngineerSkillDao;
...
@@ -6,7 +6,6 @@ import com.alibaba.cloud.integration.order.dao.EngineerSkillDao;
import
com.alibaba.cloud.integration.order.dao.OrgGroupDao
;
import
com.alibaba.cloud.integration.order.dao.OrgGroupDao
;
import
com.alibaba.cloud.integration.order.dto.EngineerInfoListResp
;
import
com.alibaba.cloud.integration.order.dto.EngineerInfoListResp
;
import
com.alibaba.cloud.integration.order.entity.EngineerInfo
;
import
com.alibaba.cloud.integration.order.entity.EngineerInfo
;
import
com.alibaba.cloud.integration.order.entity.EngineerSkill
;
import
com.alibaba.cloud.integration.order.entity.OrgGroup
;
import
com.alibaba.cloud.integration.order.entity.OrgGroup
;
import
com.alibaba.cloud.integration.order.service.EngineerService
;
import
com.alibaba.cloud.integration.order.service.EngineerService
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
...
@@ -33,7 +32,7 @@ public class EngineerServiceImpl implements EngineerService {
...
@@ -33,7 +32,7 @@ public class EngineerServiceImpl implements EngineerService {
@Transactional
@Transactional
@Override
@Override
public
Result
<?>
getEngineerInfoList
(
Integer
page
,
Integer
size
)
{
public
Result
<?>
getEngineerInfoList
(
long
page
,
long
size
)
{
// 查询工程师信息
// 查询工程师信息
IPage
<
EngineerInfo
>
pg
=
this
.
queryEngineerInfo
(
page
,
size
);
IPage
<
EngineerInfo
>
pg
=
this
.
queryEngineerInfo
(
page
,
size
);
...
@@ -60,11 +59,11 @@ public class EngineerServiceImpl implements EngineerService {
...
@@ -60,11 +59,11 @@ public class EngineerServiceImpl implements EngineerService {
@Transactional
@Transactional
@Override
@Override
public
Result
<?>
getEngineerSkillList
(
Integer
page
,
Integer
size
)
{
public
Result
<?>
getEngineerSkillList
(
long
page
,
long
size
)
{
return
null
;
return
null
;
}
}
private
IPage
<
EngineerInfo
>
queryEngineerInfo
(
Integer
page
,
Integer
size
)
{
private
IPage
<
EngineerInfo
>
queryEngineerInfo
(
long
page
,
long
size
)
{
// 分页查询工程师基础信息
// 分页查询工程师基础信息
LambdaQueryWrapper
<
EngineerInfo
>
lqw
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
EngineerInfo
>
lqw
=
new
LambdaQueryWrapper
<>();
lqw
.
orderByAsc
(
EngineerInfo:
:
getGroupId
);
lqw
.
orderByAsc
(
EngineerInfo:
:
getGroupId
);
...
@@ -79,7 +78,7 @@ public class EngineerServiceImpl implements EngineerService {
...
@@ -79,7 +78,7 @@ public class EngineerServiceImpl implements EngineerService {
//查询小组名称映射关系
//查询小组名称映射关系
HashMap
<
String
,
String
>
map
=
new
HashMap
<>();
HashMap
<
String
,
String
>
map
=
new
HashMap
<>();
if
(
groupIds
.
isEmpty
()
||
groupIds
==
null
)
{
if
(
groupIds
.
isEmpty
())
{
return
map
;
return
map
;
}
}
LambdaQueryWrapper
<
OrgGroup
>
lqw
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
OrgGroup
>
lqw
=
new
LambdaQueryWrapper
<>();
...
@@ -122,10 +121,10 @@ public class EngineerServiceImpl implements EngineerService {
...
@@ -122,10 +121,10 @@ public class EngineerServiceImpl implements EngineerService {
private
String
getEngineerAge
(
String
birth
)
{
private
String
getEngineerAge
(
String
birth
)
{
// 获取工程师年龄
// 获取工程师年龄
if
(
birth
.
isEmpty
()
||
birth
==
null
)
{
if
(
birth
.
isEmpty
())
{
return
""
;
return
""
;
}
}
int
age
=
0
;
int
age
;
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
try
{
try
{
Date
birthDate
=
dateFormat
.
parse
(
birth
);
Date
birthDate
=
dateFormat
.
parse
(
birth
);
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment