登记模式-优惠车牌列表分页列表

src/main/java/com/qmrb/system/controller/ContractPlaceNumberRelController.java

@@ -49,6 +49,12 @@ import lombok.RequiredArgsConstructor;
 public class ContractPlaceNumberRelController{
 
     private final IContractPlaceNumberRelService contractPlaceNumberRelService;
+    @Operation(summary = "协议车牌历史记录分页列表", security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/getHistoryPage")
+    public PageResult<ContractPlaceNumberRelVO> getHistoryPage(@ParameterObject ContractPlaceNumberRelQuery queryParams) {
+        Page<ContractPlaceNumberRelVO> result = contractPlaceNumberRelService.getHistoryPage(queryParams);
+        return PageResult.success(result);
+    }
 
 	@Operation(summary = "协议(客商)车牌关系分页列表", security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping("/page")

src/main/java/com/qmrb/system/pojo/query/ContractPlaceNumberRelQuery.java

@@ -19,6 +19,11 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 public class ContractPlaceNumberRelQuery extends BasePageQuery{
 
+    private String startTimeBegin;
+    private String startTimeEnd;
+    private String endTimeBegin;
+    private String endTimeEnd;
+
  	@Schema(description="关键字")
     private String keywords;
 

src/main/java/com/qmrb/system/service/IContractPlaceNumberRelService.java

@@ -36,5 +36,6 @@ public interface IContractPlaceNumberRelService extends IService<ContractPlaceNu
 	/**获取表单数据
 	 * */
 	public ContractPlaceNumberRelForm getFormData(Long id);
-	
+
+    Page<ContractPlaceNumberRelVO> getHistoryPage(ContractPlaceNumberRelQuery queryParams);
 }

src/main/java/com/qmrb/system/service/impl/ContractPlaceNumberRelServiceImpl.java

@@ -1,12 +1,13 @@
 package com.qmrb.system.service.impl;
 
 
-
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qmrb.system.common.result.PageResult;
 import com.qmrb.system.converter.ContractPlaceNumberRelConverter;
 import com.qmrb.system.framework.security.util.SecurityUtils;
+import com.qmrb.system.pojo.entity.ContractPlaceNumberRel;
 import com.qmrb.system.pojo.entity.Contract;
 import com.qmrb.system.pojo.entity.ContractPlaceNumberRel;
 import com.qmrb.system.pojo.entity.SysUser;
@@ -38,78 +39,111 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class ContractPlaceNumberRelServiceImpl extends ServiceImpl<ContractPlaceNumberRelMapper, ContractPlaceNumberRel> implements IContractPlaceNumberRelService {
 
-	private final ContractPlaceNumberRelConverter converter;
+    private final ContractPlaceNumberRelConverter converter;
 
-	@Autowired
-	SysUserService userService;
+    @Autowired
+    SysUserService userService;
 
-	@Autowired
-	IContractService contractService;
+    @Autowired
+    IContractService contractService;
 
-	/**分页查询
-	 * */
-	@Override
-	public Page<ContractPlaceNumberRelVO> getPage(ContractPlaceNumberRelQuery queryParams) {
-		// 查询参数
+    /**
+     * 分页查询
+     */
+    @Override
+    public Page<ContractPlaceNumberRelVO> getPage(ContractPlaceNumberRelQuery queryParams) {
+        // 查询参数
         int pageNum = queryParams.getPageNum();
         int pageSize = queryParams.getPageSize();
-        //Integer status = queryParams.getStatus();
-        //String keywords = queryParams.getKeywords();
-		SysUser sysUser = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getId,SecurityUtils.getUserId()));
+        // Integer status = queryParams.getStatus();
+        // String keywords = queryParams.getKeywords();
+        SysUser sysUser = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getId, SecurityUtils.getUserId()));
         // 查询数据
         Page<ContractPlaceNumberRel> dictItemPage = this.page(
                 new Page<>(pageNum, pageSize),
                 new LambdaQueryWrapper<ContractPlaceNumberRel>()
-                	.eq(sysUser != null, ContractPlaceNumberRel::getContractId,sysUser.getContractId())
-                	//.like(StrUtil.isNotBlank(keywords), ContractPlaceNumberRel::getCategoryName, keywords)
+                        .eq(sysUser != null, ContractPlaceNumberRel::getContractId, sysUser.getContractId())
+						.orderByDesc(ContractPlaceNumberRel::getStartTime)
+
+                //.like(StrUtil.isNotBlank(keywords), ContractPlaceNumberRel::getCategoryName, keywords)
         );
 
         // 实体转换
         Page<ContractPlaceNumberRelVO> pageResult = converter.entity2Page(dictItemPage);
-		// 获取车位上限
-		Contract contract = contractService.getOne(new LambdaQueryWrapper<Contract>().eq(Contract::getId, sysUser.getContractId()));
-		for (ContractPlaceNumberRelVO record : pageResult.getRecords()) {
-			record.setMaxParkingLotNum(contract.getMaxParkingLotNum());
-		}
+        // 获取车位上限
+        Contract contract = contractService.getOne(new LambdaQueryWrapper<Contract>().eq(Contract::getId, sysUser.getContractId()));
+        for (ContractPlaceNumberRelVO record : pageResult.getRecords()) {
+            record.setMaxParkingLotNum(contract.getMaxParkingLotNum());
+        }
         return pageResult;
-	}
-	
-	
-
-	/**
-	 * 保存表单
-	 * */
-	@Override
-	public ContractPlaceNumberRelForm saveForm(@Valid ContractPlaceNumberRelForm form) {
-		// 实体对象转换 form->entity
-		ContractPlaceNumberRel entity = converter.form2Entity(form);
+    }
+
+
+    /**
+     * 保存表单
+     */
+    @Override
+    public ContractPlaceNumberRelForm saveForm(@Valid ContractPlaceNumberRelForm form) {
+        // 实体对象转换 form->entity
+        ContractPlaceNumberRel entity = converter.form2Entity(form);
         // 持久化
         this.save(entity);
         ContractPlaceNumberRelForm result = converter.entity2Form(entity);
         return result;
-	}
-
-	/**更新
-	 * */
-	@Override
-	public boolean updateForm(Long id, ContractPlaceNumberRelForm form) {
-		ContractPlaceNumberRel entity = converter.form2Entity(form);
-		entity.setId(id);
+    }
+
+    /**
+     * 更新
+     */
+    @Override
+    public boolean updateForm(Long id, ContractPlaceNumberRelForm form) {
+        ContractPlaceNumberRel entity = converter.form2Entity(form);
+        entity.setId(id);
         boolean result = this.updateById(entity);
         return result;
-	}
-
-	/**获取表单数据
-	 * */
-	@Override
-	public ContractPlaceNumberRelForm getFormData(Long id) {
-		// 获取entity
-		ContractPlaceNumberRel entity = this.getById(id);
+    }
+
+    /**
+     * 获取表单数据
+     */
+    @Override
+    public ContractPlaceNumberRelForm getFormData(Long id) {
+        // 获取entity
+        ContractPlaceNumberRel entity = this.getById(id);
         Assert.isTrue(entity != null, "协议(客商)车牌关系不存在");
 
         // 实体转换
         ContractPlaceNumberRelForm form = converter.entity2Form(entity);
         return form;
-	}
-	
+    }
+
+    /**
+     * @description: 协商车牌历史记录分页列表
+     * @param: queryParams
+     * @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.qmrb.system.pojo.vo.ContractPlaceNumberRelVO>
+     * @author xue
+     * @date: 2025/3/12 17:31
+     */
+    @Override
+    public Page<ContractPlaceNumberRelVO> getHistoryPage(ContractPlaceNumberRelQuery queryParams) {
+        // 查询参数
+        int pageNum = queryParams.getPageNum();
+        int pageSize = queryParams.getPageSize();
+        // 查询数据
+		LambdaQueryWrapper<ContractPlaceNumberRel> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.ge(StrUtil.isNotBlank(queryParams.getStartTimeBegin()), ContractPlaceNumberRel::getStartTime, queryParams.getStartTimeBegin()).le(StrUtil.isNotBlank(queryParams.getStartTimeEnd()), ContractPlaceNumberRel::getStartTime, queryParams.getStartTimeEnd());
+		queryWrapper.ge(StrUtil.isNotBlank(queryParams.getEndTimeBegin()), ContractPlaceNumberRel::getEndTime, queryParams.getEndTimeBegin()).le(StrUtil.isNotBlank(queryParams.getEndTimeEnd()), ContractPlaceNumberRel::getEndTime, queryParams.getEndTimeEnd());
+		queryWrapper.eq(StrUtil.isNotBlank(queryParams.getPhone()),ContractPlaceNumberRel::getPhone, queryParams.getPhone());
+		queryWrapper.orderByDesc(ContractPlaceNumberRel::getStartTime);
+		
+        Page<ContractPlaceNumberRel> dictItemPage = this.page(
+                new Page<>(pageNum, pageSize),
+				queryWrapper
+		);
+
+        // 实体转换
+        Page<ContractPlaceNumberRelVO> pageResult = converter.entity2Page(dictItemPage);
+        return pageResult;
+    }
+
 }