|
@@ -28,6 +28,7 @@ import java.time.Duration;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
|
import java.util.Date;
|
|
|
+import java.util.Set;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -55,23 +56,30 @@ public class ContractPlaceNumberRelHisServiceImpl extends ServiceImpl<ContractPl
|
|
|
// 获取当前登录角色
|
|
|
SysUser sysUser = userService.getOne(new LambdaQueryWrapper<SysUser>()
|
|
|
.eq(SysUser::getId, SecurityUtils.getUserId()));
|
|
|
+ // 获取用户角色信息
|
|
|
+ Set<String> roles = SecurityUtils.getRoles();
|
|
|
+ String role = "";
|
|
|
+ if (roles.contains("ADMIN")) {
|
|
|
+ role = "ADMIN";
|
|
|
+ }
|
|
|
+ Page<ContractPlaceNumberRelHisVO> pageResult = baseMapper.getPageByRole(new Page<>(pageNum, pageSize), role, sysUser,queryParams);
|
|
|
// 查询数据
|
|
|
- LambdaQueryWrapper<ContractPlaceNumberRelHis> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.ge(StrUtil.isNotBlank(queryParams.getStartTimeBegin()), ContractPlaceNumberRelHis::getStartTime, queryParams.getStartTimeBegin()).le(StrUtil.isNotBlank(queryParams.getStartTimeEnd()), ContractPlaceNumberRelHis::getStartTime, queryParams.getStartTimeEnd());
|
|
|
- queryWrapper.ge(StrUtil.isNotBlank(queryParams.getEndTimeBegin()), ContractPlaceNumberRelHis::getEndTime, queryParams.getEndTimeBegin()).le(StrUtil.isNotBlank(queryParams.getEndTimeEnd()), ContractPlaceNumberRelHis::getEndTime, queryParams.getEndTimeEnd());
|
|
|
- queryWrapper.eq(StrUtil.isNotBlank(queryParams.getPhone()), ContractPlaceNumberRelHis::getPhone, queryParams.getPhone());
|
|
|
- queryWrapper.eq(StrUtil.isNotBlank(queryParams.getPlateNumber()), ContractPlaceNumberRelHis::getPlateNumber, queryParams.getPlateNumber());
|
|
|
- queryWrapper.eq(("3").equals(sysUser.getUserType()), ContractPlaceNumberRelHis::getContractId, sysUser.getContractId());
|
|
|
- queryWrapper.orderByDesc(ContractPlaceNumberRelHis::getUpdateTime);
|
|
|
-
|
|
|
- // 查询数据
|
|
|
- Page<ContractPlaceNumberRelHis> dictItemPage = this.page(
|
|
|
- new Page<>(pageNum, pageSize),
|
|
|
- queryWrapper
|
|
|
- );
|
|
|
+ // LambdaQueryWrapper<ContractPlaceNumberRelHis> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ // queryWrapper.ge(StrUtil.isNotBlank(queryParams.getStartTimeBegin()), ContractPlaceNumberRelHis::getStartTime, queryParams.getStartTimeBegin()).le(StrUtil.isNotBlank(queryParams.getStartTimeEnd()), ContractPlaceNumberRelHis::getStartTime, queryParams.getStartTimeEnd());
|
|
|
+ // queryWrapper.ge(StrUtil.isNotBlank(queryParams.getEndTimeBegin()), ContractPlaceNumberRelHis::getEndTime, queryParams.getEndTimeBegin()).le(StrUtil.isNotBlank(queryParams.getEndTimeEnd()), ContractPlaceNumberRelHis::getEndTime, queryParams.getEndTimeEnd());
|
|
|
+ // queryWrapper.eq(StrUtil.isNotBlank(queryParams.getPhone()), ContractPlaceNumberRelHis::getPhone, queryParams.getPhone());
|
|
|
+ // queryWrapper.eq(StrUtil.isNotBlank(queryParams.getPlateNumber()), ContractPlaceNumberRelHis::getPlateNumber, queryParams.getPlateNumber());
|
|
|
+ // queryWrapper.eq(("3").equals(sysUser.getUserType()), ContractPlaceNumberRelHis::getContractId, sysUser.getContractId());
|
|
|
+ // queryWrapper.orderByDesc(ContractPlaceNumberRelHis::getUpdateTime);
|
|
|
+ //
|
|
|
+ // // 查询数据
|
|
|
+ // Page<ContractPlaceNumberRelHis> dictItemPage = this.page(
|
|
|
+ // new Page<>(pageNum, pageSize),
|
|
|
+ // queryWrapper
|
|
|
+ // );
|
|
|
|
|
|
// 实体转换
|
|
|
- Page<ContractPlaceNumberRelHisVO> pageResult = converter.entity2Page(dictItemPage);
|
|
|
+ // Page<ContractPlaceNumberRelHisVO> pageResult = converter.entity2Page(dictItemPage);
|
|
|
for (ContractPlaceNumberRelHisVO record : pageResult.getRecords()) {
|
|
|
Date startTime = record.getStartTime();
|
|
|
Date endTime = record.getEndTime();
|