copy

README.md

-# statistics
-
+报表服务模块
\ No newline at end of file

cloud-statistics-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>statistics</artifactId>
+        <groupId>com.yizhi</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cloud-statistics-api</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-common-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-util</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-orm</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.mybatis.generator</groupId>
+                <artifactId>mybatis-generator-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/album/vo/AlbumGroupAccountParam.java

+package com.yizhi.statistics.application.album.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AlbumGroupAccountParam {
+	
+		Long accountId;
+	   String startDate;
+		
+		String endDate;
+		
+		String accountKwd;
+		
+		String albumKwd;
+		
+		String orgKwd;
+		
+	    Integer pageNo;
+		
+		Integer pageSize;
+		
+		Long companyId;
+		
+		Long siteId;
+		
+		Boolean isAdmin;
+
+		Long adminId;
+			
+	   Date submitTime;
+		
+		String serialNo;
+		
+		String taskName;
+		
+		Long taskId;
+		
+		public String toStringVO() {
+			return "AlbumGroupParam [startDate=" + startDate + ", endDate=" + endDate + ", accountKwd=" + accountKwd + ", pageNo="
+					+ pageNo + ", pageSize=" + pageSize + ", companyId=" + companyId + ", siteId=" + siteId + ", adminId="
+					+ adminId + ", isAdmin=" + isAdmin + ", albumKwd="+albumKwd+", serialNo=" + serialNo + ", taskId=" + taskId + ", submitTime="
+					+ submitTime + ", taskName=" + taskName +", orgKwd="+orgKwd+ "]";
+		}
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/album/vo/AlbumGroupAccountViewParam.java

+package com.yizhi.statistics.application.album.vo;
+
+import java.util.Date;
+
+import lombok.Data;
+
+@Data
+public class AlbumGroupAccountViewParam {
+
+    private Long accountId;
+
+    private String kwd;
+
+    private String startDate;
+
+    private String endDate;
+
+    private Long companyId;
+
+    private Long siteId;
+
+    private Long adminId;
+
+    private Boolean isAdmin;
+
+    private Integer pageNo;
+
+    private Integer pageSize;
+
+    private Long taskId;
+
+    Date submitTime;
+
+    String serialNo;
+
+    String taskName;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/album/vo/AlbumGroupParam.java

+package com.yizhi.statistics.application.album.vo;
+
+import java.util.Date;
+
+import lombok.Data;
+
+@Data
+public class AlbumGroupParam {
+	
+	String startDate;
+	
+	String endDate;
+	
+	String kwd;
+	
+    Integer pageNo;
+	
+	Integer pageSize;
+	
+    Long companyId;
+	
+	Long siteId;
+	
+	Long adminId;
+	
+	Boolean isAdmin;
+	
+	Long albumId;
+	/**
+	 * 报表字段
+	 */
+	String serialNo;
+	
+	Long taskId;
+	
+	Date submitTime;
+	
+	String taskName;
+	
+	public String toStringVO() {
+		return "AlbumGroupParam [startDate=" + startDate + ", endDate=" + endDate + ", kwd=" + kwd + ", pageNo="
+				+ pageNo + ", pageSize=" + pageSize + ", companyId=" + companyId + ", siteId=" + siteId + ", adminId="
+				+ adminId + ", isAdmin=" + isAdmin + ", albumId="+albumId+", serialNo=" + serialNo + ", taskId=" + taskId + ", submitTime="
+				+ submitTime + ", taskName=" + taskName + "]";
+	}
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/album/vo/ReportStudyAlbumAccountViewVo.java

+package com.yizhi.statistics.application.album.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 专辑学员学习明细
+ * @author FairyLand
+ *
+ */
+@Data
+public class ReportStudyAlbumAccountViewVo {
+
+	@ApiModelProperty(value = "用户ID")
+	private Long accountId;
+	
+	@ApiModelProperty(value = "用户名")
+	private String accountName;
+	
+	@ApiModelProperty(value = "姓名")
+	private String accountFullName;
+	
+	@ApiModelProperty(value = "专辑ID")
+	private Long albumId;
+	
+	@ApiModelProperty(value = "专辑名称")
+	private String albumName;
+	
+	@ApiModelProperty(value = "连载状态")
+	private String overed;
+	
+	@ApiModelProperty(value = "完成率")
+	private Integer completeness;
+	
+	@ApiModelProperty(value = "开始时间")
+	private Date startTime;
+	
+	@ApiModelProperty(value = "完成时间")
+	private Date endTime;
+	
+	@ApiModelProperty(value = "所在部门")
+	private String orgName;
+	
+	@ApiModelProperty(value="用户状态")
+	private Integer accountState = 0;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/album/vo/ReportStudyAlbumAccountVo.java

+package com.yizhi.statistics.application.album.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 学员参与专辑数统计
+ * @author hc
+ *
+ */
+@Data
+public class ReportStudyAlbumAccountVo {
+
+	@ApiModelProperty(value = "用户ID")
+	private Long accountId;
+	
+	@ApiModelProperty(value = "用户名")
+	private String accountName;
+	
+	@ApiModelProperty(value = "姓名")
+	private String accountFullName;
+	
+	@ApiModelProperty(value = "所在部门")
+	private String orgName;
+	
+	@ApiModelProperty(value = "参加专辑数（空返回0）")
+	private Integer totalInAlbum = 0;
+	
+	@ApiModelProperty(value = "完成专辑数（空返回0）")
+	private Integer totalFinishAlbum = 0;
+	
+	@ApiModelProperty(value = "总学习时长（HH:mm:ss）（空返回0）")
+	private String totalDuration ="0";
+	
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/album/vo/ReportStudyAlbumChartsVo.java

+package com.yizhi.statistics.application.album.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 专辑图标内容
+ * @author hc
+ *
+ */
+@Data
+public class ReportStudyAlbumChartsVo {
+
+	@ApiModelProperty(value = "显示内容")
+	private String value;
+	
+	@ApiModelProperty(value = "学习人数（空返回0）")
+	private Integer totalAccount = 0;
+	
+	@ApiModelProperty(value = "学习次数（空返回0）")
+	private Integer totalCount = 0;
+	
+	@ApiModelProperty(value = "学习专辑数（空返回0）")
+	private Integer totalalbum = 0;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/album/vo/ReportStudyAlbumViewVo1.java

+package com.yizhi.statistics.application.album.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 专辑学习结果
+ * @author hc
+ *
+ */
+@Data
+public class ReportStudyAlbumViewVo1 {
+
+	@ApiModelProperty(value="账号")
+	private Long accountId;
+	
+	@ApiModelProperty(value = "用户名")
+	private String accountName;
+	
+	@ApiModelProperty(value = "姓名")
+	private String accountFullName;
+	
+	@ApiModelProperty(value = "学习次数（空返回0）")
+	private Integer totalCount = 0;
+	
+	@ApiModelProperty(value = "学习时长（分钟）（空返回0）")
+	private String totalDuration="0:0:0";
+	
+	@ApiModelProperty(value = "开始时间")
+	private Date startTime;
+	
+	@ApiModelProperty(value = "完成时间")
+	private Date endTime;
+	
+	@ApiModelProperty(value = "所在部门")
+	private String orgName;
+	
+	@ApiModelProperty(value="用户状态")
+	private Integer accountState = 0;
+	
+	@ApiModelProperty(value = "完成率")
+	private Integer completeness;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/album/vo/ReportStudyAlbumViewVo2.java

+package com.yizhi.statistics.application.album.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 课程完成情况统计
+ * @author hc
+ *
+ */
+@Data
+public class ReportStudyAlbumViewVo2 {
+
+	@ApiModelProperty(value = "课程ID")
+	private Long courseId;
+	
+	@ApiModelProperty(value = "专辑名称")
+	private String albumName;
+	
+	@ApiModelProperty(value = "主题名称")
+	private String themeName;
+	
+	@ApiModelProperty(value = "课程名称")
+	private String courseName;
+	
+	@ApiModelProperty(value = "解锁状态 0已解锁 1发布及解锁 2自定义解锁")
+	private Integer unlock = 0;
+	
+	@ApiModelProperty(value = "已学习人数（空返回0）")
+	private Integer totalInAccount = 0;	
+	
+	@ApiModelProperty(value = "完成人数数（空返回0）")
+	private Integer finish = 0;
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/album/vo/ReportStudyAlbumViewVo3.java

+package com.yizhi.statistics.application.album.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *专辑课程学员学习明细
+ * @author hc
+ *
+ */
+@Data
+public class ReportStudyAlbumViewVo3 {
+
+	@ApiModelProperty(value="账号")
+	private Long accountId;
+	
+	@ApiModelProperty(value = "用户名")
+	private String accountName;
+	
+	@ApiModelProperty(value = "姓名")
+	private String accountFullName;
+	
+	@ApiModelProperty(value = "所在部门")
+	private String orgName;
+	
+	@ApiModelProperty(value = "主题名称")
+	private String themeName;
+	
+	@ApiModelProperty(value = "课程名称")
+	private String courseName;
+	
+	@ApiModelProperty(value = "学习时长（分钟）（空返回0）")
+	private String totalDuration="0:0:0";
+	
+	@ApiModelProperty(value = "开始时间")
+	private Date startTime;
+	
+	@ApiModelProperty(value = "完成时间")
+	private Date endTime;
+	
+	@ApiModelProperty(value = "学习状态：0已解锁 1、2未解锁")
+	private Integer unlock = 0;
+	
+	@ApiModelProperty(value = "学习状态：0进行中 1已完成")
+	private Integer state = 0;
+	
+	@ApiModelProperty(value="用户状态")
+	private Integer accountState = 0;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/album/vo/ReportStudyAlbumVo.java

+package com.yizhi.statistics.application.album.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 专辑完成情况统计
+ * @author hc
+ *
+ */
+@Data
+public class ReportStudyAlbumVo {
+
+	@ApiModelProperty(value = "专辑ID")
+	private Long albumId;
+	
+	@ApiModelProperty(value = "专辑名称")
+	private String albumName;
+	
+    @ApiModelProperty(value = "完成状态 0连载中 1已完结")
+	private Integer overed;
+    
+	@ApiModelProperty(value = "已学习人数（空返回0）")
+	private Integer totalInAccount = 0;	
+	
+	@ApiModelProperty(value = "学习次数（空返回0）")
+	private Integer totalCount = 0;
+	
+	@ApiModelProperty(value = "专辑时长")
+	private String duration ;
+	
+	@ApiModelProperty(value = "总学习时长（秒）（空返回0）")
+	private String totalDuration;
+	
+	@ApiModelProperty(value = "平均学习时长（秒）（空返回0）")
+	private String avgDuration ;
+	
+	@ApiModelProperty(value = "完成人数（空返回0）")
+	private Integer finish = 0;
+	
+	@ApiModelProperty(value = "评论数（空返回0）")
+	private Integer commentNum = 0;
+	
+	@ApiModelProperty(value = "订阅数（空返回0）")
+	private Integer subscribeNum = 0;
+	
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/CourseAccountGroupParam.java

+package com.yizhi.statistics.application.course.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CourseAccountGroupParam {
+	
+   String startDate;
+	
+	String endDate;
+	
+	String accountKwd;
+	
+	String orgKwd;
+	
+    Integer pageNo;
+	
+	Integer pageSize;
+
+	Long companyId;
+	
+	Long siteId;
+	
+	Boolean isAdmin;
+
+	Long adminId;
+	
+	
+	
+   Date submitTime;
+	
+	String serialNo;
+	
+	String taskName;
+	
+	Long taskId;
+	
+ Boolean isAllData;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/CourseAccountGroupViewParam.java

+package com.yizhi.statistics.application.course.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CourseAccountGroupViewParam {
+
+
+    private Long accountId;
+
+    private String kwd;
+
+    private String startDate;
+
+    private String endDate;
+
+    private Long companyId;
+
+    private Long siteId;
+
+    private Long adminId;
+
+    private Boolean isAdmin;
+
+    private Integer pageNo;
+
+    private Integer pageSize;
+
+
+    private Long taskId;
+
+    Date submitTime;
+
+    String serialNo;
+
+    String taskName;
+
+    /**
+     * 是否包含为学习数据
+     */
+    boolean isAllData;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/CourseGroupParam.java

+package com.yizhi.statistics.application.course.vo;
+
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class CourseGroupParam {
+	
+
+
+	String startDate;
+	
+	String endDate;
+	
+	String kwd;
+	
+    Integer pageNo;
+	
+	Integer pageSize;
+	
+    Long companyId;
+	
+	Long siteId;
+	
+	Long adminId;
+	
+	Boolean isAdmin;
+	
+	
+	
+	
+	/**
+	 * 报表字段
+	 */
+	String serialNo;
+	
+	Long taskId;
+	
+	Date submitTime;
+	
+	String taskName;
+	
+	
+
+	public String toStringVO() {
+		return "CourseGroupParam [startDate=" + startDate + ", endDate=" + endDate + ", kwd=" + kwd + ", pageNo="
+				+ pageNo + ", pageSize=" + pageSize + ", companyId=" + companyId + ", siteId=" + siteId + ", adminId="
+				+ adminId + ", isAdmin=" + isAdmin + ", serialNo=" + serialNo + ", taskId=" + taskId + ", submitTime="
+				+ submitTime + ", taskName=" + taskName + "]";
+	}
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/CourseGroupViewParam.java

+package com.yizhi.statistics.application.course.vo;
+
+import java.util.Date;
+
+import lombok.Data;
+
+@Data
+public class CourseGroupViewParam {
+	
+	private Long courseId;
+	
+	private String orgKwd;
+	
+	private String accountKwd;
+	
+      private Integer pageNo;
+	
+	private Integer pageSize;
+	
+	
+	
+	
+	
+	private Long adminId;
+	
+	private Boolean isAdmin;
+	
+	private String startDate;
+	
+	private String endDate;
+	
+	private Long companyId;
+	
+	private Long siteId;
+	
+	
+	
+	private Long taskId;
+	
+	private String serialNo;
+	
+	private String taskName;
+
+	private Date submitTime;
+
+
+	private boolean isAllData;
+	
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/CourseOrgGroupParam.java

+package com.yizhi.statistics.application.course.vo;
+
+import java.util.Date;
+
+import lombok.Data;
+
+@Data
+public class CourseOrgGroupParam {
+	
+	private String kwd;
+	
+	private String startDate;
+	
+	private String endDate;
+	
+	private Long companyId;
+	
+	private Long siteId;
+	
+	private Integer pageNo;
+	
+	private Integer pageSize;
+	
+	private Long adminId;
+	
+	private Boolean isAdmin;
+	
+	private Long taskId;
+	
+	private String serialNo;
+	
+	private String taskName;
+	
+
+	
+	private Date submitTime;
+	
+	
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/ReportStudyCourseAccountDetailsVo.java

+package com.yizhi.statistics.application.course.vo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 按用户统计--下载学习明细
+ * @author mei
+ *
+ */
+@Data
+public class ReportStudyCourseAccountDetailsVo {
+
+
+	@ApiModelProperty(value = "用户ID")
+	private Long accountId;
+
+	@ApiModelProperty(value = "用户名")
+	private String accountName;
+
+	@ApiModelProperty(value = "姓名")
+	private String accountFullName;
+
+
+	@ApiModelProperty(value="工号")
+	private String workNum;
+
+	@ApiModelProperty(value = "课程名称")
+	private String courseName;
+
+	@ApiModelProperty("课程编码")
+	private String courseCode;
+
+	@ApiModelProperty(value = "总学习时长（分钟）（空返回0）")
+	private String totalDuration;
+
+	@ApiModelProperty(value = "学习开始时间（yyyy-MM-dd HH:mm:ss）")
+	private Date startTime;
+
+	@ApiModelProperty(value = "最后学习时间（yyyy-MM-dd HH:mm:ss）")
+	private Date lastTime;
+
+	@ApiModelProperty(value = "首次完成时间（yyyy-MM-dd HH:mm:ss）")
+	private Date filstFinishTime;
+
+	@ApiModelProperty(value="课程得分")
+	private BigDecimal learnScore;
+
+
+	@ApiModelProperty(value = "学习次数")
+	private Integer studyNum = 0;
+
+	@ApiModelProperty(value = "学习状态 0未开始、1学习中、2已完成")
+	private String studystate;
+
+	@ApiModelProperty(value = "用户状态 0禁用、1启用")
+	private String accountState;
+
+	@ApiModelProperty(value = "所在部门")
+	private String orgName;
+
+	@ApiModelProperty(value = "所在组织架构")
+	private String orgNames;
+
+
+
+
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/ReportStudyCourseAccountViewVo.java

+package com.yizhi.statistics.application.course.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 课程图表数据
+ * @author mei
+ *
+ */
+
+@Data
+public class ReportStudyCourseAccountViewVo {
+	
+	@ApiModelProperty(value = "课程编码")
+	private String courseNo;
+	
+	@ApiModelProperty(value = "课程名称")
+	private String courseName;
+	
+	@ApiModelProperty(value = "学习状态：0未开始 1进行中 2已完成")
+	private Integer state = 0;
+	
+	@ApiModelProperty(value = "学习次数（空返回0）")
+	private Integer totalCount = 0;
+	
+	@ApiModelProperty(value = "开始时间（yyyy-MM-dd HH:mm:ss）")
+	private Date startTime;
+	
+	@ApiModelProperty(value = "总学习时长（分钟）（空返回0）")
+	private String totalDuration ;
+	
+	
+	
+	
+	@ApiModelProperty(value = "用户名")
+	private String accountName;
+	
+	@ApiModelProperty(value = "姓名")
+	private String accountFullName;
+	
+	@ApiModelProperty(value="所在部门")
+	private String orgName;
+	
+	@ApiModelProperty(value="用户状态")
+	private Integer accountState=0;
+	
+	@ApiModelProperty(value="可见状态---------------没有统计")
+	private Integer canState=0;
+	
+	@ApiModelProperty(value="课程得分")
+	private Float learnScore=0f;
+	
+	
+}
\ No newline at end of file

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/ReportStudyCourseAccountVo.java

+package com.yizhi.statistics.application.course.vo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 按用户分组统计
+ * @author mei
+ *
+ */
+@Data
+public class ReportStudyCourseAccountVo {
+	@ApiModelProperty(value = "用户ID")
+	private Long accountId;
+
+	@ApiModelProperty(value = "用户名")
+	private String accountName;
+
+	@ApiModelProperty(value = "姓名")
+	private String accountFullName;
+
+
+	@ApiModelProperty(value = "所在部门")
+	private String orgName;
+
+	@ApiModelProperty(value = "所在组织架构")
+	private String orgNames;
+
+	@ApiModelProperty(value = "可学课程数（空返回0）")
+	private Integer totalAskCourse = 0;
+
+	@ApiModelProperty(value = "参加课程数（空返回0）")
+	private Integer totalInCourse = 0;
+
+	@ApiModelProperty(value = "完成课程数（空返回0）")
+	private Integer totalFinishCourse = 0;
+
+	@ApiModelProperty(value = "总学习时长（分钟）（空返回0）")
+	private String totalDuration ="0";
+
+	@ApiModelProperty(value = "最后学习时间（yyyy-MM-dd HH:mm:ss）")
+	private Date lastTime;
+
+	//报表用到
+
+	@ApiModelProperty(value = "未完成课程数（空返回0)")
+	private Integer totalNoFinishCourse = 0;
+
+	@ApiModelProperty(value="用户状态")
+	private Integer accountState;
+
+	@ApiModelProperty(value="工号")
+	private String workNum;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/ReportStudyCourseChartsVo.java

+package com.yizhi.statistics.application.course.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 课程图表数据
+ * @author mei
+ *
+ */
+
+@Data
+public class ReportStudyCourseChartsVo {
+	
+	@ApiModelProperty(value = "显示内容")
+	private String value;
+	
+	@ApiModelProperty(value = "学习人数（空返回0）")
+	private Integer totalAccount = 0;
+	
+	@ApiModelProperty(value = "学习次数（空返回0）")
+	private Integer totalCount = 0;
+	
+	@ApiModelProperty(value = "学习课程数（空返回0）")
+	private Integer totalCourse = 0;
+}
\ No newline at end of file

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/ReportStudyCourseOrgVo.java

+package com.yizhi.statistics.application.course.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 按部门分组统计
+ * @author mei
+ *
+ */
+
+@Data
+public class ReportStudyCourseOrgVo {
+
+	@ApiModelProperty(value = "部门编码")
+	private String orgNo;
+
+	@ApiModelProperty(value = "部门名称")
+	private String orgName;
+
+	@ApiModelProperty(value = "所在组织架构")
+	private String orgNames;
+
+	@ApiModelProperty(value = "参加课程数（空返回0）")
+	private Integer totalInCourse = 0;
+
+	@ApiModelProperty(value = "参加人数（空返回0）")
+	private Integer totalInAccount = 0;
+
+	@ApiModelProperty(value = "总学习次数（空返回0）")
+	private Integer totalCount = 0;
+
+	@ApiModelProperty(value = "总学习时长（空返回0）")
+	private String totalDuration="0:0:0";
+
+	@ApiModelProperty(value = "平均学习时长（空返回0）")
+	private String avgDuration="0";
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/ReportStudyCourseViewVo.java

+package com.yizhi.statistics.application.course.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 课程图表数据
+ * @author mei
+ *
+ */
+
+@Data
+public class ReportStudyCourseViewVo {
+
+	@ApiModelProperty(value="账号")
+	private Long accountId;
+
+	@ApiModelProperty(value = "用户名")
+	private String accountName;
+
+	@ApiModelProperty(value = "姓名")
+	private String accountFullName;
+
+
+	@ApiModelProperty(value="工号")
+	private String workNum;
+
+	@ApiModelProperty(value = "所在部门")
+	private String orgName;
+
+	@ApiModelProperty(value = "所在组织架构")
+	private String orgNames;
+
+	@ApiModelProperty(value = "学习时长（分钟）（空返回0）")
+	private String totalDuration="0:0:0";
+
+	@ApiModelProperty(value="学习次数")
+	private Integer learnNum=0;
+
+	@ApiModelProperty(value = "开始时间")
+	private Date startTime;
+
+	@ApiModelProperty(value = "完成时间")
+	private Date endTime;
+
+	@ApiModelProperty(value = "学习状态：1进行中 2已完成")
+	private Integer state = 0;
+
+
+	//报表用到的字段
+
+	@ApiModelProperty(value="课程得分,暂不统计，需求说一个课程会有好几个测验，不知道放哪个测验的得分")
+	private Float learnScore;
+
+	@ApiModelProperty(value="获得积分")
+	private Integer learnPoint;
+
+	@ApiModelProperty(value="用户状态")
+	private Integer accountState = 0;
+
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/ReportStudyCourseVo.java

+package com.yizhi.statistics.application.course.vo;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 按课程统计
+ * @author mei
+ *
+ */
+@Data
+public class ReportStudyCourseVo {
+	
+	@ApiModelProperty(value = "课程ID")
+	private Long courseId;
+	
+	@ApiModelProperty(value = "课程编码")
+	private String courseNo;
+	
+	@ApiModelProperty(value = "课程名称")
+	private String courseName;
+	
+	
+	@ApiModelProperty(value = "可学习人数（空返回0）")
+	private Integer totalAskAccount = 0;
+	
+	@ApiModelProperty(value = "已学习人数（空返回0）")
+	private Integer totalInAccount = 0;	
+	
+	@ApiModelProperty(value = "学习次数（空返回0）")
+	private Integer totalCount = 0;
+	
+	@ApiModelProperty(value = "课程时长（h:m:s，空返回0）")
+	private String totalCourseTime;	
+	
+	@ApiModelProperty(value = "总学习时长（分钟）（空返回0）")
+	private String totalDuration;
+	
+	@ApiModelProperty(value = "平均学习时长（空返回0），保留小时2位（98.00），前端补%")
+	private String avgDuration ;
+	
+	@ApiModelProperty(value = "评论数（空返回0）")
+	private Integer numComment = 0;
+
+	@ApiModelProperty(value = "收藏数（空返回0）")
+	private Integer collectNum = 0;
+	
+	@ApiModelProperty(value = "课程评分（空返回0）")
+	private BigDecimal courseScore;	
+	
+	
+	//报表用到
+	
+	@ApiModelProperty(value="评分人数")
+	private Integer commentAccountCount = 0;
+	
+	@ApiModelProperty(value="课程当前状态")
+	private Integer state = 0;
+
+	@ApiModelProperty(value="是否关联证书")
+	private Boolean grantCertificate;
+
+	@ApiModelProperty(value="关联证书张数")
+	private Integer certificateCount;
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/RoleManage.java

+package com.yizhi.statistics.application.course.vo;
+
+import java.util.List;
+
+import com.yizhi.statistics.application.entity.StatisticsAccountRole;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RoleManage {
+	
+	@ApiModelProperty("管理员的id")
+	private Long adminId;
+	
+	@ApiModelProperty("被管理的新增对象")
+	private List<StatisticsAccountRole> listStatisticsAccountRole;
+	
+	@ApiModelProperty("被管理的删除对象")
+	private List<Long> accountDeleteIds;
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/SiteVoAskNum.java

+package com.yizhi.statistics.application.course.vo;
+
+import lombok.Data;
+
+@Data
+public class SiteVoAskNum {
+	
+	Long siteId;
+	
+	Integer askNum;
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/course/vo/WorkScope.java

+package com.yizhi.statistics.application.course.vo;
+
+import lombok.Data;
+
+@Data
+public class WorkScope {
+	
+	private Long courseId;
+	
+	private Integer scope;
+	
+	private Integer type;
+	
+	private Long siteId;
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/dashboard/vo/DashboardAccountStudyCourseChatVo.java

+package com.yizhi.statistics.application.dashboard.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * 按用户分组统计
+ * @author mei
+ *
+ */
+@Data
+public class DashboardAccountStudyCourseChatVo {
+	@ApiModelProperty(value = "显示内容")
+	private String value;
+
+	@ApiModelProperty(value = "课程学习时间（空返回0） 分钟")
+	private Integer totalStudyHour = 0;
+
+	@ApiModelProperty(value = "当天学习时间")
+	private Date studyTime;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/dashboard/vo/DashboardAccountStudyCourseVo.java

+package com.yizhi.statistics.application.dashboard.vo;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 按用户分组统计
+ * @author mei
+ *
+ */
+@Data
+public class DashboardAccountStudyCourseVo {
+
+	@ApiModelProperty(value = "完成课程数（空返回0）")
+	private Integer totalFinishCourse = 0;
+
+	@ApiModelProperty(value = "累计学习时长（空返回0.0）分钟")
+	private Float totalStudyTime = 0.0F;
+
+	@ApiModelProperty(value = "完成课程时长（为课程内素材总时长，空返回0.0 分钟）")
+	private Float totalCourseTime = 0.0F;
+	
+	@ApiModelProperty(value = "考试时长，单位（小时）")
+	private BigDecimal examDurationHour;
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/AccountDashboard.java

+package com.yizhi.statistics.application.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author taoge123
+ * @since 2020-04-07
+ */
+@Data
+@ApiModel(value = "AccountDashboard", description = "")
+@TableName("account_dashboard")
+public class AccountDashboard {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "用户Id")
+    @TableField("account_id")
+    private Long accountId;
+
+    @ApiModelProperty(value = "完成课程数 ")
+    @TableField("course_finish_num")
+    private Integer courseFinishNum;
+
+    @ApiModelProperty(value = "完成课程时长")
+    @TableField("course_time")
+    private Long courseTime;
+
+    @ApiModelProperty(value = "累计学习时间")
+    @TableField("course_study_time")
+    private Long courseStudyTime;
+    
+    @ApiModelProperty(value = "考试累计时长（单位：秒）")
+    @TableField("exam_duration_second")
+    private Integer examDurationSecond;
+
+    @ApiModelProperty(value = "课程所在站点id")
+    @TableField("site_id")
+    private Long siteId;
+
+    @ApiModelProperty(value = "课程所在公司Id")
+    @TableField("company_id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "是否发放证书： true 配置开启证书，false 不开启证书")
+    @TableField("grant_certificate")
+    private Integer grantCertificate;
+
+    @ApiModelProperty(value = "记录自动创建时间")
+    @TableField("auto_create_time")
+    private Date autoCreateTime;
+
+    @ApiModelProperty(value = "学习记录时间")
+    @TableField("study_record_time")
+    private Date studyRecordTime;
+
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/PointLog.java

+package com.yizhi.statistics.application.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 积分明细
+ * </p>
+ *
+ * @author hutao123
+ * @since 2021-01-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("point_log")
+public class PointLog extends Model<PointLog> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键Id
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 积分记录ID
+     */
+    @TableField("point_detail_id")
+    private Long pointDetailId;
+    /**
+     * 学员Id
+     */
+    @TableField("account_id")
+    private Long accountId;
+    /**
+     * 变动前数量
+     */
+    @TableField("before_count")
+    private Integer beforeCount;
+    /**
+     * 变动数量
+     */
+    @TableField("change_count")
+    private Integer changeCount;
+    /**
+     * 变动后数量
+     */
+    @TableField("after_count")
+    private Integer afterCount;
+    /**
+     * 变动类型
+     */
+    @TableField("change_type")
+    private Integer changeType;
+    /**
+     * 变动原因（考试名或项目名）
+     */
+    @TableField("relation_name")
+    private String relationName;
+    /**
+     * 创建人
+     */
+    @TableField("create_by_id")
+    private Long createById;
+    /**
+     * 创建人姓名
+     */
+    @TableField("create_by_name")
+    private String createByName;
+    /**
+     * 公司ID
+     */
+    @TableField("company_id")
+    private Long companyId;
+    /**
+     * 部门ID
+     */
+    @TableField("org_id")
+    private Long orgId;
+    /**
+     * 站点ID
+     */
+    @TableField("site_id")
+    private Long siteId;
+    /**
+     * log创建时间
+     */
+    @TableField("created_at")
+    private Date createdAt;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/PracticeChatLog.java

+package com.yizhi.statistics.application.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("practice_chat_log")
+public class PracticeChatLog extends Model<PracticeChatLog> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+    /**
+     * 陪练ID
+     */
+    @TableField("practice_id")
+    private Long practiceId;
+    /**
+     * 用户ID
+     */
+    @TableField("account_id")
+    private Long accountId;
+    /**
+     * 用户名
+     */
+    @TableField("account_name")
+    private String accountName;
+    /**
+     * 用户姓名
+     */
+    @TableField("account_full_name")
+    private String accountFullName;
+    /**
+     * 10:训练 20:考核
+     */
+    @TableField("use_type")
+    private Integer useType;
+    /**
+     * 部门名
+     */
+    @TableField("org_name")
+    private String orgName;
+    /**
+     * 组织架构
+     */
+    @TableField("org_names")
+    private String orgNames;
+    /**
+     * 陪练级别 10:初级 40:中级 80:高级
+     */
+    @TableField("level")
+    private Integer level;
+    /**
+     * 陪练状态 40:陪练中 80:陪练正常结束 90:陪练中途退出
+     */
+    @TableField("status")
+    private Integer status;
+    /**
+     * 陪练开始时间
+     */
+    @TableField("start_at")
+    private Date startAt;
+    /**
+     * 陪练结束时间
+     */
+    @TableField("end_at")
+    private Date endAt;
+    /**
+     * 通过考核最低分
+     */
+    @TableField("pass_min_score")
+    private Integer passMinScore;
+    /**
+     * 是否发放积分 80 发放，10不发放
+     */
+    @TableField("given_point_type")
+    private Integer givenPointType;
+    /**
+     * 得分
+     */
+    @TableField("average_score")
+    private Integer averageScore;
+    /**
+     * 80:通过，10:未通过
+     */
+    @TableField("pass_result")
+    private Integer passResult;
+    /**
+     * 关键词得分
+     */
+    @TableField("keyword_score")
+    private Integer keywordScore;
+    /**
+     * 关键词 完成度 单位%
+     */
+    @TableField("keyword_rate")
+    private Integer keywordRate;
+    /**
+     * 完整性得分
+     */
+    @TableField("complete_score")
+    private Integer completeScore;
+    /**
+     * 完整性 完成度 单位%
+     */
+    @TableField("complete_rate")
+    private Integer completeRate;
+    /**
+     * 流畅性得分
+     */
+    @TableField("smooth_score")
+    private Integer smoothScore;
+    /**
+     * 流畅性 完整度 单位%
+     */
+    @TableField("smooth_rate")
+    private Integer smoothRate;
+    /**
+     * 表达能力得分
+     */
+    @TableField("express_score")
+    private Integer expressScore;
+    /**
+     * 表达能力 完成度 单位%
+     */
+    @TableField("express_rate")
+    private Integer expressRate;
+    /**
+     * 礼貌用语得分
+     */
+    @TableField("polite_score")
+    private Integer politeScore;
+    /**
+     * 礼貌用语 完成度 单位%
+     */
+    @TableField("polite_rate")
+    private Integer politeRate;
+    /**
+     * 0: not deledted 1:deleted
+     */
+    @TableField("deleted")
+    private Boolean deleted;
+    @TableField("org_id")
+    private Long orgId;
+    @TableField("site_id")
+    private Long siteId;
+    @TableField("company_id")
+    private Long companyId;
+    @TableField("created_at")
+    private Date createdAt;
+    @TableField("updated_at")
+    private Date updatedAt;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/PracticeConfig.java

+package com.yizhi.statistics.application.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@TableName("practice_config")
+public class PracticeConfig extends Model<PracticeConfig> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+    /**
+     * 陪练名
+     */
+    @TableField("name")
+    private String name;
+    /**
+     * 陪练logoURL
+     */
+    @TableField("logo_url")
+    private String logoUrl;
+    /**
+     * 陪练描述
+     */
+    @TableField("description")
+    private String description;
+    /**
+     * 80:训练+考核 ,10:训练 20:考核
+     */
+    @TableField("use_type")
+    private Integer useType;
+    /**
+     * 训练开始时间
+     */
+    @TableField("practice_start_at")
+    private Date practiceStartAt;
+    /**
+     * 训练结束时间
+     */
+    @TableField("practice_end_at")
+    private Date practiceEndAt;
+    /**
+     * 考核开始时间
+     */
+    @TableField("exam_start_at")
+    private Date examStartAt;
+    /**
+     * 考核结束时间
+     */
+    @TableField("exam_end_at")
+    private Date examEndAt;
+    /**
+     * 允许最大考试；0：无限次；其他有限次；默认0
+     */
+    @TableField("max_exam_count")
+    private Integer maxExamCount;
+    /**
+     * 自定义关键词，逗号分隔，命中得分
+     */
+    @TableField("key_word")
+    private String keyWord;
+    /**
+     * 机器人配置ID
+     */
+    @TableField("robot_id")
+    private Long robotId;
+    /**
+     * 机器人参数
+     */
+    @TableField("robot_params")
+    private String robotParams;
+    /**
+     * 自定义机器人名字
+     */
+    @TableField("robot_name")
+    private String robotName;
+    /**
+     * 机器人头像URL null时走默认头像
+     */
+    @TableField("robot_pic_url")
+    private String robotPicUrl;
+    /**
+     * 陪练状态 80:上架 30:下架 10:草稿
+     */
+    @TableField("status")
+    private Integer status;
+    /**
+     * 练习可见范围  80:平台可见 40:指定用户可见
+     */
+    @TableField("visible_type")
+    private Integer visibleType;
+    /**
+     * 跳过对话类型 80允许，10:不允许
+     */
+    @TableField("skip_type")
+    private Integer skipType;
+    /**
+     * 80:本轮得分超过限制，则进入下轮；10:无论得分多少，直接进入下一轮
+     */
+    @TableField("start_next_round_type")
+    private Integer startNextRoundType;
+    /**
+     * 超过该分数，进入下一轮对话
+     */
+    @TableField("start_next_round_score")
+    private Integer startNextRoundScore;
+    /**
+     * 每轮最多失败次数，超过直接到下轮
+     */
+    @TableField("practice_failed_max_count")
+    private Integer practiceFailedMaxCount;
+    /**
+     * 考试失败最大次数，超过直接到下轮
+     */
+    @TableField("exam_failed_max_count")
+    private Integer examFailedMaxCount;
+    /**
+     * 80:允许重复提交 10:不允许重复提交
+     */
+    @TableField("repeat_push")
+    private Integer repeatPush;
+    /**
+     * 多轮对话：80:开启 10:关闭
+     */
+    @TableField("many_round_chat")
+    private Integer manyRoundChat;
+    /**
+     * 相似度
+     */
+    @TableField("similarity_rate")
+    private Integer similarityRate;
+    /**
+     * 未识别回复类型 80:默认回复，10:自定义回复
+     */
+    @TableField("similarity_failed_msg_type")
+    private Integer similarityFailedMsgType;
+    /**
+     * 自定义未识别回复，分号分隔。
+     */
+    @TableField("similarity_failed_msg")
+    private String similarityFailedMsg;
+    /**
+     * 考试及格分
+     */
+    @TableField("exam_pass_min_score")
+    private Integer examPassMinScore;
+    /**
+     * 是否发放积分 80:发放 10:不发放
+     */
+    @TableField("exam_given_point_type")
+    private Integer examGivenPointType;
+    /**
+     * 关键词
+     */
+    @TableField("score_rule_keyword")
+    private Integer scoreRuleKeyword;
+    /**
+     * 完整性
+     */
+    @TableField("score_rule_complete")
+    private Integer scoreRuleComplete;
+    /**
+     * 流畅性
+     */
+    @TableField("score_rule_smooth")
+    private Integer scoreRuleSmooth;
+    /**
+     * 表达能力
+     */
+    @TableField("score_rule_express")
+    private Integer scoreRuleExpress;
+    /**
+     * 礼貌
+     */
+    @TableField("score_rule_polite")
+    private Integer scoreRulePolite;
+    /**
+     * 0:未删除 1:已删除
+     */
+    @TableField("deleted")
+    private Boolean deleted;
+    /**
+     * 部门ID
+     */
+    @TableField("org_id")
+    private Long orgId;
+    /**
+     * 站点ID
+     */
+    @TableField("site_id")
+    private Long siteId;
+    /**
+     * 公司ID
+     */
+    @TableField("company_id")
+    private Long companyId;
+    /**
+     * 创建记录的管理员ID
+     */
+    @TableField("created_uid")
+    private Long createdUid;
+    /**
+     * 创建时间
+     */
+    @TableField("created_at")
+    private Date createdAt;
+    /**
+     * 最后一次更新记录的管理员ID
+     */
+    @TableField("updated_uid")
+    private Long updatedUid;
+    /**
+     * 更新时间
+     */
+    @TableField("updated_at")
+    private Date updatedAt;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/PracticeVisible.java

+package com.yizhi.statistics.application.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@TableName("practice_visible")
+public class  PracticeVisible extends Model<PracticeVisible> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("visible_id")
+    private Long visibleId;
+    /**
+     * 陪练ID
+     */
+    @TableField("practice_id")
+    private Long practiceId;
+    /**
+     * 可见站点Id
+     */
+    @TableField("visible_site_id")
+    private Long visibleSiteId;
+    /**
+     * 可见部门Id
+     */
+    @TableField("visible_org_id")
+    private Long visibleOrgId;
+    /**
+     * 可见部门名
+     */
+    @TableField("visible_org_name")
+    private String visibleOrgName;
+    /**
+     * 可见用户Id
+     */
+    @TableField("visible_account_id")
+    private Long visibleAccountId;
+    /**
+     * 可见用户工号
+     */
+    @TableField("visible_account_work_num")
+    private String visibleAccountWorkNum;
+    /**
+     * 用户名
+     */
+    @TableField("visible_account_name")
+    private String visibleAccountName;
+    /**
+     * 用户全名
+     */
+    @TableField("visible_account_full_name")
+    private String visibleAccountFullName;
+    /**
+     * 陪练可见范围  80:平台可见 50:部门可见 40:指定用户可见
+     */
+    @TableField("visible_type")
+    private Integer visibleType;
+    /**
+     * 公司Id
+     */
+    @TableField("company_id")
+    private Long companyId;
+    /**
+     * 0:not deleted, 1:deleted
+     */
+    @TableField("deleted")
+    private Boolean deleted;
+    @TableField("created_at")
+    private Date createdAt;
+    /**
+     * 创建管理员ID
+     */
+    @TableField("created_uid")
+    private Long createdUid;
+    @TableField("updated_at")
+    private Date updatedAt;
+    /**
+     * 更新管理员ID
+     */
+    @TableField("updated_uid")
+    private Long updatedUid;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/Report.java

+package com.yizhi.statistics.application.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 平台报告设置表
+ * @author fairyland
+ *
+ */
+@Data
+@Api(tags = "Report", description = "平台报告设置表")
+@TableName("report")
+public class Report {
+
+    private static final long serialVersionUID = 1L;
+    
+    private Long id;
+    
+    @ApiModelProperty(value = "报告名称")
+    private String name;
+    
+    @ApiModelProperty(value = "报告类型 0一季度 1二季度 2上半年 3三季度 4四季度 5下半年 6全年")
+    private Integer type;
+    
+    @ApiModelProperty(value = "统计开始时间")
+	@TableField("start_time")
+    private Date startTime;
+    
+    @ApiModelProperty(value = "统计结束时间")
+	@TableField("end_time")
+    private Date endTime;
+    
+    @ApiModelProperty(value = "状态，0下架 1上架 2预定上架 默认下架")
+    private Integer state;
+    
+    @ApiModelProperty(value = "查看人数")
+    private Long num;
+    
+    @ApiModelProperty(value = "模板路径")
+    private String url;
+    
+	@ApiModelProperty(value = "可见范围，1平台用户可见 2指定用户可见 默认全平台可见")
+	@TableField("visible_range")
+	private Integer visibleRange;
+	
+	@ApiModelProperty(value = "数据范围，1仅当前站点 2包括下属子站点 默认仅当前站点")
+	@TableField("data_range")
+	private Integer dataRange;
+	
+	@ApiModelProperty(value = "创建时间")
+	@TableField(value = "create_time", fill = FieldFill.INSERT)
+	private Date createTime;
+
+	@ApiModelProperty(value = "创建人ID")
+	@TableField(value = "create_by_id", fill = FieldFill.INSERT)
+	private Long createById;
+	
+	@ApiModelProperty(value = "修改时间")
+	@TableField(value = "update_time", fill = FieldFill.UPDATE)
+	private Date updateTime;
+
+	@ApiModelProperty(value = "修改人ID")
+	@TableField(value = "update_by_id", fill = FieldFill.UPDATE)
+	private Long updateById;
+
+	@ApiModelProperty(value = "修改人姓名")
+	@TableField(value = "update_by_name", fill = FieldFill.UPDATE)
+	private String updateByName;
+
+	@ApiModelProperty(value = "站点_ID")
+	@TableField("site_id")
+	private Long siteId;
+	
+	@ApiModelProperty(value = "企业_ID")
+	@TableField("company_id")
+	private Long companyId;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/ReportDetail.java

+package com.yizhi.statistics.application.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "ReportDetail", description = "平台报告学员详情表")
+@TableName("report_detail")
+public class ReportDetail {
+
+    private static final long serialVersionUID = 1L;
+    
+    private Long id;
+    
+	@ApiModelProperty(value = "报告id")
+	@TableField("report_id")
+    private Long reportId;
+	
+	@ApiModelProperty(value = "报告名称")
+	@TableField("report_name")
+    private String reportName;
+    
+	@ApiModelProperty(value = "报告类型")
+	@TableField("report_type")
+    private Integer reportType;
+	
+	@ApiModelProperty(value = "用户id")
+	@TableField("account_id")
+    private Long accountId;
+    
+	@ApiModelProperty(value = "查看状态 0未查看 1已查看 默认未查看")
+	@TableField("state")
+	private Integer state;
+	
+	@ApiModelProperty(value = "注册时间")
+	@TableField("register_time")
+    private Date registerTime;
+	
+	@ApiModelProperty(value = "超出比例")
+	@TableField("proportion")
+    private Integer proportion;
+	
+	@ApiModelProperty(value = "全站点超出比例")
+	@TableField("all_proportion")
+    private Integer allProportion;
+	
+	@ApiModelProperty(value = "用户时长")
+	@TableField("user_duration")
+    private Long userDuration;
+	
+	@ApiModelProperty(value = "站点名称")
+	@TableField("site_name")
+    private String siteName;
+    
+	@ApiModelProperty(value = "累计打卡数量")
+	@TableField("sign_num")
+    private Long signNum;
+	
+	@ApiModelProperty(value = "全站点累计打卡数量")
+	@TableField("all_sign_num")
+    private Long allSignNum;
+    
+	@ApiModelProperty(value = "学习总时长")
+	@TableField("study_duration")
+    private Long studyDuration;
+	
+	@ApiModelProperty(value = "全站点学习总时长")
+	@TableField("all_study_duration")
+    private Long allStudyDuration;
+    
+	@ApiModelProperty(value = "完成任务量")
+	@TableField("finish_num")
+    private Integer finishNum;
+	
+	@ApiModelProperty(value = "全站点完成任务量")
+	@TableField("all_finish_num")
+    private Integer allFinishNum;
+    
+	@ApiModelProperty(value = "获得积分")
+	@TableField("point")
+    private Long point;
+	
+	@ApiModelProperty(value = "全站点获得积分")
+	@TableField("all_point")
+    private Long allPoint;
+    
+	@ApiModelProperty(value = "首个证书")
+	@TableField("first_certificate")
+    private Date firstCertificate;
+    
+	@ApiModelProperty(value = "全站点首个证书")
+	@TableField("all_first_certificate")
+    private Date allFirstCertificate;
+	
+	@ApiModelProperty(value = "学习时间")
+	@TableField("latest_date")
+    private Date latestDate;
+    
+	@ApiModelProperty(value = "全站点学习时间")
+	@TableField("all_latest_date")
+    private Date allLatestDate;
+	
+	@ApiModelProperty(value = "学习最长天")
+	@TableField("max_study")
+    private Date maxStudy;
+	
+	@ApiModelProperty(value = "全站点学习最长天")
+	@TableField("all_max_study")
+    private Date allMaxStudy;
+	
+	@ApiModelProperty(value = "学习最长时间")
+	@TableField("max_duration")
+    private Long maxDuration;
+	
+	@ApiModelProperty(value = "全站点学习最长时间")
+	@TableField("all_max_duration")
+    private Long allMaxDuration;
+	
+	@ApiModelProperty(value = "徽章类型 0学神徽章 1学霸徽章 2学习标兵徽章 3学弟徽章 4新生徽章")
+	@TableField("type")
+    private Integer type;
+	
+	@ApiModelProperty(value = "全站点徽章类型")
+	@TableField("all_type")
+    private Integer allType;
+	
+	@ApiModelProperty(value = "创建时间")
+	@TableField(value = "create_time", fill = FieldFill.INSERT)
+	private Date createTime;
+
+	@ApiModelProperty(value = "创建人ID")
+	@TableField(value = "create_by_id", fill = FieldFill.INSERT)
+	private Long createById;
+	
+	@ApiModelProperty(value = "站点_ID")
+	@TableField("site_id")
+	private Long siteId;
+	
+	@ApiModelProperty(value = "企业_ID")
+	@TableField("company_id")
+	private Long companyId;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/ReportVisibleRange.java

+package com.yizhi.statistics.application.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableLogic;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "ReportVisibleRange", description = "	")
+@TableName("report_visible_range")
+public class ReportVisibleRange {
+
+	@ApiModelProperty(value = "主键")
+	private Long id;
+
+	@ApiModelProperty(value = "平台报告主键_ID，外键")
+	@TableField("report_id")
+	private Long reportId;
+
+	@ApiModelProperty(value = "1用户 2组织")
+	private Integer type;
+
+	@ApiModelProperty(value = "存放人或组织的ID")
+	@TableField("relation_id")
+	private Long relationId;
+	
+	@ApiModelProperty(value = "名称")
+	@TableField("name")
+	private String name;	
+	
+	@ApiModelProperty(value = "真实姓名")
+	@TableField("full_name")
+	private String fullName;	
+	
+	@ApiModelProperty(value = "0删除 1有效，默认有效")
+	@TableLogic
+	private Integer state;
+	
+	@ApiModelProperty(value = "站点_ID")
+	@TableField("site_id")
+	private Long siteId;
+	
+	@ApiModelProperty(value = "企业_ID")
+	@TableField("company_id")
+	private Long companyId;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsAccount.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yinyuyan123
+ * @since 2019-03-20
+ */
+@Data
+@Api(tags = "StatisticsAccount", description = "")
+@TableName("statistics_account")
+public class StatisticsAccount extends Model<StatisticsAccount> {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键")
+	private Long id;
+
+@ApiModelProperty(value = "学员公司ID")
+	@TableField("company_id")
+	private Long companyId;
+
+@ApiModelProperty(value = "学员站点Id")
+	@TableField("site_id")
+	private Long siteId;
+
+@ApiModelProperty(value = "学员组织ID")
+	@TableField("org_id")
+	private Long orgId;
+
+@ApiModelProperty(value = "学员组织编码")
+	@TableField("org_code")
+	private String orgCode;
+
+@ApiModelProperty(value = "学员自己所属组织名称")
+	@TableField("org_name")
+	private String orgName;
+
+@ApiModelProperty(value = "学员所有父组织名称含自己所属组织名称")
+	@TableField("org_names")
+	private String orgNames;
+
+@ApiModelProperty(value = "学员ID")
+	@TableField("account_id")
+	private Long accountId;
+
+@ApiModelProperty(value = "学员用户名")
+	@TableField("account_name")
+	private String accountName;
+
+@ApiModelProperty(value = "学员姓名")
+	@TableField("full_name")
+	private String fullName;
+
+@ApiModelProperty(value = "学员工号")
+	@TableField("work_num")
+	private String workNum;
+
+@ApiModelProperty(value = "学员状态")
+	@TableField("account_state")
+	private Integer accountState;
+
+@ApiModelProperty(value = "用户创建时间")
+private Date createTime;
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+	
+	
+	
+	public String toStringVo() {
+		return "StatisticsAccountVO [orgId=" + orgId 
+				+ ", orgName=" + orgName + ", orgNames=" + orgNames
+				+ ", accountName=" + accountName+", fullName=" + fullName
+				+ ", workNum=" + workNum + ", accountState=" + accountState
+				+"]";
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsAccountRole.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-04-18
+ */
+@Data
+@Api(tags = "StatisticsAccountRole", description = "")
+@TableName("statistics_account_role")
+public class StatisticsAccountRole extends Model<StatisticsAccountRole> {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键")
+	private Long id;
+
+@ApiModelProperty(value = "管理员id")
+	@TableField("admin_id")
+	private Long adminId;
+
+@ApiModelProperty(value = "管理员站点id")
+@TableField("admin_site_id")
+private Long adminSiteId;
+
+
+@ApiModelProperty(value = "活动类型")
+@TableField("type")
+private Integer type;
+
+@ApiModelProperty(value = "人员类型")
+@TableField("account_type")
+private Integer accountType;
+
+@ApiModelProperty(value = "站点")
+@TableField("account_site_id")
+private Long accountSiteId;
+
+@ApiModelProperty(value = "组织")
+@TableField("account_org_id")
+private Long accountOrgId;
+
+@TableField(exist=false)
+private Long askNum;
+
+
+
+
+@ApiModelProperty(value = "学员账号id")
+	@TableField("account_id")
+	private Long accountId;
+
+
+@ApiModelProperty(value = "自动创建时间")
+	@TableField("auto_create_time")
+	private Date autoCreateTime;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsActivityPoint.java

+package com.yizhi.statistics.application.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-06-05
+ */
+@Data
+@Api(tags = "StatisticsActivityPoint", description = "")
+@TableName("statistics_activity_point")
+public class StatisticsActivityPoint extends Model<StatisticsActivityPoint> {
+
+    private static final long serialVersionUID = 1L;
+
+
+	private Long id;
+
+	@TableField("activity_id")
+	private Long activityId;
+
+	@TableField("account_id")
+	private Long accountId;
+
+	private Integer point;
+
+@ApiModelProperty(value = "0课程1考试7培训项目  活动类型")
+	private Integer type;
+
+	@TableField("company_id")
+	private Long companyId;
+
+	@TableField("site_id")
+	private Long siteId;
+
+	@TableField("auto_create_time")
+	private Date autoCreateTime;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsAlbum.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "StatisticsAlbum", description = "")
+@TableName("statistics_album")
+public class StatisticsAlbum extends Model<StatisticsAlbum> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+
+	@ApiModelProperty(value = "专辑Id")
+	@TableField("album_id")
+	private Long albumId;
+
+	@ApiModelProperty(value = "专辑名字")
+	@TableField("album_name")
+	private String albumName;
+
+	@ApiModelProperty(value = "专辑当前状态")
+	@TableField("album_state")
+	private Integer albumState;
+
+    @ApiModelProperty(value = "可见范围 1 平台用户 2 指定范围 默认全平台可见")
+	private Integer scope;
+    
+	@ApiModelProperty(value = "专辑时长")
+	@TableField("duration")
+	private Long duration;
+    
+	@ApiModelProperty(value = "专辑创建时间")
+	@TableField("album_create_time")
+	private Date albumCreateTime;
+	
+	@TableField("company_id")
+	private Long companyId;
+
+	@TableField("site_id")
+	private Long siteId;
+
+	@TableField("org_id")
+	private Long orgId;
+
+	@TableField("auto_create_time")
+	private Date autoCreateTime;
+
+    @ApiModelProperty(value = "评论人数")
+    private Integer commentCount;
+    
+    @ApiModelProperty(value = "订阅人数")
+    private Integer subscribeCount;
+    
+    @ApiModelProperty(value = "完成状态 0连载中 1已完结")
+	private Integer overed;
+    
+    @ApiModelProperty(value = "未解锁课程数")
+    private Integer lockNum;
+    
+	@Override
+	protected Serializable pkVal() {
+		// TODO Auto-generated method stub
+		return this.id;
+	}
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsAlbumActivity.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "StatisticsAlbumActivity", description = "")
+@TableName("statistics_album_activity")
+public class StatisticsAlbumActivity extends Model<StatisticsAlbumActivity>{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+
+	@ApiModelProperty(value = "专辑Id")
+	@TableField("album_id")
+	private Long albumId;
+
+	@ApiModelProperty(value = "主题名称")
+	@TableField("album_name")
+	private String albumName;
+	
+	@ApiModelProperty(value = "主题id")
+	@TableField("theme_id")
+	private Long themeId;
+	
+	@ApiModelProperty(value = "主题名称")
+	@TableField("theme_name")
+	private String themeName;
+
+	@ApiModelProperty(value = "课程id")
+	@TableField("relation_id")
+	private Long relationId;
+
+	@ApiModelProperty(value = "课程名称")
+	@TableField("name")
+	private String name;
+	
+	@ApiModelProperty(value = "专辑创建时间")
+	@TableField("album_create_time")
+	private Date albumCreateTime;
+	
+    @ApiModelProperty(value = "解锁状态 0已解锁 1发布及解锁 2自定义解锁")
+	private Integer unlock;
+    
+	@ApiModelProperty(value = "解锁时间")
+	@TableField("unlock_time")
+	private Date unlockTime;
+	
+	@TableField("company_id")
+	private Long companyId;
+
+	@TableField("site_id")
+	private Long siteId;
+
+	@TableField("auto_create_time")
+	private Date autoCreateTime;
+	@Override
+	protected Serializable pkVal() {
+		// TODO Auto-generated method stub
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsAlbumActivityRecord.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "StatisticsAlbumActivityRecord", description = "")
+@TableName("statistics_album_activity_record")
+public class StatisticsAlbumActivityRecord extends Model<StatisticsAlbumActivityRecord> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+
+	@ApiModelProperty(value = "专辑Id")
+	@TableField("album_id")
+	private Long albumId;
+
+	@ApiModelProperty(value = "学员id")
+	@TableField("account_id")
+	private Long accountId;
+
+	@ApiModelProperty(value = "课程id")
+	@TableField("relation_id")
+	private Long relationId;
+
+	@ApiModelProperty(value = "学习时长")
+	private Long seconds;
+
+	@ApiModelProperty(value = "是否完成（1是，0否），默认完成。")
+	private Integer finished;
+
+	@ApiModelProperty(value = "完成时间")
+	@TableField("finish_date")
+	private Date finishDate;
+
+	@TableField("company_id")
+	private Long companyId;
+
+	@TableField("site_id")
+	private Long siteId;
+
+	@TableField("auto_create_time")
+	private Date autoCreateTime;
+
+	@Override
+	protected Serializable pkVal() {
+		// TODO Auto-generated method stub
+		return this.id;
+	}
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsCourse.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-03-16
+ */
+@Data
+@Api(tags = "StatisticsCourse", description = "")
+@TableName("statistics_course")
+public class StatisticsCourse extends Model<StatisticsCourse> {
+
+
+
+
+	private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键")
+	private Long id;
+
+@ApiModelProperty(value = "课程Id")
+	@TableField("course_id")
+	private Long courseId;
+
+@ApiModelProperty(value = "课程名字")
+	@TableField("course_name")
+	private String courseName;
+
+@ApiModelProperty(value = "课程编码")
+	@TableField("course_code")
+	private String courseCode;
+
+@ApiModelProperty(value = "课程当前状态")
+@TableField("course_state")
+private Integer courseState;
+
+@ApiModelProperty(value = "课程时长")
+	@TableField("course_duration")
+	private String courseDuration;
+
+@ApiModelProperty(value = "课程创建时间")
+	@TableField("course_create_time")
+	private Date courseCreateTime;
+
+@ApiModelProperty(value = "课程所在公司Id")
+	@TableField("company_id")
+	private Long companyId;
+
+@ApiModelProperty(value = "课程所在站点id")
+	@TableField("site_id")
+	private Long siteId;
+
+@ApiModelProperty(value = "课程所在组织id")
+	@TableField("org_id")
+	private Long orgId;
+
+
+@ApiModelProperty(value="课程的可见范围1全平台 2指定范围")
+@TableField(exist=false)
+private Integer scope;
+
+	@ApiModelProperty(value = "是否发放证书： true 配置开启证书，false 不开启证书")
+	@TableField("grant_certificate")
+	private Boolean grantCertificate;
+
+
+
+
+
+
+public String toStringVO() {
+	return "StatisticsCourse [courseId=" + courseId + ", courseName=" + courseName + ", courseCode=" + courseCode
+			+ ", courseState=" + courseState + ", courseDuration=" + courseDuration + ", courseCreateTime="
+			+ courseCreateTime + ", companyId=" + companyId + ", siteId=" + siteId + ", grantCertificate=" + grantCertificate  + ", orgId=" + orgId + "]";
+}
+
+
+
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsCourseGrade.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-07-04
+ */
+@Data
+@Api(tags = "StatisticsCourseGrade", description = "")
+@TableName("statistics_course_grade")
+public class StatisticsCourseGrade extends Model<StatisticsCourseGrade> {
+
+    private static final long serialVersionUID = 1L;
+
+
+	private Long id;
+
+	@TableField("account_id")
+	private Long accountId;
+
+	@TableField("course_id")
+	private Long courseId;
+
+	private Float score;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsCourseMessage1.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yinyuyan123
+ * @since 2019-03-20
+ */
+@Data
+@Api(tags = "StatisticsCourseMessage", description = "")
+@TableName("statistics_course_message")
+public class StatisticsCourseMessage1 extends Model<StatisticsCourseMessage1> {
+
+    private static final long serialVersionUID = 1L;
+
+
+	private byte[] id;
+
+@ApiModelProperty(value = "课程id")
+	@TableField("course_id")
+	private Long courseId;
+
+@ApiModelProperty(value = "账号id")
+	@TableField("account_id")
+	private Long accountId;
+
+@ApiModelProperty(value = "等级")
+	private Integer level;
+
+@ApiModelProperty(value = "是否有评论默认给1")
+	private Integer comment;
+
+@ApiModelProperty(value = "首次完成时间")
+	@TableField("finish_time")
+	private Date finishTime;
+
+@ApiModelProperty(value = "记录类型 1等级 2评论 3首次完成时间")
+	private Integer type;
+
+@ApiModelProperty(value = "记录创建时间")
+	@TableField("record_time")
+	private Date recordTime;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsCourseRecorde1.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yinyuyan123
+ * @since 2019-03-20
+ */
+@Data
+@Api(tags = "StatisticsCourseRecorde", description = "")
+@TableName("statistics_course_recorde")
+public class StatisticsCourseRecorde1 extends Model<StatisticsCourseRecorde1> {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键")
+	private Long id;
+
+@ApiModelProperty(value = "课程id")
+	@TableField("course_id")
+	private Long courseId;
+
+@ApiModelProperty(value = "账号id")
+	@TableField("account_id")
+	private Long accountId;
+
+@ApiModelProperty(value = "学习记录发生所在站点")
+	@TableField("site_id")
+	private Long siteId;
+
+
+
+@ApiModelProperty(value = "学习次数")
+	@TableField("learn_count")
+	private Long learnCount;
+
+@ApiModelProperty(value = "当天学习开始时间")
+	@TableField("start_time")
+	private Date startTime;
+
+@ApiModelProperty(value = "当天学习结束时间")
+	@TableField("end_time")
+	private Date endTime;
+
+@ApiModelProperty(value = "当天学习时长（S）")
+	@TableField("learn_time")
+	private Long learnTime;
+
+@ApiModelProperty(value = "学习记录发生时间")
+	@TableField("record_time")
+	private Date recordTime;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsCourseVisibleRange.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yinyuyan123
+ * @since 2019-03-20
+ */
+@Data
+@Api(tags = "StatisticsCourseVisibleRange", description = "")
+@TableName("statistics_course_visible_range")
+public class StatisticsCourseVisibleRange extends Model<StatisticsCourseVisibleRange> {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键")
+	private Long id;
+
+@ApiModelProperty(value = "公司id")
+@TableField("company_id")
+private Long companyId;
+
+@ApiModelProperty(value = "站点id")
+@TableField("site_id")
+private Long siteId;
+
+
+
+
+@ApiModelProperty(value = "课程id")
+	@TableField("course_id")
+	private Long courseId;
+
+@ApiModelProperty(value = "可见范围ID（全平台可见存放站点ID，指定范围可见存可见范围虚拟ID）")
+	@TableField("relation_id")
+	private Long relationId;
+
+@ApiModelProperty(value = "可见范围（0 游客 1 平台用户 2 指定范围）")
+	@TableField("is_virtual")
+	private Integer isVirtual;
+
+@ApiModelProperty(value = "活动类型")
+@TableField("type")
+private Integer type;
+
+@TableField(exist=false)
+private Long askNum;
+
+
+@ApiModelProperty(value = "创建时间")
+	@TableField(value = "create_time", fill = FieldFill.INSERT)
+	private Date createTime;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsForum.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotations.Version;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import lombok.Data;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author taoge123
+ * @since 2020-02-13
+ */
+@Data
+@ApiModel(value = "StatisticsForum", description = "")
+@TableName("statistics_forum")
+public class StatisticsForum {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键")
+	private Long id;
+
+	@ApiModelProperty(value = "帖子id")
+	private Long postsId;
+
+    @ApiModelProperty(value = "帖子名称")
+	private String title;
+
+    @ApiModelProperty(value = "用户id")
+	@TableField("account_id")
+	private Long accountId;
+
+    @ApiModelProperty(value = "账号名称")
+	@TableField("account_name")
+	private String accountName;
+
+    @ApiModelProperty(value = "姓名")
+	@TableField("full_name")
+	private String fullName;
+
+    @ApiModelProperty(value = "点赞数")
+	@TableField("thumbs_num")
+	private Integer thumbsNum;
+
+    @ApiModelProperty(value = "回复数（包含评论回复）")
+	@TableField("comment_num")
+	private Integer commentNum;
+
+    @ApiModelProperty(value = "阅读数")
+	@TableField("read_num")
+	private Integer readNum;
+
+    @ApiModelProperty(value = "收藏数")
+	@TableField("favorite_num")
+	private Integer favoriteNum;
+
+	@ApiModelProperty(value = "举报数")
+	@TableField("inform_num")
+	private Integer informNum;
+
+    @ApiModelProperty(value = "终端类型：1-管理端   2-pc端   3-微信端  4-app")
+	@TableField("terminal_type")
+	private Integer terminalType;
+
+    @ApiModelProperty(value = "帖子创建时间")
+	@TableField("posts_create_time")
+	private Date postsCreateTime;
+
+    @ApiModelProperty(value = "是否置顶 0：未置顶（默认） 1:置顶")
+	@TableField("is_top")
+	private Integer isTop;
+
+    @ApiModelProperty(value = "是否加精 0：未加精（默认） 1:加精")
+	@TableField("is_highlight")
+	private Integer isHighlight;
+
+    @ApiModelProperty(value = "站点id")
+	@TableField("site_id")
+	private Long siteId;
+
+	@ApiModelProperty("企业id")
+	@TableField("company_id")
+	private Long companyId;
+
+    @ApiModelProperty(value = "创建时间")
+	@TableField(value = "create_time", fill = FieldFill.INSERT)
+	private Date createTime;
+
+
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsForumAccount.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.Version;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import lombok.Data;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author taoge123
+ * @since 2020-02-13
+ */
+@Data
+@ApiModel(value = "StatisticsForumAccount", description = "")
+@TableName("statistics_forum_account")
+public class StatisticsForumAccount {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "用户id")
+    @TableField("account_id")
+    private Long accountId;
+
+    @ApiModelProperty(value = "账号名称")
+    @TableField("account_name")
+    private String accountName;
+
+    @ApiModelProperty(value = "姓名")
+    @TableField("full_name")
+    private String fullName;
+
+    @ApiModelProperty(value = "部门id")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "部门名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "职务")
+    private String position;
+
+    @ApiModelProperty(value = "用户状态")
+    private String status;
+
+    @ApiModelProperty(value = "已发表数")
+    @TableField("send_num")
+    private Integer sendNum;
+
+    @ApiModelProperty(value = "阅读数 ")
+    @TableField("read_num")
+    private Integer readNum;
+
+    @ApiModelProperty(value = "评论数 ")
+    @TableField("comment_num")
+    private Integer commentNum;
+
+    @ApiModelProperty(value = "回复数 ")
+    @TableField("reply_num")
+    private Integer replyNum;
+
+    @ApiModelProperty(value = "草稿帖子数 ")
+    @TableField("draft_num")
+    private Integer draftNum;
+
+    @ApiModelProperty(value = "精选帖子数")
+    @TableField("highlight_num")
+    private Integer highlightNum;
+
+    @ApiModelProperty(value = "置顶帖子数")
+    @TableField("top_num")
+    private Integer topNum;
+
+    @ApiModelProperty(value = "点赞数")
+    @TableField("admire_num")
+    private Integer admireNum;
+
+    @ApiModelProperty(value = "被点赞数")
+    @TableField("be_admired_num")
+    private Integer beAdmiredNum;
+
+    @ApiModelProperty(value = "举报数")
+    @TableField("inform_num")
+    private Integer informNum;
+
+    @ApiModelProperty(value = "被举报数")
+    @TableField("be_inform_num")
+    private Integer beInformNum;
+
+    @ApiModelProperty(value = "被禁言数")
+    @TableField("be_forbidden_num")
+    private Integer beForbiddenNum;
+
+    @ApiModelProperty(value = "站点id")
+    @TableField("site_id")
+    private Long siteId;
+
+    @ApiModelProperty("企业id")
+    @TableField("company_id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsResearch.java

+package com.yizhi.statistics.application.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.yizhi.statistics.application.refactor.TrResearchAnswerVO;
+import com.yizhi.statistics.application.refactor.TrResearchAuthorizeVO;
+import com.yizhi.statistics.application.refactor.TrResearchQuestionVO;
+import com.yizhi.statistics.application.refactor.TrResearchRemindVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 调研
+ * </p>
+ *
+ * @author shengchenglong
+ * @since 2018-03-12
+ */
+@Data
+@Api (tags = "Research", description = "调研")
+@TableName ("statistics_research")
+public class StatisticsResearch extends Model<StatisticsResearch> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty (value = "调研主键ID，主键")
+    @TableId ("id")
+    private Long id;
+
+    @ApiModelProperty (value = "培训项目ID")
+    @TableField ("training_project_id")
+    private Long trainingProjectId;
+
+    @ApiModelProperty (value = "调研编码，系统将自动生成调研编码；编码规则，按创建顺序累加，例如DY000001，DY000002")
+    @TableField ("research_no")
+    private String researchNo;
+
+    @ApiModelProperty (value = "积分，默认0")
+    @TableField ("point")
+    private Integer point;
+
+    @ApiModelProperty (value = "调研名称")
+    @TableField ("name")
+    private String name;
+
+    @ApiModelProperty (value = "开始时间")
+    @TableField ("start_time")
+    private Date startTime;
+
+    @ApiModelProperty (value = "结束时间")
+    @TableField ("end_time")
+    private Date endTime;
+
+    @ApiModelProperty (value = "可见范围，1平台用户可见（企业下所有人员） 2指定学员可见")
+    @TableField ("visible_range")
+    private Integer visibleRange;
+
+    @ApiModelProperty (value = "状态，0草稿 1上架 2下架")
+    @TableField ("state")
+    private Integer state;
+
+    @ApiModelProperty (value = "删除状态：0未删，1已删（默认0）")
+    @TableField ("deleted")
+    private Integer deleted;
+
+    @ApiModelProperty (value = "创建时间")
+    @TableField (value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty (value = "创建时间")
+    @TableField (value = "record_create_time", fill = FieldFill.INSERT)
+    private Date recordCreateTime;
+
+    @ApiModelProperty (value = "创建人ID")
+    @TableField (value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty (value = "创建人姓名")
+    @TableField (value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+
+    @ApiModelProperty (value = "企业_ID")
+    @TableField ("company_id")
+    private Long companyId;
+
+    @ApiModelProperty (value = "部门_ID")
+    @TableField ("org_id")
+    private Long orgId;
+
+    @ApiModelProperty (value = "站点_ID")
+    @TableField ("site_id")
+    private Long siteId;
+
+    /**
+     * 该调研可参加人数
+     */
+    @ApiModelProperty (value = "可参加人数")
+    @TableField (exist = false)
+    private Integer count;
+
+    /**
+     * 实际参加人数
+     */
+    @ApiModelProperty (value = "实际参加人数")
+    @TableField (exist = false)
+    private Integer realCount;
+
+    /**
+     * 提醒集合，不持久化
+     */
+    @ApiModelProperty (value = "消息提醒")
+    @TableField (exist = false)
+    private List<TrResearchRemindVO> reminds;
+
+    /**
+     * 关联人员集合
+     */
+    @ApiModelProperty (value = "关联人员")
+    @TableField (exist = false)
+    private List<TrResearchAuthorizeVO> authorizes;
+
+    @ApiModelProperty (value = "关联人员id")
+    @TableField (exist = false)
+    private List<Long> relationIds;
+
+
+    /**
+     * 问题集合，不持久化
+     */
+    @ApiModelProperty (value = "消息提醒")
+    @TableField (exist = false)
+    private List<TrResearchQuestionVO> questions;
+
+    @ApiModelProperty (value = "改调研的答卷")
+    @TableField (exist = false)
+    private List<TrResearchAnswerVO> trResearchAnswers;
+
+    @ApiModelProperty (value = "搜索列表显示状态：1已完成，2进行中，3已过期")
+    @TableField (exist = false)
+    private Integer finishState;
+
+    @ApiModelProperty (value = "完成时间")
+    @TableField (exist = false)
+    private Date finishTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsResearchLearnMetadata.java

+package com.yizhi.statistics.application.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学员调研明细
+ * </p>
+ *
+ * @author hutao123
+ * @since 2019-04-18
+ */
+@Data
+@Api (tags = "StatisticsResearchLearnMetadata", description = "学员调研明细")
+@TableName ("statistics_research_learn_metadata")
+public class StatisticsResearchLearnMetadata extends Model<StatisticsResearchLearnMetadata> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty (value = "自增")
+    @TableId (value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty (value = "调研ID")
+    @TableField ("research_id")
+    private Long researchId;
+
+    @ApiModelProperty (value = "用户ID")
+    @TableField ("account_id")
+    private Long accountId;
+
+    @ApiModelProperty (value = "应参加状态，1应参加 0不应参加（用于统计：应参加人数，MAX取值）")
+    @TableField ("can_state")
+    private Integer canState;
+
+    @ApiModelProperty (value = "实际参加状态，1参加 0未参加（用于统计：实参加人数，MAX取值）")
+    @TableField ("join_state")
+    private Integer joinState;
+
+    @ApiModelProperty (value = "提交时间")
+    @TableField ("finish_time")
+    private Date finishTime;
+
+    @ApiModelProperty (value = "调研参加时间")
+    @TableField ("research_answer_create_time")
+    private Date researchAnswerCreateTime;
+
+    @ApiModelProperty (value = "记录统计时间")
+    @TableField ("record_create_time")
+    private Date recordCreateTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsTraining.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-05-13
+ */
+@Data
+@Api(tags = "StatisticsTraining", description = "")
+@TableName("statistics_training")
+public class StatisticsTraining extends Model<StatisticsTraining> {
+
+    private static final long serialVersionUID = 1L;
+
+
+	private Long id;
+
+	@TableField("training_project_id")
+	private Long trainingProjectId;
+
+	@TableField("training_project_name")
+	private String trainingProjectName;
+
+	@TableField("start_time")
+	private Date startTime;
+
+	@TableField("end_time")
+	private Date endTime;
+
+	private Integer state;
+
+	@TableField(value = "create_time", fill = FieldFill.INSERT)
+	private Date createTime;
+
+	@TableField("company_id")
+	private Long companyId;
+
+	@TableField("site_id")
+	private Long siteId;
+
+	@TableField("org_id")
+	private Long orgId;
+
+	@TableField("auto_create_time")
+	private Date autoCreateTime;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsTrainingPlan.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-05-31
+ */
+@Data
+@Api(tags = "StatisticsTrainingPlan", description = "")
+@TableName("statistics_training_plan")
+public class StatisticsTrainingPlan extends Model<StatisticsTrainingPlan> {
+
+    private static final long serialVersionUID = 1L;
+
+
+	private Long id;
+	
+	@TableField("training_project_id")
+	private Long trainingProjectId;
+
+	@TableField("plan_id")
+	private Long planId;
+
+	@TableField("plan_name")
+	private String planName;
+
+	@TableField("company_id")
+	private Long companyId;
+
+	@TableField("site_id")
+	private Long siteId;
+
+	@TableField("auto_create_time")
+	private Date autoCreateTime;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsTrainingPlanActivity.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 学习计划中的活动
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-05-14
+ */
+@Data
+@Api(tags = "StatisticsTrainingPlanActivity", description = "学习计划中的活动")
+@TableName("statistics_training_plan_activity")
+public class StatisticsTrainingPlanActivity extends Model<StatisticsTrainingPlanActivity> {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键id")
+	private Long id;
+
+@ApiModelProperty(value = "冗余培训项目id")
+	@TableField("training_project_id")
+	private Long trainingProjectId;
+
+@ApiModelProperty(value = "学习计划id")
+	@TableField("tp_plan_id")
+	private Long tpPlanId;
+
+@ApiModelProperty(value = "活动类型：0课程1考试2调研3直播4投票5作业6证书7外部链接")
+	private Integer type;
+
+@ApiModelProperty(value = "关联的活动的id")
+	@TableField("relation_id")
+	private Long relationId;
+
+@ApiModelProperty(value = "活动名称，从活动那边取过来，不能自定义")
+	private String name;
+
+@ApiModelProperty(value = "站点id")
+	@TableField("site_id")
+	private Long siteId;
+
+
+@ApiModelProperty(value = "企业id")
+	@TableField("company_id")
+	private Long companyId;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsTrainingStudentActivityRecord.java

+package com.yizhi.statistics.application.entity;
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 学员完成活动记录（这里无论有没有被设置成别的活动的开启条件，都记录）
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-05-14
+ */
+@Data
+@Api(tags = "StatisticsTrainingStudentActivityRecord", description = "学员完成活动记录（这里无论有没有被设置成别的活动的开启条件，都记录）")
+@TableName("statistics_training_student_activity_record")
+public class StatisticsTrainingStudentActivityRecord extends Model<StatisticsTrainingStudentActivityRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键id")
+	private Long id;
+
+@ApiModelProperty(value = "活动类型： 0课程 1考试 2调研 3直播 4投票 5作业 6证书 7外部链接 8报名 9签到")
+	private Integer type;
+
+@ApiModelProperty(value = "学员id")
+	@TableField("account_id")
+	private Long accountId;
+
+@ApiModelProperty(value = "课程、考试、调研、直播、投票、作业、证书、外部链接的id，由type决定类型。")
+	@TableField("relation_id")
+	private Long relationId;
+
+@ApiModelProperty(value = "若是考试（type=1）的话，需要记录分数")
+	private Float score;
+
+@ApiModelProperty(value = "若是课程，需要记录学习时长")
+	private Long seconds;
+
+@ApiModelProperty(value = "是否完成（1是，0否），默认完成。")
+	private Integer finished;
+
+@ApiModelProperty(value = "完成时间")
+	@TableField("finish_date")
+	private Date finishDate;
+
+@ApiModelProperty(value = "所属站点id")
+	@TableField("site_id")
+	private Long siteId;
+
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsTrainingStudentPlanRecorde.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 计划完成记录，只有计划完成才会有记录
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-05-14
+ */
+@Data
+@Api(tags = "StatisticsTrainingStudentPlanRecorde", description = "计划完成记录，只有计划完成才会有记录")
+@TableName("statistics_training_student_plan_recorde")
+public class StatisticsTrainingStudentPlanRecorde extends Model<StatisticsTrainingStudentPlanRecorde> {
+
+    private static final long serialVersionUID = 1L;
+
+
+	private Long id;
+
+@ApiModelProperty(value = "冗余培训项目id")
+	@TableField("training_project_id")
+	private Long trainingProjectId;
+
+@ApiModelProperty(value = "所属站点id")
+	@TableField("site_id")
+	private Long siteId;
+
+@ApiModelProperty(value = "学习计划id")
+	@TableField("tp_plan_id")
+	private Long tpPlanId;
+
+@ApiModelProperty(value = "学员id")
+	@TableField("account_id")
+	private Long accountId;
+
+@ApiModelProperty(value = "完成时间")
+	@TableField("finish_date")
+	private Date finishDate;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/StatisticsTrainingStudentRecorde.java

+package com.yizhi.statistics.application.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 培训项目完成情况，只有计划完成才会有记录
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-05-14
+ */
+@Data
+@Api(tags = "StatisticsTrainingStudentRecorde", description = "培训项目完成情况，只有计划完成才会有记录")
+@TableName("statistics_training_student_recorde")
+public class StatisticsTrainingStudentRecorde extends Model<StatisticsTrainingStudentRecorde> {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键id")
+	private Long id;
+
+@ApiModelProperty(value = "对应的培训项目id")
+	@TableField("training_project_id")
+	private Long trainingProjectId;
+
+@ApiModelProperty(value = "所属站点id")
+	@TableField("site_id")
+	private Long siteId;
+
+@ApiModelProperty(value = "学员id")
+	@TableField("account_id")
+	private Long accountId;
+
+@ApiModelProperty(value = "完成时间")
+	@TableField("finish_date")
+	private Date finishDate;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/User.java

+package com.yizhi.statistics.application.entity;
+
+import lombok.Data;
+
+@Data
+public class User {
+	
+	private Long accountId;
+	
+	private Long orgId;
+	
+	private String orgCode;
+	
+	private String orgName;
+	
+	private String accountName;
+	
+	private String fullName;
+	
+	private String phoneNum;
+	
+	private String workNum;
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/vo/CourseCalculateTimeVo.java

+package com.yizhi.statistics.application.entity.vo;
+
+import java.util.Date;
+
+
+
+import lombok.Data;
+
+@Data
+public class CourseCalculateTimeVo {
+
+	private Date startDate;
+	
+	private String startDateString;
+	
+	private Date endDate;
+	
+	private String endDateString;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/entity/vo/ErrorMsg.java

+package com.yizhi.statistics.application.entity.vo;
+
+public class ErrorMsg {
+	 
+	private Long id;
+	
+	private String msg;
+
+	public ErrorMsg(Long id, String msg) {
+		super();
+		this.id = id;
+		this.msg = msg;
+	}
+
+	@Override
+	public String toString() {
+		return "自定义日志ErrorMsg： [id=" + id + ", msg=" + msg + "]";
+	}
+	
+	
+	
+	
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/enums/PointChangeTypeEnum.java

+package com.yizhi.statistics.application.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PointChangeTypeEnum
+ * @author: zjl
+ * @date: 2021/1/25  15:45
+ */
+public class PointChangeTypeEnum {
+    public static Integer onlineCourse = 10;//在线课程
+    public static Integer offlineCourse = 20;//线下课程
+    public static Integer trainingProject = 30;//项目
+    public static Integer exam = 40; //考试
+    public static Integer assignment = 50; //作业
+    public static Integer research = 60;//调研
+    public static Integer caselibrary = 70;//原创活动
+    public static Integer clockIn = 80;//打卡
+    public static Integer forum = 90;//论坛
+    public static Integer sign = 100;//签到
+    public static Integer externalImport = 110;//外部导入
+    public static Integer practice = 120;//陪练
+
+    public final static Map<Integer, String> relation = new HashMap<Integer, String>() {
+        {
+            put(onlineCourse, "在线课程");
+            put(offlineCourse, "线下课程");
+            put(trainingProject, "项目");
+            put(exam, "考试");
+            put(assignment, "作业");
+            put(research, "调研");
+            put(caselibrary, "原创活动");
+            put(clockIn, "打卡");
+            put(forum, "论坛");
+            put(sign, "签到");
+            put(externalImport, "外部导入");
+            put(practice, "陪练");
+        }
+    };
+
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/enums/ReportType.java

+package com.yizhi.statistics.application.enums;
+
+public enum ReportType {
+	firstQuarter(0,"一季度报告"),
+	secondQuarter(1,"二季度报告"),
+	firstHalfYear(2,"上半年度报告"),
+    thirdQuarter(3,"三季度报告"),
+    fourthQuarter(4,"四季度报告"),
+    secondHalfYear(5,"下半年度报告"),
+    annual(6,"年度报告");
+    private Integer type;
+    private String typeName;
+
+    ReportType(Integer type, String typeName) {
+        this.type = type;
+        this.typeName = typeName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+    
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/exam/domain/po/ExamGroupPO.java

+package com.yizhi.statistics.application.exam.domain.po;
+
+import com.yizhi.core.application.context.RequestContext;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @Date 2020/9/17 2:32 下午
+ * @Author lvjianhui
+ **/
+@Data
+@ApiModel
+public class ExamGroupPO extends RequestContext {
+    String startAt;
+    String endAt;
+    String orgNameLike;
+    Integer pageIndex;
+    Integer pageSize;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/exam/domain/po/UserExamGroupPO.java

+package com.yizhi.statistics.application.exam.domain.po;
+
+import com.yizhi.core.application.context.RequestContext;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @Date 2020/9/17 10:17 下午
+ * @Author lvjianhui
+ **/
+@Data
+@ApiModel
+public class UserExamGroupPO extends RequestContext {
+    String startAt;
+    String endAt;
+    String userName;
+    String orgCode;
+    Long orgId;
+    String orgName;
+    Integer pageIndex;
+    Integer pageSize;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/exam/domain/vo/ExamGroupOrgVO.java

+package com.yizhi.statistics.application.exam.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Date 2020/9/17 2:21 下午
+ * @Author lvjianhui
+ **/
+@Data
+@ApiModel
+public class ExamGroupOrgVO {
+
+    Long orgId;
+
+    @ApiModelProperty("部门名")
+    String orgName;
+
+    @ApiModelProperty("部门编码")
+    String orgCode;
+
+    @ApiModelProperty(value = "所在组织架构",hidden = true)
+    String orgNames;
+
+    @ApiModelProperty("可参加考试数")
+    Long examCount = 0L;
+
+    @ApiModelProperty("可参加用户数")
+    Long planUserCount = 0L;
+
+    @ApiModelProperty("实际参加用户数")
+    Long actualUserCount = 0L;
+
+    @ApiModelProperty("通过考试用户数")
+    Long passUserCount = 0L;
+
+    @ApiModelProperty("通过率")
+    Long passRate = 0L;
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/exam/domain/vo/UserExamByOrgVO.java

+package com.yizhi.statistics.application.exam.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Date 2020/9/17 10:44 上午
+ * @Author lvjianhui
+ **/
+@Data
+@ApiModel
+public class UserExamByOrgVO {
+
+    String orgName;
+    String orgCode;
+
+    @ApiModelProperty("用户名")
+    String userName;
+
+    @ApiModelProperty("姓名")
+    String fullName;
+
+    @ApiModelProperty("应参加考试数")
+    Long planJoinCount = 0L;
+
+    @ApiModelProperty("实际参加考试数")
+    Long actualJoinCount = 0L;
+
+    @ApiModelProperty("通过考试数")
+    Long passCount = 0L;
+
+    @ApiModelProperty("考试时长")
+    Integer duration;
+
+    @ApiModelProperty("未通过考试数")
+    Long unPassCount = 0L;
+
+    //组织机构代码
+    @ApiModelProperty(value = "组织结构", hidden = true)
+    String orgNames;
+
+
+
+    @ApiModelProperty("通过率")
+    Integer passRate = 0;
+
+    public Long getPassRate() {
+        if (passCount == null || actualJoinCount == null) return 0L;
+        if (passCount == 0 || actualJoinCount == 0) return 0L;
+        return (passCount * 100) / actualJoinCount;
+    }
+
+    Long accountId;
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/exam/domain/vo/UserExamDetailOrgVO.java

+package com.yizhi.statistics.application.exam.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @Date 2020/9/21 10:42 上午
+ * @Author lvjianhui
+ **/
+@Data
+public class UserExamDetailOrgVO {
+    String name;
+    String fullName;
+    Long accountId;
+    String orgName;
+    String orgCode;
+    String examName;
+    String examStartAt;
+    String examEndAt;
+    Long examId;
+    Integer duration;
+    Integer joinExamCount;
+    Integer passExamCount;
+    String firstPushAt;
+    Integer maxScore;
+    String  examStatus = "已参加";
+    // 1通过 0未通过 -1未参加
+    Integer examState = -1;
+    String examResult = "已通过";
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/feign/DashboardClient.java

+package com.yizhi.statistics.application.feign;
+
+import com.yizhi.statistics.application.entity.AccountDashboard;
+import com.yizhi.statistics.application.refactor.course.CourseDashboardParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "statistics", contextId = "DashboardClient")
+public interface DashboardClient {
+
+    /**
+     * 根据时间获取学习记录
+     *
+     * @param param
+     * @return
+     */
+    @PostMapping("/accountDashboard/getRecords/byAccountId")
+    public List<AccountDashboard> getRecords(@RequestBody CourseDashboardParam param);
+
+    @GetMapping("/accountDashboard/asynchronous/dashboard")
+    public void AsynchronousDashboard(@RequestParam("yesterday") String yesterday);
+
+    /**
+     * 专门用于跑历史数据  startDateString 直到  endDateString
+     * @param endDateString
+     */
+    @GetMapping("/accountDashboard/diy/asynchronous/dashboard")
+    public void diyAsynchronousDashboard(@RequestParam("startDateString") String startDateString,
+                                         @RequestParam("endDateString") String endDateString);
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/feign/ReportAlbumClient.java

+package com.yizhi.statistics.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.statistics.application.album.vo.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(name="statistics", contextId = "ReportAlbumClient")
+public interface ReportAlbumClient {
+
+	@PostMapping("/statisticsAlbum/chart/group")
+	public List<ReportStudyAlbumChartsVo> chartGroup(@RequestBody AlbumGroupParam albumGroupParam);
+	
+	@PostMapping("/statisticsAlbum/group")
+	public Page<ReportStudyAlbumVo> albumGroup(@RequestBody AlbumGroupParam albumGroupParam);
+	
+	@PostMapping("/statisticsAlbum/group/excel")
+	public void albumGroupExport(@RequestBody AlbumGroupParam albumGroupParam);
+	
+	@PostMapping("/statisticsAlbum/group/view")
+	public List<ReportStudyAlbumViewVo2> albumGroupView(@RequestBody AlbumGroupParam albumGroupParam);
+	
+	@PostMapping("/statisticsAlbum/group/view/export1")
+	public void albumGroupViewExport1(@RequestBody AlbumGroupParam albumGroupParam);
+	
+	@PostMapping("/statisticsAlbum/group/view/export2")
+	public void albumGroupViewExport2(@RequestBody AlbumGroupParam albumGroupParam);
+	
+	@PostMapping("/statisticsAlbum/group/view/export3")
+	public void albumGroupViewExport3(@RequestBody AlbumGroupParam albumGroupParam);
+	
+	@PostMapping("/statisticsAlbum/account/group")
+	public Page<ReportStudyAlbumAccountVo> albumAccountGroup(@RequestBody AlbumGroupAccountParam albumGroupAccountParam);
+	
+	@PostMapping("/statisticsAlbum/account/group/export")
+	public void albumAccountGroupExport(@RequestBody AlbumGroupAccountParam albumGroupAccountParam);
+	
+	@PostMapping("/statisticsAlbum/account/group/view")
+	public Page<ReportStudyAlbumAccountViewVo> albumAccountGroupView(@RequestBody AlbumGroupAccountParam albumGroupAccountParam);
+	
+	@PostMapping("/statisticsAlbum/account/group/view/export")
+	public void albumAccountGroupViewExport(@RequestBody AlbumGroupAccountParam accountParam);
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/feign/ReportClient.java

+package com.yizhi.statistics.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.statistics.application.entity.Report;
+import com.yizhi.statistics.application.entity.ReportVisibleRange;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name="statistics", contextId = "statistics-ReportClient")
+public interface ReportClient {
+
+	@GetMapping("/statisticsReport/save")
+	public void save(@RequestParam("type") Integer type);
+	
+	@PostMapping("/statisticsReport/update")
+	public Report update(@RequestBody Report report);
+	
+	@GetMapping("/statisticsReport/up")
+	public Boolean up(@RequestParam("reportId") Long reportId);
+	
+	@GetMapping("/statisticsReport/down")
+	public Boolean down(@RequestParam("reportId") Long reportId);
+	
+	@PostMapping("/statisticsReport/authorize/insert")
+	public Boolean insertReportVisibleRanges(@RequestBody List<ReportVisibleRange> reportVisibleRanges);
+	
+	@GetMapping("/statisticsReport/list")
+	public Page<Report> list(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNo") Integer pageNo, @RequestParam("type") Integer type,
+			@RequestParam("siteId") Long siteId, @RequestParam("companyId") Long companyId, @RequestParam("kwd") String kwd);
+	
+	@GetMapping("/statisticsReport/VisibleRange")
+	public List<ReportVisibleRange> VisibleRange(@RequestParam("reportId") Long reportId);
+	
+	@PostMapping("/statisticsReport/relation/list")
+	public List<Report> relationList(@RequestBody List<Long> ids);
+	
+	@GetMapping("/statisticsReport/get/id")
+	public Report getById(@RequestParam("id") Long id);
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/feign/StatisticsAlbumClientV2.java

+package com.yizhi.statistics.application.feign;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name="statistics", contextId = "StatisticsAlbumClientV2")
+public interface StatisticsAlbumClientV2 {
+
+
+    @GetMapping("/statisticsAlbum/manual/import/album/data")
+    @ApiOperation(value = "手动导入报表专辑相关数据")
+    public void albumManualImport(@RequestParam(value = "startDate",required = false) String startDate,
+                                  @RequestParam(value = "endDate",required = false) String endDate,
+                                  @RequestParam(value = "siteId",required = false) Long siteId,
+                                  @RequestParam(value = "companyId",required = false) Long companyId
+    );
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/feign/StatisticsCourseClient.java

+package com.yizhi.statistics.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.statistics.application.course.vo.*;
+import com.yizhi.statistics.application.entity.StatisticsCourse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name="statistics", contextId = "StatisticsCourseClient")
+public interface StatisticsCourseClient {
+	
+	@GetMapping("/test/test")
+	public StatisticsCourse statisticsCourse(@RequestParam(value="id")Long id);
+	
+	
+	/**
+	 * 系统更改角色的时候，改变管理员的信息
+	 * @param accountId
+	 * @param siteId
+	 */
+	@GetMapping("/statisticsReport/update/role")
+	public void statisticsUpdateRole(@RequestParam(value="accountId",required=true)Long accountId,
+			                                                 @RequestParam(value="siteId",required=true)Long siteId);
+	
+	
+
+	  @GetMapping("/statisticsReport/asynchronous/load/date")
+	  public String AsynchronousCourse(@RequestParam(value="startDate",required=false) String startDate,
+			                                                          @RequestParam(value="endDate",required=false) String endDate);
+
+
+	/**
+	 * 处理发版培训项目数据库 tp_plan_activity，tp_student_project_record，tp_student_plan_record 数据丢失，手动跑批
+	 * @param startDate
+	 * @param endDate
+	 */
+	@GetMapping("/statisticsReport/asynchronous/load/date/training")
+	public void AsynchronousCourseTraining(@RequestParam(value="startDate",required=false) String startDate,
+									 @RequestParam(value="endDate",required=false) String endDate);
+	
+
+	  /**
+	   * 图形报表
+	   * @param startDate
+	   * @param endDate
+	   * @param companyId
+	   * @param orgId
+	   * @param siteId
+	   * @param orgIds
+	   * @return
+	   */
+	  @GetMapping("/statisticsCourse/chart/group")
+	  public List<ReportStudyCourseChartsVo> chartGroup(
+			  @RequestParam("startDate")String startDate,
+			  @RequestParam("endDate")String endDate,
+			  @RequestParam("companyId")Long companyId,
+			  @RequestParam("siteId")Long siteId,
+			  @RequestParam("adminId")Long adminId,
+			  @RequestParam("isAdmin")Boolean isAdmin);
+	  
+	  
+	  
+	  /**
+	   * 按照课程统计
+	   */
+	  @PostMapping("/statisticsCourse/group")
+	  public Page<ReportStudyCourseVo> courseGroup(@RequestBody CourseGroupParam courseGroupParam);
+	  
+	  
+	  
+	  /**
+	   * 按照课程统计下载
+	   * @param map
+	   */
+	  @PostMapping("/statisticsCourse/group/excel")
+	  public void courseGroupExcel(@RequestBody CourseGroupParam courseGroupExportExcelVo);
+	  
+	  
+	  
+	  /**
+	   * 按照课程统计详情
+	   */
+	  @PostMapping("/statisticsCourse/group/view")
+	  public Page<ReportStudyCourseViewVo> courseGroupView(@RequestBody CourseGroupViewParam courseGroupViewParam);
+	  
+	  
+	  
+	  /**
+	   * 按照课程统计详情导出Excel
+	   * @param map
+	   */
+	  @PostMapping("/statisticsCourse/group/view/excel")
+	  public void courseGroupViewExcel(@RequestBody CourseGroupViewParam courseGroupViewParam);
+	  
+	  
+	
+	  
+	  /**
+	   * 按照用户统计
+	   */
+	  @PostMapping("/statisticsCourse/account/group")
+	  public Page<ReportStudyCourseAccountVo> courseAccountGroup(@RequestBody CourseAccountGroupParam courseAccountGroupParam);
+	  
+	  
+	  /**
+	   * 按照用户统计导出
+	   * @param map
+	   */
+	  @PostMapping("/statisticsCourse/account/group/excel")
+	  public void courseAccountGroupExportExcel(@RequestBody CourseAccountGroupParam courseAccountGroupParam);
+	  
+	  
+	  
+	  /**
+	   * 下载用户学习明细
+	   * @param map
+	   */
+	  @PostMapping("/statisticsCourse/account/details/export")
+	  public void courseAccountDetails(@RequestBody CourseAccountGroupParam courseAccountGroupParam);
+	  
+	  
+	  /**
+	   * 按照用户统计详情
+	   * @return
+	   */
+	  @PostMapping("/statisticsCourse/account/group/view")
+	  public  Page<ReportStudyCourseAccountViewVo> courseAccountGroupView(@RequestBody CourseAccountGroupViewParam courseAccountGroupViewParam);
+	  
+	  
+	  
+	  
+	  /**
+	   *按照用户统计详情导出Excel
+	   * @return
+	   */
+	  @PostMapping("/statisticsCourse/account/group/view/export")
+	  public  void courseAccountGroupViewExport(@RequestBody CourseAccountGroupViewParam courseAccountGroupViewParam);
+	  
+	  
+	  
+	  
+	 
+
+	  
+	  
+	  /**
+	   * 按照部门统计
+	   * @return
+	   */
+	  @PostMapping("/statisticsCourse/org/group")
+	  public Page<ReportStudyCourseOrgVo> courseOrgGroup(@RequestBody CourseOrgGroupParam courseOrgGroupParam);
+	  
+	  
+	  
+	  /**
+	   * 按照部门统计下载
+	   * @param map
+	   */
+	  @PostMapping("/statisticsCourse/org/group/export")
+	  public void courseOrgGroupExport(@RequestBody CourseOrgGroupParam courseOrgGroupParam);
+
+	/**
+	 * 学员 学习时间记录 手动跑批
+	 * @param startTime
+	 * @param endTime
+	 */
+	@GetMapping("/statisticsReport/statisticsCourse/org/study/dashboard")
+	public void courseOrgStudyDashboard(@RequestParam("startTime")String startTime,
+										  @RequestParam("endTime")String endTime);
+
+	/**
+	 * 公司下用户 手动跑批
+	 * @param companyId
+	 */
+	@GetMapping("/statisticsReport/asynchronous/load/assignsite/system")
+	public void assignSiteSystemAccount(@RequestParam("companyId") Long companyId);
+
+
+
+	@GetMapping("/statisticsReport/asynchronous/load/date/course")
+	public String AsynchronousCourse(@RequestParam(value="startDate",required=false)String startDate,
+									 @RequestParam(value="endDate",required=false)String endDate,
+									 @RequestParam(value="companyId",required=false)Long companyId,
+									 @RequestParam(value="siteId",required=false)Long siteId);
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/feign/StatisticsExamClient.java

+package com.yizhi.statistics.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.statistics.application.exam.domain.po.ExamGroupPO;
+import com.yizhi.statistics.application.exam.domain.po.UserExamGroupPO;
+import com.yizhi.statistics.application.exam.domain.vo.ExamGroupOrgVO;
+import com.yizhi.statistics.application.exam.domain.vo.UserExamByOrgVO;
+import com.yizhi.statistics.application.refactor.exam.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+/**
+ * 报表服务考试
+ *
+ * @param
+ * @author ding
+ * @date 2019/4/18
+ */
+@FeignClient(name = "statistics",contextId = "StatisticsExamClient")
+public interface StatisticsExamClient {
+
+    /**
+     * 部门用户考试统计
+     * @param po
+     * @return
+     */
+    @GetMapping("statisticsExam/group/org/users")
+    Page<UserExamByOrgVO> getExamByGroupOrgUser(@RequestBody UserExamGroupPO po);
+
+    /**
+     * 部门用户考试统计
+     * @param po
+     * @return
+     */
+    @GetMapping("statisticsExam/group/org/users/download")
+    String getExamByGroupOrgUserDownload(@RequestBody UserExamGroupPO po);
+
+    @GetMapping("statisticsExam/group/org/users/detail/download")
+    String getExamByGroupOrgUserDetailDownload(@RequestBody UserExamGroupPO po);
+
+    /**
+     * 部门考试统计
+     * @param po
+     * @return
+     */
+    @GetMapping("statisticsExam/group/org")
+    Page<ExamGroupOrgVO> getExamGroupByOrg(@RequestBody ExamGroupPO po);
+
+    /**
+     * 部门统计下载
+     * @param po
+     * @return
+     */
+    @GetMapping("statisticsExam/group/org/download")
+    String getExamGroupByOrgDownload(@RequestBody ExamGroupPO po);
+
+    /**
+     * 报表服务考试定时服务
+     *
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @GetMapping("/statisticsExam/asynchronous/load/date/old")
+    public void AsynchronousExam(@RequestParam(value = "startDate", required = false) String startDate,
+                                 @RequestParam(value = "endDate", required = false) String endDate);
+
+
+    /**
+     * 按考试统计
+     *
+     * @param reportExamParam
+     * @return
+     */
+    @GetMapping("statisticsExam/group")
+    public Page<ReportExamVO> getExamGroup(@RequestBody ReportExamParam reportExamParam);
+
+
+    /**
+     * 按考试统计下载s
+     *
+     * @param reportExamParam
+     * @return
+     */
+    @GetMapping("statisticsExam/group/download")
+    public String getExamGroupDownload(@RequestBody ReportExamParam reportExamParam);
+
+    /**
+     * 按考试查看按用户
+     *
+     * @param vo
+     * @return
+     */
+    @GetMapping("statisticsExam/group/account")
+    public Page<ReportExamAccountsViewVo> getExamAccountView(@RequestBody ExamCountByUserVO vo);
+
+    /**
+     * 按考试查看按用户下载
+     *
+     * @param vo
+     * @return
+     */
+    @GetMapping("statisticsExam/group/account/trExams/download")
+    public String getExamAccountTrExamsDownload(@RequestBody ExamCountByUserVO vo);
+
+    /**
+     * 按用户统计
+     * @param vo
+     * @return
+     */
+    @GetMapping("statisticsExam/account/group")
+    public Page<ReportExamAccountVO> getAccountGroup(@RequestBody ExamCountByUserVO vo);
+
+    /**
+     * 按用户统计下载
+     * @param vo
+     * @return
+     */
+    @GetMapping("statisticsExam/account/group/download")
+    public String getAccountGroupDownload(@RequestBody ExamCountByUserVO vo);
+
+
+    @GetMapping("statisticsExam/account/group/view")
+    public Page<ReportExamAccountViewVo> getAccountGroupView(
+           @RequestParam(name = "startTime", required = false) String startTime,
+           @RequestParam(name = "endTime", required = false) String endTime,
+           @RequestParam(name = "accountId", required = true) Long accountId,
+           @RequestParam(name = "examNameLike", required = false) String examNameLike,
+           @RequestParam(name = "pageSize", required = false) Integer pageSize,
+           @RequestParam(name = "pageNo", required = false) Integer pageNo);
+
+    @GetMapping("statisticsExam/account/group/view/download")
+    public String getAccountGroupViewDownload(
+            @RequestParam(name = "startTime", required = false) String startTime,
+            @RequestParam(name = "endTime", required = false) String endTime,
+            @RequestParam(name = "examNameLike", required = false) String examNameLike,
+            @RequestParam(name = "accountId", required = true) Long accountId);
+
+    @GetMapping("statisticsExam/examView")
+    public StatisticsExamVO getExam(
+            @RequestParam(name = "examId", required = true) Long examId);
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/feign/StatisticsForumAccountClient.java

+package com.yizhi.statistics.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.statistics.application.entity.StatisticsForumAccount;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+@FeignClient(name = "statistics", contextId = "StatisticsForumAccountClient")
+public interface StatisticsForumAccountClient {
+
+    /**
+     * 按用户统计
+     *
+     * @param keyword
+     * @param pageNo
+     * @param PageSize
+     * @return
+     */
+    @GetMapping("/statisticsForumAccount/getPage")
+    public Page<StatisticsForumAccount> getPage(@RequestParam(value = "keyword",required = false) String keyword,
+                                                @RequestParam("pageNo") Integer pageNo,
+                                                @RequestParam("PageSize") Integer PageSize);
+
+    @ApiOperation("论坛统计-按用户统计下载")
+    @GetMapping("/statisticsForumAccount/download")
+    public String download(@RequestBody Map map);
+
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/feign/StatisticsForumClient.java

+package com.yizhi.statistics.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.statistics.application.entity.StatisticsForum;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+@FeignClient(name="statistics", contextId = "StatisticsForumClient")
+public interface StatisticsForumClient {
+
+	/**
+	 * 按帖子统计
+	 * @param keyword
+	 * @param pageNo
+	 * @param PageSize
+	 * @return
+	 */
+	@GetMapping("/statisticsForum/getPage")
+	public Page<StatisticsForum> getPage(@RequestParam (value = "keyword",required = false)String keyword,
+										 @RequestParam (value = "startDate",required = false) String startDate,
+										 @RequestParam (value = "endDate",required = false) String endDate,
+										 @RequestParam ("pageNo")Integer pageNo,
+										 @RequestParam ("PageSize")Integer PageSize);
+
+	/**
+	 * 按帖子下载
+	 *
+	 * @return
+	 */
+	@ApiOperation("论坛统计-按帖子统计下载")
+	@GetMapping("/statisticsForum/download")
+	public String download(@RequestBody Map map);
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/feign/StatisticsPointClient.java

+package com.yizhi.statistics.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.statistics.application.request.point.StatisticsPointDetailQO;
+import com.yizhi.statistics.application.request.point.StatisticsPointQO;
+import com.yizhi.statistics.application.vo.point.StatisticsPointDetailVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @ClassName: StatisticsPointClient
+ * @author: zjl
+ * @date: 2021/1/25  15:40
+ */
+@FeignClient(name="statistics", contextId = "StatisticsPointClient")
+public interface StatisticsPointClient {
+
+    @PostMapping("/statistics/point/detail/get")
+    @ApiOperation("获取用户积分明细")
+    public Page<StatisticsPointDetailVO> getStatisticsPoint(@RequestBody StatisticsPointDetailQO qo);
+
+    @PostMapping("/statistics/point/detail/export")
+    @ApiOperation("导出用户积分明细")
+    public String exportStatisticsPoint(@RequestBody StatisticsPointDetailQO qo);
+
+    @PostMapping("/statistics/point/export")
+    @ApiOperation("导出所有用户积分明细")
+    public String exportAllStatisticsPoint(@RequestBody StatisticsPointQO qo);
+
+    /**
+     * 同步积分明细数据
+     */
+    @GetMapping("/statistics/point/sync/details")
+    void syncPointDetails(@RequestParam(name = "startDate",required = false) String startDate,
+                                 @RequestParam(name = "endDate",required = false) String endDate ,
+                                 @RequestParam(name = "companyId",required = false) Long companyId ,
+                                 @RequestParam(name = "siteId",required = false) Long siteId);
+}

cloud-statistics-api/src/main/java/com/yizhi/statistics/application/feign/StatisticsPracticeByOrgClient.java

+package com.yizhi.statistics.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.statistics.application.request.practice.PracticeByOrgPageReq;
+import com.yizhi.statistics.application.request.practice.PracticeReportByUserReq;
+import com.yizhi.statistics.application.vo.practice.PracticeReportByUserListVo;
+import com.yizhi.statistics.application.vo.practice.PracticeStatByOrgVo;
+import com.yizhi.util.application.page.PageInfo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @ClassName: StatisticsPracticeClient
+ * @author: lvjh
+ * @date: 2020/11/11  10:29
+ */
+@FeignClient(name = "statistics", contextId = "StatisticsPracticeByOrgClient",path = "/statistics/practice/org")
+public interface StatisticsPracticeByOrgClient {
+
+
+    /**
+     * 按部门分页查询
+     * @param param
+     * @return
+     */
+    @PostMapping("/list/page")
+    public PageInfo<PracticeStatByOrgVo> groupByOrgPage(@RequestBody PracticeByOrgPageReq param);
+
+    /**
+     * 按部门详情分页查询
+     * @param param
+     * @return
+     */
+    @PostMapping("/list/detail/page")
+    public Page<PracticeReportByUserListVo> getDetailByOrgIdPage(@RequestBody PracticeReportByUserReq param);
+
+    /**
+     * 按部门 导出列表
+     * @param param
+     * @return
+     */
+    @PostMapping("/list/page/export")
+    public String groupByOrgExport(@RequestBody PracticeByOrgPageReq param);
+
+    /**
+     *  按部门详情导出
+     * @param param
+     * @return
+     */
+    @PostMapping("/list/detail/page/export")
+    public String getDetailByOrgIdPageExport(@RequestBody PracticeReportByUserReq param);
+
+    /**
+     * 按部门详情-用户导出
+     * @param param
+     * @return
+     */
+    @PostMapping("/list/user/detail/page/export")
+    public String getUserDetailByOrgIdPageExport(@RequestBody PracticeReportByUserReq param);
+
+
+}