fix: 积分充值记录-过滤只显示充值的

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/controller/SysDeptRechargeController.java

@@ -114,7 +114,7 @@ public class SysDeptRechargeController {
      */
     @GetMapping("/page-recharge-record")
     public R<IPage<SysDeptRechargeRecordVO>> pageRechargeRecord(Page<SysDeptRechargeRecordVO> page, @Validated SysDeptRechargeRequest.ToAdminRecordPage toAdminRecordPage) {
-        return R.ok(deptRechargeRecordService.pageRechargeRecord(page, toAdminRecordPage.getDeptId()));
+        return R.ok(deptRechargeRecordService.pageRechargeRecord(page, toAdminRecordPage.getDeptId(), toAdminRecordPage.getType()));
     }
 
     /**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/dto/SysDeptRechargeRequest.java

@@ -70,6 +70,11 @@ public class SysDeptRechargeRequest implements Serializable {
          */
         @NotNull(message = "企业id必填")
         private Integer deptId;
+
+        /**
+         * 积分充值记录操作类型
+         */
+        private RechargeRecordType type;
     }
 
     /**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/service/SysDeptRechargeRecordService.java

@@ -22,9 +22,10 @@ public interface SysDeptRechargeRecordService extends IService<SysDeptRechargeRe
      *
      * @param page       分页参数
      * @param deptId     企业id
+     * @param type       操作类型
      * @return 分页结果
      */
-    IPage<SysDeptRechargeRecordVO> pageRechargeRecord(Page<SysDeptRechargeRecordVO> page, Integer deptId);
+    IPage<SysDeptRechargeRecordVO> pageRechargeRecord(Page<SysDeptRechargeRecordVO> page, Integer deptId, RechargeRecordType type);
 
     /**
      * 分配、发包记录(企业)

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/service/impl/SysDeptRechargeRecordServiceImpl.java

@@ -61,14 +61,19 @@ public class SysDeptRechargeRecordServiceImpl extends ServiceImpl<SysDeptRecharg
      *
      * @param page       分页参数
      * @param deptId     企业id
+     * @param type       操作类型
      * @return 分页结果
      */
     @Override
-    public IPage<SysDeptRechargeRecordVO> pageRechargeRecord(Page<SysDeptRechargeRecordVO> page, Integer deptId) {
+    public IPage<SysDeptRechargeRecordVO> pageRechargeRecord(Page<SysDeptRechargeRecordVO> page, Integer deptId, RechargeRecordType type) {
         LambdaQueryWrapper<SysDeptRechargeRecord> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(SysDeptRechargeRecord::getDeptId, deptId);
         queryWrapper.eq(SysDeptRechargeRecord::getDelFlag, DelEnum.NOT_DEL.val());
         queryWrapper.orderByDesc(SysDeptRechargeRecord::getCreateTime);
+        if (type != null) {
+            queryWrapper.eq(SysDeptRechargeRecord::getType, type);
+        }
+
         Page<SysDeptRechargeRecord> recordPage = this.page(new Page<>(page.getCurrent(), page.getSize()), queryWrapper);
 
         if (CollUtil.isNotEmpty(recordPage.getRecords())) {