修改代码

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.SysDeptAccountHistory;
+import com.ydtech.modules.admin.model.dto.SysDeptAccountHistoryDto;
 import com.ydtech.modules.admin.service.SysDeptAccountHistoryService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ser.model.SerAnnualAuditOrder;
@@ -28,8 +29,8 @@ public class SysDeptAccountHistoryController extends BaseController {
 
     @PostMapping("/queryPage")
     @ApiOperation(value = "机构账户表日志记录分页")
-    public HttpResult getSysDeptAccountHistory(@RequestBody SysDeptAccountHistory sysDeptAccountHistory){
-        IPage<SysDeptAccountHistory> getSysDeptAccountHistory = sysDeptAccountHistoryService.selectList(sysDeptAccountHistory);
+    public HttpResult getSysDeptAccountHistory(@RequestBody SysDeptAccountHistoryDto sysDeptAccountHistoryDto){
+        IPage<SysDeptAccountHistory> getSysDeptAccountHistory = sysDeptAccountHistoryService.selectList(sysDeptAccountHistoryDto);
         PageResult pageResult = buildPageResponse(getSysDeptAccountHistory);
         return HttpResult.ok(pageResult);
     }

src/main/java/com/ydtech/modules/admin/model/SysDeptAccountEntity.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @TableName(value = "sys_dept_account")
 @Data
 @ApiModel(value = "机构管理")
-public class SysDeptAccountEntity extends PageRequest implements Serializable {
+public class SysDeptAccountEntity implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
@@ -31,6 +31,4 @@ public class SysDeptAccountEntity extends PageRequest implements Serializable {
     private Date createTime;
 
 
-
-
 }

src/main/java/com/ydtech/modules/admin/model/SysDeptAccountHistory.java

@@ -15,7 +15,7 @@ import java.util.Date;
 @TableName(value = "sys_dept_account_history")
 @Data
 @ApiModel(value = "机构管理历史记录")
-public class SysDeptAccountHistory extends PageRequest implements Serializable{
+public class SysDeptAccountHistory implements Serializable{
         @ApiModelProperty(value = "历史记录ID")
         @TableId(value = "id")
         private String id;

src/main/java/com/ydtech/modules/admin/model/dto/SysDeptAccountHistoryDto.java

@@ -0,0 +1,55 @@
+package com.ydtech.modules.admin.model.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ydtech.core.page.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class SysDeptAccountHistoryDto extends PageRequest {
+    @ApiModelProperty(value = "历史记录ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "部门ID")
+    @TableField(value = "dept_id")
+    private String deptId;
+
+    @TableField(value = "amount")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "剩余金额")
+    @TableField(value = "surplus_amount")
+    private BigDecimal surplusAmount;
+    @ApiModelProperty(value = "提现/收入 1提现 2收入")
+    @TableField(value = "documentary")
+    private String documentary;
+
+    @ApiModelProperty(value = "来源订单")
+    @TableField(value = "suborder")
+    private String suborder;
+
+    @ApiModelProperty(value = "转出银行卡")
+    @TableField(value = "from_bank_card")
+    private String fromBankCard;
+
+    @ApiModelProperty(value = "转入银行卡")
+    @TableField(value = "to_bank_card")
+    private String toBankCard;
+
+    @ApiModelProperty(value = "提交人")
+    @TableField(value = "user_id")
+    private String userId;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "备注")
+    @TableField(value = "remark")
+    private String remark;
+}

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

@@ -3,6 +3,7 @@ package com.ydtech.modules.admin.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.model.SysDeptAccountHistory;
+import com.ydtech.modules.admin.model.dto.SysDeptAccountHistoryDto;
 import com.ydtech.modules.inv.model.InvAccountOperate;
 import com.ydtech.modules.ser.model.SerAnnualAuditOrder;
 import com.ydtech.modules.ser.model.vo.SerAnnualAuditOrderQueryVo;
@@ -12,5 +13,5 @@ import java.text.ParseException;
 
 
 public interface SysDeptAccountHistoryService extends IService<SysDeptAccountHistory> {
-    IPage<SysDeptAccountHistory> selectList(SysDeptAccountHistory sysDeptAccountHistory);
+    IPage<SysDeptAccountHistory> selectList(SysDeptAccountHistoryDto sysDeptAccountHistoryDto);
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.admin.dao.SysDeptAccountHistoryMapper;
 import com.ydtech.modules.admin.model.SysDeptAccountHistory;
+import com.ydtech.modules.admin.model.dto.SysDeptAccountHistoryDto;
 import com.ydtech.modules.admin.service.SysDeptAccountHistoryService;
 import com.ydtech.modules.ser.dao.SerAnnualAuditOrderMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,23 +21,23 @@ public class SysDeptAccountHistoryServiceImpl extends ServiceImpl<SysDeptAccount
     @Autowired
     private SysDeptAccountHistoryMapper sysDeptAccountHistoryMapper;
     @Override
-    public IPage<SysDeptAccountHistory> selectList(SysDeptAccountHistory sysDeptAccountHistory) {
+    public IPage<SysDeptAccountHistory> selectList(SysDeptAccountHistoryDto sysDeptAccountHistoryDto) {
         PageRequest pageRequest = new PageRequest();
-        pageRequest.setPageNum(sysDeptAccountHistory.getPageNum());
-        pageRequest.setPageSize(sysDeptAccountHistory.getPageSize());
+        pageRequest.setPageNum(sysDeptAccountHistoryDto.getPageNum());
+        pageRequest.setPageSize(sysDeptAccountHistoryDto.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
         LambdaQueryWrapper<SysDeptAccountHistory> queryWrapper = new LambdaQueryWrapper<>();
         //机构Id
-        if (sysDeptAccountHistory.getDeptId() != null && !"".equals(sysDeptAccountHistory.getDeptId())) {
-            queryWrapper.eq(SysDeptAccountHistory::getDeptId, sysDeptAccountHistory.getDeptId());
+        if (sysDeptAccountHistoryDto.getDeptId() != null && !"".equals(sysDeptAccountHistoryDto.getDeptId())) {
+            queryWrapper.likeRight(SysDeptAccountHistory::getDeptId, sysDeptAccountHistoryDto.getDeptId());
         }
         //提现、收入
-        if (sysDeptAccountHistory.getDocumentary() != null && !"".equals(sysDeptAccountHistory.getDocumentary())) {
-            queryWrapper.eq(SysDeptAccountHistory::getDocumentary, sysDeptAccountHistory.getDocumentary());
+        if (sysDeptAccountHistoryDto.getDocumentary() != null && !"".equals(sysDeptAccountHistoryDto.getDocumentary())) {
+            queryWrapper.eq(SysDeptAccountHistory::getDocumentary, sysDeptAccountHistoryDto.getDocumentary());
         }
         //来源订单
-        if (sysDeptAccountHistory.getSuborder() != null && !"".equals(sysDeptAccountHistory.getSuborder())) {
-            queryWrapper.eq(SysDeptAccountHistory::getSuborder, sysDeptAccountHistory.getSuborder());
+        if (sysDeptAccountHistoryDto.getSuborder() != null && !"".equals(sysDeptAccountHistoryDto.getSuborder())) {
+            queryWrapper.eq(SysDeptAccountHistory::getSuborder, sysDeptAccountHistoryDto.getSuborder());
         }
         Page pageData = sysDeptAccountHistoryMapper.selectPage(page, queryWrapper);
 

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

@@ -10,7 +10,6 @@
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
     </resultMap>
 
-
     <select id="getDept" resultMap="BaseResultMap">
     SELECT
         a.dept_id,