机构账户历史记录修改

src/main/java/com/ydtech/modules/admin/dao/SysDeptAccountHistoryMapper.java

@@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Param;
 
 
 public interface SysDeptAccountHistoryMapper extends BaseMapper<SysDeptAccountHistory> {
-    Page<SysDeptAccountHistoryDto> getDeptHistory(Page page,@Param("sysDeptAccountHistoryDto") SysDeptAccountHistoryDto sysDeptAccountHistoryDto);
+    Page<SysDeptAccountHistory> getDeptHistory(Page page,@Param("sysDeptAccountHistoryDto") SysDeptAccountHistoryDto sysDeptAccountHistoryDto);
 }

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

@@ -51,7 +51,6 @@ public class SysDeptAccountHistoryDto{
 
     @ApiModelProperty(value = "创建时间")
     @TableField(value = "create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty(value = "备注")

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

@@ -123,6 +123,15 @@ public class SysAmountAuditingEntity implements Serializable {
     @TableField(exist = false)
     private String bankAccount;
 
+    /**
+     * 开户行地址
+     */
+    @TableField(exist = false)
+    private String bankAddress;
+
+    @TableField(exist = false)
+    private String mobile;
+
     /**
      * 审核人名称
      */

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

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 
 
 public interface SysDeptAccountHistoryService extends IService<SysDeptAccountHistory> {
-    IPage<SysDeptAccountHistoryDto> selectList(SysDeptAccountHistoryDto sysDeptAccountHistoryDto);
+    IPage<SysDeptAccountHistory> selectList(SysDeptAccountHistoryDto sysDeptAccountHistoryDto);
 
     /**
      * 添加历史记录

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

@@ -25,13 +25,12 @@ public class SysDeptAccountHistoryServiceImpl extends ServiceImpl<SysDeptAccount
     @Autowired
     private SysDeptAccountHistoryMapper sysDeptAccountHistoryMapper;
     @Override
-    public IPage<SysDeptAccountHistoryDto> selectList(SysDeptAccountHistoryDto sysDeptAccountHistoryDto) {
+    public IPage<SysDeptAccountHistory> selectList(SysDeptAccountHistoryDto sysDeptAccountHistoryDto) {
         PageRequest pageRequest = new PageRequest();
         pageRequest.setPageNum(sysDeptAccountHistoryDto.getPageNo());
         pageRequest.setPageSize(sysDeptAccountHistoryDto.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
-        Page<SysDeptAccountHistoryDto> deptHistoryList = sysDeptAccountHistoryMapper.getDeptHistory(page,sysDeptAccountHistoryDto);
-        return deptHistoryList;
+        return sysDeptAccountHistoryMapper.getDeptHistory(page,sysDeptAccountHistoryDto);
     }
 
     /**

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

@@ -12,7 +12,7 @@
         <result column="suborder" jdbcType="VARCHAR" property="suborder"/>
         <result column="user_id" jdbcType="VARCHAR" property="userId"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
-        <result column="create_date" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result property="createTimeStart" column="createTimeStart" jdbcType="VARCHAR"/>
         <result property="createTimeEnd" column="createTimeEnd" jdbcType="VARCHAR"/>
     </resultMap>
@@ -28,7 +28,7 @@
         a.suborder,
         a.user_id,
         a.remark,
-        DATE(a.create_time) as create_date
+        a.create_time
         FROM
         sys_dept_account_history a
         LEFT JOIN sys_dept b ON a.dept_id = b.id
@@ -44,10 +44,10 @@
             AND a.documentary = #{sysDeptAccountHistoryDto.documentary}
         </if>
         <if test="sysDeptAccountHistoryDto.createTimeStart != null and sysDeptAccountHistoryDto.createTimeStart != ''">
-            and DATE(a.create_time) &gt;= #{sysDeptAccountHistoryDto.createTimeStart}
+            and a.create_time &gt;= #{sysDeptAccountHistoryDto.createTimeStart}
         </if>
         <if test="sysDeptAccountHistoryDto.createTimeEnd != null and sysDeptAccountHistoryDto.createTimeEnd != ''">
-            and DATE(a.create_time) &lt;= #{sysDeptAccountHistoryDto.createTimeEnd}
+            and a.create_time &lt;= #{sysDeptAccountHistoryDto.createTimeEnd}
         </if>
     </select>