修改统计报表

bill-manager/src/main/java/com/mortals/xhx/module/pj/service/impl/PjEvaluateStatServiceImpl.java

@@ -294,11 +294,11 @@ public class PjEvaluateStatServiceImpl extends AbstractCRUDServiceImpl<PjEvaluat
     public List<PjEvaluateStatEntity> getBillInfos(PjEvaluateStatQuery query, Integer datePattern, PageInfo pageInfo, Context context) {
         List<PjEvaluateStatEntity> statList = new ArrayList<>();
         if (datePattern == TimeUnitEnum.DAY.getValue()) {
-            query.setGroupList(Arrays.asList("day"));
+            query.setGroupList(Arrays.asList("year","month","day"));
             query.setOrderColList(Arrays.asList(new OrderCol("year", OrderCol.DESCENDING), new OrderCol("month", OrderCol.DESCENDING), new OrderCol("day", OrderCol.DESCENDING), new OrderCol("createTime")));
             statList = this.getDao().getStatList(query, pageInfo);
         } else if (datePattern == TimeUnitEnum.MONTH.getValue()) {
-            query.setGroupList(Arrays.asList("month"));
+            query.setGroupList(Arrays.asList("year","month"));
             query.setOrderColList(Arrays.asList(new OrderCol("year", OrderCol.DESCENDING), new OrderCol("month", OrderCol.DESCENDING), new OrderCol("createTime")));
             statList = this.getDao().getStatList(query, pageInfo);
         } else if (datePattern == TimeUnitEnum.YEAR.getValue()) {

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

@@ -6,11 +6,9 @@ import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
 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.pj.model.PjEvaluateEntity;
 import com.mortals.xhx.module.pj.model.PjEvaluateQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,28 +18,12 @@ 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.pj.model.PjEvaluateStatEntity;
 import com.mortals.xhx.module.pj.service.PjEvaluateStatService;
-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.*;
 
@@ -72,7 +54,7 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
 
     @PostMapping(value = "/stat")
     @UnAuth
-    public Rest<String> addAttendanceRecordCustom(@RequestBody PjEvaluateQuery pjEvaluateQuery) {
+    public Rest<String> pjStat(@RequestBody PjEvaluateQuery pjEvaluateQuery) {
         Rest<String> ret = new Rest();
         Map<String, Object> model = new HashMap();
         Context context = this.getContext();

bill-manager/src/main/resources/sqlmap/module/ph/PhQueueStatMapperExt.xml

@@ -17,10 +17,6 @@
         a.section_name,
         a.hall_name,
         a.business,
-        a.year,
-        a.month,
-        a.day,
-
         <!-- 平均等待时间-->
         avg(IFNULL(a.wait_time,0)) wait_time
         <!-- 评价数量-->

bill-manager/src/main/resources/sqlmap/module/pj/PjEvaluateStatMapperExt.xml

@@ -19,9 +19,6 @@
         a.pj_option,
         a.hall_name,
         a.window_fromnum,
-        a.year,
-        a.month,
-        a.day,
         <!-- 评价数量-->
         sum(IFNULL(a.pj_count,0)) pj_count