Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
27aac171
Commit
27aac171
authored
Apr 21, 2022
by
284718418@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改BUG 排序问题,缺少字段显示
parent
a8d901a3
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
28 deletions
+40
-28
src/main/java/cn/timer/api/bean/zpgl/ZpglZwxx.java
+29
-0
src/main/java/cn/timer/api/controller/zpgl/ZpglController.java
+1
-1
src/main/java/cn/timer/api/controller/zpgl/ZpglZwxxController.java
+8
-25
src/main/java/cn/timer/api/dao/zpgl/ZpglZwxxMapper.java
+2
-2
No files found.
src/main/java/cn/timer/api/bean/zpgl/ZpglZwxx.java
View file @
27aac171
...
...
@@ -157,5 +157,34 @@ public class ZpglZwxx extends Model<ZpglZwxx> {
*/
@ApiModelProperty
(
value
=
"更新时间"
)
private
Date
updateTime
;
/**
* 省名
*/
@Transient
@TableField
(
exist
=
false
)
@ApiModelProperty
(
value
=
"省名"
)
private
String
province
;
/**
* 区名
*/
@Transient
@TableField
(
exist
=
false
)
@ApiModelProperty
(
value
=
"区名"
)
private
String
district
;
/**
* 城市
*/
@Transient
@TableField
(
exist
=
false
)
@ApiModelProperty
(
value
=
"城市"
)
private
String
city
;
/**
* 工作地点
*/
@Transient
@TableField
(
exist
=
false
)
@ApiModelProperty
(
value
=
"工作地点"
)
private
String
gzddName
;
}
src/main/java/cn/timer/api/controller/zpgl/ZpglController.java
View file @
27aac171
...
...
@@ -136,7 +136,7 @@ public class ZpglController {
if
(!
StringUtils
.
isEmpty
(
query
))
{
queryWrapper
.
lambda
().
and
(
qw
->
qw
.
like
(
ZpglRcxx:
:
getName
,
query
).
or
().
eq
(
ZpglRcxx:
:
getMobile
,
query
).
or
().
eq
(
ZpglRcxx:
:
getMail
,
query
));
}
queryWrapper
.
lambda
().
eq
(
ZpglRcxx:
:
getStatus
,
status
);
queryWrapper
.
lambda
().
eq
(
ZpglRcxx:
:
getStatus
,
status
)
.
orderByDesc
(
ZpglRcxx:
:
getCreateTime
)
;
IPage
<
ZpglRcxx
>
zpglRcxxPage
=
ZpglRcxx
.
builder
().
build
().
selectPage
(
page
,
queryWrapper
);
List
<
ZpglRcxx
>
zpglRcxxs
=
page
.
getRecords
();
zpglRcxxPage
.
getCurrent
();
...
...
src/main/java/cn/timer/api/controller/zpgl/ZpglZwxxController.java
View file @
27aac171
...
...
@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.github.yulichang.query.MPJQueryWrapper
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
...
...
@@ -47,26 +48,6 @@ import java.util.List;
@Slf4j
public
class
ZpglZwxxController
{
@Value
(
value
=
"${config-8timer.init-password}"
)
private
String
pwd
;
// 回调地址
@Value
(
"${config-8timer.machine8timerUrl}"
)
public
String
mac_command
;
@Autowired
private
KqglAssoKqzdkfsMapper
kqglassokqzdkfsmapper
;
@Autowired
private
QyzxEmpLoginMapper
qyzxEmpLoginMapper
;
@Autowired
private
RealTimeUpdate
realtimeupdate
;
@Autowired
private
UserEquiRelationMapper
userequirelationmapper
;
@Autowired
private
YgglMainEmpMapper
ygglMainEmpMapper
;
@Autowired
private
ZpglService
zpglService
;
@Autowired
private
ZpglRcxxMapper
zpglRcxxMapper
;
/**
* 招聘职位列表
*
...
...
@@ -82,15 +63,17 @@ public class ZpglZwxxController {
@ApiParam
(
"状态"
)
@RequestParam
(
required
=
false
)
Integer
status
)
{
try
{
Page
<
ZpglZwxx
>
page
=
new
Page
<
ZpglZwxx
>(
baseQuery
.
getPageNum
(),
baseQuery
.
getPageSize
());
QueryWrapper
<
ZpglZwxx
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
lambda
().
eq
(
ZpglZwxx:
:
getOrgCode
,
userBean
.
getOrgCode
()).
eq
(
ZpglZwxx:
:
getDeleteFlag
,
0
);
MPJQueryWrapper
<
ZpglZwxx
>
queryWrapper
=
new
MPJQueryWrapper
<>();
queryWrapper
.
selectAll
(
ZpglZwxx
.
class
).
select
(
"zg.gzdd_name"
,
"zg.province"
,
"zg.district"
,
"zg.city"
)
.
leftJoin
(
"zpgl_gzdd zg on t.zpgl_gzdd_id = zg.id"
);
queryWrapper
.
eq
(
"t.org_code"
,
userBean
.
getOrgCode
()).
eq
(
"t.delete_flag"
,
0
);
if
(!
StringUtils
.
isEmpty
(
zpglZwxxId
)
&&
zpglZwxxId
>
0
)
{
queryWrapper
.
lambda
().
eq
(
ZpglZwxx:
:
getId
,
zpglZwxxId
);
queryWrapper
.
eq
(
"t.id"
,
zpglZwxxId
);
}
if
(!
StringUtils
.
isEmpty
(
query
))
{
queryWrapper
.
l
ambda
().
like
(
ZpglZwxx:
:
getName
,
query
);
queryWrapper
.
l
ike
(
"t.name"
,
query
);
}
queryWrapper
.
lambda
().
eq
(
ZpglZwxx:
:
getStatus
,
status
).
orderByDesc
(
ZpglZwxx:
:
getCreateTime
);
queryWrapper
.
eq
(
"t.status"
,
status
).
orderByDesc
(
"t.create_time"
);
IPage
<
ZpglZwxx
>
zpglZwxxPage
=
ZpglZwxx
.
builder
().
build
().
selectPage
(
page
,
queryWrapper
);
List
<
ZpglZwxx
>
zpglRcxxs
=
page
.
getRecords
();
zpglZwxxPage
.
getCurrent
();
...
...
src/main/java/cn/timer/api/dao/zpgl/ZpglZwxxMapper.java
View file @
27aac171
...
...
@@ -2,7 +2,7 @@ package cn.timer.api.dao.zpgl;
import
cn.timer.api.bean.zpgl.ZpglZwxx
;
import
com.
baomidou.mybatisplus.core.mapper.
BaseMapper
;
import
com.
github.yulichang.base.MPJ
BaseMapper
;
import
org.springframework.stereotype.Repository
;
/**
...
...
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Repository;
* @date 2022-03-08 15:14:40
*/
@Repository
public
interface
ZpglZwxxMapper
extends
BaseMapper
<
ZpglZwxx
>
{
public
interface
ZpglZwxxMapper
extends
MPJ
BaseMapper
<
ZpglZwxx
>
{
}
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