修改办件查询列表

base-manager/src/main/java/com/mortals/xhx/module/dowork/model/vo/DoworkStatVo.java

@@ -3,6 +3,8 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.dowork.model.DoworkStatEntity;
 import java.util.ArrayList;
 import java.util.List;
+
+import com.mortals.xhx.module.dowork.model.DoworkStatQuery;
 import lombok.Data;
 import com.mortals.framework.annotation.Excel;
 import java.math.BigDecimal;
@@ -30,4 +32,7 @@ public class DoworkStatVo extends BaseEntityLong {
     private Integer monthEnd;
 
 
+    private List<DoworkStatQuery> orConditionList;
+
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dowork/web/DoworkStatController.java

 package com.mortals.xhx.module.dowork.web;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
@@ -14,8 +16,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 办件统计
@@ -46,6 +47,24 @@ public class DoworkStatController extends BaseCRUDJsonBodyMappingController<Dowo
         }
         if (ObjectUtils.isEmpty(query.getAreaCode())) throw new AppException("区域编码不能为空！");
 
+        //固定请求参数 最近6月
+        int curMonth = DateUtil.month(new Date())+1;
+        int curYear = DateUtil.year(new Date());
+        DateTime dateTime = DateUtil.offsetMonth(new Date(), -6);
+        int startYear = DateUtil.year(dateTime);
+        int startMonth = DateUtil.month(dateTime) + 1;
+
+        List<DoworkStatQuery> conditionList = new ArrayList<>();
+        DoworkStatQuery query1 = new DoworkStatQuery();
+        query1.setYear(startYear);
+        query1.setMonthStart(startMonth);
+        conditionList.add(query1);
+
+        DoworkStatQuery query2 = new DoworkStatQuery();
+        query2.setYear(curYear);
+        query2.setMonthEnd(curMonth);
+        query.setOrConditionList(conditionList);
+
         Runnable runnable = new Runnable() {
             @Override
             public void run() {