活动数量统计、事件上报统计 修改排序

esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenEventReportDTO.java

@@ -49,11 +49,16 @@ public class ScreenEventReportDTO implements Serializable {
 	private String time;
 
     /**
-     * 类型
+     * 类型
 1：month2：quarter3：year
      */
 	private Integer type;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
     /**
      * 创建人
      */

esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerActivityDTO.java

@@ -53,6 +53,12 @@ public class ScreenVolunteerActivityDTO implements Serializable {
      */
 	private Integer type;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+
     /**
      * 创建人
      */

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenEventReportEntity.java

@@ -49,9 +49,14 @@ public class ScreenEventReportEntity extends BaseEpdcEntity {
 	private String time;
 
     /**
-     * 类型
+     * 类型
 1：month2：quarter3：year
      */
 	private Integer type;
 
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
 }

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenVolunteerActivityEntity.java

@@ -53,4 +53,9 @@ public class ScreenVolunteerActivityEntity extends BaseEpdcEntity {
      */
 	private Integer type;
 
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
 }

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventReportServiceImpl.java

@@ -71,7 +71,7 @@ public class ScreenEventReportServiceImpl extends BaseServiceImpl<ScreenEventRep
         QueryWrapper<ScreenEventReportEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
-        wrapper.orderByAsc("time");
+        wrapper.orderByAsc("SORT");
 
         return wrapper;
     }

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java

@@ -75,7 +75,7 @@ public class ScreenVolunteerActivityServiceImpl extends BaseServiceImpl<ScreenVo
         String type = (String)params.get("type");
         wrapper.eq(StringUtils.isNotBlank(type), "type", type);
 
-        wrapper.orderByAsc("time");
+        wrapper.orderByAsc("SORT");
 
         return wrapper;
     }

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenEventReportDao.xml

@@ -8,6 +8,7 @@
         <result property="count" column="COUNT"/>
         <result property="time" column="TIME"/>
         <result property="type" column="TYPE"/>
+        <result property="sort" column="SORT"/>
         <result property="createdBy" column="CREATED_BY"/>
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenVolunteerActivityDao.xml

@@ -8,6 +8,7 @@
         <result property="count" column="COUNT"/>
         <result property="time" column="TIME"/>
         <result property="type" column="TYPE"/>
+        <result property="sort" column="SORT"/>
         <result property="createdBy" column="CREATED_BY"/>
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>