1.提现审核添加审核人 审核时间

2.app分页查询

src/main/java/com/ydtech/modules/admin/controller/SysAmountAuditingController.java

@@ -24,7 +24,6 @@ public class SysAmountAuditingController extends BaseController {
     @Autowired
     private SysAmountAuditingService sysAmountAuditingService;
 
-//SysAmountAuditingEntity
     @PostMapping("/queryPage")
     @ApiOperation(value = "提现审核分页")
     public HttpResult<BasePageResult<SysAmountAuditingEntity>> queryPageOrder(@RequestBody @Valid SysAmountAuditingVo sysAmountAuditingVo ) {
@@ -41,5 +40,10 @@ public class SysAmountAuditingController extends BaseController {
         sysAmountAuditingService.AmountReview(sysUserAccountVo);
         return HttpResult.ok("审核成功");
     }
-
+    @PostMapping("/queryAppPage")
+    @ApiOperation(value = "提现审核分页")
+    public HttpResult<BasePageResult<SysAmountAuditingEntity>> queryAppPage(@RequestBody @Valid SysAmountAuditingVo sysAmountAuditingVo ) {
+        BasePageResult<SysAmountAuditingEntity> result = sysAmountAuditingService.queryAppPage(sysAmountAuditingVo);
+        return HttpResult.ok("success", result);
+    }
 }

src/main/java/com/ydtech/modules/admin/model/po/SysAmountAuditingEntity.java

@@ -53,6 +53,18 @@ public class SysAmountAuditingEntity implements Serializable {
     @TableField(value = "amount_status")
     private String amountStatus;
 
+    /**
+     * 审核时间
+     */
+    @TableField(value = "auditing_time")
+    private Date auditingTime;
+
+    /**
+     * 审核人
+     */
+    @TableField(value = "auditing_user_id")
+    private String auditingUserId;
+
 
     /**
      *   用户当前金额
@@ -97,4 +109,10 @@ public class SysAmountAuditingEntity implements Serializable {
      */
     @TableField(exist = false)
     private String bankAccount;
+
+    /**
+     *   审核人名称
+     */
+    @TableField(exist = false)
+    private String auditingUserName;
 }

src/main/java/com/ydtech/modules/admin/model/vo/SysAmountAuditingVo.java

@@ -79,11 +79,23 @@ public class SysAmountAuditingVo {
 
     @ApiModelProperty("开始时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private String startTime;
+    private Date startTime;
 
     @ApiModelProperty("结束时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private String endTime;
+    private Date endTime;
+
+    @ApiModelProperty("审批时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date auditingTime;
+
+    @ApiModelProperty("审核人")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String auditingUserId;
+    @ApiModelProperty(value = "审核人名称")
+    private String auditingUserName;
+
+
 
 
 }

src/main/java/com/ydtech/modules/admin/service/SysAmountAuditingService.java

@@ -12,4 +12,6 @@ public interface SysAmountAuditingService extends IService<SysAmountAuditingEnti
 
     BasePageResult<SysAmountAuditingEntity> queryByVo(SysAmountAuditingVo sysAmountAuditingVo);
 
+    BasePageResult<SysAmountAuditingEntity> queryAppPage(SysAmountAuditingVo sysAmountAuditingVo);
+
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -9,6 +9,7 @@ import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
 import com.ydtech.modules.admin.service.SysAmountAuditingService;
 import com.ydtech.modules.admin.service.SysUserAccountService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.utils.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -78,4 +79,15 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         return new BasePageResult<>(sysAmountAuditingVo.getPageNum(), page.getSize(), sysUserAccountHistoryPage.getTotal(), page.getPages(),
                 sysUserAccountHistoryPage.getRecords());
     }
+
+    @Override
+    public BasePageResult<SysAmountAuditingEntity> queryAppPage(SysAmountAuditingVo sysAmountAuditingVo) {
+        String id = BaseController.getUser().getId();
+        sysAmountAuditingVo.setUserId(id);
+        Page<SysAmountAuditingEntity> page = new Page<>(sysAmountAuditingVo.getPageNum(), sysAmountAuditingVo.getPageSize());
+        QueryWrapper<SysAmountAuditingEntity> wrapper = new QueryWrapper<>();
+        Page<SysAmountAuditingEntity> sysUserAccountHistoryPage = baseMapper.queryPageOrder(sysAmountAuditingVo, page);
+        return new BasePageResult<>(sysAmountAuditingVo.getPageNum(), page.getSize(), sysUserAccountHistoryPage.getTotal(), page.getPages(),
+                sysUserAccountHistoryPage.getRecords());
+    }
 }

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -42,10 +42,13 @@
         a.create_time as "createTime",
         a.auditing_status as "auditingStatus",
         a.amount_status as "amountStatus",
+        a.auditing_time as "auditingTime",
+        a.auditing_user_id as "auditingUserId",
         b.user_amount as "userAmount",
         b.amount as "historyAmount",
         b.surplus_amount as "surplusAmount",
-        su.id as "userName",
+        su.name as "userName",
+        su2.name as "auditingUserName",
         su.dept_id as "deptId",
         sd.name as "deptName",
         bc.bank_account as "bankAccount"
@@ -54,7 +57,7 @@
         left join sys_user su on su.id =a.user_id
         left join sys_dept sd on sd.id =su.dept_id
         left join sys_user_bank_card bc on bc.bank_number =a.bank_number
-
+        left join sys_user su2  on  su2.id = a.auditing_user_id
         <where>
             <if test="sysAmountAuditingVo.auditingStatus !=null  and sysAmountAuditingVo.auditingStatus != ''">
                 a.auditing_status=#{sysAmountAuditingVo.auditingStatus}