1.提现任务时间筛选

src/main/java/com/ydtech/modules/console/dto/WithdrawalTaskDto.java

@@ -62,4 +62,7 @@ public class WithdrawalTaskDto implements Serializable {
     @ApiModelProperty(value = "提现时间")
     private String createTime;
 
+    @ApiModelProperty(value = "审核时间")
+    private String auditingTime;
+
 }

src/main/java/com/ydtech/modules/console/service/impl/WithdrawalTaskServiceImpl.java

@@ -20,7 +20,7 @@ public class WithdrawalTaskServiceImpl implements WithdrawalTaskService {
 
     @Override
     public BasePageResult<WithdrawalTaskDto> queryByVo(WithdrawalTaskVo withdrawalTaskVo) {
-        HashMap<String, String> dateMapByType = getDateMapByType(withdrawalTaskVo.getDateType(), withdrawalTaskVo.getBeginDate(), withdrawalTaskVo.getEndDate());
+        HashMap<String, String> dateMapByType = getDateMapByTypeNew(withdrawalTaskVo.getDateType(), withdrawalTaskVo.getBeginDate(), withdrawalTaskVo.getEndDate());
         withdrawalTaskVo.setBeginDate(dateMapByType.get("startDate"));
         withdrawalTaskVo.setEndDate(dateMapByType.get("endDate"));
 
@@ -37,38 +37,43 @@ public class WithdrawalTaskServiceImpl implements WithdrawalTaskService {
      */
     @Override
     public HashMap<String, Object> countWithdrawal(WithdrawalTaskVo withdrawalTaskVo) {
-        HashMap<String, String> dateMapByType = getDateMapByType(withdrawalTaskVo.getDateType(), withdrawalTaskVo.getBeginDate(), withdrawalTaskVo.getEndDate());
+        HashMap<String, String> dateMapByType = getDateMapByTypeNew(withdrawalTaskVo.getDateType(), withdrawalTaskVo.getBeginDate(), withdrawalTaskVo.getEndDate());
         withdrawalTaskVo.setBeginDate(dateMapByType.get("startDate"));
         withdrawalTaskVo.setEndDate(dateMapByType.get("endDate"));
         HashMap<String, Object> resultItem = withdrawalTaskMapper.countWithdrawal(withdrawalTaskVo);
         return resultItem;
     }
 
-
-    private static HashMap<String, String> getDateMapByType(String type, String startDate, String endDate) {
-        HashMap<String, String> map = new HashMap<>();
-        String startDateStr = "";
-        String endDateStr = "";
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(startDate) && org.apache.commons.lang3.StringUtils.isNotBlank(endDate)) {
-            startDateStr = org.apache.commons.lang3.StringUtils.isNotBlank(startDate) ? startDate + " 00:00:00" : null;
-            endDateStr = org.apache.commons.lang3.StringUtils.isNotBlank(endDate) ? endDate + " 23:59:59" : null;
-        } else {
-            if ("1".equals(type)) {
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/19 11:57
+     *  @Description:  通过时间类型判断
+     */
+    private static HashMap<String,String> getDateMapByTypeNew(String type, String startDate, String endDate) {
+        HashMap<String,String> map =new HashMap<>();
+        String  startDateStr="";
+        String  endDateStr="";
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(startDate) && org.apache.commons.lang3.StringUtils.isNotBlank(endDate)){
+            startDateStr= org.apache.commons.lang3.StringUtils.isNotBlank(startDate)?startDate+" 00:00:00":null;
+            endDateStr= org.apache.commons.lang3.StringUtils.isNotBlank(endDate)?endDate+" 23:59:59":null;
+        }else{
+            if("1".equals(type)){
                 // 近1天
-                startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 00:00:00";
-                endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
-            } else if ("2".equals(type)) {
+                startDateStr= SliceUpDateUtil.getBeforeDay(new Date(),0)+" 00:00:00";
+                endDateStr=SliceUpDateUtil.getBeforeDay(new Date(),0)+" 23:59:59";
+            }else if("2".equals(type)){
                 // 近7天
-                startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 1) + " 00:00:00";
-                endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
-            } else if ("3".equals(type)) {
+                startDateStr=SliceUpDateUtil.getBeforeDay(new Date(),1)+" 00:00:00";
+                endDateStr=SliceUpDateUtil.getBeforeDay(new Date(),0)+" 23:59:59";
+            }else if("3".equals(type)){
                 // 近30天
-                startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 6) + " 00:00:00";
-                endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
+                startDateStr=SliceUpDateUtil.getBeforeDay(new Date(),6)+" 00:00:00";
+                endDateStr=SliceUpDateUtil.getBeforeDay(new Date(),0)+" 23:59:59";
             }
         }
-        map.put("startDate", startDateStr);
-        map.put("endDate", endDateStr);
+        map.put("startDate",startDateStr);
+        map.put("endDate",endDateStr);
         return map;
     }
 }

src/main/resources/mapper/modules/console/WithdrawalTaskMapper.xml

@@ -44,7 +44,7 @@
                  left join sys_user su2 on su2.id = a.auditing_user_id
         <where>
             <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
-                AND a.auditing_time BETWEEN #{vo.beginDate} AND #{vo.endDate}
+                AND a.create_time BETWEEN #{vo.beginDate} AND #{vo.endDate}
             </if>
         </where>
 
@@ -63,7 +63,7 @@
         from sys_amount_auditing a
         <where>
             <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
-                AND a.auditing_time BETWEEN #{vo.beginDate} AND #{vo.endDate}
+                AND a.create_time BETWEEN #{vo.beginDate} AND #{vo.endDate}
             </if>
         </where>