待提现、已提现时间查询bug，提现时间bug修复

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

@@ -3,6 +3,7 @@ package com.ydtech.modules.admin.model.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -52,6 +53,7 @@ public class SysAmountAuditingEntity implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(value = "create_time")
     private Date createTime;
 

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

@@ -1,19 +1,14 @@
 package com.ydtech.modules.admin.model.vo;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -87,12 +82,12 @@ public class SysAmountAuditingVo {
     private int pageNum;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private LocalDate startTime;
+    //@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String startTime;
 
     @ApiModelProperty("结束时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private LocalDate endTime;
+    //@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String endTime;
 
     @ApiModelProperty("审批时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM")

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

@@ -106,7 +106,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             sysAmountAuditingVo.setAuditingUserId(BaseController.getUser().getId());
             sysAmountAuditingVo.setAuditingTime(new Date());
             BeanUtils.copyProperties(sysAmountAuditingVo, sysAmountAuditingEntity);
-            sysAmountAuditingVo.setCreateTime(new Date());
+            sysAmountAuditingEntity.setCreateTime(null);
             baseMapper.updateById(sysAmountAuditingEntity);
             //通过审核表id查询历史记录表
             LambdaQueryWrapper<SysUserAccountHistory> lqw = new LambdaQueryWrapper<>();
@@ -134,10 +134,10 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             params.put("pageNum",sysAmountAuditingVo.getPageNum());
             params.put("pageSize",sysAmountAuditingVo.getPageSize());
             if(ObjectUtils.isNotEmpty(sysAmountAuditingVo.getStartTime())){
-                params.put("startDate",sysAmountAuditingVo.getStartTime().toString());
+                params.put("startDate",sysAmountAuditingVo.getStartTime());
             }
             if(ObjectUtils.isNotEmpty(sysAmountAuditingVo.getEndTime())){
-                params.put("endDate",sysAmountAuditingVo.getEndTime().toString());
+                params.put("endDate",sysAmountAuditingVo.getEndTime());
             }
             if(StringUtils.isNotEmpty(sysAmountAuditingVo.getAuditingStatus())){
                 params.put("auditingStatus",sysAmountAuditingVo.getAuditingStatus());

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

@@ -144,13 +144,10 @@
             </if>
 
             <if test="startDate !=null and startDate != ''  and  endDate !=null  and  endDate!= '' ">
-                and DATE_FORMAT( a.auditing_time, '%Y-%m-%d')  between DATE_FORMAT(#{startDate}, '%Y-%m-%d') and DATE_FORMAT(#{endDate}, '%Y-%m-%d')
-            </if>
-            <if test="timeFiltering !=null and timeFiltering != '' ">
-             AND   DATE_FORMAT(a.auditing_time, '%Y-%m') = #{timeFiltering}
+                and DATE_FORMAT( a.create_time, '%Y-%m-%d')  between DATE_FORMAT(#{startDate}, '%Y-%m-%d') and DATE_FORMAT(#{endDate}, '%Y-%m-%d')
             </if>
         </where>
-        order by a.auditing_time desc
+        order by a.create_time desc
     </select>
 
     <select id="getProgressIng" resultType="com.ydtech.modules.admin.model.po.SysAmountAuditingEntity">