添加排号与评价统计报表

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

@@ -5,6 +5,7 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.pj.model.PjEvaluateStatEntity;
 import com.mortals.xhx.module.pj.dao.PjEvaluateStatDao;
+import com.mortals.xhx.module.pj.model.PjEvaluateStatQuery;
 
 import java.util.List;
 
@@ -29,7 +30,7 @@ public interface PjEvaluateStatService extends ICRUDService<PjEvaluateStatEntity
     Rest<Void> updateSitePjStat(PjEvaluateStatEntity entity, Context context);
 
 
-    List<PjEvaluateStatEntity> getBillInfos(Long siteId, String createTimeStart, Integer datePattern, PageInfo pageInfo, Context context);
+    List<PjEvaluateStatEntity> getBillInfos(PjEvaluateStatQuery query, Integer datePattern, PageInfo pageInfo, Context context);
 
 
 }
\ No newline at end of file

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

@@ -275,11 +275,8 @@ public class PjEvaluateStatServiceImpl extends AbstractCRUDServiceImpl<PjEvaluat
 
 
     @Override
-    public List<PjEvaluateStatEntity> getBillInfos(Long siteId, String createTimeStart, Integer datePattern, PageInfo pageInfo, Context context) {
+    public List<PjEvaluateStatEntity> getBillInfos(PjEvaluateStatQuery query, Integer datePattern, PageInfo pageInfo, Context context) {
         List<PjEvaluateStatEntity> statList = new ArrayList<>();
-        PjEvaluateStatQuery query = new PjEvaluateStatQuery();
-        query.setSiteId(siteId);
-        query.setCreateTimeStart(createTimeStart);
         if (datePattern == TimeUnitEnum.DAY.getValue()) {
             query.setGroupList(Arrays.asList("day"));
             query.setOrderColList(Arrays.asList(new OrderCol("year", OrderCol.DESCENDING), new OrderCol("month", OrderCol.DESCENDING), new OrderCol("day", OrderCol.DESCENDING), new OrderCol("createTime")));

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

@@ -12,7 +12,7 @@
             </foreach>
         </if>
         id,
-        siteId,
+        site_id,
         createTime,
         year,
         month,