修改统计报表

bill-manager/src/main/java/com/mortals/xhx/module/ph/web/PhQueueStatController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.pdu.RespData;
@@ -16,6 +17,7 @@ import com.mortals.xhx.module.pj.model.PjEvaluateQuery;
 import com.mortals.xhx.module.pj.model.PjEvaluateStatEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StopWatch;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -73,6 +75,15 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
         super.init(model, context);
     }
 
+
+    @Override
+    protected void doListBefore(PhQueueStatEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getHallName())) query.setHallName("");
+        if (ObjectUtils.isEmpty(query.getSectionName())) query.setSectionName("");
+        if (ObjectUtils.isEmpty(query.getBusiness())) query.setBusiness("");
+        if (ObjectUtils.isEmpty(query.getWindowFromnum())) query.setWindowFromnum("");
+    }
+
     @PostMapping(value = "/stat")
     @UnAuth
     public Rest<String> addAttendanceRecordCustom(@RequestBody PhQueueQuery phQueueQuery) {

bill-manager/src/main/java/com/mortals/xhx/module/pj/web/PjEvaluateStatController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
@@ -12,6 +13,7 @@ import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.pj.model.PjEvaluateQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StopWatch;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -52,6 +54,14 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
     }
 
 
+    @Override
+    protected void doListBefore(PjEvaluateStatEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getHallName())) query.setHallName("");
+        if (ObjectUtils.isEmpty(query.getSectionName())) query.setSectionName("");
+        if (ObjectUtils.isEmpty(query.getPjOption())) query.setPjOption("");
+        if (ObjectUtils.isEmpty(query.getWindowFromnum())) query.setWindowFromnum("");
+    }
+
     @PostMapping(value = "/stat")
     @UnAuth
     public Rest<String> pjStat(@RequestBody PjEvaluateQuery pjEvaluateQuery) {
@@ -84,7 +94,7 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
                         sitestatEntity.setSiteCode(site.getSiteCode());
 
                         sitestatEntity.setYear(curDate.year());
-                        sitestatEntity.setMonth(curDate.month()+1 );
+                        sitestatEntity.setMonth(curDate.month() + 1);
                         sitestatEntity.setDay(curDate.dayOfMonth());
                         //设置年月日
                         this.service.updateSitePjStat(sitestatEntity, context);