Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobilePoolController.java

@@ -73,10 +73,8 @@ public class FosterwxMobilePoolController extends BaseController<FosterwxMobileP
     }
 
     @PostMapping("/getOutOfServerList")
-    public Object getOutOfServerList(@Valid @RequestBody FosterwxMobilePoolHandle fosterwxMobilePoolHandle, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
-        }
+    public Object getOutOfServerList() {
+        FosterwxMobilePoolHandle fosterwxMobilePoolHandle = new FosterwxMobilePoolHandle();
         fosterwxMobilePoolHandle.setStatus(0);
         fosterwxMobilePoolHandle.setPage(1);
         fosterwxMobilePoolHandle.setPageSize(999999999);

src/main/java/com/mokamrp/privates/entity/pangu/FosterwxFlowListHandle.java

@@ -3,9 +3,13 @@ package com.mokamrp.privates.entity.pangu;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 @Data
 public class FosterwxFlowListHandle extends Model<FosterwxFlowListHandle> {
     private Integer page;
     private Integer pageSize;
     private String poolIndex;
+    private LocalDate timeFrom;
+    private LocalDate timeTo;
 }

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxMobileMapper.xml

@@ -68,5 +68,6 @@
             <if test="param.wxStatus != null">and wx_status = #{param.wxStatus}</if>
             <if test="param.status != null">and status = #{param.status}</if>
         </where>
+        order by id desc
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxFlowListServiceImpl.java

@@ -10,6 +10,8 @@ import com.mokamrp.privates.service.pangu.FosterwxFlowListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -39,6 +41,14 @@ public class FosterwxFlowListServiceImpl extends ServiceImpl<FosterwxFlowListMap
         Page<FosterwxFlowList> pageObj = new Page<FosterwxFlowList>(page, pageSize);
         LambdaQueryWrapper<FosterwxFlowList> fosterwxFlowListLambdaQueryWrapper = new LambdaQueryWrapper<>();
         fosterwxFlowListLambdaQueryWrapper.eq(FosterwxFlowList::getPoolId, handle.getPoolIndex());
+        if (null != handle.getTimeFrom()) {
+            fosterwxFlowListLambdaQueryWrapper.ge(FosterwxFlowList::getCreateAt, LocalDateTime.of(handle.getTimeFrom(), LocalTime.MIN));
+        }
+        if (null != handle.getTimeTo()) {
+            fosterwxFlowListLambdaQueryWrapper.le(FosterwxFlowList::getCreateAt, LocalDateTime.of(handle.getTimeTo(), LocalTime.MAX));
+        }
+
+        fosterwxFlowListLambdaQueryWrapper.orderByDesc(FosterwxFlowList::getId);
         pageObj = fosterwxFlowListMapper.selectPage(pageObj, fosterwxFlowListLambdaQueryWrapper);
         Map<String, Object> resMap = new HashMap<String, Object>();
         resMap.put("list", pageObj.getRecords());