修改统计报表

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

@@ -6,49 +6,31 @@ 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.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.GroupListEnum;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.ph.model.PhQueueQuery;
+import com.mortals.xhx.module.ph.model.PhQueueStatEntity;
 import com.mortals.xhx.module.ph.model.PhQueueStatQuery;
-import com.mortals.xhx.module.pj.model.PjEvaluateQuery;
-import com.mortals.xhx.module.pj.model.PjEvaluateStatEntity;
+import com.mortals.xhx.module.ph.service.PhQueueStatService;
 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.ph.model.PhQueueStatEntity;
-import com.mortals.xhx.module.ph.service.PhQueueStatService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.Arrays;
-
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import static com.mortals.framework.ap.SysConstains.*;
-
-import com.mortals.xhx.common.code.*;
-
 /**
  * 排队叫号汇总统计
  *
@@ -73,7 +55,23 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
     @Override
     protected void init(Map<String, Object> model, Context context) {
 
-
+        //通过站点 查询存在的部门 大厅等
+        Object siteId = model.get("siteId");
+        if (!ObjectUtils.isEmpty(siteId)) {
+            PhQueueStatQuery queueStatQuery = new PhQueueStatQuery();
+            queueStatQuery.setSiteId((Long) siteId);
+            List<PhQueueStatEntity> phQueueStatEntities = this.service.find(queueStatQuery, context);
+            Map<String, String> sectionNameMap = phQueueStatEntities.stream().filter(f -> !ObjectUtils.isEmpty(f.getSectionName())).collect(Collectors.toMap(PhQueueStatEntity::getSectionName, PhQueueStatEntity::getSectionName, (k1, k2) -> k2));
+            Map<String, String> hallNameMap = phQueueStatEntities.stream().filter(f -> !ObjectUtils.isEmpty(f.getHallName())).collect(Collectors.toMap(PhQueueStatEntity::getHallName, PhQueueStatEntity::getHallName, (k1, k2) -> k2));
+            Map<String, String> windowFromnumMap = phQueueStatEntities.stream().filter(f -> !ObjectUtils.isEmpty(f.getWindowFromnum())).collect(Collectors.toMap(PhQueueStatEntity::getWindowFromnum, PhQueueStatEntity::getWindowFromnum, (k1, k2) -> k2));
+            Map<String, String> bussinessMap = phQueueStatEntities.stream().filter(f -> !ObjectUtils.isEmpty(f.getBusiness())).collect(Collectors.toMap(PhQueueStatEntity::getBusiness, PhQueueStatEntity::getBusiness, (k1, k2) -> k2));
+
+            this.addDict(model, "sectionNameList", sectionNameMap);
+            this.addDict(model, "hallNameList", hallNameMap);
+            this.addDict(model, "windowFromnumList", windowFromnumMap);
+            this.addDict(model, "bussinessList", bussinessMap);
+            this.addDict(model, "groupList", GroupListEnum.getEnumMap());
+        }
 
         super.init(model, context);
     }
@@ -85,6 +83,8 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
         if (ObjectUtils.isEmpty(query.getSectionName())) query.setSectionName("");
         if (ObjectUtils.isEmpty(query.getBusiness())) query.setBusiness("");
         if (ObjectUtils.isEmpty(query.getWindowFromnum())) query.setWindowFromnum("");
+
+        model.put("siteId", query.getSiteId());
     }
 
     @PostMapping(value = "/stat")
@@ -119,7 +119,7 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
                         sitestatEntity.setSiteCode(site.getSiteCode());
 
                         sitestatEntity.setYear(curDate.year());
-                        sitestatEntity.setMonth(curDate.month()+1);
+                        sitestatEntity.setMonth(curDate.month() + 1);
                         sitestatEntity.setDay(curDate.dayOfMonth());
                         //设置年月日
                         this.service.updateSitePhStat(sitestatEntity, context);

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

@@ -60,9 +60,9 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
             PjEvaluateStatQuery pjEvaluateStatQuery = new PjEvaluateStatQuery();
             pjEvaluateStatQuery.setSiteId((Long)siteId);
             List<PjEvaluateStatEntity> pjEvaluateStatEntities = this.service.find(pjEvaluateStatQuery, context);
-            Map<String, String> sectionNameMap = pjEvaluateStatEntities.stream().collect(Collectors.toMap(PjEvaluateStatEntity::getSectionName, PjEvaluateStatEntity::getSectionName, (k1, k2) -> k2));
-            Map<String, String> hallNameMap = pjEvaluateStatEntities.stream().collect(Collectors.toMap(PjEvaluateStatEntity::getHallName, PjEvaluateStatEntity::getHallName, (k1, k2) -> k2));
-            Map<String, String> windowFromnumMap = pjEvaluateStatEntities.stream().collect(Collectors.toMap(PjEvaluateStatEntity::getWindowFromnum, PjEvaluateStatEntity::getWindowFromnum, (k1, k2) -> k2));
+            Map<String, String> sectionNameMap = pjEvaluateStatEntities.stream().filter(f->!ObjectUtils.isEmpty(f.getSectionName())).collect(Collectors.toMap(PjEvaluateStatEntity::getSectionName, PjEvaluateStatEntity::getSectionName, (k1, k2) -> k2));
+            Map<String, String> hallNameMap = pjEvaluateStatEntities.stream().filter(f->!ObjectUtils.isEmpty(f.getHallName())).collect(Collectors.toMap(PjEvaluateStatEntity::getHallName, PjEvaluateStatEntity::getHallName, (k1, k2) -> k2));
+            Map<String, String> windowFromnumMap = pjEvaluateStatEntities.stream().filter(f->!ObjectUtils.isEmpty(f.getWindowFromnum())).collect(Collectors.toMap(PjEvaluateStatEntity::getWindowFromnum, PjEvaluateStatEntity::getWindowFromnum, (k1, k2) -> k2));
 
             this.addDict(model, "sectionNameList", sectionNameMap);
             this.addDict(model, "hallNameList", hallNameMap);