Commit 27aac171 by 284718418@qq.com

修改BUG 排序问题,缺少字段显示

parent a8d901a3
...@@ -157,5 +157,34 @@ public class ZpglZwxx extends Model<ZpglZwxx> { ...@@ -157,5 +157,34 @@ public class ZpglZwxx extends Model<ZpglZwxx> {
*/ */
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private Date updateTime; 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;
} }
...@@ -136,7 +136,7 @@ public class ZpglController { ...@@ -136,7 +136,7 @@ public class ZpglController {
if (!StringUtils.isEmpty(query)) { 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().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); IPage<ZpglRcxx> zpglRcxxPage = ZpglRcxx.builder().build().selectPage(page, queryWrapper);
List<ZpglRcxx> zpglRcxxs = page.getRecords(); List<ZpglRcxx> zpglRcxxs = page.getRecords();
zpglRcxxPage.getCurrent(); zpglRcxxPage.getCurrent();
......
...@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.yulichang.query.MPJQueryWrapper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
...@@ -47,26 +48,6 @@ import java.util.List; ...@@ -47,26 +48,6 @@ import java.util.List;
@Slf4j @Slf4j
public class ZpglZwxxController { 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 { ...@@ -82,15 +63,17 @@ public class ZpglZwxxController {
@ApiParam("状态") @RequestParam(required = false) Integer status) { @ApiParam("状态") @RequestParam(required = false) Integer status) {
try { try {
Page<ZpglZwxx> page = new Page<ZpglZwxx>(baseQuery.getPageNum(), baseQuery.getPageSize()); Page<ZpglZwxx> page = new Page<ZpglZwxx>(baseQuery.getPageNum(), baseQuery.getPageSize());
QueryWrapper<ZpglZwxx> queryWrapper = new QueryWrapper<>(); MPJQueryWrapper<ZpglZwxx> queryWrapper = new MPJQueryWrapper<>();
queryWrapper.lambda().eq(ZpglZwxx::getOrgCode, userBean.getOrgCode()).eq(ZpglZwxx::getDeleteFlag,0); 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) { if (!StringUtils.isEmpty(zpglZwxxId) && zpglZwxxId > 0) {
queryWrapper.lambda().eq(ZpglZwxx::getId, zpglZwxxId); queryWrapper.eq("t.id", zpglZwxxId);
} }
if (!StringUtils.isEmpty(query)) { if (!StringUtils.isEmpty(query)) {
queryWrapper.lambda().like(ZpglZwxx::getName, query); queryWrapper.like("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); IPage<ZpglZwxx> zpglZwxxPage = ZpglZwxx.builder().build().selectPage(page, queryWrapper);
List<ZpglZwxx> zpglRcxxs = page.getRecords(); List<ZpglZwxx> zpglRcxxs = page.getRecords();
zpglZwxxPage.getCurrent(); zpglZwxxPage.getCurrent();
......
...@@ -2,7 +2,7 @@ package cn.timer.api.dao.zpgl; ...@@ -2,7 +2,7 @@ package cn.timer.api.dao.zpgl;
import cn.timer.api.bean.zpgl.ZpglZwxx; import cn.timer.api.bean.zpgl.ZpglZwxx;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
...@@ -13,6 +13,6 @@ import org.springframework.stereotype.Repository; ...@@ -13,6 +13,6 @@ import org.springframework.stereotype.Repository;
* @date 2022-03-08 15:14:40 * @date 2022-03-08 15:14:40
*/ */
@Repository @Repository
public interface ZpglZwxxMapper extends BaseMapper<ZpglZwxx> { public interface ZpglZwxxMapper extends MPJBaseMapper<ZpglZwxx> {
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment