项目初始化

.gitignore

@@ -0,0 +1,237 @@
+
+#################
+## Eclipse
+#################
+
+.idea
+*.pydevproject
+.project
+.metadata
+/bin
+/tmp
+*/target/*
+*.class
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+/.settings
+.loadpath
+# External tool builders
+/.externalToolBuilders
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+.DS_Store
+MANIFEST.MF
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+/ipch
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+/_ReSharper*
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+/[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+*.publishproj
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+/AppPackages
+
+# Others
+/sql
+*.Cache
+/ClientBin
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[cod]
+
+# Packages
+*.egg
+*.egg-info
+/dist
+/build
+/eggs
+/parts
+/var
+/sdist
+/develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+#jekyll
+_site/
+.sass-cache/
+
+
+#############
+## selef
+#############
+
+/*/.settings
+/*/target/*
+rebel.xml
+/yuxin-school-manage.iml
+/yuxin-school-common/yuxin-school-common.iml
+/.idea/
+/.idea/
+/.idea/

README.md

@@ -0,0 +1,71 @@
+<!-- MarkdownTOC -->
+
+- 网校开发规范
+- 资源下载
+    - 七牛下载方法：
+    - 阿里oss下载方法：
+- 日志输出规范
+
+<!-- /MarkdownTOC -->
+
+
+#网校开发规范
+
+* 1、方法内（包括js），所有入参必须做必填、取值范围校验；
+* 2、方法内（包括js），所有判断必须要做null值处理，并且需要补充null值的处理逻辑，不予许出现null后未处理，导致后续代码出现异常的情况    
+* 3、所有页面触发的请求，做页面js防止重复点击的逻辑处理   
+* 4、有时效性的数据，必须要加超时处理逻辑
+* 5、所有列表性质的功能，必须要有分页功能；出现无分页的设计，及时通知上级去协调，同时暂停任务；
+* 6、N+1查询引发的性能问题，必须控制N的数量，前台N值不予许大于20，后台N值不予许大于100； 若有这种情况出现，及时通知上级进行协调处理；
+* 7、热点、且对实时性要求不高的数据，可以考虑加缓存
+* 8、开发过程中，必须明确每一个逻辑的处理范围。不明确的及时提出，不得臆想逻辑；任务下发到具体开发时，开讨论会明确，开发、测试、产品所有的业务逻辑及测试方案
+* 9、逻辑分支的边界值处理，不可遗漏
+
+* 10、提高提交代码时的自检粒度，做到一bug一提交、一功能一提交，提交时检查文件是否匹配；当日未能完成的任务，提交到各自的分支上；
+* 11、上线当周要求，每位开发尽力做到每日无bug遗留；归属于产品的bug，及时确定方案
+
+# 资源下载
+学员或者老师要下载资源（存储在oss或者七牛）时，禁止将资源下载到本地，然后将资源回传到客户端；
+
+应调用对应的API生成下载链接，然后让客户端302到下载链接上。
+
+## 七牛下载方法：
+
+
+```
+    String url = FileQNUtils.download(key);
+    // 当url链接增加 attname后，浏览器会强制下载，且文件名为参数指定的值
+    url += "&attname=" + StringUtil.URLEncoder(fileName);
+    return "redirect:" + url;
+```
+
+## 阿里oss下载方法：
+
+```
+    // 调用,此方法会生成私有下载链接，默认有效期1个小时，同样浏览器会强制执行下载，即使是图片也不会再浏览器中打开
+    String url = com.yuxin.wx.utils.FileUtil.generatePresignedUrl(key,fileName);
+    return "redirect:" + url;
+```
+
+# 日志输出规范
+
+1,日志输出应使用slf4j api，不要使用log4j，logging，logback 等api
+logName 可以是模块名，或者类名
+
+```
+    import org.slf4j.Logger;
+    import org.slf4j.LoggerFactory;
+    
+    private Logger log = LoggerFactory.getLogger(logName);
+```
+
+2,日志级别，应根据需要，如 ```log.info("进入方法了"); ```这种日志，应该使用debug级别，生产默认级别是info，不会输出debug
+
+3,日志输出,错误示例 ```log.debug("用户的ID为" + id);```
+这种情况java会进行字符串+的操作，产生多个对象，且在服务端info级别时，这个字符串+的操作依然会执行；
+应使用 ```log.debug("用户的id为{}", id);```
+
+4,错误日志输出，错误示例 ```log.error("发生异常了", e.getMessage());```
+这种情况不会打印出exception详细信息，如空指针异常，此种情况只会打印出来 NullpointerException;且 输出的内容无意义；
+应使用``` log.error("functionName发生异常 companyId={},xxxx={}", companyId,id ,e);```
+最后一个参数必须是 抛出来的异常对象

pom.xml

@@ -0,0 +1,396 @@
+<?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">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.yuxin</groupId>
+	<artifactId>yuxin-school-manage</artifactId>
+	<version>private-6.8.4</version>
+	<packaging>pom</packaging>
+	<name>yuxin-school-manage</name>
+	<modules>
+		<module>yuxin-school-common</module>
+		<module>yuxin-school-api</module>
+		<module>yuxin-school-model</module>
+		<module>yuxin-school-core</module>
+	    <module>yuxin-school-web</module>
+	</modules>
+	
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.framework.version>4.3.20.RELEASE</spring.framework.version>
+		<dispatching-center-client.version>private-1.0.0</dispatching-center-client.version>
+		<common-utils.version>private-1.0.12</common-utils.version>
+		<feign.version>9.7.0</feign.version>
+		<fast.json.version>1.2.0</fast.json.version>
+		<lombok.version>1.16.18</lombok.version>
+		<guava.version>20.0</guava.version>
+		<slf4j.version>1.7.25</slf4j.version>
+		<log4j.version>2.11.1</log4j.version>
+		<skywalking-log4j2.version>6.4.0</skywalking-log4j2.version>
+	</properties>
+	
+	<dependencyManagement>
+		<dependencies>
+			<!-- Spring framework -->
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-core</artifactId>
+				<version>${spring.framework.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-beans</artifactId>
+				<version>${spring.framework.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-tx</artifactId>
+				<version>${spring.framework.version}</version>
+			</dependency>
+			
+			<dependency>
+				<groupId>javassist</groupId>
+				<artifactId>javassist</artifactId>
+				<version>3.12.1.GA</version>
+			</dependency>
+			<dependency>
+				<groupId>cglib</groupId>
+				<artifactId>cglib-nodep</artifactId>
+				<version>2.2.2</version>
+			</dependency>
+
+			<!-- apache & commons -->
+			<dependency>
+				<groupId>commons-beanutils</groupId>
+				<artifactId>commons-beanutils-core</artifactId>
+				<version>1.8.3</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>commons-logging</artifactId>
+						<groupId>commons-logging</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>commons-lang</groupId>
+				<artifactId>commons-lang</artifactId>
+				<version>2.5</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.poi</groupId>
+				<artifactId>poi</artifactId>
+				<version>3.7</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-email</artifactId>
+				<version>1.2</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-net</groupId>
+				<artifactId>commons-net</artifactId>
+				<version>2.2</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-codec</groupId>
+				<artifactId>commons-codec</artifactId>
+				<version>1.4</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+				<version>2.0</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-collections</groupId>
+				<artifactId>commons-collections</artifactId>
+				<version>3.2.1</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-discovery</groupId>
+			  	<artifactId>commons-discovery</artifactId>
+			  	<version>0.5</version>
+			</dependency>
+
+			<!-- web -->
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>servlet-api</artifactId>
+				<version>2.5</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>javax.servlet.jsp</groupId>
+				<artifactId>jsp-api</artifactId>
+				<version>2.1</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.freemarker</groupId>
+				<artifactId>freemarker</artifactId>
+				<version>2.3.16</version>
+			</dependency>
+			<dependency>
+				<groupId>net.sf.json-lib</groupId>
+				<artifactId>json-lib</artifactId>
+				<version>2.1</version>
+			</dependency>
+			<dependency>
+				<groupId>net.sf.ezmorph</groupId>
+				<artifactId>ezmorph</artifactId>
+				<version>1.0.6</version>
+			</dependency>
+			<dependency>
+				<groupId>org.htmlparser</groupId>
+				<artifactId>htmlparser</artifactId>
+				<version>1.6</version>
+				<exclusions>
+					<exclusion>
+						<groupId>sun.jdk</groupId>
+						<artifactId>tools</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.tuckey</groupId>
+				<artifactId>urlrewrite</artifactId>
+				<version>3.2.0</version>
+			</dependency>
+			<dependency>
+				<groupId>jstl</groupId>
+				<artifactId>jstl</artifactId>
+				<version>1.1.2</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.validation</groupId>
+				<artifactId>validation-api</artifactId>
+				<version>1.0.0.GA</version>
+			</dependency>
+			<dependency>
+				<groupId>xfire</groupId>
+				<artifactId>xfire-jsr181-api</artifactId>
+				<version>1.0-M1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.xfire</groupId>
+				<artifactId>xfire-java5</artifactId>
+				<version>1.2.6</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.axis</groupId>
+				<artifactId>axis</artifactId>
+				<version>1.4</version>
+			</dependency>
+
+			<!-- other -->
+			<dependency>
+				<groupId>dom4j</groupId>
+				<artifactId>dom4j</artifactId>
+				<version>1.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>jaxen</groupId>
+				<artifactId>jaxen</artifactId>
+				<version>1.1.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.ostermiller</groupId>
+				<artifactId>utils</artifactId>
+				<version>1.07.00</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant</artifactId>
+				<version>1.9.6</version>
+			</dependency>
+			<dependency>
+				<groupId>jexcelapi</groupId>
+				<artifactId>jxl</artifactId>
+				<version>2.6</version>
+			</dependency>
+			<dependency>
+				<groupId>com.thoughtworks.xstream</groupId>
+				<artifactId>xstream</artifactId>
+				<version>1.4.2</version>
+			</dependency>
+			<dependency>
+				<groupId>org.quartz-scheduler</groupId>
+				<artifactId>quartz</artifactId>
+				<version>2.1.6</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>slf4j-api</artifactId>
+						<groupId>org.slf4j</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>jta</artifactId>
+						<groupId>javax.transaction</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.solr</groupId>
+				<artifactId>solr-core</artifactId>
+				<version>1.4.1</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>slf4j-api</artifactId>
+						<groupId>org.slf4j</groupId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.apache.solr</groupId>
+						<artifactId>solr-solrj</artifactId>
+					</exclusion>
+					<exclusion>
+						<artifactId>wstx-asl</artifactId>
+						<groupId>woodstox</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.solr</groupId>
+				<artifactId>solr-solrj</artifactId>
+				<version>1.4.1</version>
+			</dependency>
+			
+			<!-- JMS -->
+			<dependency>
+				<groupId>stax</groupId>
+				<artifactId>stax-api</artifactId>
+				<version>1.0.1</version>
+			</dependency>
+			
+			<dependency>
+				<artifactId>mybatis</artifactId>
+				<groupId>org.mybatis</groupId>
+				<version>3.1.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.mybatis</groupId>
+				<artifactId>mybatis-spring</artifactId>
+				<version>1.2.0</version>
+			</dependency>
+			
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.8.2</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-test</artifactId>
+				<version>${spring.framework.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<!-- logging -->
+			<dependency>
+				<groupId>log4j</groupId>
+				<artifactId>log4j</artifactId>
+				<version>1.2.16</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-log4j12</artifactId>
+				<version>1.7.25</version>
+			</dependency>
+			<dependency>
+			    <groupId>org.slf4j</groupId>
+			    <artifactId>slf4j-api</artifactId>
+			    <version>1.7.25</version>
+			</dependency>
+
+			<dependency>
+				<groupId>io.github.openfeign</groupId>
+				<artifactId>feign-core</artifactId>
+				<version>${feign.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>io.github.openfeign</groupId>
+				<artifactId>feign-gson</artifactId>
+				<version>${feign.version}</version>
+			</dependency>
+
+			<!--内部api引用 start-->
+
+			<dependency>
+				<groupId>com.yunduo</groupId>
+				<artifactId>dispatching-center-client</artifactId>
+                <version>${dispatching-center-client.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.yunduo</groupId>
+				<artifactId>common-utils</artifactId>
+				<version>${common-utils.version}</version>
+			</dependency>
+
+			<!--内部api引用 end-->
+			<dependency>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok</artifactId>
+				<version>${lombok.version}</version>
+			</dependency>
+
+			<!-- pageHelper -->
+			<dependency>
+				<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>${guava.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.skywalking</groupId>
+				<artifactId>apm-toolkit-log4j-2.x</artifactId>
+				<version>${skywalking-log4j2.version}</version>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.6.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.codehaus.mojo</groupId> -->
+<!-- 				<artifactId>versions-maven-plugin</artifactId> -->
+<!-- 				<version>2.3</version> -->
+<!-- 				<configuration> -->
+<!-- 					<newVersion>5.9-SNAPSHOT</newVersion> -->
+<!-- 					<processAllModules>true</processAllModules> -->
+<!-- 					<allowSnapshots>true</allowSnapshots> -->
+<!-- 				</configuration> -->
+<!-- 			</plugin> -->
+		</plugins>
+
+		<!--<resources>-->
+			<!--<resource>-->
+				<!--<directory>src/main/java</directory>-->
+				<!--<includes>-->
+					<!--<include>**/*.*</include>-->
+				<!--</includes>-->
+				<!--<excludes>-->
+					<!--<exclude>**/*.java</exclude>-->
+				<!--</excludes>-->
+			<!--</resource>-->
+		<!--</resources>-->
+	</build>
+
+	<distributionManagement>
+		<repository>
+			<id>alimaven</id>
+			<name>Nexus aliyun</name>
+			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
+		</repository>
+	</distributionManagement>
+</project>

yuxin-school-api/.gitignore

@@ -0,0 +1,137 @@
+## .gitignore for Grails 1.2 and 1.3
+
+# .gitignore for maven
+target/
+*.releaseBackup
+
+# web application files
+#/web-app/WEB-INF
+
+# IDE support files
+/.classpath
+/.launch
+/.project
+/.settings
+/*.launch
+/*.tmproj
+/ivy*
+/eclipse
+
+# default HSQL database files for production mode
+/prodDb.*
+
+# general HSQL database files
+*Db.properties
+*Db.script
+
+# logs
+/stacktrace.log
+/test/reports
+/logs
+*.log
+*.log.*
+
+# project release file
+/*.war
+
+# plugin release file
+/*.zip
+/*.zip.sha1
+
+# older plugin install locations
+/plugins
+/web-app/plugins
+/web-app/WEB-INF/classes
+
+# "temporary" build files
+target/
+out/
+build/
+
+# other
+*.iws
+
+#.gitignore for java
+*.class
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+## .gitignore for eclipse
+
+*.pydevproject
+.project
+.metadata
+bin/**
+tmp/**
+tmp/**/*
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+MANIFEST.MF
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+## .gitignore for intellij
+
+*.iml
+*.ipr
+*.iws
+.idea/
+
+## .gitignore for linux
+.*
+!.gitignore
+!.gitattributes
+!.editorconfig
+!.eslintrc
+!.travis.yml
+*~
+
+## .gitignore for windows
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+## .gitignore for mac os x
+
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+## hack for graddle wrapper
+!wrapper/*.jar
+!**/wrapper/*.jar

yuxin-school-api/pom.xml

@@ -0,0 +1,111 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>yuxin-school-manage</artifactId>
+		<groupId>com.yuxin</groupId>
+		<version>private-6.8.4</version>
+	</parent>
+	<artifactId>yuxin-school-api</artifactId>
+	<name>yuxin-school-api</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<school.model.version>${project.version}</school.model.version>
+	</properties>
+	
+	<dependencies>
+		<dependency>
+			<groupId>com.yuxin</groupId>
+			<artifactId>yuxin-school-model</artifactId>
+			<version>${school.model.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.yuxin</groupId>
+			<artifactId>yuxin-school-common</artifactId>
+			<version>${school.model.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
+        <dependency>
+            <groupId>com.yunduo</groupId>
+            <artifactId>common-utils</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>com.yunduo</groupId>
+			<artifactId>dispatching-center-client</artifactId>
+		</dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>4.3.20.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+	<build>
+	  <plugins>
+		  <!--  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.10.3</version>
+            <executions>
+                <execution>
+                    <id>attach-javadocs</id>
+                    <phase>install</phase>
+                    <goals>
+                        <goal>jar</goal>
+                    </goals>
+                </execution>
+            </executions>
+            <configuration>
+                <encoding>UTF-8</encoding>
+                <charset>UTF-8</charset>
+                <additionalOptions>
+                    <additionalOption>-Xdoclint:none</additionalOption>
+                </additionalOptions>
+            </configuration>
+        </plugin>-->
+	    <plugin>
+		  <groupId>org.apache.maven.plugins</groupId>
+		  <artifactId>maven-source-plugin</artifactId>
+		  <version>2.2.1</version>
+          <executions>
+	        <execution>
+	            <id>attach-sources</id>  
+	            <goals>
+	                <goal>jar</goal> 
+	            </goals>
+	        </execution>  
+	      </executions>
+	    </plugin>
+	  </plugins>
+	</build>
+</project>

yuxin-school-api/src/main/java/com/yuxin/custom/api/indexVideo/ICompanyIndexModelVideoService.java

@@ -0,0 +1,15 @@
+package com.yuxin.custom.api.indexVideo;
+
+import com.yuxin.custom.model.indexVideo.CompanyIndexModelVideo;
+
+public interface ICompanyIndexModelVideoService {
+
+    // 添加
+    void insert(CompanyIndexModelVideo cimv);
+    // 更新
+    void update(CompanyIndexModelVideo video);
+    // 删除
+    void deleteCompanyIndexModelVideoById(Integer id);
+    // 根据id查询
+    CompanyIndexModelVideo findCompanyIndexModelVideoById(Integer id);
+}

yuxin-school-api/src/main/java/com/yuxin/custom/api/xintan/IStudentExtralService.java

@@ -0,0 +1,25 @@
+package com.yuxin.custom.api.xintan;
+
+import com.yuxin.custom.model.xintan.StudentExtral;
+import com.yuxin.custom.model.xintan.StudentExtralExperience;
+import com.yuxin.custom.model.xintan.StudentExtralPic;
+import com.yuxin.wx.common.PageFinder;
+
+import java.util.List;
+
+/**
+ * Created by lmandy on 2019/2/15.
+ */
+public interface IStudentExtralService {
+
+    PageFinder<StudentExtral> ajaxGetTableList(StudentExtral extral);
+
+    void batchPass(String[] idArr);
+
+    StudentExtral findById(Integer id);
+    List<StudentExtralExperience> findStudentExtralExperienceByUserId(Integer userId);
+
+    void update(StudentExtral extral);
+
+    List<StudentExtralPic> findStudentExtralPicByUserId(Integer userId);
+}

yuxin-school-api/src/main/java/com/yuxin/custom/api/xintan/ISysExportTaskService.java

@@ -0,0 +1,24 @@
+package com.yuxin.custom.api.xintan;
+
+import com.yuxin.custom.model.xintan.StudentExtral;
+import com.yuxin.custom.model.xintan.StudentExtralExperience;
+import com.yuxin.custom.model.xintan.SysExportTask;
+import com.yuxin.wx.common.PageFinder;
+
+import java.util.List;
+
+/**
+ * Created by lmandy on 2019/2/15.
+ */
+public interface ISysExportTaskService {
+
+    void insertTask(SysExportTask task);
+
+    PageFinder<SysExportTask> searchTaskList(SysExportTask task);
+
+    void update(SysExportTask task);
+
+    SysExportTask findByHashcode(String hashCode);
+
+    List<SysExportTask> findTasksByCondition(SysExportTask task);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/auth/IAuthPrivilegeCategoryService.java

@@ -0,0 +1,143 @@
+package com.yuxin.wx.api.auth;
+
+import java.util.List;
+
+import com.yuxin.wx.model.auth.AuthPrivilegeCategory;
+import com.yuxin.wx.vo.privilege.PrivilegeListVo;
+
+/**
+ * Service Interface:AuthPrivilegeCategory
+ * @author wang.zx
+ * @date 2015-1-26
+ */
+public interface IAuthPrivilegeCategoryService  {
+	/**
+	 * 
+	* @Title: saveAuthPrivilegeCategory
+	* @Description: 新增AuthPrivilegeCategory
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void insert(AuthPrivilegeCategory T);
+	
+	/**
+	 * 
+	* @Title: batchSaveAuthPrivilegeCategory 
+	* @Description: 批量新增AuthPrivilegeCategory
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void batchInsert(List<AuthPrivilegeCategory> T);
+	
+	/**
+	 * 
+	* @Title: updateAuthPrivilegeCategory 
+	* @Description: 编辑AuthPrivilegeCategory
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void update(AuthPrivilegeCategory T);
+	
+	/**
+	 * 
+	* @Title: deleteAuthPrivilegeCategoryById 
+	* @Description: 根据id删除AuthPrivilegeCategory
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void deleteAuthPrivilegeCategoryById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteAuthPrivilegeCategoryByIds 
+	* @Description: 根据id批量删除AuthPrivilegeCategory
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void deleteAuthPrivilegeCategoryByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findAuthPrivilegeCategoryById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	AuthPrivilegeCategory findAuthPrivilegeCategoryById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findAuthPrivilegeCategoryByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<AuthPrivilegeCategory>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	List<AuthPrivilegeCategory> findAuthPrivilegeCategoryByPage(AuthPrivilegeCategory search);
+	
+ /**
+  * 
+ * @Title: findAuthPrivilegeCategoryByPage 
+ * @Description: 查询所有信息
+ * @return
+ * @return List<AuthPrivilegeCategory>    返回类型 
+ * @throws 
+ * @exception 
+ * @date 2015-1-26
+ * @user by chopin
+  */
+	List<AuthPrivilegeCategory> finAll();
+	
+	/**
+	 * 
+	 * Class Name: IAuthPrivilegeCategoryService.java
+	 * @Description: 查询菜单列表
+	 * @author zhang.zx
+	 * @date 2015年5月19日 下午3:36:39
+	 * @modifier
+	 * @modify-date 2015年5月19日 下午3:36:39
+	 * @version 1.0
+	 * @return
+	 */
+	List<PrivilegeListVo> queryOnePrivilege(PrivilegeListVo privilege);
+	/**
+	 * 
+	 * Class Name: IAuthPrivilegeCategoryService.java
+	 * @Description: 根据公司Id查询
+	 * @author ycl
+	 * @date 2015-5-22 下午5:54:34
+	 * @modifier
+	 * @modify-date 2015-5-22 下午5:54:34
+	 * @version 1.0
+	 * @param companyId
+	 * @return
+	 */
+	List<AuthPrivilegeCategory> findByCompanyId(Integer companyId);
+	
+	List<PrivilegeListVo> queryOnePrivilegeByCompanys(PrivilegeListVo privilege);
+	
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/auth/IAuthPrivilegeService.java

@@ -0,0 +1,139 @@
+package com.yuxin.wx.api.auth;
+
+import java.util.List;
+
+import com.yuxin.wx.model.auth.AuthPrivilege;
+import com.yuxin.wx.model.auth.AuthPrivilegeCategory;
+
+/**
+ * Service Interface:AuthPrivilege
+ * @author wang.zx
+ * @date 2015-1-26
+ */
+public interface IAuthPrivilegeService  {
+	/**
+	 * 
+	* @Title: saveAuthPrivilege
+	* @Description: 新增AuthPrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void insert(AuthPrivilege T);
+	
+	/**
+	 * 
+	* @Title: batchSaveAuthPrivilege 
+	* @Description: 批量新增AuthPrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void batchInsert(List<AuthPrivilege> T);
+	
+	/**
+	 * 
+	* @Title: updateAuthPrivilege 
+	* @Description: 编辑AuthPrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void update(AuthPrivilege T);
+	
+	/**
+	 * 
+	* @Title: deleteAuthPrivilegeById 
+	* @Description: 根据id删除AuthPrivilege
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void deleteAuthPrivilegeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteAuthPrivilegeByIds 
+	* @Description: 根据id批量删除AuthPrivilege
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void deleteAuthPrivilegeByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findAuthPrivilegeById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	AuthPrivilege findAuthPrivilegeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findAuthPrivilegeByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<AuthPrivilege>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	List<AuthPrivilege> findAuthPrivilegeByPage(AuthPrivilege search);
+	
+	/**
+	 * 
+	 * Class Name: IAuthPrivilegeService.java
+	 * @Description: 获取权限子菜单
+	 * @author Chopin
+	 * @date 2015年2月2日
+	 * @version 1.0
+	 * @param categoryId
+	 * @return
+	 */
+	List<AuthPrivilege> findAuthPrivilegeByCategory(Integer categoryId);
+	/**
+	 * 
+	 * Class Name: IAuthPrivilegeService.java
+	 * @Description: 根据公司Id查询
+	 * @author ycl
+	 * @date 2015-5-22 下午5:43:39
+	 * @modifier
+	 * @modify-date 2015-5-22 下午5:43:39
+	 * @version 1.0
+	 * @param companyId
+	 * @return
+	 */
+	List<AuthPrivilege> findByCompanyId(Integer companyId);
+	
+	/**
+	 * 
+	 * Class Name: IAuthPrivilegeService.java
+	 * @Description: 根据id查询权限名
+	 * @author 周文斌
+	 * @date 2015-8-20 下午1:52:07
+	 * @version 1.0
+	 * @param list
+	 * @return
+	 */
+	List<String> findNameById(List<Integer> list);
+	
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/auth/IAuthRolePrivilegeService.java

@@ -0,0 +1,165 @@
+package com.yuxin.wx.api.auth;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.yuxin.wx.model.auth.AuthPrivilege;
+import com.yuxin.wx.model.auth.AuthRole;
+import com.yuxin.wx.model.auth.AuthRolePrivilege;
+import com.yuxin.wx.model.user.Users;
+import com.yuxin.wx.vo.privilege.PrivilegeVo;
+import com.yuxin.wx.vo.privilege.TreeNode;
+
+/**
+ * Service Interface:AuthRolePrivilege
+ * @author wang.zx
+ * @date 2015-1-26
+ */
+public interface IAuthRolePrivilegeService  {
+	/**
+	 * 
+	* @Title: saveAuthRolePrivilege
+	* @Description: 新增AuthRolePrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void insert(AuthRolePrivilege T);
+	
+	/**
+	 * 
+	* @Title: batchSaveAuthRolePrivilege 
+	* @Description: 批量新增AuthRolePrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void batchInsert(List<AuthRolePrivilege> T);
+	
+	/**
+	 * 
+	* @Title: updateAuthRolePrivilege 
+	* @Description: 编辑AuthRolePrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void update(AuthRolePrivilege T);
+	
+	/**
+	 * 
+	* @Title: deleteAuthRolePrivilegeById 
+	* @Description: 根据id删除AuthRolePrivilege
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void deleteAuthRolePrivilegeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteAuthRolePrivilegeByIds 
+	* @Description: 根据id批量删除AuthRolePrivilege
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void deleteAuthRolePrivilegeByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findAuthRolePrivilegeById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	AuthRolePrivilege findAuthRolePrivilegeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findAuthRolePrivilegeByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<AuthRolePrivilege>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	List<AuthRolePrivilege> findAuthRolePrivilegeByPage(AuthRolePrivilege search);
+	
+	/**
+	 * 
+	 * Class Name: IAuthRolePrivilegeService.java
+	 * @Description: 获取角色下的权限列表
+	 * @author Chopin
+	 * @date 2015年2月2日
+	 * @version 1.0
+	 * @param roleId
+	 * @return
+	 */
+	List<AuthRolePrivilege> findPrivilegeByRole(String roleId);
+	
+	
+ /**
+  * 
+  * Class Name: IAuthRolePrivilegeService.java
+  * @Description: 保存角色权限配置
+  * @author Chopin
+  * @date 2015年2月2日
+  * @version 1.0
+  * @param roleId
+  * @return
+  */
+	String saveRolePrivilege(List<TreeNode> nodes,String roleId,Users loginUser);
+	
+	/**
+	 * 
+	 * Class Name: IAuthRolePrivilegeService.java
+	 * @Description: 查询角色菜单
+	 * @author zhang.zx
+	 * @date 2015年5月19日 下午6:01:28
+	 * @modifier
+	 * @modify-date 2015年5月19日 下午6:01:28
+	 * @version 1.0
+	 * @param roleId
+	 * @return
+	 */
+	List<PrivilegeVo> findUserPrivileges(String roleId);
+
+    int isHasNewGuidePermession(Map map);
+
+	/**
+	 * @Description: 根据用户id查询有没有发放积分的权限
+	 * @author zhangqinglei
+	 * @date 2017-11-2
+	 * @param int
+	 */
+	int findPrivilegeByUserId(int id);
+	int findPrivilegeByUserIdOfexpert(Integer id);
+
+	/**
+	 * @Description: 如果用户有辅导员角色，判断该用户所有的权限中学员管理权限的数量是否等于1,如果等于1，则在学生列表页做特殊显示调整
+	 * @author zhangqinglei
+	 * @date 2018-1-3
+	 * @param int
+	 */
+	int isOnlyCoach(int userId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/auth/IAuthRoleService.java

@@ -0,0 +1,243 @@
+package com.yuxin.wx.api.auth;
+
+import java.util.List;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.auth.AuthRole;
+import com.yuxin.wx.model.auth.AuthRolePrivilege;
+import com.yuxin.wx.model.user.Users;
+import com.yuxin.wx.vo.privilege.TreeNode;
+import com.yuxin.wx.vo.privilege.UserRolesListVo;
+
+/**
+ * Service Interface:AuthRole
+ * @author wang.zx
+ * @date 2015-1-26
+ */
+public interface IAuthRoleService  {
+	/**
+	 * 
+	* @Title: saveAuthRole
+	* @Description: 新增AuthRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void insert(AuthRole entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveAuthRole 
+	* @Description: 批量新增AuthRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void batchInsert(List<AuthRole> entity);
+	
+	/**
+	 * 
+	* @Title: updateAuthRole 
+	* @Description: 编辑AuthRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void update(AuthRole entity);
+	
+	/**
+	 * 
+	* @Title: deleteAuthRoleById 
+	* @Description: 根据id删除AuthRole
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void deleteAuthRoleById(String id);
+	
+	/**
+	 * 
+	* @Title: deleteAuthRoleByIds 
+	* @Description: 根据id批量删除AuthRole
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void deleteAuthRoleByIds(String[] ids);
+	
+	/**
+	 * 
+	* @Title: findAuthRoleById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	AuthRole findAuthRoleById(String id);
+	
+	/**
+	 * 
+	* @Title: findAuthRoleByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<AuthRole>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	List<AuthRole> findAuthRoleByPage(AuthRole search);
+	/**
+	 * 
+	 * Class Name: IAuthRoleService.java
+	 * @Description: 获取所有权限列表
+	 * @author Chopin
+	 * @date 2015年1月27日
+	 * @version 1.0
+	 * @return
+	 */
+	List<AuthRole> findAllAuthRole();
+	
+ /**
+  * 
+ * @Title: saveRoles 
+ * @Description: 保存权限树
+ * @return
+ * @return List<AuthRole>    返回类型 
+ * @throws 
+ * @exception 
+ * @date 2015-1-27
+ * @user by chopin  */
+ public String saveRoles(List<TreeNode> nodes,Users loginUser);
+ 
+ 
+ /**
+  * 
+  * Class Name: IAuthRoleService.java
+  * @Description: 查询用户角色
+  * @author zhang.zx
+  * @date 2015年5月18日 下午9:05:18
+  * @modifier
+  * @modify-date 2015年5月18日 下午9:05:18
+  * @version 1.0
+  * @param search
+  * @return
+  */
+ PageFinder<UserRolesListVo>  queryAllUser(UserRolesListVo search);
+ 
+ /**
+  * 
+  * Class Name: IAuthRoleService.java
+  * @Description: 根据用户id查询角色
+  * @author zhang.zx
+  * @date 2015年5月20日 下午2:35:53
+  * @modifier
+  * @modify-date 2015年5月20日 下午2:35:53
+  * @version 1.0
+  * @param userId
+  * @return
+  */
+ List<AuthRole> queryAuthRoleListByUser(Integer userId);
+ /**
+  * 
+  * Class Name: IAuthRoleService.java
+  * @Description: 根据公司Id查询
+  * @author ycl
+  * @date 2015-5-22 下午6:37:35
+  * @modifier
+  * @modify-date 2015-5-22 下午6:37:35
+  * @version 1.0
+  * @param companyId
+  * @return
+  */
+ List<AuthRole> findByCompanyId(Integer companyId);
+ 
+ /**
+  * 
+  * Class Name: IAuthRoleService.java
+  * @Description: 查询所有用户角色
+  * @author zhang.zx
+  * @date 2015年6月3日 下午3:52:45
+  * @modifier
+  * @modify-date 2015年6月3日 下午3:52:45
+  * @version 1.0
+  * @return
+  */
+ List<AuthRole> findAll();
+
+ /**
+  * 
+  * Class Name: IAuthRoleService.java
+  * @Description: 条件查询角色信息
+  * @author zhang.zx
+  * @date 2015年6月17日 下午12:01:55
+  * @modifier
+  * @modify-date 2015年6月17日 下午12:01:55
+  * @version 1.0
+  * @param search
+  * @return
+  */
+ List<AuthRole> queryRolesByCondition(AuthRole search);
+ 
+ /**
+  * 
+  * Class Name: IAuthRoleService.java
+  * @Description: 自定义角色菜单
+  * @author zhang.zx
+  * @date 2016年1月11日 下午5:35:12
+  * @modifier
+  * @modify-date 2016年1月11日 下午5:35:12
+  * @version 1.0
+  * @param companyId
+  * @param name
+  * @param privlageIds
+  * @return
+  */
+ boolean addAuthRoleandMenu(Integer companyId,String name,String privlageIds,Integer roleFlag);
+ 
+ /**
+  * 
+  * Class Name: IAuthRoleService.java
+  * @Description:查询角色
+  * @author zhang.zx
+  * @date 2016年1月11日 下午6:24:18
+  * @modifier
+  * @modify-date 2016年1月11日 下午6:24:18
+  * @version 1.0
+  * @param rUids
+  * @return
+  */
+ List<AuthRole> queryRolesByUid(String rUids);
+ 
+ 	boolean hasRoleFlag(Integer userId);
+ 	
+ 	/**
+ 	 * 
+ 	 * Class Name: IAuthRoleService.java
+ 	 * @Description: 判断用户是否拥有某个权限
+ 	 * @author zhang.zx
+ 	 * @date 2016年1月26日 下午2:59:45
+ 	 * @modifier
+ 	 * @modify-date 2016年1月26日 下午2:59:45
+ 	 * @version 1.0
+ 	 * @param userId 当前登录用户Id
+ 	 * @param privilegeCode 权限名称
+ 	 * @return true:有此权限，false:无此权限
+ 	 */
+ 	boolean checkUserHasPrivilege(Integer userId,String privilegeCode);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/auth/IAuthUserRoleService.java

@@ -0,0 +1,159 @@
+package com.yuxin.wx.api.auth;
+
+import java.util.List;
+import java.util.Set;
+
+import com.yuxin.wx.model.auth.AuthRole;
+import com.yuxin.wx.model.auth.AuthUserRole;
+
+/**
+ * Service Interface:AuthUserRole
+ * @author wang.zx
+ * @date 2015-1-26
+ */
+public interface IAuthUserRoleService  {
+	/**
+	 * 
+	* @Title: saveAuthUserRole
+	* @Description: 新增AuthUserRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void insert(AuthUserRole T);
+	
+	/**
+	 * 
+	* @Title: batchSaveAuthUserRole 
+	* @Description: 批量新增AuthUserRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void batchInsert(List<AuthUserRole> T);
+	
+	/**
+	 * 
+	* @Title: updateAuthUserRole 
+	* @Description: 编辑AuthUserRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void update(AuthUserRole T);
+	
+	/**
+	 * 
+	* @Title: deleteAuthUserRoleById 
+	* @Description: 根据id删除AuthUserRole
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void deleteAuthUserRoleById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteAuthUserRoleByIds 
+	* @Description: 根据id批量删除AuthUserRole
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	void deleteAuthUserRoleByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findAuthUserRoleById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	AuthUserRole findAuthUserRoleById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findAuthUserRoleByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<AuthUserRole>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-1-26
+	* @user by wangzx
+	 */
+	List<AuthUserRole> findAuthUserRoleByPage(AuthUserRole search);
+	
+	/**
+	 * 
+	 * Class Name: IAuthUserRoleService.java
+	 * @Description: 根据用户获取权限列表
+	 * @author Chopin
+	 * @date 2015年2月1日
+	 * @version 1.0
+	 * @param userId
+	 * @return
+	 */
+	String findUserRoles(Integer userId);
+	/**
+	 * 
+	 * Class Name: IAuthUserRoleService.java
+	 * @Description: 根据用户获取权限列表
+	 * @author Chopin
+	 * @date 2015年2月1日
+	 * @version 1.0
+	 * @param userId
+	 * @return
+	 */
+	Set<String> queryUserRoles(String userName);
+	
+ /**
+  * 
+  * Class Name: IAuthUserRoleService.java
+  * @Description: 根据角色获取权限列表
+  * @author Chopin
+  * @date 2015年2月1日
+  * @version 1.0
+  * @param id
+  * @return
+  */
+ List<AuthUserRole> findByRoleId(String userId);
+ /**
+  * Class Name: IAuthUserRoleService.java
+  * @Description: 获取用户权限列表
+  * @author Chopin
+  * @param userId
+  * @return
+  */
+ Set<String> findUserPermissions(String userName);
+ 
+ /**
+  * 
+  * Class Name: IAuthUserRoleService.java
+  * @Description: 根据id删除用户角色信息
+  * @author zhang.zx
+  * @date 2015年12月22日 下午4:22:29
+  * @modifier
+  * @modify-date 2015年12月22日 下午4:22:29
+  * @version 1.0
+  * @param id
+  */
+ void deleteByRoleId(Integer id);
+	
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/authCustom/ICustomAuthPrivilegeService.java

@@ -0,0 +1,111 @@
+package com.yuxin.wx.api.authCustom;
+
+import java.util.List;
+
+import com.yuxin.wx.model.authCustom.CustomAuthPrivilege;
+/**
+ * Service Interface:CustomAuthPrivilege
+ * @author licong
+ * @date 2018-5-4
+ */
+public interface ICustomAuthPrivilegeService  {
+	/**
+	 * 
+	* @Title: saveCustomAuthPrivilege
+	* @Description: 新增CustomAuthPrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void insert(CustomAuthPrivilege entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCustomAuthPrivilege 
+	* @Description: 批量新增CustomAuthPrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void batchInsert(List<CustomAuthPrivilege> list);
+	
+	/**
+	 * 
+	* @Title: updateCustomAuthPrivilege 
+	* @Description: 编辑CustomAuthPrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void update(CustomAuthPrivilege entity);
+	
+	/**
+	 * 
+	* @Title: deleteCustomAuthPrivilegeById 
+	* @Description: 根据id删除CustomAuthPrivilege
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void deleteCustomAuthPrivilegeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCustomAuthPrivilegeByIds 
+	* @Description: 根据id批量删除CustomAuthPrivilege
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void deleteCustomAuthPrivilegeByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCustomAuthPrivilegeById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	CustomAuthPrivilege findCustomAuthPrivilegeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCustomAuthPrivilegeByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CustomAuthPrivilege>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	List<CustomAuthPrivilege> findCustomAuthPrivilegeByPage(CustomAuthPrivilege search);
+
+	List<CustomAuthPrivilege> queryAll();
+
+	List<CustomAuthPrivilege> findAllByLevelAndSort();
+
+    List<CustomAuthPrivilege> findUsersHasPrivileges(Integer userId);
+
+    List<CustomAuthPrivilege> findPrivilegesByRoleId(List<Integer> roleIds);
+
+    List<CustomAuthPrivilege> queryDefaultPri(String roleType);
+
+    List<CustomAuthPrivilege> findUsersHasPrivilegesAndRoleType(Integer userId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/authCustom/ICustomAuthPublicRoleDelService.java

@@ -0,0 +1,99 @@
+package com.yuxin.wx.api.authCustom;
+
+import java.util.List;
+
+import com.yuxin.wx.model.authCustom.CustomAuthPublicRoleDel;
+/**
+ * Service Interface:CustomAuthPublicRoleDel
+ * @author licong
+ * @date 2018-5-8
+ */
+public interface ICustomAuthPublicRoleDelService  {
+	/**
+	 * 
+	* @Title: saveCustomAuthPublicRoleDel
+	* @Description: 新增CustomAuthPublicRoleDel
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-8
+	* @user by wangzx
+	 */
+	void insert(CustomAuthPublicRoleDel entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCustomAuthPublicRoleDel 
+	* @Description: 批量新增CustomAuthPublicRoleDel
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-8
+	* @user by wangzx
+	 */
+	void batchInsert(List<CustomAuthPublicRoleDel> list);
+	
+	/**
+	 * 
+	* @Title: updateCustomAuthPublicRoleDel 
+	* @Description: 编辑CustomAuthPublicRoleDel
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-8
+	* @user by wangzx
+	 */
+	void update(CustomAuthPublicRoleDel entity);
+	
+	/**
+	 * 
+	* @Title: deleteCustomAuthPublicRoleDelById 
+	* @Description: 根据id删除CustomAuthPublicRoleDel
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-8
+	* @user by wangzx
+	 */
+	void deleteCustomAuthPublicRoleDelById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCustomAuthPublicRoleDelByIds 
+	* @Description: 根据id批量删除CustomAuthPublicRoleDel
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-8
+	* @user by wangzx
+	 */
+	void deleteCustomAuthPublicRoleDelByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCustomAuthPublicRoleDelById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-8
+	* @user by wangzx
+	 */
+	CustomAuthPublicRoleDel findCustomAuthPublicRoleDelById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCustomAuthPublicRoleDelByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CustomAuthPublicRoleDel>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-8
+	* @user by wangzx
+	 */
+	List<CustomAuthPublicRoleDel> findCustomAuthPublicRoleDelByPage(CustomAuthPublicRoleDel search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/authCustom/ICustomAuthRolePrivilegeService.java

@@ -0,0 +1,114 @@
+package com.yuxin.wx.api.authCustom;
+
+import java.util.HashMap;
+import java.util.List;
+
+import com.yuxin.wx.model.authCustom.CustomAuthRolePrivilege;
+/**
+ * Service Interface:CustomAuthRolePrivilege
+ * @author licong
+ * @date 2018-5-4
+ */
+public interface ICustomAuthRolePrivilegeService  {
+	/**
+	 * 
+	* @Title: saveCustomAuthRolePrivilege
+	* @Description: 新增CustomAuthRolePrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void insert(CustomAuthRolePrivilege entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCustomAuthRolePrivilege 
+	* @Description: 批量新增CustomAuthRolePrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void batchInsert(List<CustomAuthRolePrivilege> list);
+	
+	/**
+	 * 
+	* @Title: updateCustomAuthRolePrivilege 
+	* @Description: 编辑CustomAuthRolePrivilege
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void update(CustomAuthRolePrivilege entity);
+	
+	/**
+	 * 
+	* @Title: deleteCustomAuthRolePrivilegeById 
+	* @Description: 根据id删除CustomAuthRolePrivilege
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void deleteCustomAuthRolePrivilegeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCustomAuthRolePrivilegeByIds 
+	* @Description: 根据id批量删除CustomAuthRolePrivilege
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void deleteCustomAuthRolePrivilegeByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCustomAuthRolePrivilegeById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	CustomAuthRolePrivilege findCustomAuthRolePrivilegeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCustomAuthRolePrivilegeByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CustomAuthRolePrivilege>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	List<CustomAuthRolePrivilege> findCustomAuthRolePrivilegeByPage(CustomAuthRolePrivilege search);
+
+	/**
+	* @Title: ICustomAuthRolePrivilegeService.java 
+	* @Package com.yuxin.wx.api.authCustom 
+	* @Description: TODO 查询是否有观看财务的权限
+	* @author actor
+	* @date 2018年5月15日 上午10:14:29 
+	* @return 
+	* @version V1.0
+	 */
+	int isHasNewGuidePermession(HashMap<String, String> map);
+
+    void deleteByRoleId(CustomAuthRolePrivilege search);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/authCustom/ICustomAuthRoleService.java

@@ -0,0 +1,146 @@
+package com.yuxin.wx.api.authCustom;
+
+import java.util.List;
+import java.util.Set;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.authCustom.CustomAuthRole;
+import com.yuxin.wx.vo.privilege.CustomAuthRoleVo;
+import com.yuxin.wx.vo.privilege.UserRolesListVo;
+/**
+ * Service Interface:CustomAuthRole
+ * @author licong
+ * @date 2018-5-4
+ */
+public interface ICustomAuthRoleService  {
+	/**
+	 * 
+	* @Title: saveCustomAuthRole
+	* @Description: 新增CustomAuthRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void insert(CustomAuthRole entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCustomAuthRole 
+	* @Description: 批量新增CustomAuthRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void batchInsert(List<CustomAuthRole> list);
+	
+	/**
+	 * 
+	* @Title: updateCustomAuthRole 
+	* @Description: 编辑CustomAuthRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void update(CustomAuthRole entity);
+	
+	/**
+	 * 
+	* @Title: deleteCustomAuthRoleById 
+	* @Description: 根据id删除CustomAuthRole
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void deleteCustomAuthRoleById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCustomAuthRoleByIds 
+	* @Description: 根据id批量删除CustomAuthRole
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void deleteCustomAuthRoleByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCustomAuthRoleById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	CustomAuthRole findCustomAuthRoleById(Integer id);
+	List<CustomAuthRole> findAuthRoleListByUser(Integer id);
+	/**
+	 * 
+	* @Title: findCustomAuthRoleByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CustomAuthRole>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	List<CustomAuthRole> findCustomAuthRoleByPage(CustomAuthRole search);
+
+    Set<String> queryUserRoleType(String userName);
+
+    PageFinder<CustomAuthRoleVo> findCustomAuthRoleByCompanyId(CustomAuthRole search);
+
+    void delCustomRole(Integer roleId, Integer companyId);
+
+    Integer findTecherOrAssRoleId(CustomAuthRole search);
+
+	int checkRoleName(CustomAuthRole search);
+
+	/**
+	* @Title: ICustomAuthRoleService.java
+	* @Package com.yuxin.wx.api.authCustom
+	* @Description: TODO 判断用户是否拥有某个权限
+	* @author actor
+	* @date 2018年5月8日 下午6:01:09
+	* @return true:有此权限，false:无此权限
+	* @version V1.0
+	 */
+	boolean hasRoleFlag();
+
+	/**
+	* @Title: ICustomAuthRoleService.java
+	* @Package com.yuxin.wx.api.authCustom
+	* @Description: TODO 查询用户角色
+	* @author actor
+	* @date 2018年5月8日 下午6:39:04
+	* @return
+	* @version V1.0
+	 */
+	PageFinder<UserRolesListVo> queryAllUser(UserRolesListVo search);
+
+	/**
+	* @Title: ICustomAuthRoleService.java
+	* @Package com.yuxin.wx.api.authCustom
+	* @Description: TODO 查询该公司下对应的所有权限
+	* @author actor
+	* @date 2018年5月9日 上午11:33:34
+	* @return
+	* @version V1.0
+	 */
+	List<CustomAuthRole> queryRoleListByCompany(Integer companyId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/authCustom/ICustomAuthUserRoleService.java

@@ -0,0 +1,130 @@
+package com.yuxin.wx.api.authCustom;
+
+import java.util.List;
+
+import com.yuxin.wx.model.authCustom.CustomAuthUserRole;
+/**
+ * Service Interface:CustomAuthUserRole
+ * @author licong
+ * @date 2018-5-4
+ */
+public interface ICustomAuthUserRoleService  {
+	/**
+	 * 
+	* @Title: saveCustomAuthUserRole
+	* @Description: 新增CustomAuthUserRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void insert(CustomAuthUserRole entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCustomAuthUserRole 
+	* @Description: 批量新增CustomAuthUserRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void batchInsert(List<CustomAuthUserRole> list);
+	
+	/**
+	 * 
+	* @Title: updateCustomAuthUserRole 
+	* @Description: 编辑CustomAuthUserRole
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void update(CustomAuthUserRole entity);
+	
+	/**
+	 * 
+	* @Title: deleteCustomAuthUserRoleById 
+	* @Description: 根据id删除CustomAuthUserRole
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void deleteCustomAuthUserRoleById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCustomAuthUserRoleByIds 
+	* @Description: 根据id批量删除CustomAuthUserRole
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	void deleteCustomAuthUserRoleByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCustomAuthUserRoleById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	CustomAuthUserRole findCustomAuthUserRoleById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCustomAuthUserRoleByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CustomAuthUserRole>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-5-4
+	* @user by wangzx
+	 */
+	List<CustomAuthUserRole> findCustomAuthUserRoleByPage(CustomAuthUserRole search);
+
+	/**
+	 * 查询该用户对应的所有权限
+	* @Title: ICustomAuthUserRoleService.java 
+	* @Package com.yuxin.wx.api.authCustom 
+	* @Description: TODO 
+	* @author actor
+	* @date 2018年5月10日 下午11:34:07 
+	* @return 
+	* @version V1.0
+	 */
+	List<CustomAuthUserRole> queryList(CustomAuthUserRole userRole);
+
+	/**
+	* @Title: ICustomAuthUserRoleService.java 
+	* @Package com.yuxin.wx.api.authCustom 
+	* @Description: TODO 删除该用户对应的所有角色
+	* @author actor
+	* @date 2018年5月11日 下午2:58:56 
+	* @return 
+	* @version V1.0
+	 */
+	void deleteUserRoleByUserId(Integer id);
+
+    int findRoleHasBindUsers(CustomAuthUserRole search);
+
+    int findUsersBindRoleCount(Integer userId);
+
+    List<CustomAuthUserRole> queryzpz();
+
+    List<CustomAuthUserRole> queryzpp();
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/base/IBaseService.java

@@ -0,0 +1,5 @@
+package com.yuxin.wx.api.base;
+
+public interface IBaseService {
+	
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/certificate/ICertificateConfigService.java

@@ -0,0 +1,122 @@
+package com.yuxin.wx.api.certificate;
+
+import com.yuxin.wx.model.certificate.CertificateConfig;
+import com.yuxin.wx.vo.certificate.CertificateUserRelationVo;
+
+import java.util.List;
+
+/**
+ * Service Interface:CertificateConfig
+ * @author chopin
+ * @date 2016-9-22
+ */
+public interface ICertificateConfigService  {
+	/**
+	 * 
+	* @Title: saveCertificateConfig
+	* @Description: 新增CertificateConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void insert(CertificateConfig entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCertificateConfig 
+	* @Description: 批量新增CertificateConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void batchInsert(List<CertificateConfig> list);
+	
+	/**
+	 * 
+	* @Title: updateCertificateConfig 
+	* @Description: 编辑CertificateConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void update(CertificateConfig entity);
+	
+	/**
+	 * 
+	* @Title: deleteCertificateConfigById 
+	* @Description: 根据id删除CertificateConfig
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void deleteCertificateConfigById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCertificateConfigByIds 
+	* @Description: 根据id批量删除CertificateConfig
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void deleteCertificateConfigByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCertificateConfigById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	CertificateConfig findCertificateConfigById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCertificateConfigByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CertificateConfig>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	List<CertificateConfig> findCertificateConfigByPage(CertificateConfig search);
+	
+	Integer pageCount(CertificateConfig search);
+	
+	Integer checkNameIsExist(CertificateConfig search);
+	
+	List<CertificateConfig> queryAllCertificate(CertificateConfig search);
+
+	String createPoster(CertificateUserRelationVo cur, String companyName,CertificateConfig certificateConfig, String companyDomain);
+
+	String createPoster(CertificateUserRelationVo cur, String companyName,CertificateConfig certificateConfig, String companyDomain,boolean exportFlag);
+
+	/**
+	 * 查询所有证书配置
+	 */
+	List<CertificateConfig> findAllCertConfig();
+
+	String getExamScore(Integer id, Integer userId);
+
+	Integer getCoursePackageCount(Integer classPackageId);
+
+	List<String> getCourseInfo(Integer courseId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/certificate/ICertificateConfigVariableService.java

@@ -0,0 +1,22 @@
+package com.yuxin.wx.api.certificate;
+
+import com.yuxin.wx.model.certificate.CertificateConfigVariable;
+
+import java.util.List;
+
+public interface ICertificateConfigVariableService {
+
+    List<CertificateConfigVariable> page(CertificateConfigVariable configVariable);
+/**
+ * @author huoji
+ */
+    void insert(CertificateConfigVariable configVariable);
+    CertificateConfigVariable findByid(Integer id);
+    void deleteByid(Integer id);
+    void update(CertificateConfigVariable configVariable);
+    void deleteByCerId(Integer cerId);
+    //根据证书id查询证书变量  hxs 2019-09-19
+    List<CertificateConfigVariable> getVariableByCerId(Integer cerId);
+    //变量去重
+    List<CertificateConfigVariable> getVariableByCerIdDistinct(Integer cerId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/certificate/ICertificateCourseRelationService.java

@@ -0,0 +1,128 @@
+package com.yuxin.wx.api.certificate;
+
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.certificate.CertificateCourseRelation;
+import com.yuxin.wx.vo.certificate.CertificateUserCourseVo;
+import com.yuxin.wx.vo.certificate.ReleaseSearchVo;
+/**
+ * Service Interface:CertificateCourseRelation
+ * @author chopin
+ * @date 2016-9-22
+ */
+public interface ICertificateCourseRelationService  {
+	/**
+	 * 
+	* @Title: saveCertificateCourseRelation
+	* @Description: 新增CertificateCourseRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void insert(CertificateCourseRelation entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCertificateCourseRelation 
+	* @Description: 批量新增CertificateCourseRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void batchInsert(List<CertificateCourseRelation> list);
+	
+	/**
+	 * 
+	* @Title: updateCertificateCourseRelation 
+	* @Description: 编辑CertificateCourseRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void update(CertificateCourseRelation entity);
+	
+	/**
+	 * 
+	* @Title: deleteCertificateCourseRelationById 
+	* @Description: 根据id删除CertificateCourseRelation
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void deleteCertificateCourseRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCertificateCourseRelationByIds 
+	* @Description: 根据id批量删除CertificateCourseRelation
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void deleteCertificateCourseRelationByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCertificateCourseRelationById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	CertificateCourseRelation findCertificateCourseRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCertificateCourseRelationByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CertificateCourseRelation>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	List<CertificateCourseRelation> findCertificateCourseRelationByPage(CertificateCourseRelation search);
+
+	List<CertificateCourseRelation> queryRelationByCerId(Integer cerId);
+	
+	List<CertificateUserCourseVo> pageReleaseCertificateList(ReleaseSearchVo search);
+	
+	Integer pageReleaseCertificateListCount(ReleaseSearchVo search);
+	
+	void deletByCerId(Integer cerId);
+
+	/**
+	 * 查询考试类型的发放记录
+	 * @param search
+	 * @return
+	 */
+    PageFinder<CertificateUserCourseVo> pageReleaseCertificateExamList(ReleaseSearchVo search);
+
+	JSONObject ckeckExamPassStatus(Integer cerId,Integer userId);
+
+	/**
+	 * 证书详情页面-培训批次类型批量导出sql
+	 * @param param
+	 * @return
+	 */
+	List<Map<String,Object>> findCerExportCoursePackageData(Map param);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/certificate/ICertificateExportService.java

@@ -0,0 +1,26 @@
+package com.yuxin.wx.api.certificate;
+
+import com.yuxin.wx.model.certificate.CertificateConfig;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 证书详情的导出
+ */
+public interface ICertificateExportService {
+
+    //获取证书详情中-课程类型的导出
+    List<Map<String,Object>> getCourseDataList(CertificateConfig config, String userIds, Integer companyId, Integer cerId);
+
+    //获取培训批次类型的导出
+    List<Map<String,Object>> getCoursePackageDataList(CertificateConfig config, String userIds, Integer companyId, Integer cerId);
+
+    //获取考试的导出
+    List<Map<String,Object>> getExamDataList(CertificateConfig config, String userIds, Integer companyId, Integer cerId);
+
+    //获取导入发放记录的导出
+    List<Map<String,Object>> getImportGrantDataList(String ids, Integer companyId, Integer cerId);
+
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/certificate/ICertificateUserImportGrantRecordService.java

@@ -0,0 +1,28 @@
+package com.yuxin.wx.api.certificate;
+
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.certificate.CertificateUserImportGrantRecord;
+import com.yuxin.wx.model.certificate.CertificateUserImportGrantRecordVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 证书用户批量发放
+ */
+public interface ICertificateUserImportGrantRecordService {
+
+    //相同证书下同一个用户只能发放一次
+    List<CertificateUserImportGrantRecord> getCerImportGrantRecordByCerIdUserId(Map param);
+
+    /**
+     * 证书导入记录
+     * @param search
+     * @return
+     */
+    PageFinder<CertificateUserImportGrantRecordVo> pageCerticateImportRecords(CertificateUserImportGrantRecordVo search);
+
+    //证书详情页面-批量导出sql
+    List<Map<String,Object>> findCerImportExportData(Map param);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/certificate/ICertificateUserImportTempService.java

@@ -0,0 +1,36 @@
+package com.yuxin.wx.api.certificate;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.certificate.CertificateUserImportTemp;
+import com.yuxin.wx.vo.excelImport.ImportDataVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 证书用户导入  hxs  2019-09-20
+ */
+public interface ICertificateUserImportTempService {
+
+	//获取导入的临时数据
+	List<CertificateUserImportTemp> findByCondition(Map param);
+
+	//每次导入前，删除上一次的记录
+	int deleteByCondition(Map param);
+
+	//批量导入
+	JSONObject bathInsertData(ImportDataVo students, Integer userId, Integer cerId);
+
+	//动态拼接查询sql
+	PageFinder<CertificateUserImportTemp> getDynamicSqlDataByPage(CertificateUserImportTemp certificateUserImportTemp);
+	int getDynamicSqlDataCount(Map map);
+
+	//批量发放证书
+	JSONObject batchCerGrant(String usersArrayStr, Integer cerId, Integer userId, String domain);
+
+	//根据id查询记录。导出excel使用
+	List<Map<String,Object>> findImportData(Map param);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/certificate/ICertificateUserRelationService.java

@@ -0,0 +1,204 @@
+package com.yuxin.wx.api.certificate;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.dto.Resp;
+import com.yuxin.wx.model.certificate.CertificateConfig;
+import com.yuxin.wx.model.certificate.CertificateUserRelation;
+import com.yuxin.wx.vo.certificate.CertificateUserCourseVo;
+import com.yuxin.wx.vo.certificate.CertificateUserRelationVo;
+import com.yuxin.wx.vo.certificate.ReleaseSearchVo;
+import com.yuxin.wx.vo.certificate.ViewCertificateVo;
+
+import java.util.List;
+import java.util.Map;
+/**
+ * Service Interface:CertificateUserRelation
+ * @author chopin
+ * @date 2016-9-22
+ */
+public interface ICertificateUserRelationService  {
+	/**
+	 * 
+	* @Title: saveCertificateUserRelation
+	* @Description: 新增CertificateUserRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void insert(CertificateUserRelation entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCertificateUserRelation 
+	* @Description: 批量新增CertificateUserRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void batchInsert(List<CertificateUserRelation> list);
+	
+	/**
+	 * 
+	* @Title: updateCertificateUserRelation 
+	* @Description: 编辑CertificateUserRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void update(CertificateUserRelation entity);
+	
+	/**
+	 * 
+	* @Title: deleteCertificateUserRelationById 
+	* @Description: 根据id删除CertificateUserRelation
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void deleteCertificateUserRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCertificateUserRelationByIds 
+	* @Description: 根据id批量删除CertificateUserRelation
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	void deleteCertificateUserRelationByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCertificateUserRelationById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	CertificateUserRelation findCertificateUserRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCertificateUserRelationByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CertificateUserRelation>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-9-22
+	* @user by wangzx
+	 */
+	List<CertificateUserRelation> findCertificateUserRelationByPage(CertificateUserRelation search);
+	
+	/**
+	 * 
+	 * Class Name: ICertificateUserRelationService.java
+	 * @Description: 根据StuId,CerId,ClassTypeId查证书
+	 * @author dongshuai
+	 * @date 2016年9月23日 下午7:35:24
+	 * @modifier
+	 * @modify-date 2016年9月23日 下午7:35:24
+	 * @version 1.0
+	 * @param map
+	 * @return
+	 */
+	CertificateUserRelationVo queryCertificateUserRelationByStuIdAndCerIdAndClassId(Map<String, Integer> map);
+
+	List<CertificateUserRelationVo> queryCertificateUserRelationsByCon(Map<String, Integer> map);
+
+	
+	/**
+	 * 
+	 * Class Name: ICertificateUserRelationService.java
+	 * @Description: 根据cerId查询获得该证书的学员总数
+	 * @author male
+	 * @date 2016年9月28日 下午7:35:24
+	 * @modifier
+	 * @modify-date 2016年9月28日 下午7:35:24
+	 * @version 1.0
+	 * @param Integer
+	 * @return Integer
+	 */
+	Integer queryUserCountByCerId(Integer cerId);
+	Integer queryUserAllStudy(Integer cerId);
+	List<ViewCertificateVo> queryUserAndCertificateInfo(ViewCertificateVo search);
+	
+	Integer queryUserAndCertificateInfoCount(ViewCertificateVo search);
+	
+	Integer queryReleaseCount(ViewCertificateVo search);
+	
+	List<ViewCertificateVo> findListBySearchCondtion(ViewCertificateVo search);
+
+	Integer findCountBySearchCondtion(ViewCertificateVo search);
+
+    PageFinder<CertificateUserCourseVo> pageCerticateUserList(ReleaseSearchVo search);
+
+	List<Integer> pageClassTypeCertGrantRecordStudentId(ReleaseSearchVo search);
+
+	/**
+	 * 获取用户证书发放记录
+	 */
+    List<CertificateUserCourseVo> pageClassTypeCertGrantRecord(ReleaseSearchVo search);
+
+	int countClassTypeCertGrantRecord(ReleaseSearchVo search);
+
+	List<Integer> pageClassPackageCertGrantRecordStudentId(ReleaseSearchVo search);
+
+	/**
+	 * 获取用户证书发放记录
+	 */
+	List<CertificateUserCourseVo> pageClassPackageCertGrantRecord(ReleaseSearchVo search);
+
+	int countClassPackageCertGrantRecord(ReleaseSearchVo search);
+
+	/**
+	 * 证书发放
+	 * @param relations
+	 * @param config
+	 */
+    void grantCertificate(List<CertificateUserRelation> relations, CertificateConfig config,String companyName, String domain) throws Exception;
+
+	/**
+	 * 重新发放
+	 * @param relations
+	 * @param config
+	 * @param companyName
+	 */
+	void againGrantCertificate(List<CertificateUserRelation> relations, CertificateConfig config,String companyName,Integer userId,Integer cerId,Integer companyId, String domain);
+
+	/**
+	 * 根据用户id查询用户信息
+	 * @param param
+	 * @return
+	 */
+	List<Map<String,Object>> findUserStudentInfoByUserIds(Map param);
+
+
+	/**
+	 * 根据证书，用户等查询是否给用户发放证书
+	 * @param search
+	 * @return
+	 */
+	CertificateUserRelation queryCertificateUserRelation(ViewCertificateVo search);
+
+	Resp batchGrant(Integer cerId, String grantArr, Integer onlineFlag, String companyName, String domain);
+
+    List<Integer> findUnCompleteCertId();
+
+    Integer queryUserCountByCerId2(Integer id);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/certificate/ICompanyCertificateNumberService.java

@@ -0,0 +1,44 @@
+package com.yuxin.wx.api.certificate;
+
+import com.yuxin.wx.model.certificate.CompanyCertificateNumber;
+
+import java.util.List;
+
+/**
+ * @author lmandy
+ * @date 2020/4/1
+ */
+public interface ICompanyCertificateNumberService {
+
+    void insert(CompanyCertificateNumber entity);
+
+    void batchInsert(List<CompanyCertificateNumber> list);
+
+    void update(CompanyCertificateNumber entity);
+
+    CompanyCertificateNumber findById(Integer id);
+
+    List<CompanyCertificateNumber> findAll();
+
+    List<CompanyCertificateNumber> page(CompanyCertificateNumber certificateNumber);
+
+    Integer pageCount(CompanyCertificateNumber certificateNumber);
+
+    void deleteCertificateNum(CompanyCertificateNumber certificateNumber);
+
+    void updateUseCerNumlimitOne(Integer cerId,Integer cerGrantId);
+
+    CompanyCertificateNumber findByCerGrantId(Integer cerGrantId);
+
+    CompanyCertificateNumber findByUserCerGrantId(Integer cerGrantId, Integer companyId);
+
+    Integer findCountByTotal(Integer cerId);
+
+    Integer findCountByGrant(Integer cerId);
+
+    /**
+     * 取消使用
+     * @param id
+     */
+    void cancelUse(Integer id);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/BjyPlaybackVidoService.java

@@ -0,0 +1,52 @@
+package com.yuxin.wx.api.classes;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.classes.liveroom.BjyPlaybackVido;
+import com.yuxin.wx.vo.classes.CoursePlaybackVo;
+
+import java.util.List;
+
+/**
+ * @author weijb
+ * @date 2019-10-18 19:47
+ * @description
+ **/
+public interface BjyPlaybackVidoService {
+
+    void bjyLiveToVidoCallback(BjyPlaybackVido playback);
+    void insert(BjyPlaybackVido playback);
+    void update(BjyPlaybackVido playback);
+
+    List<BjyPlaybackVido> findPlaybackByCompanyId(int companyId);
+    List<BjyPlaybackVido> findPlaybackByRoomId(String roomId);
+
+    //V6.8.4.1 获取百家云回放记录列表
+    PageFinder<CoursePlaybackVo> getCoursePlaybackList(CoursePlaybackVo search);
+
+    //V6.8.4.1 删除回放
+    JSONObject delPlayback(String courseIds,Integer companyIds);
+    JSONObject delPlaybackById(String id,Integer companyIds);
+
+    //根据课次id查询回放的list
+    PageFinder<CoursePlaybackVo> getPlaybackByCourseId(CoursePlaybackVo search);
+
+    //V6.8.4.1 根据roomId和videoId查询唯一存在的值
+    List<BjyPlaybackVido> getPlaybackInfo(BjyPlaybackVido bjyPlaybackVido);
+
+    //V6.8.4.1 获取回放地址
+    JSONObject getPlaybackUrl(Integer playbackId);
+    /**
+     * 删除直播回放
+     *
+     * @param lessonId 课次ID
+     */
+    void deleteLiveReplay(Integer lessonId);
+
+    /**
+     * 删除公开课回放
+     *
+     * @param openCourseId 课次ID
+     */
+    void deleteOpenCourseReplay(Integer openCourseId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IBjyAccountService.java

@@ -0,0 +1,113 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+
+import com.yuxin.wx.model.classes.liveroom.BjyAccount;
+/**
+ * Service Interface:BjyAccount
+ * @author chopin
+ * @date 2017-7-27
+ */
+public interface IBjyAccountService  {
+	/**
+	 * 
+	* @Title: saveBjyAccount
+	* @Description: 新增BjyAccount
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	void insert(BjyAccount entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveBjyAccount 
+	* @Description: 批量新增BjyAccount
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	void batchInsert(List<BjyAccount> list);
+	
+	/**
+	 * 
+	* @Title: updateBjyAccount 
+	* @Description: 编辑BjyAccount
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	void update(BjyAccount entity);
+	
+	/**
+	 * 
+	* @Title: deleteBjyAccountById 
+	* @Description: 根据id删除BjyAccount
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	void deleteBjyAccountById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteBjyAccountByIds 
+	* @Description: 根据id批量删除BjyAccount
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	void deleteBjyAccountByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findBjyAccountById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	BjyAccount findBjyAccountById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findBjyAccountByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<BjyAccount>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	List<BjyAccount> findBjyAccountByPage(BjyAccount search);
+
+	BjyAccount findByCompanyId(Integer companyId);
+
+    List<BjyAccount> finAll();
+
+	BjyAccount findByCompanyIdAndAccount(Integer companyId,String account);
+	Integer insertAccount(BjyAccount account);
+
+	//查询所有不重复的PartnerId，根据账号去获取对应的回放数据
+	List<BjyAccount> getBjyAccountPartnerIds();
+
+	List<Integer> getBjyCompanyIds();
+
+	BjyAccount findByAccount(String account);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IBjyCoursewareInLessonService.java

@@ -0,0 +1,105 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+
+import com.yuxin.wx.model.classes.liveroom.BjyCoursewareInLesson;
+/**
+ * Service Interface:BjyCoursewareInLesson
+ * @author chopin
+ * @date 2017-7-27
+ */
+public interface IBjyCoursewareInLessonService  {
+	/**
+	 * 
+	* @Title: saveBjyCoursewareInLesson
+	* @Description: 新增BjyCoursewareInLesson
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	void insert(BjyCoursewareInLesson entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveBjyCoursewareInLesson 
+	* @Description: 批量新增BjyCoursewareInLesson
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	void batchInsert(List<BjyCoursewareInLesson> list);
+	
+	/**
+	 * 
+	* @Title: updateBjyCoursewareInLesson 
+	* @Description: 编辑BjyCoursewareInLesson
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	void update(BjyCoursewareInLesson entity);
+	
+	/**
+	 * 
+	* @Title: deleteBjyCoursewareInLessonById 
+	* @Description: 根据id删除BjyCoursewareInLesson
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	void deleteBjyCoursewareInLessonById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteBjyCoursewareInLessonByIds 
+	* @Description: 根据id批量删除BjyCoursewareInLesson
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	void deleteBjyCoursewareInLessonByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findBjyCoursewareInLessonById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	BjyCoursewareInLesson findBjyCoursewareInLessonById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findBjyCoursewareInLessonByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<BjyCoursewareInLesson>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-27
+	* @user by wangzx
+	 */
+	List<BjyCoursewareInLesson> findBjyCoursewareInLessonByPage(BjyCoursewareInLesson search);
+
+	List<BjyCoursewareInLesson> findBySearch(BjyCoursewareInLesson bil);
+
+	Integer findBySearchCount(BjyCoursewareInLesson bil);
+
+	void delBySearch(BjyCoursewareInLesson search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IBjyCoursewareService.java

@@ -0,0 +1,103 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+
+import com.yuxin.wx.model.classes.liveroom.BjyCourseware;
+/**
+ * Service Interface:BjyCourseware
+ * @author chopin
+ * @date 2017-7-26
+ */
+public interface IBjyCoursewareService  {
+	/**
+	 * 
+	* @Title: saveBjyCourseware
+	* @Description: 新增BjyCourseware
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-26
+	* @user by wangzx
+	 */
+	void insert(BjyCourseware entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveBjyCourseware 
+	* @Description: 批量新增BjyCourseware
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-26
+	* @user by wangzx
+	 */
+	void batchInsert(List<BjyCourseware> list);
+	
+	/**
+	 * 
+	* @Title: updateBjyCourseware 
+	* @Description: 编辑BjyCourseware
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-26
+	* @user by wangzx
+	 */
+	void update(BjyCourseware entity);
+	
+	/**
+	 * 
+	* @Title: deleteBjyCoursewareById 
+	* @Description: 根据id删除BjyCourseware
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-26
+	* @user by wangzx
+	 */
+	void deleteBjyCoursewareById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteBjyCoursewareByIds 
+	* @Description: 根据id批量删除BjyCourseware
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-26
+	* @user by wangzx
+	 */
+	void deleteBjyCoursewareByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findBjyCoursewareById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-26
+	* @user by wangzx
+	 */
+	BjyCourseware findBjyCoursewareById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findBjyCoursewareByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<BjyCourseware>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-7-26
+	* @user by wangzx
+	 */
+	List<BjyCourseware> findBjyCoursewareByPage(BjyCourseware search);
+
+	List<BjyCourseware> findBySearch(BjyCourseware bcs);
+
+	Integer findBySearchCount(BjyCourseware bcs);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IBjyOperDataService.java

@@ -0,0 +1,15 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.Map;
+
+/**
+ *后台补直播收费数据
+ */
+public interface IBjyOperDataService {
+
+	Map getBjyPlayBack();
+
+	Map updateBjyPlayBack();
+
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IBjyPlaybackVideoAllService.java

@@ -0,0 +1,21 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.BjyPlaybackVideoAll;
+
+import java.util.List;
+
+/**
+ *直播教师课次信息
+ */
+public interface IBjyPlaybackVideoAllService {
+
+	//批量插入
+	int batchInsert(List<BjyPlaybackVideoAll> bjyPlaybackVideoAlls);
+
+	//删除旧数据，从接口获取新数据
+	void batchDelete(BjyPlaybackVideoAll bjyPlaybackVideoAll);
+
+	List<BjyPlaybackVideoAll> getList();
+	void update(BjyPlaybackVideoAll bjyPlaybackVideoAll);
+	int getListCount();
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassModuleLessonCoursewareService.java

@@ -0,0 +1,90 @@
+package com.yuxin.wx.api.classes;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.classes.ClassModuleLessonCourseware;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 课件课次 Service
+ *
+ * @author PengSongHe
+ * @date 2019/12/31 18:05
+ */
+public interface IClassModuleLessonCoursewareService {
+    /**
+     * 添加
+     *
+     * @author PengSongHe
+     * @date 2019/12/31 18:04
+     */
+    void insert(ClassModuleLessonCourseware entity);
+
+    /**
+     * 更新
+     *
+     * @author PengSongHe
+     * @date 2019/12/31 18:06
+     */
+    void update(ClassModuleLessonCourseware entity);
+
+    /**
+     * 删除
+     *
+     * @author PengSongHe
+     * @date 2019/12/31 18:06
+     */
+    void deleteById(Integer id);
+
+    /**
+     * 查询
+     *
+     * @author PengSongHe
+     * @date 2019/12/31 18:07
+     */
+    ClassModuleLessonCourseware findById(Integer id);
+
+    /**
+     * 根据课次id查询
+     *
+     * @author PengSongHe
+     * @date 2019/12/31 18:08
+     */
+    List<ClassModuleLessonCourseware> findByLessonId(Integer lessonId);
+
+    /**
+     * 直播间上传文档
+     * @return
+     */
+    JSONObject uploadDocToRoom(JSONObject json, ClassModuleLessonCourseware classModuleLessonCourseware, MultipartFile multipartFile);
+
+    /**
+     * 查询关联平台列表
+     *
+     * @author PengSongHe
+     * @date 2020/1/8 15:18
+     */
+    PageFinder<ClassModuleLessonCourseware> listCoursewareByLessonId(ClassModuleLessonCourseware classModuleLessonCourseware);
+
+    /**
+     * 查询平台课件列表
+     *
+     * @author PengSongHe
+     * @date 2020/1/8 15:18
+     */
+    PageFinder<ClassModuleLessonCourseware> listCourseware(ClassModuleLessonCourseware query);
+
+    List<ClassModuleLessonCourseware> listCoursewareByLessonId(Integer companyId, Integer schoolId, Integer lessonId);
+
+    JSONObject removeCourseware(JSONObject jsonObject, ClassModuleLessonCourseware classModuleLessonCourseware);
+
+    /**
+     * 课件绑定
+     *
+     * @author PengSongHe
+     * @date 2020/1/8 14:49
+     */
+    JSONObject bindCourseware(ClassModuleLessonCourseware data);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassModuleLessonLogService.java

@@ -0,0 +1,18 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.ClassModuleLessonLog;
+
+import java.util.List;
+
+
+public interface IClassModuleLessonLogService {
+
+
+	void insert(ClassModuleLessonLog classModuleLessonLog);
+
+	void update(ClassModuleLessonLog classModuleLessonLog);
+
+	ClassModuleLessonLog findBySearch(ClassModuleLessonLog cmllsearch);
+
+	List<ClassModuleLessonLog> findListByPage(ClassModuleLessonLog search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassModuleLessonRoleService.java

@@ -0,0 +1,34 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.ClassModuleLessonRole;
+
+import java.util.List;
+
+
+public interface IClassModuleLessonRoleService {
+
+	void insert(ClassModuleLessonRole search);
+
+
+	void batchInsert(List<ClassModuleLessonRole> search);
+
+
+	void update(ClassModuleLessonRole search);
+
+
+	void deleteById(Integer id);
+
+
+	void deleteByIds(Integer[] ids);
+
+	ClassModuleLessonRole findById(Integer id);
+
+
+	void deleteBylessonId(Integer id);
+
+	List<ClassModuleLessonRole> findByLessonId(Integer lessonId);
+
+    List<Integer> findAssistantIdsByLessonId(Integer lessonId);
+
+	List<ClassModuleLessonRole> findByPage(ClassModuleLessonRole search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassModuleLessonService.java

@@ -0,0 +1,433 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.classes.BjyCourseVo;
+import com.yuxin.wx.model.classes.ClassModuleLesson;
+import com.yuxin.wx.vo.classes.*;
+import com.yuxin.wx.vo.student.LessonStudyDataVo;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Service Interface:ClassModuleLesson
+ * @author wang.zx
+ * @date 2014-12-5
+ */
+public interface IClassModuleLessonService  {
+	/**
+	 *
+	* @Title: saveClassModuleLesson
+	* @Description: 新增ClassModuleLesson
+	* @return void    返回类型
+	* @throws
+	* @exception
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void insert(ClassModuleLesson classModuleLesson);
+
+	/**
+	 *
+	* @Title: batchSaveClassModuleLesson
+	* @Description: 批量新增ClassModuleLesson
+	* @return void    返回类型
+	* @throws
+	* @exception
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassModuleLesson> classModuleLesson);
+
+	/**
+	 *
+	* @Title: updateClassModuleLesson
+	* @Description: 编辑ClassModuleLesson
+	* @return void    返回类型
+	* @throws
+	* @exception
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void update(ClassModuleLesson classModuleLesson);
+
+	/**
+	 *
+	* @Title: deleteClassModuleLessonById
+	* @Description: 根据id删除ClassModuleLesson
+	* @param id
+	* @return void    返回类型
+	* @throws
+	* @exception
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassModuleLessonById(Integer id);
+
+	/**
+	 * 删除第三方的课次
+	 * @param id
+	 * @param companyId
+	 * @param type 0课程  1公开课
+	 */
+	void deleteClassModuleLessonByThirdparty(Integer id,Integer companyId,Integer type);
+
+	/**
+	 *
+	* @Title: deleteClassModuleLessonByIds
+	* @Description: 根据id批量删除ClassModuleLesson
+	* @param ids
+	* @return void    返回类型
+	* @throws
+	* @exception
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassModuleLessonByIds(Integer[] ids);
+
+	/**
+	 *
+	* @Title: findClassModuleLessonById
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型
+	* @throws
+	* @exception
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	ClassModuleLesson findClassModuleLessonById(Integer id);
+
+	String findRoomIdByLessonId(Integer id);
+	/**
+	 *
+	* @Title: findClassModuleLessonByPage
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassModuleLesson>    返回类型
+	* @throws
+	* @exception
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	List<ClassModuleLesson> findClassModuleLessonByPage(ClassModuleLesson search);
+
+	/**
+	 * @Description:(根据教室Id查询对应的课次)
+	 * @author wang.zx
+	 * @date 2015-1-13 下午5:56:38
+	 * @version 1.0
+	 * @param classroomId
+	 * @return
+	 */
+	List<ClassModuleLesson> findClassModuleLessonByClassroomId(Integer classroomId);
+
+	/**
+	 * @Description:(根据班号Id查询对应的课次)
+	 * @author wang.zx
+	 * @date 2015-2-1 下午6:22:59
+	 * @version 1.0
+	 * @param moduleNoId
+	 * @return
+	 */
+
+	List<ClassModuleLesson> findClassModuleLessonByModuleNoId(Integer moduleNoId);
+
+
+	/**
+	 * @Description:根据教室Id、开始、结束时间获取教室的使用情况
+	 * @author wang.zx
+	 * @date 2015-1-29 下午11:55:44
+	 * @version 1.0
+	 * @param roomId
+	 * @param startDate
+	 * @param endDate
+	 * @return
+	 */
+	List<ClassModuleLesson> findLessonsByRoomIdAndDate(Integer roomId, Date startDate, Date endDate);
+
+	/**
+	 * Class Name: IClassModuleLessonService.java
+	 * @Description: 教师排课详情查询
+	 * @author Keyn
+	 * @date 2015-1-21 下午3:22:27
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	PageFinder<ClassModuleLessonVo> findClassModuleLessonByKeys(ClassModuleLessonVo search);
+
+	/**
+	 *
+	 * Class Name: IClassModuleLessonService.java
+	 * @Description: 查询单个课程信息
+	 * @author Keyn
+	 * @date 2015-1-22 上午10:59:42
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	ClassModuleLessonVo findClassModuleLessonById(ClassModuleLessonVo search);
+	/**
+	 *
+	 * Class Name: IClassModuleLessonService.java
+	 * @Description: 查询老师的课次
+	 * @author ycl
+	 * @date 2015-5-7 上午10:30:07
+	 * @modifier
+	 * @modify-date 2015-5-7 上午10:30:07
+	 * @version 1.0
+	 * @param classModuleLesson
+	 * @return
+	 */
+	List<ClassModuleLesson> findLessonByTeachers(ClassModuleLesson classModuleLesson);
+	/**
+	 *
+	 * Class Name: IClassModuleLessonService.java
+	 * @Description: 查询今天以后教室占用情况
+	 * @author 周文斌
+	 * @date 2015-5-7 上午10:55:03
+	 * @version 1.0
+	 * @param sysConfigClassroom
+	 * @return
+	 */
+	List<ClassModuleLesson> findLessonInfoByRoomIdAndDate(ClassModuleLesson cml);
+
+	/**
+	 *
+	 * Class Name: IClassModuleLessonService.java
+	 * @Description: 定时任务 查询 昨天所有课次
+	 * @author 周文斌
+	 * @date 2015-5-26 下午5:45:02
+	 * @version 1.0
+	 * @param date
+	 * @return
+	 */
+	List<LessonVo> findByDate(String date);
+
+	/**
+	 *
+	 * Class Name: IClassModuleLessonService.java
+	 * @Description: 查询直播id
+	 * @author 周文斌
+	 * @date 2015-6-8 下午6:06:49
+	 * @version 1.0
+	 * @param param
+	 * @return
+	 */
+	List<String> findLiveByTime(Map<String,Object> param);
+
+	/**
+	 * 移动课次到某个班号
+	 * zhang.zx
+	 * @param param
+	 */
+	void mvLesson(Map<String, Object> param);
+
+	/**
+	 *
+	 * Class Name: IClassModuleLessonService.java
+	 * @Description: 根据课次名称查询课次
+	 * @author zhang.zx
+	 * @date 2015年9月15日 下午3:14:10
+	 * @modifier
+	 * @modify-date 2015年9月15日 下午3:14:10
+	 * @version 1.0
+	 * @param lessonName
+	 * @return
+	 */
+	List<ClassModuleLesson> findclassLessonByName(String lessonName,Integer moduleNo);
+
+	/**
+	 *
+	 * Class Name: IClassModuleLessonService.java
+	 * @Description: 查询zs回看为空的课堂
+	 * @author 周文斌
+	 * @date 2015-11-28 下午2:18:45
+	 * @version 1.0
+	 * @param param
+	 * @return
+	 */
+	List<CmlVo> findZsLiveByTime(Map<String, Object> param);
+
+	List<ClassModuleLesson> findcmlByModuleNoId(Integer moduleNoId);
+	ClassModuleLesson findcmlByRoomId(String roomId,String type);
+	ClassModuleLesson findcmlByRoomId(String roomId);
+	List<Integer> findClassModuleLessonIdsByModuleNoId(Integer id);
+
+	/**
+	 * 查询百家云直播平台昨天的直播课次（包含公开课次）
+	 * @author licong
+	 * @date 2017年7月26日 下午7:50:49
+	 */
+	List<TaskLiveVo> findBjyLive(ClassModuleLesson lesson);
+	List<TaskLiveVo> findLessonByDate(ClassModuleLesson lesson);
+
+	/**
+	 * 获取没有回放的昨日课程
+	 * @param lesson
+	 * @return
+	 */
+	List<TaskLiveVo> findBjyLiveAndReurl(ClassModuleLesson lesson);
+	List<TimeTableLessonVo> queryLessonForTimeTable(TimeTableSearchVo search);
+
+	/**
+	 * 课次到课率
+	 * @param lessonVo
+	 * @return
+	 */
+	PageFinder<ClassModuleLessonVo> queryLiveAttendanceRate(ClassModuleLessonVo lessonVo);
+
+	/**
+	 * 查询平均到课率统计
+	 * @param lessonVo
+	 * @return
+	 */
+	Map<String,Object> queryAVGLiveAttendanceRate(ClassModuleLessonVo lessonVo);
+	/**
+	 * 导出课次到课率
+	 * @param lessonVo
+	 * @return
+	 */
+    List<ClassModuleLessonVo> exportLiveAttendanceRate(ClassModuleLessonVo lessonVo);
+
+	PageFinder<ClassModuleLesson> findClassModuleLessonByWhere(ClassModuleLesson classModuleLessonVo);
+
+	/**
+	 * 判断使用单班号查询还是多班号查询
+	 * @return
+	 */
+	boolean classSwitch(Integer companyId);
+
+    Integer findModuleNoLessonCount(ClassModuleLesson classModuleLesson);
+
+    List<ExportStuLeanPersentVo> findSimpleCodeClassPackageLesson(Map<String, Object> param);
+
+	List<ExportStuLeanPersentVo> findMuchCodeClassPackageLesson(Map<String, Object> param);
+
+    List<ExportStuLeanPersentVo> findSimpleCodeClassTypeLesson(Integer id);
+
+	List<ExportStuLeanPersentVo> findMuchCodeClassTypeLesson(Integer id);
+
+	List<ClassModuleLessonVo> findLessonByTime(Integer companyId, String startSendTimeStr, String actualTimeStr);
+
+	ClassModuleLessonVo findClassModuleLessonVoById(Integer id,Integer userId);
+
+    /*根据classtypeId查询最早的lesson*/
+    ClassModuleLesson queryRecentLessonByClassTypeId(Integer id);
+
+    /*根据classtypeId查询最晚的lesson*/
+    ClassModuleLesson queryLatestLessonByClassTypeId(Integer id);
+
+	ClassModuleLesson findClassModuleLessonByLiveroomId(String serial);
+
+    ClassModuleLesson findClassModuleLessonByCmfId(Integer id);
+
+    ClassTypeVo queryCommodityLiveInfoByCompanyIdAndCommodityId(Map<String, Object> param);
+
+	List<String> findClassModuleLessonByLiveClassTypeId(Integer classTypeId);
+
+    List<ClassModuleLesson> findcmlByModuleNoIdAndTime(Integer classModelNoId, String time);
+
+	Integer countByModuleNoIdAndTime(Integer classModelNoId, String time);
+
+	int findReplayByids(List<String> ids);
+
+    List<ClassModuleLesson> findClassModuleLessonByModuleNoIdAndTime(Integer moduleNoId, String time);
+
+    ClassModuleLesson isClassByRoomidAndLessonid(String roomid,Integer lessonid);
+
+	List<String> findClassModuleLessonByMeetClassTypeId(Integer classTypeId, Integer stuId);
+
+	Integer findClassModuleLessonByCourseId(Integer classTypeId, Integer userId);
+
+    List<ClassModuleLesson> findYesterDayLiveClassModuleNo(Date date,Integer lessonId);
+
+    List<Integer> findStuidByClassModuleNoid(Integer companyId ,Integer id,Integer lessonid,boolean muchCode);
+
+    Map<String,Object> doPercentData(Integer userId, List<String> ids,Integer classTypeId,Integer courseType,Integer companyId);
+
+	List<String> findClassModuleLessonByClassTypeId(Integer courseId);
+
+    Map<String,Object> studyPercentData(LessonStudyDataVo lessonStudyDataVo, List<LessonStudyDataVo> stuCourseData);
+	Map<String,Object> studyPercentData2(LessonStudyDataVo lessonStudyDataVo, LessonStudyDataVo stuCourseData);
+    List<ClassModuleLessonVo> findShareModuleLessonByTime(Integer companyId, String startSendTimeStr, String actualTimeStr);
+
+	/**
+	 * 查询 - 查询首页直播数据
+	 * @param mlv
+	 * @return
+	 */
+	List<ModuleLessonVo> queryModuleLessonVos(ModuleLessonVo mlv) throws ParseException;
+
+    /**
+     * 判断当前课程是否学习完成
+     *
+     * @param studentId   学员ID
+     * @param classTypeId 课程ID
+     * @return 是否完成学习
+     */
+    Boolean checkIsFinishCourse(Integer studentId, Integer classTypeId);
+
+
+	/**
+	 * 获取课程学习进度 是否完成情况
+	 * @param studentId
+	 * @param classTypeId
+	 * @param flag
+	 * @return
+	 */
+	Boolean getStudyPercentStatu(Integer studentId, Integer classTypeId,Boolean flag);
+	/**
+	 * 获取课程学习进度
+	 *
+	 * @param studentId   学员ID
+	 * @param classTypeId 课程ID
+	 * @return 课程进度
+	 */
+	String getStudyPercent(Integer studentId, Integer classTypeId,Boolean flag);
+
+	//获取百家云小班课的lesson
+	List<LiveChargeVo> getXbLessonByCompanyId(Map param);
+	//获取百家云小班课的lesson
+	List<ClassModuleLesson> getListByCompanyIdAndStartTime(Integer companyId, String lessonDate);
+	//获取百家云小班课的lesson
+	List<ClassModuleLesson> getListByMap(Map param);
+	//根据roomid获取对应的课次
+	List<BjyCourseVo> getCourseInfoByRoomIds(Map param);
+
+	//V6.8.4 获取老师上课时间统计
+	PageFinder<TeacherCourseVo> queryTeacherCourseData(TeacherCourseVo teacherCourseVo);
+
+	/**
+	 * 查询创建的直播间信息
+	 * @param param
+	 * @return
+	 */
+	List<ClassModuleLesson> queryLiveRoomInfoByParam(Map param);
+
+	/**
+	 * 删除直播回放
+	 *
+	 * @param companyId 机构ID
+	 * @param lessonId 直播课次ID
+	 */
+	void deleteLiveReplay(Integer companyId, Integer lessonId);
+
+	/**
+	 * 删除公开课回放
+	 *
+	 * @param companyId 机构ID
+	 * @param openCourseId  公开课ID
+	 */
+	void deleteOpenCourseReplay(Integer companyId, Integer openCourseId);
+
+	/**
+	 * 根据classTypeId查询课次
+	 * @param classTypeId
+	 * @return
+	 */
+	List<ClassModuleLesson> queryLessonsByClassTypeId(Integer classTypeId,String liveType);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassModuleNoOnsaleService.java

@@ -0,0 +1,134 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+
+import com.yuxin.wx.model.classes.ClassModuleNoOnsale;
+/**
+ * Service Interface:ClassModuleNoOnsale
+ * @author wang.zx
+ * @date 2015-8-14
+ */
+public interface IClassModuleNoOnsaleService  {
+	/**
+	 * 
+	* @Title: saveClassModuleNoOnsale
+	* @Description: 新增ClassModuleNoOnsale
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-14
+	* @user by wangzx
+	 */
+	void insert(ClassModuleNoOnsale entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassModuleNoOnsale 
+	* @Description: 批量新增ClassModuleNoOnsale
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-14
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassModuleNoOnsale> list);
+	
+	/**
+	 * 
+	* @Title: updateClassModuleNoOnsale 
+	* @Description: 编辑ClassModuleNoOnsale
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-14
+	* @user by wangzx
+	 */
+	void update(ClassModuleNoOnsale entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassModuleNoOnsaleById 
+	* @Description: 根据id删除ClassModuleNoOnsale
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-14
+	* @user by wangzx
+	 */
+	void deleteClassModuleNoOnsaleById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassModuleNoOnsaleByIds 
+	* @Description: 根据id批量删除ClassModuleNoOnsale
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-14
+	* @user by wangzx
+	 */
+	void deleteClassModuleNoOnsaleByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassModuleNoOnsaleById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-14
+	* @user by wangzx
+	 */
+	ClassModuleNoOnsale findClassModuleNoOnsaleById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassModuleNoOnsaleByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassModuleNoOnsale>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-14
+	* @user by wangzx
+	 */
+	List<ClassModuleNoOnsale> findClassModuleNoOnsaleByPage(ClassModuleNoOnsale search);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleNoOnsaleService.java
+	 * @Description: 条件查询在售班号
+	 * @author zhang.zx
+	 * @date 2015年9月10日 下午8:40:06
+	 * @modifier
+	 * @modify-date 2015年9月10日 下午8:40:06
+	 * @version 1.0
+	 * @param moduleOnsale
+	 * @return
+	 */
+	ClassModuleNoOnsale queryClassModuleOnSale(ClassModuleNoOnsale moduleOnsale);
+
+    ClassModuleNoOnsale queryClassModuleNoHasBind(
+            ClassModuleNoOnsale moduleOnsale);
+
+    /**
+	 * 
+	 * Class Name: IClassModuleNoOnsaleService.java
+	 * @Description: 根据班型和模块查询在售班号
+	 * @author zhang.zx
+	 * @date 2016年3月23日 下午7:43:22
+	 * @modifier
+	 * @modify-date 2016年3月23日 下午7:43:22
+	 * @version 1.0
+	 * @param moduleOnsale
+	 * @return
+	 */
+	ClassModuleNoOnsale queryClassNoOnSale(ClassModuleNoOnsale moduleOnsale);
+
+	ClassModuleNoOnsale queryModuleOnSaleModuleNo(Integer moduleId);
+
+    void deleteByWhere(ClassModuleNoOnsale sale);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassModuleNoService.java

@@ -0,0 +1,340 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+import java.util.Map;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.classes.ClassModule;
+import com.yuxin.wx.model.classes.ClassModuleNo;
+import com.yuxin.wx.model.classes.ClassModuleNoOnsale;
+import com.yuxin.wx.model.company.Company;
+import com.yuxin.wx.model.student.StudentPaySlave;
+import com.yuxin.wx.vo.classes.ClassModuleNoListVo;
+import com.yuxin.wx.vo.classes.ClassModuleNoVo;
+import com.yuxin.wx.vo.classes.ClassVo;
+/**
+ * Service Interface:ClassModuleNo
+ * @author wang.zx
+ * @date 2014-12-5
+ */
+public interface IClassModuleNoService  {
+	/**
+	 * 
+	* @Title: saveClassModuleNo
+	* @Description: 新增ClassModuleNo
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void insert(ClassModuleNo classModuleNo);
+	
+	/**
+	 * 
+	* @Title: getCampus_name
+	* @Description: 由id获得校区名称
+	* @return String    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-28
+	* @user by ycl
+	 */
+	String getCampus_nameById(Integer id);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassModuleNo 
+	* @Description: 批量新增ClassModuleNo
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassModuleNo> classModuleNo);
+	
+	/**
+	 * 
+	* @Title: updateClassModuleNo 
+	* @Description: 编辑ClassModuleNo
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void update(ClassModuleNo classModuleNo);
+	
+	/**
+	 * 
+	* @Title: deleteClassModuleNoById 
+	* @Description: 根据id删除ClassModuleNo
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassModuleNoById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassModuleNoByIds 
+	* @Description: 根据id批量删除ClassModuleNo
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassModuleNoByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassModuleNoById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	ClassModuleNo findClassModuleNoById(Integer id);
+	
+	
+	/**
+	 * 
+	* @Title: findClassModuleNoById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by chopin
+	 */
+	List<ClassModuleNoVo> findListByModuleId(Integer moduleId);
+	
+	/**
+	 * 
+	* @Title: findClassModuleNoByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassModuleNo>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	List<ClassModuleNo> findClassModuleNoByPage(ClassModuleNo search);
+	
+	/**
+	 * @Description:(查询班号list)
+	 * @author wang.zx 
+	 * @date 2015-1-9 下午7:12:13
+	 * @version 1.0
+	 * @param vo
+	 * @return
+	 */
+	List<ClassModuleNoListVo> findClassModuleNoListVoByPage(ClassModuleNo search);
+	
+	/**
+	 * @Description:根据校区ID查询该校区下是否还有正在使用的课程
+	 * @author wang.zx 
+	 * @date 2015-2-9 下午7:12:13
+	 * @version 1.0
+	 * @param vo
+	 * @return
+	 */
+	List<ClassModuleNo> findClassModuleNoListByCampusId(Integer compusId);
+	
+	/**
+	 * @Description:(根据班号ID查询对应的VO)
+	 * @author wang.zx 
+	 * @date 2015-2-1 下午6:11:17
+	 * @version 1.0
+	 * @param id
+	 * @return
+	 */
+	ClassModuleNoListVo findModuleNoListVoById(Integer id);
+	
+	int findCountByKeys(ClassModuleNo search);
+	
+	/**T
+	 * 
+	 * Class Name: IClassModuleNoService.java
+	 * @Description: 根据moduelid 查询 班号
+	 * @author 周文斌
+	 * @date 2015-5-4 下午6:13:21
+	 * @version 1.0
+	 * @param <T>
+	 * @param moduleIds
+	 * @return
+	 */
+	List<String> findClassNoByCompanyId(Map<String,Object> param);
+	
+	
+	/**
+	 * 
+	* @Title: findListByModule
+	* @Description: 根据moduleid 查询 moduleNo 列表
+	* @param moduleId
+	* @return ClassModuleNo    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by chopin
+	 */
+	public List<ClassModuleNoVo> findListByModule(ClassModuleNo search);
+	/**
+	 * 
+	 * Class Name: IClassModuleNoService.java
+	 * @Description: 根据模块查询对应班号
+	 * @author 权飞虎
+	 * @date 2015年5月8日 下午3:22:48
+	 * @modifier
+	 * @modify-date 2015年5月8日 下午3:22:48
+	 * @version 1.0
+	 * @param classModuleId
+	 * @return
+	 */
+	List<ClassModuleNo> findByCmId(Integer classModuleId,Integer classTypeId);
+
+    List<ClassModuleNo> findByCmIdOrderbyDefaultFlag(Integer classModuleId, Integer classTypeId);
+
+    /**
+	 * 
+	 * Class Name: IClassModuleNoService.java
+	 * @Description: 根据子订单查询所有模块号
+	 * @author 权飞虎
+	 * @date 2015年5月9日 上午10:41:42
+	 * @modifier
+	 * @modify-date 2015年5月9日 上午10:41:42
+	 * @version 1.0
+	 * @param paySlave
+	 * @return
+	 */
+	List<ClassModuleNo> findBySearch(StudentPaySlave paySlave);
+
+	List<ClassModuleNoListVo> findVoByCmId(Integer id);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleNoService.java
+	 * @Description: 查询班号详细信息
+	 * @author zhang.zx
+	 * @date 2015年5月11日 上午11:35:11
+	 * @modifier
+	 * @modify-date 2015年5月11日 上午11:35:11
+	 * @version 1.0
+	 * @param classModule
+	 * @return
+	 */
+	List<ClassModuleNoListVo> findModuleNoListByClassType(Integer moduleId);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleNoService.java
+	 * @Description: 多条件查询排课
+	 * @author 周文斌
+	 * @date 2015-5-14 下午8:30:36
+	 * @version 1.0
+	 * @param param
+	 * @return
+	 */
+	List<ClassVo> findClassInfoByMap(ClassVo classVo);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleNoService.java
+	 * @Description: 查询多条件 排课 总数
+	 * @author 周文斌
+	 * @date 2015-5-14 下午9:01:45
+	 * @version 1.0
+	 * @param classVo
+	 * @return
+	 */
+	Integer findCountByMap(ClassVo classVo);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleNoService.java
+	 * @Description: 根据item id 查询 班号
+	 * @author 周文斌
+	 * @date 2015-6-5 下午12:11:47
+	 * @version 1.0
+	 * @param classModuleNo
+	 * @return
+	 */
+	List<ClassModuleNo> findByItem(ClassModuleNo classModuleNo);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleNoService.java
+	 * @Description: 根据公司id查询班号
+	 * @author zhang.zx
+	 * @date 2015年8月11日 下午5:14:02
+	 * @modifier
+	 * @modify-date 2015年8月11日 下午5:14:02
+	 * @version 1.0
+	 * @param companyId
+	 * @return
+	 */
+	List<ClassModuleNo> queryModuleNoByCompanyId(Integer companyId);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleNoService.java
+	 * @Description: 根据模块号查询班号
+	 * @author zhang.zx
+	 * @date 2015年8月18日 下午2:32:09
+	 * @modifier
+	 * @modify-date 2015年8月18日 下午2:32:09
+	 * @version 1.0
+	 * @param id
+	 * @return
+	 */
+	List<ClassModuleNo> queryClassModuleNoById(Integer id);
+
+    List<ClassModuleNo> queryClassModuleNoByClassTypeIdAndModuleId(Integer classTypeId, Integer moduleId);
+
+    List<ClassModuleNo> findModuleNoOnSaleByModuleId(Integer id);
+	
+	List<Integer> findClassModuleNoIdsByModuleId(Integer id);
+
+    PageFinder<ClassModuleNoListVo> findClassModuleNoListByWhere(ClassModuleNo classModuleNo);
+
+	int getBuyClassMoudleNoCount(Integer companyId, Integer moduleNoId, boolean muchCode);
+
+	ClassModuleNo findClassModuleNoByDefaultOnsale(ClassModuleNoOnsale search);
+
+	boolean checkMuchCode(Integer companyId);
+	/**
+	 * 查询班号购买人数
+	 */
+	Integer getModuleNoBuyNumByModuleNoId(Integer companyId,Integer moduleId,Integer classModuleNoId);
+
+	List<ClassModuleNo> findMoreClassModuleNoByCourseId(Integer currentId, Integer classTypeId, Integer userId);
+	
+	/**
+	 * @Author liaoshilin
+	 * @Date 2019/04/23 17:40
+	 * param: 
+	 * @param classTypeId
+	 * @return
+	 * @Description 根据课程id查询班号id
+	 */
+	List<Integer> queryClassModuleNoIdByClassTypeId(Integer classTypeId);
+
+	/**
+	 * 查询课程单元下班号ID集合
+	 *
+	 * @param moduleId 课程单元ID
+	 * @return 班号ID集合
+	 */
+    List<Integer> findIdByModuleId(Integer moduleId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassModuleService.java

@@ -0,0 +1,538 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.classes.ClassModule;
+import com.yuxin.wx.model.classes.ClassModuleLesson;
+import com.yuxin.wx.model.classes.ClassModuleNo;
+import com.yuxin.wx.model.classes.ClassType;
+import com.yuxin.wx.model.student.StudentPaySlave;
+import com.yuxin.wx.vo.classes.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Service Interface:ClassModule
+ * @author wang.zx
+ * @date 2014-12-5
+ */
+public interface IClassModuleService  {
+	/**
+	 * 
+	* @Title: saveClassModule
+	* @Description: 新增ClassModule
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void insert(ClassModule classModule);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassModule 
+	* @Description: 批量新增ClassModule
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassModule> classModule);
+	
+	/**
+	 * 
+	* @Title: updateClassModule 
+	* @Description: 编辑ClassModule
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void update(ClassModule classModule);
+	
+	/**
+	 * 
+	* @Title: deleteClassModuleById 
+	* @Description: 根据id删除ClassModule
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassModuleById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassModuleByIds 
+	* @Description: 根据id批量删除ClassModule
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassModuleByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassModuleById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	ClassModule findClassModuleById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassModuleByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassModule>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	List<ClassModule> findClassModuleByPage(ClassModule search);
+	
+	
+	/**
+	 * 
+	* @Title: queryClassModuleByKeys 
+	* @Description: 根据条件查询模块信息
+	* @return
+	* @return List<ClassModule>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-6
+	* @user by zhangbo
+	 */
+	public List<ClassModuleVo> queryClassModuleByKeys(ClassModule classModule);
+	
+	/**
+	 * 
+	* @Title: queryClassModuleByKeysCount 
+	* @Description: 根据条件查询模块总数
+	* @return
+	* @return List<ClassModule>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-6
+	* @user by zhangbo
+	 */
+	public int queryClassModuleByKeysCount(ClassModule classModule);
+
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据id查询模块详细信息
+	 * @author Kevin
+	 * @date 2014-12-19 上午10:09:31
+	 * @version 1.0
+	 * @param moduleId
+	 * @return
+	 */
+	public ClassModuleVo queryOneVoById(Integer moduleId);
+	
+	/**
+	 * @Description:(根据二级项目查询对应的模块)
+	 * @author wang.zx 
+	 * @date 2014-12-27 下午7:20:53
+	 * @version 1.0
+	 * @param secondItemId
+	 * @return
+	 */
+	public List<ClassModule> findModulesBySecondItemId(Integer secondItemId);
+	
+	/**
+	 * @Description: 根据条件查询模块列表，不分页
+	 * @author wzx
+	 * @date 2015-5-28 下午4:52:55
+	 * @version 1.0
+	 * @return
+	 */
+	public List<ClassModule> findModulesByModule(ClassModule module);
+	
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据班级模块关系获取当前班级下面所有模块
+	 * @author Kevin
+	 * @date 2014年12月31日
+	 * @version 1.0
+	 * @param secondItemId
+	 * @return
+	 */
+	
+	public List<ClassModule> findModulesByClassTypeId(Integer classTypeId);
+	
+	/**
+	 * 根据模块id查询是否被班型所用
+	 * Class Name: IClassModuleService.java
+	 * @Description: TODO(这里用一句话描述这个方法的作用)
+	 * @author Keyn
+	 * @date 2015-2-6 下午12:45:42
+	 * @version 1.0
+	 * @param moduleId
+	 * @return
+	 */
+	Integer checkUpdate(Integer moduleId);
+	
+	/**
+	 * 根据模块id查询是否能停用
+	 * Class Name: IClassModuleService.java
+	 * @Description: TODO(这里用一句话描述这个方法的作用)
+	 * @author Keyn
+	 * @date 2015-2-6 下午12:45:42
+	 * @version 1.0
+	 * @param moduleId
+	 * @return
+	 */
+	Integer checkStop(Integer moduleId);
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据班型查询所对应的模块号
+	 * @author 权飞虎
+	 * @date 2015年4月27日 上午11:34:37
+	 * @modifier
+	 * @modify-date 2015年4月27日 上午11:34:37
+	 * @version 1.0
+	 * @param id
+	 * @return
+	 */
+	List<ClassModule> findByClassTypeId(Integer id);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 条件查询可用模块信息
+	 * @author zhang.zx
+	 * @date 2015-5-6
+	 * @modifier
+	 * @modify-date 2015-5-6
+	 * @version 1.0
+	 * @param classModule
+	 * @return
+	 */
+	List<ClassModuleVo> findAllClassModule(ClassModule classModule);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据班型查询模块
+	 * @author zhang.zx
+	 * @date 2015-5-6
+	 * @modifier
+	 * @modify-date 2015-5-6
+	 * @version 1.0
+	 * @param 
+	 * @return
+	 */
+	List<ClassModuleVo> queryAllModules(String classTypeId);
+
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据主订单查询模块
+	 * @author 权飞虎
+	 * @date 2015年5月8日 下午9:08:20
+	 * @modifier
+	 * @modify-date 2015年5月8日 下午9:08:20
+	 * @version 1.0
+	 * @param paySlave
+	 * @return
+	 */
+	List<ClassModule> findByPayMasterId(StudentPaySlave paySlave);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 通过schoolid 关联查询
+	 * @author 周文斌
+	 * @date 2015-5-8 下午8:31:53
+	 * @version 1.0
+	 * @param schoolId
+	 * @return
+	 */
+	List<ModuleLessonVo> findBySchoolId(ModuleLessonVo mlv);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 查询总条数
+	 * @author 周文斌
+	 * @date 2015-5-11 下午6:56:53
+	 * @version 1.0
+	 * @param mlv
+	 * @return
+	 */
+	Integer findCountBySchoolId(ModuleLessonVo mlv);
+	
+	/**
+	 * @Description: 根据模块id批量查询模块
+	 * @author wzx
+	 * @date 2015-5-11 上午10:09:23
+	 * @version 1.0
+	 * @param ids
+	 * @return
+	 */
+	List<ClassModule> findModuleByIds(List<String> ids);
+	
+
+	PageFinder<ClassModuleVo> querySearchPage(ClassModule module);
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据id做假删除
+	 * @author 权飞虎
+	 * @date 2015年5月12日 下午5:26:27
+	 * @modifier
+	 * @modify-date 2015年5月12日 下午5:26:27
+	 * @version 1.0
+	 * @param module
+	 */
+	void changeStatus(ClassModule module);
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据名字查询模块(不包括已经删除的)
+	 * @author 权飞虎
+	 * @date 2015年5月12日 下午9:05:56
+	 * @modifier
+	 * @modify-date 2015年5月12日 下午9:05:56
+	 * @version 1.0
+	 * @param name
+	 * @param companyId 
+	 * @return
+	 */
+	List<ClassModule> findByName(String name, Integer companyId);
+	/**
+	 * 根据schoolid查询
+	 */
+	List<ClassModule> findNameBySchool(ClassModule cm);
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据ID查询
+	 * @author 权飞虎
+	 * @date 2015年5月13日 下午3:12:38
+	 * @modifier
+	 * @modify-date 2015年5月13日 下午3:12:38
+	 * @version 1.0
+	 * @param id
+	 * @return
+	 */
+	ClassModuleVo findClassModuleVoById(Integer id);
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据条件查模块号
+	 * @author 权飞虎
+	 * @date 2015年5月17日 下午7:57:32
+	 * @modifier
+	 * @modify-date 2015年5月17日 下午7:57:32
+	 * @version 1.0
+	 * @param moduleNo
+	 * @return
+	 */
+	List<ClassModule> findClassModules(ClassModuleNo moduleNo);
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 判断当前模块是否正在在售模块中使用
+	 * @author 权飞虎
+	 * @date 2015年5月18日 下午4:05:17
+	 * @modifier
+	 * @modify-date 2015年5月18日 下午4:05:17
+	 * @version 1.0
+	 * @param id
+	 * @param currentCompanyId
+	 * @return
+	 */
+	Integer isUse(Integer id, Integer currentCompanyId);
+	
+	/**
+	 * 根据模块名称查询模块信息
+	 * zhang.zx
+	 * @param name
+	 * @return
+	 */
+	ClassModule queryModuleByName(ClassModule c);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据班型id查询模块
+	 * @author zhang.zx
+	 * @date 2015年7月14日 下午5:35:36
+	 * @modifier
+	 * @modify-date 2015年7月14日 下午5:35:36
+	 * @version 1.0
+	 * @param classTypeId
+	 * @return
+	 */
+	ClassModule queryModuleByClasstypeId(Integer classTypeId);
+	
+	/**
+	 * 添加在售模块班号
+	 * zhang.zx
+	 * @param search
+	 */
+	void insertClassModuleOnsale(ClassmoduleNoOnsaleVo search);
+	
+	/**
+	 * 根据模块号查询班号
+	 * zhang.zx
+	 * @param moduleId
+	 * @return
+	 */
+	List<ClassmoduleNoOnsaleVo> queryModuleNoByModuleId(Integer moduleId);
+	
+	/**
+	 * 删除在售班号
+	 * zhang.zx
+	 * @param id
+	 */
+	void deleteClassModuleOnsaleById(ClassmoduleNoOnsaleVo c);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description:查询视频模块信息
+	 * @author zhang.zx
+	 * @date 2015年7月7日 上午9:32:14
+	 * @modifier
+	 * @modify-date 2015年7月7日 上午9:32:14
+	 * @version 1.0
+	 * @param vc
+	 * @return
+	 */
+	List<ClassVideoModuleVo> queryVideoModule(ClassVideoModuleVo vc);
+
+    ClassModule queryMeetModuleByClasstypeId(Integer classTypeId);
+
+    /**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 根据公司id查询模块信息
+	 * @author zhang.zx
+	 * @date 2015年8月11日 下午4:26:36
+	 * @modifier
+	 * @modify-date 2015年8月11日 下午4:26:36
+	 * @version 1.0
+	 * @param companyId
+	 * @return
+	 */
+	List<ClassModule> queryModulesByCompanyId(Integer companyId);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleService.java
+	 * @Description: 添加班号
+	 * @author zhang.zx
+	 * @date 2015年8月12日 下午6:56:14
+	 * @modifier
+	 * @modify-date 2015年8月12日 下午6:56:14
+	 * @version 1.0
+	 * @param search
+	 */
+	void insertClassModuleOnsale(List<ClassmoduleNoOnsaleVo> search);
+
+    void deleteModuleNOSaleByClassTypeId(Integer classTypeId);
+
+    /**
+	 * @Description: 根据版型ID查询版型所对应的总课时
+	 * @author wzx
+	 * @date 2015-5-12 下午7:25:57
+	 * @version 1.0
+	 * @param classTypeId
+	 * @return
+	 */
+	Integer calculationHourByClassType(Integer classTypeId);
+	
+    List<ClassmoduleNoOnsaleVo> queryModuleNoByClasstypeId(Integer classTypeId);
+    
+    /**
+     * 
+     * Class Name: IClassModuleService.java
+     * @Description: 根据roomId查询公司id 培训机构id
+     * @author 周文斌
+     * @date 2015-12-11 下午3:29:40
+     * @version 1.0
+     * @param roomId
+     * @return
+     */
+    ClassModule findCompanyIdByClassNo(String roomId);
+
+    ClassModule findCompanyIdByZsReplayClassNo(String roomId);
+
+    /**
+     * 
+     * Class Name: IClassModuleService.java
+     * @Description: 修改状态
+     * @author 周文斌
+     * @date 2015-12-31 下午4:05:21
+     * @version 1.0
+     * @param param
+     */
+    void updateModelByItem(Map<String, Object> param);
+
+    int findNameCountInSameClassType(HashMap search);
+
+    CmlVo findCompanyIdByTkyClassNo(String roomId);
+
+	CmlVo findCompanyIdByRoomIdAndLiveType(CmlVo cml);
+
+    ClassModule findItemIdByLessonId(ClassModule classModule);
+
+    List<ClassModuleLesson> querySpecificClassModuleLesson(Map map);
+
+	PageFinder<ClassModuleVo> findModulesByWhere(ClassModuleVo ClassModule);
+
+    PageFinder<ClassType> findClassTypeByCourseId(ClassType classModule);
+
+    List<ClassmoduleNoOnsaleVo> findClassModuleNoById(Integer id);
+
+    List<Integer> findClassTypeByCourseIdList(ClassType classType);
+
+	List<Integer> findHasbindClassTypeByModuleId(Integer moduleId);
+
+	ClassModuleNo findByModuleIdAndTypeId(ClassmoduleNoOnsaleVo vo);
+
+    List<ClassModuleVo> findShareModules(ClassModuleVo classModule);
+
+    List<ClassModule> findHomeWorkClassModules(Integer currentCompanyId, Integer courseId);
+
+	/**
+	 * 根据课程id查询班号
+	 *
+	 * @param classTypeId
+	 * @param companyId
+	 * @return
+	 */
+    List<ClassModuleVo> queryAllModules(Integer classTypeId, Integer companyId);
+
+    /**
+    * @descreption 根据分类id获取cc点播列表
+    * @author  weijb
+    * @param
+    * @return
+    * @date        2020-04-07 17:12
+    */
+	void removeCcVideo(Integer companyId,String categoryid,String operate);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassModuleVideoRelationService.java

@@ -0,0 +1,110 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+import com.yuxin.wx.model.classes.ClassModuleVideoRelation;
+/**
+ * Service Interface:ClassModuleVideoRelation
+ * @author wang.zx
+ * @date 2014-12-5
+ */
+public interface IClassModuleVideoRelationService  {
+	/**
+	 * 
+	* @Title: saveClassModuleVideoRelation
+	* @Description: 新增ClassModuleVideoRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void insert(ClassModuleVideoRelation classModuleVideoRelation);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassModuleVideoRelation 
+	* @Description: 批量新增ClassModuleVideoRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassModuleVideoRelation> classModuleVideoRelation);
+	
+	/**
+	 * 
+	* @Title: updateClassModuleVideoRelation 
+	* @Description: 编辑ClassModuleVideoRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void update(ClassModuleVideoRelation classModuleVideoRelation);
+	
+	/**
+	 * 
+	* @Title: deleteClassModuleVideoRelationById 
+	* @Description: 根据id删除ClassModuleVideoRelation
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassModuleVideoRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassModuleVideoRelationByIds 
+	* @Description: 根据id批量删除ClassModuleVideoRelation
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassModuleVideoRelationByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassModuleVideoRelationById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	ClassModuleVideoRelation findClassModuleVideoRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassModuleVideoRelationByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassModuleVideoRelation>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	List<ClassModuleVideoRelation> findClassModuleVideoRelationByPage(ClassModuleVideoRelation search);
+	
+	/**
+	 * 
+	 * Class Name: IClassModuleVideoRelationService.java
+	 * @Description: 根据模块id删除相关模块视频关系信息
+	 * @author Keyn
+	 * @date 2015-1-6 下午2:24:03
+	 * @version 1.0
+	 * @param moduleId
+	 */
+	void deleteByModuleId(String moduleId);
+	
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassPackageCategoryService.java

@@ -0,0 +1,194 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+import java.util.Map;
+
+import com.yuxin.wx.dto.classpackage.ClassPackageCategoryDTO;
+import com.yuxin.wx.model.classes.ClassPackage;
+import com.yuxin.wx.model.classes.ClassPackageCategory;
+/**
+ * Service Interface:ClassPackageCategory
+ * @author chopin
+ * @date 2016-3-21
+ */
+public interface IClassPackageCategoryService  {
+	/**
+	 * 
+	* @Title: saveClassPackageCategory
+	* @Description: 新增ClassPackageCategory
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void insert(ClassPackageCategory entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassPackageCategory 
+	* @Description: 批量新增ClassPackageCategory
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassPackageCategory> list);
+	
+	/**
+	 * 
+	* @Title: updateClassPackageCategory 
+	* @Description: 编辑ClassPackageCategory
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void update(ClassPackageCategory entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassPackageCategoryById 
+	* @Description: 根据id删除ClassPackageCategory
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void deleteClassPackageCategoryById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassPackageCategoryByIds 
+	* @Description: 根据id批量删除ClassPackageCategory
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void deleteClassPackageCategoryByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassPackageCategoryById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	ClassPackageCategory findClassPackageCategoryById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassPackageCategoryByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassPackageCategory>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	List<ClassPackageCategory> findClassPackageCategoryByPage(ClassPackageCategory search);
+	
+	/**
+	 * 
+	 * Class Name: IClassPackageCategoryService.java
+	 * @Description: 条件查询分类列表
+	 * @author zhang.zx
+	 * @date 2016年3月21日 下午5:19:26
+	 * @modifier
+	 * @modify-date 2016年3月21日 下午5:19:26
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	List<ClassPackageCategory> queryClassCategoryLists(ClassPackageCategory search);
+	
+	/**
+	 * 
+	 * Class Name: IClassPackageCategoryService.java
+	 * @Description: 查询分类下最大id
+	 * @author zhang.zx
+	 * @date 2016年3月21日 下午5:20:40
+	 * @modifier
+	 * @modify-date 2016年3月21日 下午5:20:40
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	Integer queryMaxIdByCondition(ClassPackageCategory search);
+	
+	/**
+	 * 
+	 * Class Name: IClassPackageCategoryService.java
+	 * @Description: 查询分类下是否还存在培训批次
+	 * @author zhang.zx
+	 * @date 2016年3月21日 下午7:03:36
+	 * @modifier
+	 * @modify-date 2016年3月21日 下午7:03:36
+	 * @version 1.0
+	 * @param map
+	 * @return
+	 */
+	Integer queryIsExistClassPackage(ClassPackage search);
+	/**
+	 * 
+	 * Class Name: IClassPackageCategoryService.java
+	 * @Description: 查询所有分类
+	 * @author chopin.sun
+	 * @date 2016年3月21日 下午7:03:36
+	 * @modifier
+	 * @modify-date 2016年3月21日 下午7:03:36
+	 * @version 1.0
+	 * @param map
+	 * @return
+	 */
+	public List<ClassPackageCategory> findAll(Integer companyId);
+	
+	/**
+	 * 
+	 * Class Name: IClassPackageCategoryService.java
+	 * @Description: 条件查询某个类型(companyId and code)
+	 * @author zhang.zx
+	 * @date 2016年4月6日 下午1:42:24
+	 * @modifier
+	 * @modify-date 2016年4月6日 下午1:42:24
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	List<ClassPackageCategory> queryClassCategoryCodeByWhere(ClassPackageCategory search);
+	
+	ClassPackageCategory queryClassPackageCategoryByCode(ClassPackageCategory search);
+
+    List<ClassPackageCategory> queryAllHasSchoolId(Integer currentCompanyId, Integer integer);
+
+	void updateItems(List<ClassPackageCategory> items);
+
+    Map<Integer,String> findNameByIds(Integer companyId, List<Integer> ids);
+
+	/**
+	 * 查询分类的树节点
+	 * @param search
+	 * @return 组装好的级联树结构
+	 */
+	List<ClassPackageCategoryDTO> queryCategoryTree(ClassPackageCategory search);
+
+	/**
+	 * 查新一级分类
+	 * @param currentCompanyId
+	 * @param currentSchoolId
+	 * @return
+	 */
+    List<ClassPackageCategory> queryRootClassCategoryLists(Integer currentCompanyId, Integer currentSchoolId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassPackageMemberService.java

@@ -0,0 +1,106 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.ClassPackage;
+import com.yuxin.wx.model.classes.ClassPackageMember;
+
+import java.util.List;
+/**
+ * Service Interface:ClassPackageMember
+ * @author chopin
+ * @date 2018-3-16
+ */
+public interface IClassPackageMemberService  {
+	/**
+	 * 
+	* @Title: saveClassPackageMember
+	* @Description: 新增ClassPackageMember
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	void insert(ClassPackageMember entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassPackageMember 
+	* @Description: 批量新增ClassPackageMember
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassPackageMember> list);
+	
+	/**
+	 * 
+	* @Title: updateClassPackageMember 
+	* @Description: 编辑ClassPackageMember
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	void update(ClassPackageMember entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassPackageMemberById 
+	* @Description: 根据id删除ClassPackageMember
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	void deleteClassPackageMemberById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassPackageMemberByIds 
+	* @Description: 根据id批量删除ClassPackageMember
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	void deleteClassPackageMemberByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassPackageMemberById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	ClassPackageMember findClassPackageMemberById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassPackageMemberByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassPackageMember>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	List<ClassPackageMember> findClassPackageMemberByPage(ClassPackageMember search);
+
+	List<Integer> queryLevelIdsByPackageId(ClassPackageMember search);
+
+	void updateVipCoursePackage(ClassPackage coursePackage, List<ClassPackageMember> insertList, List<Integer> deleteList);
+
+	ClassPackageMember findByClassPackageIdAndMemberId(ClassPackageMember search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassPackageRelationService.java

@@ -0,0 +1,148 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+
+import com.yuxin.wx.dto.classpackage.ClassPackageRelationDTO;
+import com.yuxin.wx.model.classes.ClassPackageRelation;
+
+/**
+ * Service Interface:ClassPackageRelation
+ * @author chopin
+ * @date 2016-3-21
+ */
+public interface IClassPackageRelationService  {
+	/**
+	 * 
+	* @Title: saveClassPackageRelation
+	* @Description: 新增ClassPackageRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void insert(ClassPackageRelation entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassPackageRelation 
+	* @Description: 批量新增ClassPackageRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassPackageRelation> list);
+	
+	/**
+	 * 
+	* @Title: updateClassPackageRelation 
+	* @Description: 编辑ClassPackageRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void update(ClassPackageRelation entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassPackageRelationById 
+	* @Description: 根据id删除ClassPackageRelation
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void deleteClassPackageRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassPackageRelationByIds 
+	* @Description: 根据id批量删除ClassPackageRelation
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void deleteClassPackageRelationByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassPackageRelationById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	ClassPackageRelation findClassPackageRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassPackageRelationByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassPackageRelation>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	List<ClassPackageRelation> findClassPackageRelationByPage(ClassPackageRelation search);
+	
+	/**
+	 * 
+	 * Class Name: IClassPackageRelationService.java
+	 * @Description: 查询培训批次和课程中关系列表
+	 * @author zhang.zx
+	 * @date 2016年3月23日 下午5:00:24
+	 * @modifier
+	 * @modify-date 2016年3月23日 下午5:00:24
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	List<ClassPackageRelation> queryClassPackageStageRelation(ClassPackageRelation search);
+	/**
+	 * 
+	* @Title: findClassPackageRelationById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by chopin
+	 */
+	List<ClassPackageRelation> findClassPackageRelations(ClassPackageRelation search);
+
+    /*查询某一培训批次下的所有老师id*/
+    List<Integer> queryPackageTeachers(Integer id);
+	
+    /**
+	 * @Author liaoshilin
+	 * @Date 2019/03/05 18:18
+	 * param: 
+	 * @param id
+	 * @return
+	 * @Description 根据课程id删除
+	 */
+	void deleteByClassTypeId(Integer id);
+
+	/**
+	 * 设置改数据的排序并插入
+	 * @param classPackageRelation
+	 */
+    void insertWithSort(ClassPackageRelationDTO classPackageRelation);
+
+    List<ClassPackageRelation> findByClassPackageId(Integer classPackageId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassPackageService.java

@@ -0,0 +1,276 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.classes.ClassPackage;
+import com.yuxin.wx.model.classes.ClassPackageMember;
+import com.yuxin.wx.model.student.StudentPayMaster;
+import com.yuxin.wx.vo.classes.ClassPackageRelateVo;
+import com.yuxin.wx.vo.classes.ClasspackageVo;
+import com.yuxin.wx.vo.course.OrderManage;
+import com.yuxin.wx.vo.student.StudentClassLeanDetailVo;
+import com.yuxin.wx.vo.student.StudentLessTimeVo;
+
+import java.util.List;
+import java.util.Map;
+/**
+ * Service Interface:ClassPackage
+ * @author chopin
+ * @date 2016-3-21
+ */
+public interface IClassPackageService  {
+	/**
+	 * 
+	* @Title: saveClassPackage
+	* @Description: 新增ClassPackage
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void insert(ClassPackage entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassPackage 
+	* @Description: 批量新增ClassPackage
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassPackage> list);
+	
+	/**
+	 * 
+	* @Title: updateClassPackage 
+	* @Description: 编辑ClassPackage
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void update(ClassPackage entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassPackageById 
+	* @Description: 根据id删除ClassPackage
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void deleteClassPackageById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassPackageByIds 
+	* @Description: 根据id批量删除ClassPackage
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void deleteClassPackageByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassPackageById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	ClassPackage findClassPackageById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassPackageById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	ClasspackageVo findClassPackageVoById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassPackageByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassPackage>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	List<ClassPackage> findClassPackageByPage(ClassPackage search);
+	
+	/**
+	 * 
+	 * Class Name: IClassPackageService.java
+	 * @Description: 分页查询培训批次列表
+	 * @author zhang.zx
+	 * @date 2016年3月21日 下午6:56:17
+	 * @modifier
+	 * @modify-date 2016年3月21日 下午6:56:17
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	PageFinder<ClassPackage> findClassPackageLists(ClassPackage search);
+	
+	/**
+	 * 
+	 * Class Name: IClassPackageService.java
+	 * @Description: 查询培训批次（不含分页）
+	 * @author zhang.zx
+	 * @date 2016年3月22日 下午1:51:47
+	 * @modifier
+	 * @modify-date 2016年3月22日 下午1:51:47
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	List<ClassPackage> queryClassPackageByWhere(ClassPackage search);
+	
+	/**
+	 * 
+	 * Class Name: IClassPackageService.java
+	 * @Description: 查询培训批次订单列表
+	 * @author zhang.zx
+	 * @date 2016年3月29日 上午11:43:34
+	 * @modifier
+	 * @modify-date 2016年3月29日 上午11:43:34
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	PageFinder<OrderManage> findClassPackageOrderList(OrderManage search);
+	/**
+	 * 查询培训批次里所有的版型id
+	 */
+	List<Integer> findClassPackageAllClasses(Integer classPackageId);
+	
+	PageFinder<ClassPackage> queryClassPackageHasCountsByCondition(ClassPackage search);
+
+	Object findByCondition(ClasspackageVo search);
+	
+	List<ClassPackage> queryCommodityByClassPackage(ClassPackage search);
+	
+	ClassPackage queryClassPackageByComId(Integer id);
+	
+	List<ClassPackage> queryClassPackageInPayMasterCondition(ClassPackage search);
+
+	PageFinder<ClasspackageVo> queryVipCoursePackageListByVipId(ClassPackageMember search);
+
+    void delVipCoursePackage(ClassPackageMember search);
+
+	void addVipCoursePackages(List<ClassPackage> vipClassPackage, List<ClassPackageMember> vipRelation);
+
+    List<ClassPackage> queryPackageByProtocolId(ClassPackage search);
+
+    List<ClasspackageVo> findByIds(List<Integer> list);
+	List<Map<String,Object>> getTodateMaster(StudentPayMaster studentPayMaster);
+	int getTodateMasterCount(StudentPayMaster studentPayMaster);
+    List<ClasspackageVo> queryClassPackageByConditionNew(Map<String,Object> map);
+
+    List<ClasspackageVo> findByIdsNew(Map<String,Object> map);
+
+    List<Integer> queryClassPackageExistClassTypeIds(Integer classPackageId);
+
+    Integer countPackageClasstype(Integer id);
+
+    Map<Integer,String> findNameByIds(Integer companyId, List<Integer> ids);
+
+    ClassPackage findById(Integer courseId);
+
+	/**
+	 * 关联培训批次页面搜索
+	 * @param search
+	 * @return
+	 */
+	PageFinder<ClassPackageRelateVo> queryRelateClassPackageList(ClassPackage search);
+
+    Integer findByCommontyId(Integer commodityId);
+
+	/**
+	 * 根据培训批次ID，获取对应的源培训批次ID
+	 *
+	 * @param classPackageId 培训批次ID
+	 * @return 源培训批次ID，如没有则返回null
+	 */
+    Integer findSupplyCourseId(Integer classPackageId);
+
+	/**
+	 * 判断培训批次能否被删除 1：被代理不能删除；2：未停止招生 和 下架不能删除
+	 *
+	 * @param classPackageId 培训批次ID
+	 * @return 是否可以被删除
+	 */
+	boolean checkCanDelete(Integer classPackageId);
+
+	PageFinder<ClasspackageVo> findStuBuyClassPackage(ClasspackageVo classpackageVo);
+
+	List<StudentLessTimeVo> queryLessionList(Map<String, Object> map);
+
+	List<StudentLessTimeVo> queryCpLesList(StudentClassLeanDetailVo conditon);
+
+	StudentLessTimeVo findLesByCmnIds(List<Integer> cmoList, Integer userId);
+
+	/**
+	 * 所有的视频课次数
+	 */
+	Integer queryLecCount(Integer classTypeId);
+
+	/**
+	 * 已经完成的视频课次
+	 */
+	Integer queryLecFinishCount(Integer classTypeId, Integer stuId);
+
+	List<StudentLessTimeVo> queryLessionListDuoban(Map<String, Object> map);
+
+	/**
+	 * @Title: ClassPackageServiceImpl.java
+	 * @Package com.yuxin.wx.classes.impl
+	 * @Description: TODO 处理面授时间问题
+	 * @author actor
+	 * @date 2019年3月12日 下午8:09:02
+	 * @param
+	 * @return
+	 * @version V6.3_study
+	 */
+	Map<String, Integer> findFaceLesByCmnIds(List<Integer> faceList, Integer userId);
+
+    Integer queryCpLecCount(StudentClassLeanDetailVo codition);
+
+    /**
+     * 检查购买过的阶段
+     */
+    List<Integer> findHasBuyStage(Integer stuId, Integer classPackeId);
+
+    /**
+     * 课程包 已经完成的视频课次
+     */
+    Integer queryCpLecFinishCount(StudentClassLeanDetailVo codition);
+
+    /**
+     * 课程包 购买部分阶段时的已经完成的视频课次
+     */
+    Integer queryCpHasBuyStageLecFinishCount(StudentClassLeanDetailVo codition);
+
+    Map<String, String> leanPercent(Integer companyId, Integer classTypeId, Integer stuId, Integer userId, String type, Integer classPackageId, Map<String, String> conditionMap);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassPackageStageService.java

@@ -0,0 +1,123 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.classes.ClassPackageStage;
+import com.yuxin.wx.vo.classes.ClassPackageStageVo;
+
+/**
+ * Service Interface:ClassPackageStage
+ * @author chopin
+ * @date 2016-3-21
+ */
+public interface IClassPackageStageService  {
+	/**
+	 * 
+	* @Title: saveClassPackageStage
+	* @Description: 新增ClassPackageStage
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void insert(ClassPackageStage entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassPackageStage 
+	* @Description: 批量新增ClassPackageStage
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassPackageStage> list);
+	
+	/**
+	 * 
+	* @Title: updateClassPackageStage 
+	* @Description: 编辑ClassPackageStage
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void update(ClassPackageStage entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassPackageStageById 
+	* @Description: 根据id删除ClassPackageStage
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void deleteClassPackageStageById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassPackageStageByIds 
+	* @Description: 根据id批量删除ClassPackageStage
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	void deleteClassPackageStageByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassPackageStageById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	ClassPackageStage findClassPackageStageById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassPackageStageByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassPackageStage>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-3-21
+	* @user by wangzx
+	 */
+	List<ClassPackageStage> findClassPackageStageByPage(ClassPackageStage search);
+	
+	/**
+	 * 
+	 * Class Name: IClassPackageStageService.java
+	 * @Description: 查询培训批次下的所有阶段
+	 * @author zhang.zx
+	 * @date 2016年3月23日 下午3:43:18
+	 * @modifier
+	 * @modify-date 2016年3月23日 下午3:43:18
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	List<ClassPackageStage> queryClassPackageStages(ClassPackageStage search);
+
+	/**
+	 * 阶段列表
+	 * @param classPackageStage
+	 * @return 阶段名称、阶段title、课程数量、售价
+	 */
+    PageFinder<ClassPackageStageVo> queryRelateClassPackageStageList(ClassPackageStage classPackageStage);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassTypeDetailService.java

@@ -0,0 +1,19 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.ClassTypeDetail;
+
+/**
+ * 课程、培训批次拓展字段表
+ *
+ * @author PengSongHe
+ * @date 2019/11/17 16:15
+ */
+public interface IClassTypeDetailService {
+    void insert(ClassTypeDetail entity);
+
+    void update(ClassTypeDetail entity);
+
+    ClassTypeDetail findByProductId(Integer productId, Integer type);
+
+    void updateByGroupQr(Integer productId, Integer type, Integer groupQrOpen, String groupQrImg);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassTypeLessonDataRelationService.java

@@ -0,0 +1,13 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.ClassTypeLessonDataRelation;
+
+/**
+ * @className: IClassTypeLessonDataRelationService.java
+ * @description:
+ * @author: luogang
+ * @createDate: 2018-09-17 10:10
+ */
+public interface IClassTypeLessonDataRelationService {
+    ClassTypeLessonDataRelation findClassTypeLessonId(Integer currentCompanyId, Integer id);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassTypeMeetItemRelationService.java

@@ -0,0 +1,104 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.ClassTypeMeetItemRelation;
+
+import java.util.List;
+/**
+ * Service Interface:ClassTypeMeetItemRelation
+ * @author chopin
+ * @date 2017-8-10
+ */
+public interface IClassTypeMeetItemRelationService  {
+	/**
+	 * 
+	* @Title: saveClassTypeMeetItemRelation
+	* @Description: 新增ClassTypeMeetItemRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-8-10
+	* @user by wangzx
+	 */
+	void insert(ClassTypeMeetItemRelation entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassTypeMeetItemRelation 
+	* @Description: 批量新增ClassTypeMeetItemRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-8-10
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassTypeMeetItemRelation> list);
+	
+	/**
+	 * 
+	* @Title: updateClassTypeMeetItemRelation 
+	* @Description: 编辑ClassTypeMeetItemRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-8-10
+	* @user by wangzx
+	 */
+	void update(ClassTypeMeetItemRelation entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeMeetItemRelationById 
+	* @Description: 根据id删除ClassTypeMeetItemRelation
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-8-10
+	* @user by wangzx
+	 */
+	void deleteClassTypeMeetItemRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeMeetItemRelationByIds 
+	* @Description: 根据id批量删除ClassTypeMeetItemRelation
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-8-10
+	* @user by wangzx
+	 */
+	void deleteClassTypeMeetItemRelationByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassTypeMeetItemRelationById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-8-10
+	* @user by wangzx
+	 */
+	ClassTypeMeetItemRelation findClassTypeMeetItemRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassTypeMeetItemRelationByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassTypeMeetItemRelation>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-8-10
+	* @user by wangzx
+	 */
+	List<ClassTypeMeetItemRelation> findClassTypeMeetItemRelationByPage(ClassTypeMeetItemRelation search);
+
+
+	List<ClassTypeMeetItemRelation> findBySearch(ClassTypeMeetItemRelation search);
+
+	void insertOrUpdate(List<ClassTypeMeetItemRelation> json_arr, String[] delIdArray, List<ClassTypeMeetItemRelation> teacherList);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassTypeMemberDiscountService.java

@@ -0,0 +1,165 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+import java.util.Map;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.classes.ClassTypeMemberDiscount;
+import com.yuxin.wx.vo.classes.ClassTypeMemberDiscountVo;
+import com.yuxin.wx.vo.company.MemberLevelAndClassTypeVo;
+/**
+ * Service Interface:ClassTypeMemberDiscount
+ * @author chopin
+ * @date 2016-5-17
+ */
+public interface IClassTypeMemberDiscountService  {
+	/**
+	 * 
+	* @Title: saveClassTypeMemberDiscount
+	* @Description: 新增ClassTypeMemberDiscount
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	void insert(ClassTypeMemberDiscount entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassTypeMemberDiscount 
+	* @Description: 批量新增ClassTypeMemberDiscount
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassTypeMemberDiscount> list);
+	
+	/**
+	 * 
+	* @Title: updateClassTypeMemberDiscount 
+	* @Description: 编辑ClassTypeMemberDiscount
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	void update(ClassTypeMemberDiscount entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeMemberDiscountById 
+	* @Description: 根据id删除ClassTypeMemberDiscount
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	void deleteClassTypeMemberDiscountById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeMemberDiscountByIds 
+	* @Description: 根据id批量删除ClassTypeMemberDiscount
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	void deleteClassTypeMemberDiscountByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassTypeMemberDiscountById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	ClassTypeMemberDiscount findClassTypeMemberDiscountById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassTypeMemberDiscountByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassTypeMemberDiscount>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	List<ClassTypeMemberDiscount> findClassTypeMemberDiscountByPage(ClassTypeMemberDiscount search);
+	
+	/**
+	 * 课程会员等级列表
+	 * @param search
+	 * @return
+	 */
+	List<ClassTypeMemberDiscount> findClassLevelList(ClassTypeMemberDiscount search);
+	
+	/**
+	 * 更新课程会员信息
+	 * @param list
+	 * @return
+	 */
+	String updateClassTypeMember(Integer companyId,Integer cId,List<ClassTypeMemberDiscount> list);
+	
+	/**
+	 * 
+	 * @Description:根据会员等级id查询课程
+	 * @author: dongshuai
+	 * @date: 2016年5月26日
+	 * @param search
+	 * @return
+	 *
+	 */
+	List<MemberLevelAndClassTypeVo> queryMemberLevelAndClassTypeVoListByMemberId(ClassTypeMemberDiscountVo search);
+	
+	
+	/**
+	 * 
+	 * @Description:保存会员课程
+	 * @author: dongshuai
+	 * @date: 2016年5月26日
+	 * @param memberId
+	 * @param ids
+	 * @param companyId
+	 * @return
+	 *
+	 */
+//	boolean saveClassType(String memberId,String ids,int companyId);
+	Map<String,Object> saveClassType(String memberId, String ids, int companyId);
+
+	PageFinder<MemberLevelAndClassTypeVo> queryMemberLevelAndClassTypeVoListByMemberIdPage(
+			ClassTypeMemberDiscount search);
+	
+	/**
+	 * 
+	 * @Description:根据课程id和会员id查询课程信息
+	 * @author: dongshuai
+	 * @date: 2016年5月29日
+	 * @param classTypeId
+	 * @return
+	 *
+	 */
+	MemberLevelAndClassTypeVo queryMemberLevelAndClassTypeVoByClassId(ClassTypeMemberDiscount ctmd);
+	
+	ClassTypeMemberDiscount findDiscountByMemberIdAndClassTypeId(ClassTypeMemberDiscount ctmd);
+
+	void deleteClassTypeMemberDiscountByMemberId(Integer id);
+	
+	int selectClassTypeCount(Integer id);
+
+    List<MemberLevelAndClassTypeVo> findVipCourseClassNew(Map<String,Object> map);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassTypeModuleRelationService.java

@@ -0,0 +1,168 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.yuxin.wx.model.classes.ClassType;
+import com.yuxin.wx.model.classes.ClassTypeModuleRelation;
+import com.yuxin.wx.vo.classes.ClassTypeModuleRelationVo;
+/**
+ * Service Interface:ClassTypeModuleRelation
+ * @author wang.zx
+ * @date 2014-12-5
+ */
+public interface IClassTypeModuleRelationService  {
+	/**
+	 * 
+	* @Title: saveClassTypeModuleRelation
+	* @Description: 新增ClassTypeModuleRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void insert(ClassTypeModuleRelation classTypeModuleRelation);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassTypeModuleRelation 
+	* @Description: 批量新增ClassTypeModuleRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassTypeModuleRelation> classTypeModuleRelation);
+	
+	/**
+	 * 
+	* @Title: updateClassTypeModuleRelation 
+	* @Description: 编辑ClassTypeModuleRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void update(ClassTypeModuleRelation classTypeModuleRelation);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeModuleRelationById 
+	* @Description: 根据id删除ClassTypeModuleRelation
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassTypeModuleRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeModuleRelationByIds 
+	* @Description: 根据id批量删除ClassTypeModuleRelation
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassTypeModuleRelationByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassTypeModuleRelationById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	ClassTypeModuleRelation findClassTypeModuleRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassTypeModuleRelationByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassTypeModuleRelation>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	List<ClassTypeModuleRelation> findClassTypeModuleRelationByPage(ClassTypeModuleRelation search);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeModuleRelationService.java
+	 * @Description: 根据班型id删除相关联 的模块
+	 * @author Keyn
+	 * @date 2015-1-5 下午3:38:39
+	 * @version 1.0
+	 * @param classTypeId
+	 */
+	public void deleteByClassTypeId(String classTypeId);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeModuleRelationService.java
+	 * @Description: 根据班型id 查询模块id
+	 * @author 周文斌
+	 * @date 2015-5-4 下午5:44:49
+	 * @version 1.0
+	 * @param classTypeId
+	 * @return
+	 */
+	List<Integer> findModelIdByClassTypeId(List<ClassType> classTypes);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeModuleRelationService.java
+	 * @Description: 根据班型更新模块
+	 * @author zhang.zx
+	 * @date 2015-5-4 下午5:44:49
+	 * @version 1.0
+	 * @param classTypeId
+	 * @return
+	 */
+	void updateModuleByClassTypeId(ClassTypeModuleRelation classTypeModuleRelation);
+	
+	/**
+	 * @Description: 根据条件查询所有的模块关联信息
+	 * @author wzx
+	 * @date 2015-6-30 下午3:15:18
+	 * @version 1.0
+	 * @param map
+	 * @return
+	 */
+	List<ClassTypeModuleRelationVo> findClassModuleRelationByClassTypeId(HashMap map);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeModuleRelationService.java
+	 * @Description: 根据ClassTypeID查询全部ModuleID
+	 * @author dongshuai
+	 * @date 2016年8月31日 下午5:02:48
+	 * @version 1.0
+	 * @param id
+	 * @return
+	 */
+	List<Integer> findClassModuleIdsByClassTypeId(Integer id);
+
+	List<ClassTypeModuleRelation> queryClassTypeIdByModuleId(Integer moduleId);
+
+	List<ClassTypeModuleRelationVo> findClassModuleRelationByPackageId(HashMap map);
+
+    void deleteByWhere(ClassTypeModuleRelation relation);
+
+	void deleteByCondition(String teachMethod, Integer id);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassTypeRemoteRelationService.java

@@ -0,0 +1,125 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+
+import com.yuxin.wx.model.classes.ClassTypeRemoteRelation;
+import com.yuxin.wx.vo.classes.ModuleRemoteVo;
+/**
+ * Service Interface:ClassTypeRemoteRelation
+ * @author wang.zx
+ * @date 2014-12-5
+ */
+public interface IClassTypeRemoteRelationService  {
+	/**
+	 * 
+	* @Title: saveClassTypeRemoteRelation
+	* @Description: 新增ClassTypeRemoteRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void insert(ClassTypeRemoteRelation classTypeRemoteRelation);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassTypeRemoteRelation 
+	* @Description: 批量新增ClassTypeRemoteRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassTypeRemoteRelation> classTypeRemoteRelation);
+	
+	/**
+	 * 
+	* @Title: updateClassTypeRemoteRelation 
+	* @Description: 编辑ClassTypeRemoteRelation
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void update(ClassTypeRemoteRelation classTypeRemoteRelation);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeRemoteRelationById 
+	* @Description: 根据id删除ClassTypeRemoteRelation
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassTypeRemoteRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeRemoteRelationByIds 
+	* @Description: 根据id批量删除ClassTypeRemoteRelation
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassTypeRemoteRelationByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassTypeRemoteRelationById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	ClassTypeRemoteRelation findClassTypeRemoteRelationById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassTypeRemoteRelationByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassTypeRemoteRelation>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	List<ClassTypeRemoteRelation> findClassTypeRemoteRelationByPage(ClassTypeRemoteRelation search);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeRemoteRelationService.java
+	 * @Description: 根据班型id删除相关联的远程教育模块
+	 * @author Keyn
+	 * @date 2015-1-5 下午3:40:52
+	 * @version 1.0
+	 * @param classTypeId
+	 */
+	public void deleteByClassTypeId(String classTypeId);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeModuleRelationService.java
+	 * @Description:根据班型id查询远程模块
+	 * @author zhang.zx
+	 * @date 2015年5月26日 下午6:56:14
+	 * @modifier
+	 * @modify-date 2015年5月26日 下午6:56:14
+	 * @version 1.0
+	 * @param classTypeId
+	 * @return
+	 */
+	List<ModuleRemoteVo> queryRomoteListByClassTypeId(Integer classTypeId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassTypeResourceService.java

@@ -0,0 +1,154 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.ClassTypeResource;
+import com.yuxin.wx.vo.classes.ClassTypeResourceVo;
+
+import java.util.List;
+/**
+ * Service Interface:ClassTypeResource
+ * @author wang.zx
+ * @date 2015-8-11
+ */
+public interface IClassTypeResourceService  {
+	/**
+	 * 
+	* @Title: saveClassTypeResource
+	* @Description: 新增ClassTypeResource
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	void insert(ClassTypeResource entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassTypeResource 
+	* @Description: 批量新增ClassTypeResource
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassTypeResource> list);
+	
+	/**
+	 * 
+	* @Title: updateClassTypeResource 
+	* @Description: 编辑ClassTypeResource
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	void update(ClassTypeResource entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeResourceById 
+	* @Description: 根据id删除ClassTypeResource
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	void deleteClassTypeResourceById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeResourceByIds 
+	* @Description: 根据id批量删除ClassTypeResource
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	void deleteClassTypeResourceByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassTypeResourceById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	ClassTypeResource findClassTypeResourceById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassTypeResourceByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassTypeResource>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	List<ClassTypeResource> findClassTypeResourceByPage(ClassTypeResource search);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeResourceService.java
+	 * @Description: 分页查询列表
+	 * @author 周文斌
+	 * @date 2015-8-11 下午6:29:39
+	 * @version 1.0
+	 * @param res
+	 * @return
+	 */
+	List<ClassTypeResourceVo> findResBy(ClassTypeResource res);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeResourceService.java
+	 * @Description: 查询总数
+	 * @author 周文斌
+	 * @date 2015-8-11 下午6:32:49
+	 * @version 1.0
+	 * @param res
+	 * @return
+	 */
+	Integer findResCountBy(ClassTypeResource res);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeResourceService.java
+	 * @Description: 条件查询资料信息
+	 * @author zhang.zx
+	 * @date 2015年9月8日 下午7:06:40
+	 * @modifier
+	 * @modify-date 2015年9月8日 下午7:06:40
+	 * @version 1.0
+	 * @param res
+	 * @return
+	 */
+	List<ClassTypeResourceVo> findResByCondition(ClassTypeResource res);
+
+    List<ClassTypeResourceVo> findOne2OnePersonalResList(ClassTypeResource res);
+
+    Integer findOne2OnePersonalResListCount(ClassTypeResource res);
+
+    List<ClassTypeResourceVo> findOne2OnePersonalResListWithOutPage(ClassTypeResource res);
+
+    List<ClassTypeResourceVo> findResMeetBy(ClassTypeResource res);
+
+	Integer findResCountMeetBy(ClassTypeResource res);
+
+    List<ClassTypeResourceVo> findMeetCourseSourceDetail(ClassTypeResource classTypeResource);
+
+	List<ClassTypeResource> findByLectureId(Integer lectureId);
+	// 根据课程id查询并且节id为空的情况
+	List<ClassTypeResource> findByClassTypeId(Integer classTypeId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassTypeResourceTypeService.java

@@ -0,0 +1,123 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+
+import com.yuxin.wx.model.classes.ClassTypeResourceType;
+/**
+ * Service Interface:ClassTypeResourceType
+ * @author wang.zx
+ * @date 2015-8-11
+ */
+public interface IClassTypeResourceTypeService  {
+	/**
+	 * 
+	* @Title: saveClassTypeResourceType
+	* @Description: 新增ClassTypeResourceType
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	void insert(ClassTypeResourceType entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassTypeResourceType 
+	* @Description: 批量新增ClassTypeResourceType
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassTypeResourceType> list);
+	
+	/**
+	 * 
+	* @Title: updateClassTypeResourceType 
+	* @Description: 编辑ClassTypeResourceType
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	void update(ClassTypeResourceType entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeResourceTypeById 
+	* @Description: 根据id删除ClassTypeResourceType
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	void deleteClassTypeResourceTypeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeResourceTypeByIds 
+	* @Description: 根据id批量删除ClassTypeResourceType
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	void deleteClassTypeResourceTypeByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassTypeResourceTypeById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	ClassTypeResourceType findClassTypeResourceTypeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassTypeResourceTypeByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassTypeResourceType>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-8-11
+	* @user by wangzx
+	 */
+	List<ClassTypeResourceType> findClassTypeResourceTypeByPage(ClassTypeResourceType search);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeResourceTypeService.java
+	 * @Description: 根据公司id查询资源类型
+	 * @author 周文斌
+	 * @date 2015-8-11 下午5:49:56
+	 * @version 1.0
+	 * @param compnayId
+	 * @return
+	 */
+	List<ClassTypeResourceType> findResourceTypeByCompanpyId(Integer companyId);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeResourceTypeService.java
+	 * @Description: 查询是否存在
+	 * @author 周文斌
+	 * @date 2015-8-12 上午10:44:43
+	 * @version 1.0
+	 * @param ctrt
+	 * @return
+	 */
+	ClassTypeResourceType findResourceTypeBy(ClassTypeResourceType ctrt);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassTypeService.java

@@ -0,0 +1,502 @@
+package com.yuxin.wx.api.classes;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.dto.Resp;
+import com.yuxin.wx.model.classes.ClassType;
+import com.yuxin.wx.model.commodity.Commodity;
+import com.yuxin.wx.vo.classes.ClassPackageConditionVo;
+import com.yuxin.wx.vo.classes.ClassTypeVo;
+import com.yuxin.wx.vo.company.MemberLevelAndClassTypeVo;
+/**
+ * Service Interface:ClassType
+ * @author wang.zx
+ * @date 2014-12-5
+ */
+public interface IClassTypeService  {
+	/**
+	 * 
+	* @Title: saveClassType
+	* @Description: 新增ClassType
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void insert(ClassType classType);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassType 
+	* @Description: 批量新增ClassType
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassType> classType);
+	
+	/**
+	 * 
+	* @Title: updateClassType 
+	* @Description: 编辑ClassType
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void update(ClassType classType);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeById 
+	* @Description: 根据id删除ClassType
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassTypeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeByIds 
+	* @Description: 根据id批量删除ClassType
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	void deleteClassTypeByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassTypeById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by wangzx
+	 */
+	ClassType findClassTypeById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassTypeList
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by Chopin
+	 */
+	List<ClassType> findClassTypeList(ClassType classType);
+	
+	/**
+	 * 
+	* @Title: findClassTypeList
+	* @Description: 根据id查询远程班型
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by Chopin
+	 */
+	List<ClassType> findClassTypeList2(ClassType classType);
+	
+	/**
+	 * 
+	* @Title: queryClassTypeByKeysForPage 
+	* @Description: 分页查询
+	* @return
+	* @return PageFinder<ClassTypeVo>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-1-1
+	* @user by zhangbo
+	 */
+	public PageFinder<ClassTypeVo> queryClassTypeByKeysForPage(ClassType search);
+	
+	/**
+	 * 
+	* @Title: findClassTypeDetail 
+	* @Description: 获取班型详细信息
+	* @return
+	* @return List<ClassType>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2014-12-5
+	* @user by chopin
+	 */
+	ClassTypeVo findClassTypeDetail(Map<String,String> map);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 添加班型相关联的模块信息或者远程教育信息
+	 * @author Keyn
+	 * @date 2015-1-5 下午3:46:11
+	 * @version 1.0
+	 * @param classType
+	 * @param ralationsIdVal
+	 */
+	public void updateClassTypeRalation(ClassType classType,String ralationsIdVal);
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 查询所报班型
+	 * @author 权飞虎
+	 * @date 2015年4月25日 下午6:22:35
+	 * @modifier
+	 * @modify-date 2015年4月25日 下午6:22:35
+	 * @version 1.0
+	 * @param id	学生id
+	 * @param companyId		公司id	
+	 * @param payMasterId 	订单id
+	 * @return
+	 */
+	ClassType findClassTypeByStuId(Integer id, Integer companyId, Integer payMasterId);
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Descript 权飞虎
+	 * @date 2015年4月29日 下午4:03:32
+	 * @modifier
+	 * @modify-date 2015年4月29日 下午4:03:32
+	 * @version 1.0
+	 * @param id
+	 * @param object
+	 * @return
+	 */
+	List<ClassType> findByItem(Integer conpanyId,Integer schoolId,Integer itemOneId,Integer itemTwoId);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 查询班型详情
+	 * @author zhang.zx
+	 * @date 2015年5月5日 上午10:43:43
+	 * @modifier
+	 * @modify-date 2015年5月5日 上午10:43:43
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	PageFinder<ClassTypeVo> findClassTypesByPage(ClassType search);
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description:根据远程信息查询班型
+	 * @author 权飞虎
+	 * @date 2015年5月13日 下午6:01:58
+	 * @modifier
+	 * @modify-date 2015年5月13日 下午6:01:58
+	 * @version 1.0
+	 * @param id
+	 * @return
+	 */
+	List<ClassType> findByRemote(Integer id);
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 根君班号查询班型
+	 * @author 权飞虎
+	 * @date 2015年5月13日 下午6:13:53
+	 * @modifier
+	 * @modify-date 2015年5月13日 下午6:13:53
+	 * @version 1.0
+	 * @param id
+	 * @return
+	 */
+	List<ClassType> findByModule(Integer id);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 根据班型名称查询班
+	 * @author zhang.zx
+	 * @date 2015年5月5日 上午10:43:43
+	 * @modifier
+	 * @modify-date 2015年5月5日 上午10:43:43
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	ClassType findClassTypeByName(String name,Integer companyId,Integer schoolId,Integer oneItem,Integer towItem);
+
+	/**
+	 * 
+	 * Class Name: ICommodityService.java
+	 * @Description: 查询是否 还有出售中的班型 根据学校id 和 公司id
+	 * @author 周文斌
+	 * @date 2015-5-13 下午6:36:07
+	 * @version 1.0
+	 * @param param
+	 * @return
+	 */
+	List<String> findNameById(Map<String,Object> param);
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 查询该公司所有未删除班型
+	 * @author 权飞虎
+	 * @date 2015年5月15日 上午10:38:58
+	 * @modifier
+	 * @modify-date 2015年5月15日 上午10:38:58
+	 * @version 1.0
+	 * @param classType
+	 * @return
+	 */
+	List<ClassType> findClassTypeList3(Integer companyId);
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 根据一级项目查询版型
+	 * @author admin
+	 * @date 2015年5月15日 下午2:45:21
+	 * @modifier
+	 * @modify-date 2015年5月15日 下午2:45:21
+	 * @version 1.0
+	 * @param itemOneId
+	 * @param companyId
+	 * @return
+	 */
+	List<ClassType> findByItemOne(Integer itemOneId, Integer companyId);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityService.java
+	 * @Description:改变班型收藏状态
+	 * @author zhang.zx
+	 * @date 2015-5-13 下午6:36:07
+	 * @version 1.0
+	 * @param param
+	 * @return
+	 */
+	void changClassTypeCollectStatus(ClassType classType);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 查询班型是否存在
+	 * @author zhang.zx
+	 * @date 2015年5月26日 下午4:12:18
+	 * @modifier
+	 * @modify-date 2015年5月26日 下午4:12:18
+	 * @version 1.0
+	 * @param classType
+	 * @return
+	 */
+	List<ClassType> findClassTypeExits(ClassType classType);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 条件查询班型信息
+	 * @author zhang.zx
+	 * @date 2015年6月3日 下午7:01:38
+	 * @modifier
+	 * @modify-date 2015年6月3日 下午7:01:38
+	 * @version 1.0
+	 * @param classType
+	 * @return
+	 */
+	List<ClassType> findClassTypeByCondition(ClassType classType);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 查询班型id name
+	 * @author 周文斌
+	 * @date 2015-7-16 下午2:38:19
+	 * @version 1.0
+	 * @param conpanyId
+	 * @param schoolId
+	 * @param itemOneId
+	 * @param itemTwoId
+	 * @return
+	 */
+	List<ClassType> findClassByItem(Integer conpanyId,Integer schoolId,Integer itemOneId,Integer itemTwoId);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 根据公司id查询班型信息
+	 * @author zhang.zx
+	 * @date 2015年8月11日 下午4:21:18
+	 * @modifier
+	 * @modify-date 2015年8月11日 下午4:21:18
+	 * @version 1.0
+	 * @param companyId
+	 * @return
+	 */
+	List<ClassType> findClassTypeBycompanyId(Integer companyId);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 购买课程,根据商品id查询所购买的课程
+	 * @author 权飞虎
+	 * @date 2015年4月13日 下午4:36:50
+	 * @modifier
+	 * @modify-date 2015年4月13日 下午4:36:50
+	 * @version 1.0
+	 * @param id
+	 * @return
+	 */
+	ClassType findClassTypeByCommodity(Integer id);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 查询学科下 课程列表
+	 * @author 周文斌
+	 * @date 2015-12-22 下午3:22:41
+	 * @version 1.0
+	 * @param commodity
+	 * @return
+	 */
+	List<Integer> findClassTypeByClass(ClassType ct);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 课程是否可见
+	 * @author 周文斌
+	 * @date 2015-12-22 下午3:33:34
+	 * @version 1.0
+	 * @param param
+	 */
+	void updateDeflag(Map<String, Object> param);
+	
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 查询培训批次下的课程
+	 * @author zhang.zx
+	 * @date 2016年3月23日 下午4:27:09
+	 * @modifier
+	 * @modify-date 2016年3月23日 下午4:27:09
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	List<ClassTypeVo> queryClassTypesByClassPackage(ClassPackageConditionVo search);
+	List<ClassTypeVo> queryClassTypesByClassPackage2(ClassPackageConditionVo search);
+	/**
+	 * 
+	 * Class Name: IClassTypeService.java
+	 * @Description: 查询培训批次下是否存在某个课
+	 * @author zhang.zx
+	 * @date 2016年3月23日 下午5:59:55
+	 * @modifier
+	 * @modify-date 2016年3月23日 下午5:59:55
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	List<ClassTypeVo> queryIsExistByClassPackage(ClassPackageConditionVo search);
+	
+	/**
+	 * 
+	 * @Description:查询允许使用会员的课程
+	 * @author: dongshuai
+	 * @date: 2016年5月26日
+	 * @param param
+	 * @return
+	 *
+	 */
+	PageFinder<ClassTypeVo> queryClassTypeForMember(MemberLevelAndClassTypeVo mlactVo);
+	PageFinder<ClassTypeVo> queryClassTypeForMemberShare(MemberLevelAndClassTypeVo mlactVo);
+	List<ClassType> queryCourseByOneAndTwoItem(ClassType search);
+	List<ClassType> queryCourseByOneAndTwoItemCertificate(ClassType search);
+	List<ClassType> findClassTypeList4(Integer companyId);
+
+	ClassTypeVo findClassTypeVoByClassTypeId(Integer classTypeId);
+
+	List<ClassType> findAllclassType(ClassType cp);
+
+    List<ClassType> findClassTypeByTeacherId(ClassType cp);
+
+    List<ClassType> queryClassTypeByItemOneOrItemTwo(ClassType cp);
+	
+	List<Map<Integer,String>> findTikuClassTypeIdsByItem(HashMap<String, String> search);
+
+    Integer selClassPackageNumByClassTypeId(Integer id);
+    int allCourseCount(Integer company);
+    List<ClassType> getHelpVideoByCompanyId(Integer companyId,String likeStr);
+
+    List<ClassTypeVo> queryTemplateClassType(Map<String,Object> map);
+
+    /*查询所有录播课课次数*/
+    Integer queryLecCount(Integer id);
+
+    /*查询所有直播、面授课课次数*/
+    Integer queryLessionCount(Integer id);
+
+    List<ClassTypeVo> queryByIds(Map<String,Object> map);
+
+    List<ClassTypeVo> queryTemplateClassTypesByPageShare(Map<String,Object> map);
+
+    ClassType findClassTypeByLessonId(Integer companyId, Integer id);
+
+    List<ClassType> queryCourseByItem(ClassType cp);
+
+    Map<Integer, String> findNameByIds(Integer companyId, List<Integer> ids);
+
+    ClassType findById(Integer courseId);
+	/**
+	 * 复制课程
+	 * @author 魏俊标
+	 * @date 2019-07-15
+	 * @param classType
+	 */
+	Map<String, Object> copyClassType(ClassType classType);
+
+	int queryStageOfClassPackage(Integer currentCompanyId, Integer classPackageId);
+
+	/**
+	 * 根据培训批次查询所有的课程
+	 *
+	 * @param search
+	 * @return
+	 */
+	List<ClassTypeVo> listClassTypesByClassPackage(ClassPackageConditionVo search);
+
+	/**
+	 * 计算培训批次总价格
+	 *
+	 * @param companyId      机构ID
+	 * @param classPackageId 培训批次ID
+	 * @return 培训批次总金额
+	 */
+	BigDecimal calculateTotalAmount(Integer companyId, Integer classPackageId);
+
+	/**
+	 * 根据课程ID，获取对应的源课程ID
+	 *
+	 * @param classTypeId 课程ID
+	 * @return 源课程ID，如没有则返回null
+	 */
+	Integer findSupplyCourseId(Integer classTypeId);
+
+    boolean checkCanDelete(Integer classTypeId);
+
+    List<ClassType> findByIds(List<Integer> classTypeIds);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/IClassTypeTagService.java

@@ -0,0 +1,106 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.ClassTypeTag;
+
+import java.util.List;
+/**
+ * Service Interface:ClassTypeTag
+ * @author licong
+ * @date 2017-9-27
+ */
+public interface IClassTypeTagService  {
+	/**
+	 * 
+	* @Title: saveClassTypeTag
+	* @Description: 新增ClassTypeTag
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-9-27
+	* @user by wangzx
+	 */
+	void insert(ClassTypeTag entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveClassTypeTag 
+	* @Description: 批量新增ClassTypeTag
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-9-27
+	* @user by wangzx
+	 */
+	void batchInsert(List<ClassTypeTag> list);
+	
+	/**
+	 * 
+	* @Title: updateClassTypeTag 
+	* @Description: 编辑ClassTypeTag
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-9-27
+	* @user by wangzx
+	 */
+	void update(ClassTypeTag entity);
+	
+	/**
+	 * 
+	* @Title: deleteClassTypeTagById 
+	* @Description: 根据id删除ClassTypeTag
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-9-27
+	* @user by wangzx
+	 */
+	void deleteClassTypeTagById(Integer id);
+
+
+    /**
+	 * 
+	* @Title: deleteClassTypeTagByIds 
+	* @Description: 根据id批量删除ClassTypeTag
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-9-27
+	* @user by wangzx
+	 */
+	void deleteClassTypeTagByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findClassTypeTagById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-9-27
+	* @user by wangzx
+	 */
+	ClassTypeTag findClassTypeTagById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findClassTypeTagByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<ClassTypeTag>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2017-9-27
+	* @user by wangzx
+	 */
+	List<ClassTypeTag> findClassTypeTagByPage(ClassTypeTag search);
+
+    List<ClassTypeTag> findBySearch(ClassTypeTag search);
+
+	void deleteByClassTypeId(Integer classTypeId);
+
+	List<ClassTypeTag> findByClasstypeId(Integer classTypeId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ICopyClassPackageService.java

@@ -0,0 +1,22 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.ClassPackage;
+
+import java.util.Map;
+
+/**
+ * @title: ICopyClassPackageService.java
+ * @description: 复制培训批次
+ * @author: luogang
+ * @create: 2019-07-15 11:35
+ */
+public interface ICopyClassPackageService {
+    /**
+     * 复制培训批次
+     *
+     * @param targetId     被复制培训批次ID
+     * @param classPackage 培训批次内容
+     * @return
+     */
+    Map<String,Object> copyClassPackage(Integer targetId, ClassPackage classPackage);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILessonGroupLiveService.java

@@ -0,0 +1,28 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.live.bjy.LessonGroupLive;
+
+import java.util.List;
+
+/**
+ * Service Interface:BjyAccount
+ * @author chopin
+ * @date 2017-7-27
+ */
+public interface ILessonGroupLiveService {
+
+	void insert(LessonGroupLive entity);
+
+	void batchInsert(List<LessonGroupLive> list);
+
+	void update(LessonGroupLive entity);
+
+	void deletebyId(Integer id);
+
+	/**
+	 * 查询课次分组数量
+	 * @param lessonId
+	 * @return
+	 */
+	Integer countGroupByLessonId(Integer lessonId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILessonGroupLiveStudentService.java

@@ -0,0 +1,22 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.live.bjy.LessonGroupLiveStudent;
+
+import java.util.List;
+
+/**
+ * Service Interface:BjyAccount
+ * @author chopin
+ * @date 2017-7-27
+ */
+public interface ILessonGroupLiveStudentService {
+
+	void insert(LessonGroupLiveStudent entity);
+
+	void batchInsert(List<LessonGroupLiveStudent> list);
+
+	void update(LessonGroupLiveStudent entity);
+
+	void deletebyId(Integer id);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILessonLiveDetailService.java

@@ -0,0 +1,10 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.LessonLiveDetail;
+
+public interface ILessonLiveDetailService {
+    void insert(LessonLiveDetail lessonLiveDetail);
+    void update(LessonLiveDetail lessonLiveDetail);
+    void updateByLiveFinish(Integer id, Integer liveFinish);
+    LessonLiveDetail findSaveTeacherHs(Integer lessonId ,String type);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILessonStudyDataService.java

@@ -0,0 +1,44 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.classes.LessonStudyData;
+import com.yuxin.wx.vo.student.LessonStudyDataVo;
+import com.yuxin.wx.vo.student.LessonStudyDetailVo;
+
+/**
+ * @className: ILessonStudyDataService.java
+ * @description: 学员上课记录统计
+ * @author: luogang
+ * @createDate: 2019-01-15 15:51
+ */
+public interface ILessonStudyDataService {
+    List<LessonStudyDataVo> findStuCourseData(LessonStudyDataVo lessonStudyDataVo);
+
+    List<LessonStudyData> findStuLessonStudyRecord(Integer stuId, Integer classModuleNoId);
+
+    PageFinder<LessonStudyData> findBylesIdAndUidPage(LessonStudyData lesData);
+
+    List<LessonStudyData> findBylesIdAndUid(LessonStudyData lesData);
+
+    Integer findStuCourseDataCount(LessonStudyDataVo lessonStudyDataVo);
+
+    List<LessonStudyData> findStuLessonStudyschedule(Integer userId, Integer moduleNoId);
+
+    PageFinder<LessonStudyDataVo> findStudyRecord(LessonStudyDataVo lessonStudyDataVo, List<LessonStudyDataVo> stuCourseData);
+
+    void batchInsert(List<LessonStudyData> lessonStudyDatas);
+
+    List<Integer> findUidsByModuleNo(Integer id, Integer lessonid);
+
+    List<LessonStudyDataVo> findStudyDataEcharts(LessonStudyData lesData);
+
+    JSONObject findRecirdByLessonId(LessonStudyData studyData, JSONObject json);
+
+    Integer findRecirdByLessonIdCount(LessonStudyData studyData);
+    PageFinder<LessonStudyDetailVo> liveInClassTypeData(LessonStudyDetailVo vo) ;
+
+    List<LessonStudyData> findByUidAndModuleNoId(Integer id, List<Integer> cmList,String staTime,String endTime);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILessonStudyRecordService.java

@@ -0,0 +1,20 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.LessonStudyRecord;
+
+import java.util.Date;
+import java.util.List;
+
+public interface ILessonStudyRecordService {
+
+
+    void batchInsert(List<LessonStudyRecord> list);
+
+    int todayDataCount(Date start,Date end);
+
+    List<LessonStudyRecord> todayDataPager(Date start,Date end,int index,int pageSize,Integer lessonId);
+    List<LessonStudyRecord> todayDataPager2(Date start,Date end,int index,int pageSize,Integer lessonId);
+	void update(LessonStudyRecord temp);
+
+	void updateForDate(Date start,Date end,Integer lessonId,Integer watchType);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILiveChargeDataService.java

@@ -0,0 +1,22 @@
+package com.yuxin.wx.api.classes;
+
+import java.util.Map;
+
+/**
+ *后台补直播收费数据
+ */
+public interface ILiveChargeDataService {
+
+	//直播收费补数据
+
+	/**
+	 *
+	 * @param companyIds  机构id 多个用,
+	 * @param dates 日期 多个用,
+	 * @param type  1百家云 2 cc
+	 * @return
+	 */
+	Map addLiveChargeData(String companyIds, String dates,Integer type);
+
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILiveChargeGetDataService.java

@@ -0,0 +1,30 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.vo.classes.LiveChargeVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *获取直播平台数据
+ */
+public interface ILiveChargeGetDataService {
+
+	/**获取第三方的数据
+	 * @param lesson
+	 * @return 最终返回的对象
+	 * 	List ccMapResult.put("liveDurationStatistics",liveDurationStatistics);
+	 * 	POJO ccMapResult.put("liveDurationStatisticsLesson",statisticsLesson);
+	 */
+	Map<String,Object> getLiveThirdData(LiveChargeVo lesson);
+
+
+	/**
+	 * 获取小班课直播数据
+	 * @param param
+	 * @return
+	 */
+	List<LiveChargeVo> getLiveDataByCompanyDate(Map param);
+
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILiveChargeStandardService.java

@@ -0,0 +1,15 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.live.smallCharge.LiveChargeStandard;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *直播小班课教室学员观看记录收费标准
+ */
+public interface ILiveChargeStandardService {
+
+	List<LiveChargeStandard> getLiveCharge(LiveChargeStandard standardSearch);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILiveDurationStatisticsLessonService.java

@@ -0,0 +1,28 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.live.smallCharge.LiveDurationStatisticsLesson;
+
+import java.util.List;
+
+/**
+ *直播教师课次信息
+ */
+public interface ILiveDurationStatisticsLessonService {
+
+	//批量插入
+	int insert(LiveDurationStatisticsLesson durationStatisticsLesson);
+
+	//查询是否重复判断
+	List<LiveDurationStatisticsLesson> getLiveDurationStatisticsLesson(LiveDurationStatisticsLesson liveDurationStatisticsLesson);
+
+	//删除旧数据，从接口获取新数据
+	void deleteLiveDurationStatisticsLesson(LiveDurationStatisticsLesson liveDurationStatisticsLesson);
+	//已使用金额
+    Double totalUseMoney(Integer companyId);
+
+    List<LiveDurationStatisticsLesson> querySmallClassList(LiveDurationStatisticsLesson search);
+
+	int querySmallClassListCount(LiveDurationStatisticsLesson search);
+
+    Double totalUseMoneyBySchool(LiveDurationStatisticsLesson search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILiveDurationStatisticsService.java

@@ -0,0 +1,25 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.live.smallCharge.LiveDurationStatistics;
+import com.yuxin.wx.live.smallCharge.LiveDurationStatisticsLesson;
+
+import java.util.List;
+
+/**
+ *直播教室学员观看记录
+ */
+public interface ILiveDurationStatisticsService {
+
+	//批量插入
+	int batchInsert(List<LiveDurationStatistics> list);
+
+	//查询是否重复判断
+	List<LiveDurationStatistics> getLiveDurationStatistics(LiveDurationStatistics liveDurationStatistics);
+
+	//删除旧数据，从接口获取新数据
+	void deleteLiveDurationStatistics(LiveDurationStatistics liveDurationStatistics);
+
+    List<LiveDurationStatistics> querySmallClassDetailList(LiveDurationStatistics search);
+
+	int querySmallClassDetailCount(LiveDurationStatistics search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classes/ILiveRoomService.java

@@ -0,0 +1,67 @@
+package com.yuxin.wx.api.classes;
+
+import com.yuxin.wx.model.classes.ClassModuleLesson;
+import com.yuxin.wx.model.company.CompanyLiveConfig;
+import com.yuxin.wx.model.course.LiveOpenCourse;
+
+public interface ILiveRoomService {
+	
+	/**
+	 * @Description: 创建直播教室
+	 * @author zx.wang
+	 * @date 2015-11-10 下午3:31:55
+	 * @version 2.0
+	 * @param o
+	 * @return
+	 */
+	String createLiveRoom(Object o, Integer companyId);
+	
+	/**
+	 * @Description:更新直播教室
+	 * @author zx.wang
+	 * @date 2015-11-10 下午3:33:07
+	 * @version 2.0
+	 * @param o
+	 * @return
+	 */
+	String updateLiveRoom(Object o, Integer companyId);
+	
+	/**
+	 * @Description: 删除直播教室
+	 * @author zx.wang
+	 * @date 2015-11-10 下午3:33:37
+	 * @version 2.0
+	 * @param o
+	 * @return
+	 */
+	String deleteLiveRoom(Object o);
+	
+	/**
+	 * @Description: 将课程转变为E课堂/展示互动， 要传递的对象
+	 * @author zx.wang
+	 * @date 2015-11-11 下午4:04:35
+	 * @version 2.0
+	 * @param cml
+	 * @param customer
+	 * @param key
+	 * @return
+	 */
+	Object lessonConvertLiveRoom(ClassModuleLesson cml, Integer companyId);
+	
+	/**
+	 * @Description: 将公开课实体转化为E课堂/展示互动， 要传递的对象
+	 * @author zx.wang
+	 * @date 2015-11-17 上午11:26:46
+	 * @version 2.0
+	 * @param open
+	 * @param customer
+	 * @param key
+	 * @return
+	 */
+	Object openConvertLiveRoom(LiveOpenCourse open, Integer companyId);
+	
+	Object lessonConvertLiveRoom(ClassModuleLesson cml, CompanyLiveConfig config);
+	
+	Object openConvertLiveRoom(LiveOpenCourse open, CompanyLiveConfig config);
+	
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classin/IClassInCoursewareReationService.java

@@ -0,0 +1,16 @@
+package com.yuxin.wx.api.classin;
+
+import com.yuxin.wx.model.classin.ClassInCoursewareReation;
+
+import java.util.List;
+
+public interface IClassInCoursewareReationService {
+
+    List<ClassInCoursewareReation> findByFolderId(ClassInCoursewareReation reation);
+    void delete(Integer id);
+    void insert(ClassInCoursewareReation reation);
+    Integer findByFolderIdCount(ClassInCoursewareReation reation);
+    ClassInCoursewareReation findById(Integer id);
+    List<ClassInCoursewareReation> findByids(Integer[] ids);
+    void deleteByIds(Integer[] ids);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/classin/IClassInUserRelationService.java

@@ -0,0 +1,32 @@
+package com.yuxin.wx.api.classin;
+
+import java.util.List;
+
+import com.yuxin.wx.model.classin.ClassInUserRelation;
+
+public interface IClassInUserRelationService {
+	/** 不需要操作 */
+	public static int DONT_NEED = 0;
+	/** 需要新增 */
+	public static int NEED_INSERT = 1;
+	
+	/** 更新手机号 */
+	public static int UPDATE_MOBILE = 2;
+	/** 更新昵称 */
+	public static int UPDATE_NICK_NAME = 3;
+	/** 更新密码 */
+	public static int UPDATE_PASSWORD = 4;
+
+	ClassInUserRelation getTeacherById(Integer companyId, Integer userId);
+	
+	ClassInUserRelation getStudentById(Integer companyId, Integer userId);
+
+	List<Integer> checkUserStatus(ClassInUserRelation classInUserRelation);
+
+	void insert(ClassInUserRelation classInUserRelation);
+
+	void update(ClassInUserRelation classInUserRelation);
+
+	ClassInUserRelation findBySearch(ClassInUserRelation classInUserRelation);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/commodity/ICommodityProductRealtionService.java

@@ -0,0 +1,143 @@
+package com.yuxin.wx.api.commodity;
+
+import com.yuxin.wx.model.commodity.CommodityProductRealtion;
+
+import java.util.List;
+
+/**
+ * Service Interface:CommodityProductRealtion
+ * @author wang.zx
+ * @date 2015-3-14
+ */
+public interface ICommodityProductRealtionService  {
+	/**
+	 * 
+	* @Title: saveCommodityProductRealtion
+	* @Description: 新增CommodityProductRealtion
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	void insert(CommodityProductRealtion T);
+	
+	/**
+	 * 
+	* @Title: batchSaveCommodityProductRealtion 
+	* @Description: 批量新增CommodityProductRealtion
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	void batchInsert(List<CommodityProductRealtion> T);
+	
+	/**
+	 * 
+	* @Title: updateCommodityProductRealtion 
+	* @Description: 编辑CommodityProductRealtion
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	void update(CommodityProductRealtion T);
+	
+	/**
+	 * 
+	* @Title: deleteCommodityProductRealtionById 
+	* @Description: 根据id删除CommodityProductRealtion
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	void deleteCommodityProductRealtionById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCommodityProductRealtionByIds 
+	* @Description: 根据id批量删除CommodityProductRealtion
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	void deleteCommodityProductRealtionByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCommodityProductRealtionById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	CommodityProductRealtion findCommodityProductRealtionById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCommodityProductRealtionByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CommodityProductRealtion>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	List<CommodityProductRealtion> findCommodityProductRealtionByPage(CommodityProductRealtion search);
+	
+	
+	public CommodityProductRealtion findByProduyctId(CommodityProductRealtion CcommodityProductRealtion);
+
+	CommodityProductRealtion findCourseToCommodityByProduyctId(CommodityProductRealtion CommodityProductRealtion);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityProductRealtionService.java
+	 * @Description: 根据班型id查询商品id
+	 * @author zhang.zx
+	 * @date 2015年5月26日 下午4:43:09
+	 * @modifier
+	 * @modify-date 2015年5月26日 下午4:43:09
+	 * @version 1.0
+	 * @param id
+	 * @return
+	 */
+	CommodityProductRealtion findByClassTypeId(String id);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityProductRealtionService.java
+	 * @Description: 查询培训批次商品
+	 * @author zhang.zx
+	 * @date 2016年3月28日 下午2:44:18
+	 * @modifier
+	 * @modify-date 2016年3月28日 下午2:44:18
+	 * @version 1.0
+	 * @param id
+	 * @return
+	 */
+	CommodityProductRealtion findByClassPackageId(String id);
+
+    Integer findClassIdByComId(Integer id);
+
+	Integer findProductIdByComId(Integer id);
+
+	Integer findComIdByClassId(Integer courseId);
+
+	Integer findComIdByClassPackageId(Integer classPackageId);
+
+    CommodityProductRealtion findByComId(Integer queryId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/commodity/ICommodityService.java

@@ -0,0 +1,275 @@
+package com.yuxin.wx.api.commodity;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.classes.ClassPackage;
+import com.yuxin.wx.model.classes.ClassType;
+import com.yuxin.wx.model.commodity.Commodity;
+import com.yuxin.wx.model.commodity.CommodityProductRealtion;
+import com.yuxin.wx.vo.commodity.CommodityBuyNumVo;
+import com.yuxin.wx.vo.commodity.CommodityVo;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Service Interface:Commodity
+ * @author wang.zx
+ * @date 2015-3-14
+ */
+public interface ICommodityService  {
+	/**
+	 * 
+	* @Title: saveCommodity
+	* @Description: 新增Commodity
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	void insert(Commodity T);
+	
+	/**
+	 * 
+	* @Title: batchSaveCommodity 
+	* @Description: 批量新增Commodity
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	void batchInsert(List<Commodity> T);
+	
+	/**
+	 * 
+	* @Title: updateCommodity 
+	* @Description: 编辑Commodity
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	void update(Commodity T);
+	
+	/**
+	 * 
+	* @Title: deleteCommodityById 
+	* @Description: 根据id删除Commodity
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	void deleteCommodityById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCommodityByIds 
+	* @Description: 根据id批量删除Commodity
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	void deleteCommodityByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCommodityById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	Commodity findCommodityById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCommodityByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<Commodity>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-14
+	* @user by wangzx
+	 */
+	List<Commodity> findCommodityByPage(Commodity search);
+	
+	/**
+	 * 
+	* @Title: findCommodityByPage 
+	* @Description: 根据自定义条件查询
+	* @return
+	* @return List<Commodity>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-12
+	* @user by chopin
+	 */
+	List<CommodityVo> searchCommodityByItemOne(Integer schoolId,Integer itemOneId);
+	
+	/**
+	 * 
+	* @Title: findCommodityByPage 
+	* @Description: 根据一、二级项目
+	* @return
+	* @return List<Commodity>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-12
+	* @user by chopin
+	 */
+	List<CommodityVo> searchCommodityByItemTwo(Integer schoolId,Integer itemOneId,Integer itemSecondId);
+	
+	/**
+	 * 
+	* @Title: findCommodityByPage 
+	* @Description: 根据自定义条件查询商品，校区Id不能为空
+	* @return
+	* @return List<Commodity>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-3-12
+	* @user by chopin
+	 */
+	List<CommodityVo> searchCommodityList(CommodityVo search);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityService.java
+	 * @Description: 分页和条件查询商品
+	 * @author zhang.zx
+	 * @date 2015-4-8
+	 * @modifier
+	 * @version 1.0
+	 * @param search
+	 * @return  PageFinder<Commodity> 返回类型
+	 */
+	PageFinder<CommodityVo> queryCommodityByPage(CommodityVo search);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityService.java
+	 * @Description: 分页和条件查询商品
+	 * @author chopin
+	 * @date 2015-4-8
+	 * @modifier
+	 * @version 1.0
+	 * @param search
+	 * @return  PageFinder<Commodity> 返回类型
+	 */
+	public List<CommodityVo> loadData(Map search);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityService.java
+	 * @Description: 根据自定义条件查询商品
+	 * @author chopin
+	 * @date 2015-4-8
+	 * @modifier
+	 * @version 1.0
+	 * @param search
+	 * @return  PageFinder<Commodity> 返回类型
+	 */
+	public List<CommodityVo> loadData(CommodityVo search);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityService.java
+	 * @Description: 根据班型ID查询商品
+	 * @author chopin
+	 * @date 2015-4-8
+	 * @modifier
+	 * @version 1.0
+	 * @param search
+	 * @return  PageFinder<Commodity> 返回类型
+	 */
+	public List<CommodityVo> loadData2(Map search);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityService.java
+	 * @Description: 根据商品id修改购买人数
+	 * @author liyushan
+	 * @date 2015-6-23
+	 * @modifier
+	 * @version 1.0
+	 * @param id
+	 * @return  PageFinder<Commodity> 返回类型
+	 */
+	void updateBuyNumById(Integer id);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityService.java
+	 * @Description: 根据公司id查询商品信息
+	 * @author zhang.zx
+	 * @date 2015年8月11日 下午4:31:44
+	 * @modifier
+	 * @modify-date 2015年8月11日 下午4:31:44
+	 * @version 1.0
+	 * @param companyId
+	 * @return
+	 */
+	List<Commodity> querycommByCompanyId(Integer companyId);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityService.java
+	 * @Description: 查询培训机构下 学科下 商品id
+	 * @author 周文斌
+	 * @date 2015-12-22 下午2:55:07
+	 * @version 1.0
+	 * @param commodity
+	 * @return
+	 */
+	List<Integer> findComId(Commodity commodity);
+	
+	/**
+	 * 
+	 * Class Name: ICommodityService.java
+	 * @Description: 批量修改
+	 * @author 周文斌
+	 * @date 2015-12-22 下午3:15:31
+	 * @version 1.0
+	 * @param param
+	 */
+	void updateStatus(Map<String, Object> param);
+	
+	Integer findCommodityIdByClassTypeId(Integer classTypeId);
+	
+	String findCommodityName(Integer id);
+
+    Commodity findComByClassTypeId(Map<String, Object> comMap);
+
+    Commodity findCommodityByType(CommodityBuyNumVo search);
+
+	Integer findClassPackageIdByCommodityId(Integer commodityId);
+
+	Integer findClassTypeIdByCommodityId(Integer commodityId);
+
+    void classTypeOnsaleSet(ClassType classType, CommodityProductRealtion commodityProductRealtion, Integer userId);
+
+	void classPackageOnsaleSet(ClassPackage cp, CommodityProductRealtion comm1, Integer currentUserId);
+
+	void classTypeStopSaleSet(ClassType classType, CommodityProductRealtion commodityProductRealtion, Integer currentUserId);
+
+	Integer findCommodityIdByClassPackageId(Integer id);
+
+    List<CommodityVo> queryByCommodityVo(CommodityVo commodity);
+
+    List<CommodityVo> queryByIds(HashMap<String,Object> map);
+
+	boolean checkAgentCourseByCommodityId(Integer commodityId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/commodity/ICommodityShareService.java

@@ -0,0 +1,39 @@
+package com.yuxin.wx.api.commodity;
+
+import java.util.List;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.commodity.CommoditySchoolRelation;
+import com.yuxin.wx.model.commodity.CommoditySchoolShare;
+import com.yuxin.wx.model.commodity.SchoolShareClassType;
+import com.yuxin.wx.vo.classes.ClassTypeVo;
+
+public interface ICommodityShareService {
+
+	PageFinder<CommoditySchoolShare> findByPage(CommoditySchoolShare search);
+
+	List<CommoditySchoolRelation> findCommoditySchoolRelationByShareId(Integer shareId);
+
+	void saveOrUpdate(CommoditySchoolShare commoditySchoolShare);
+
+	void delShare(Integer id,Integer userId);
+
+	void delRelation(Integer id,Integer userId);
+	
+	PageFinder<SchoolShareClassType> findCommodityByPage(CommoditySchoolRelation search);
+
+	List<CommoditySchoolRelation> findShareItem(CommoditySchoolRelation commoditySchoolRelation);
+
+	void saveRelation(List<CommoditySchoolRelation> relationList);
+
+	void saveOrUpdateRelation(CommoditySchoolRelation commoditySchoolRelation);
+	PageFinder<ClassTypeVo> findClassTypeCurrentAndShare(CommoditySchoolRelation search);
+
+	CommoditySchoolShare findBy(CommoditySchoolShare commoditySchoolShare);
+
+	void delRelationByCourse(CommoditySchoolRelation relation);
+
+	CommoditySchoolShare findByClassId(Integer classTypeId, Integer itemOneId, Integer itemTwoId, Integer companyId);
+
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/CompanyConcurrentDistributionService.java

@@ -0,0 +1,46 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.model.company.CompanyConcurrentDistribution;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+public interface CompanyConcurrentDistributionService {
+
+    void insert(CompanyConcurrentDistribution ccd);
+    void update(CompanyConcurrentDistribution ccd);
+
+    /*
+    * 根据条件查询
+    * */
+    List<CompanyConcurrentDistribution> findBySearch(CompanyConcurrentDistribution ccd);
+
+    /*
+    * 根据年份查询
+    * */
+    List<CompanyConcurrentDistribution> findByYear(CompanyConcurrentDistribution ccd);
+
+
+    /*
+      * 根据月份查询
+      * */
+    List<CompanyConcurrentDistribution> findByMonth(CompanyConcurrentDistribution ccd);
+
+    /*
+    *
+    * 查询公司配置预存并发的初始年份
+    *
+    * */
+    String queryCompanyPrestoreRecord(Integer companyId);
+
+    /*
+    *
+    * 获取某一月份最新的并发量
+    *
+    * */
+    CompanyConcurrentDistribution findLatestConcurrentByMonth(CompanyConcurrentDistribution ccd);
+
+
+    void insertPrestoreLog(HashMap<String,Object> map);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/CompanyPushConfigService.java

@@ -0,0 +1,7 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.model.company.CompanyPushConfig;
+
+public interface CompanyPushConfigService {
+    CompanyPushConfig findPushConfigByCompanyId(Integer companyId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/CompanySignatureService.java

@@ -0,0 +1,38 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.company.CompanySignature;
+import com.yuxin.wx.model.course.CourseProtocolConfig;
+
+import java.util.List;
+
+public interface CompanySignatureService {
+
+    void modifySubCompany(CompanySignature companySignature);
+
+    CompanySignature findById(Integer id);
+
+    CompanySignature findByIdentityId(String identityId);
+
+    void update(CompanySignature companySignature);
+
+    PageFinder<CompanySignature> findCompanySignData(CompanySignature query);
+
+    List<CompanySignature> findCompanySigns(CompanySignature query);
+
+    /**
+     * 查询关联印章的课程协议名
+     */
+    List<String> findCourseProtocolName(CourseProtocolConfig query);
+
+    /**
+     * 删除签章，逻辑删除
+     */
+    Integer delById(Integer id);
+
+    int countEnableSignature(Integer companyId);
+
+    Integer checkSignInfo(CompanySignature companySignature);
+
+    void delete(Integer id);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/CurriculumFairSpService.java

@@ -0,0 +1,26 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.enums.fair.QueryType;
+
+/**
+ * Service Support
+ */
+public interface CurriculumFairSpService {
+
+    /**
+     * 查询 - 供应商机构id
+     * @param type 查询类型
+     * @param queryId 查询id
+     * @return
+     */
+    Integer getSupplyComId(QueryType type, Integer queryId);
+
+    /**
+     * 验证 - 是否属于代理商课程
+     * @param type 查询类型
+     * @param queryId 查询id
+     * @return
+     */
+    Boolean isProxyCurriculum(QueryType type, Integer queryId);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/IClassTypeClassInRelationService.java

@@ -0,0 +1,36 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.model.company.ClassTypeClassInRelation;
+
+/**
+ * @className: IClassTypeClassInRelationService.java
+ * @description:
+ * @author: luogang
+ * @createDate: 2018-08-21 11:28
+ */
+public interface IClassTypeClassInRelationService {
+    void insert(ClassTypeClassInRelation entity);
+    void update(ClassTypeClassInRelation entity);
+    ClassTypeClassInRelation findDefalutClassInCourseIdByCompanyId(Integer companyId);
+
+    ClassTypeClassInRelation findClassInCourseByClassTypeId(Integer companyId,Integer classTypeId);
+
+    ClassTypeClassInRelation findClassInCourseByClassLessonId(Integer companyId, Integer lessonId);
+
+    ClassTypeClassInRelation findClassInCourseByOpenClassId(Integer companyId, Integer id);
+
+    ClassTypeClassInRelation findClassInCourseByClassId(Integer currentCompanyId, Integer id);
+
+    ClassTypeClassInRelation findClassInCourseByDefaultCourseId(Integer companyId, Integer classTypeId);
+
+    ClassTypeClassInRelation findClassInCourseByModelNoId(Integer companyId, Integer classModelNoId);
+
+    int findClassInCountByLessonId(Integer companyId);
+
+    ClassTypeClassInRelation findClassInMeetCourseByLessonId(Integer currentCompanyId, Integer id);
+    
+	ClassTypeClassInRelation findBySearch(ClassTypeClassInRelation classInRelation);
+
+    ClassTypeClassInRelation findClassInCourseByWhere(ClassTypeClassInRelation classInSearch);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppAuthService.java

@@ -0,0 +1,114 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.CompanyAppAuth;
+/**
+ * Service Interface:CompanyAppAuth
+ * @author chopin
+ * @date 2016-5-27
+ */
+public interface ICompanyAppAuthService  {
+	/**
+	 * 
+	* @Title: saveCompanyAppAuth
+	* @Description: 新增CompanyAppAuth
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void insert(CompanyAppAuth entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyAppAuth 
+	* @Description: 批量新增CompanyAppAuth
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyAppAuth> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyAppAuth 
+	* @Description: 编辑CompanyAppAuth
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void update(CompanyAppAuth entity);
+	void updateForXcx(CompanyAppAuth entity);
+	/**
+	 * 
+	* @Title: deleteCompanyAppAuthById 
+	* @Description: 根据id删除CompanyAppAuth
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void deleteCompanyAppAuthById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyAppAuthByIds 
+	* @Description: 根据id批量删除CompanyAppAuth
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void deleteCompanyAppAuthByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyAppAuthById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	CompanyAppAuth findCompanyAppAuthById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyAppAuthByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyAppAuth>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	List<CompanyAppAuth> findCompanyAppAuthByPage(CompanyAppAuth search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyAppAuthService.java
+	 * @Description: 查询app版本
+	 * @author zhang.zx
+	 * @date 2016年5月27日 下午5:38:41
+	 * @modifier
+	 * @modify-date 2016年5月27日 下午5:38:41
+	 * @version 1.0
+	 * @param caa
+	 * @return
+	 */
+	CompanyAppAuth findByParams(CompanyAppAuth caa);
+	CompanyAppAuth findByParamsForXcx(CompanyAppAuth caa);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppBarConfigService.java

@@ -0,0 +1,104 @@
+package com.yuxin.wx.api.company;
+
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.CompanyAppBarConfig;
+
+/**
+ * Service Interface:CompanyAppBarConfig
+ * @author chopin
+ * @date 2016-5-5
+ */
+public interface ICompanyAppBarConfigService  {
+	/**
+	 * 
+	* @Title: saveCompanyAppBarConfig
+	* @Description: 新增CompanyAppBarConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-5
+	* @user by wangzx
+	 */
+	void insert(CompanyAppBarConfig entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyAppBarConfig 
+	* @Description: 批量新增CompanyAppBarConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-5
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyAppBarConfig> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyAppBarConfig 
+	* @Description: 编辑CompanyAppBarConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-5
+	* @user by wangzx
+	 */
+	void update(CompanyAppBarConfig entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyAppBarConfigById 
+	* @Description: 根据id删除CompanyAppBarConfig
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-5
+	* @user by wangzx
+	 */
+	void deleteCompanyAppBarConfigById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyAppBarConfigByIds 
+	* @Description: 根据id批量删除CompanyAppBarConfig
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-5
+	* @user by wangzx
+	 */
+	void deleteCompanyAppBarConfigByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyAppBarConfigById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-5
+	* @user by wangzx
+	 */
+	CompanyAppBarConfig findCompanyAppBarConfigById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyAppBarConfigByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyAppBarConfig>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-5
+	* @user by wangzx
+	 */
+	List<CompanyAppBarConfig> findCompanyAppBarConfigByPage(CompanyAppBarConfig search);
+
+	List<CompanyAppBarConfig> findByCompanyAppBarConfig(CompanyAppBarConfig search);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppConfigService.java

@@ -0,0 +1,117 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.CompanyAppConfig;
+import com.yuxin.wx.vo.company.CompanyAppConfigVo;
+
+/**
+ * Service Interface:CompanyAppConfig
+ * @author chopin
+ * @date 2016-5-27
+ */
+public interface ICompanyAppConfigService  {
+	/**
+	 * 
+	* @Title: saveCompanyAppConfig
+	* @Description: 新增CompanyAppConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void insert(CompanyAppConfig entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyAppConfig 
+	* @Description: 批量新增CompanyAppConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyAppConfig> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyAppConfig 
+	* @Description: 编辑CompanyAppConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void update(CompanyAppConfig entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyAppConfigById 
+	* @Description: 根据id删除CompanyAppConfig
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void deleteCompanyAppConfigById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyAppConfigByIds 
+	* @Description: 根据id批量删除CompanyAppConfig
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void deleteCompanyAppConfigByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyAppConfigById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	CompanyAppConfig findCompanyAppConfigById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyAppConfigByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyAppConfig>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	List<CompanyAppConfig> findCompanyAppConfigByPage(CompanyAppConfig search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyAppConfigService.java
+	 * @Description: 查询公司app配置
+	 * @author zhang.zx
+	 * @date 2016年5月27日 下午6:45:17
+	 * @modifier
+	 * @modify-date 2016年5月27日 下午6:45:17
+	 * @version 1.0
+	 * @param companyId
+	 * @return
+	 */
+	CompanyAppConfig queryCompanyConfig(CompanyAppConfig search);
+
+    CompanyAppConfigVo queryAppConfig(CompanyAppConfigVo config);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppIndexTemplateService.java

@@ -0,0 +1,35 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.CompanyAppIndexTemplate;
+import com.yuxin.wx.model.company.CompanyAppTemplateModule;
+import com.yuxin.wx.model.company.CompanyAppTemplateModuleCycle;
+import com.yuxin.wx.model.company.CompanyAppTemplateModuleNav;
+
+public interface ICompanyAppIndexTemplateService {
+
+	CompanyAppIndexTemplate findById(Integer id);
+
+	CompanyAppIndexTemplate queryByCondition(CompanyAppIndexTemplate template);
+
+	List<CompanyAppIndexTemplate> queryByTemplate(CompanyAppIndexTemplate template);
+
+	void updateTemplate(CompanyAppIndexTemplate t);
+
+	void batchInsert(List<CompanyAppIndexTemplate> list);
+
+	void insert(CompanyAppIndexTemplate template);
+
+	void saveAppModule(Integer companyId, Integer templateId, 
+			List<CompanyAppTemplateModule<?>> moduleList, 
+			List<CompanyAppTemplateModuleCycle> cyclePicList, 
+			List<CompanyAppTemplateModuleNav> topNavList,
+			List<CompanyAppTemplateModuleNav> bottomNavList) throws Exception;
+
+	void initTemplate(Integer companyId, Integer schoolId, boolean campusIndeAppConfig) throws Exception;
+
+	CompanyAppIndexTemplate findBy(CompanyAppIndexTemplate indexTemplate);
+
+	void update(CompanyAppIndexTemplate template);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppPersonTemplateService.java

@@ -0,0 +1,20 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.model.company.CompanyAppPersonTemplate;
+
+import java.util.List;
+
+public interface ICompanyAppPersonTemplateService {
+
+    CompanyAppPersonTemplate queryByCondition(CompanyAppPersonTemplate template);
+
+
+    List<CompanyAppPersonTemplate> queryByTemplate(CompanyAppPersonTemplate template);
+
+    void updateByTemplate(CompanyAppPersonTemplate template);
+
+    void batchInsert(List<CompanyAppPersonTemplate> list);
+
+
+    void insert(CompanyAppPersonTemplate template);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppTemplateModuleCycleService.java

@@ -0,0 +1,11 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.CompanyAppTemplateModule;
+import com.yuxin.wx.model.company.CompanyAppTemplateModuleCycle;
+
+public interface ICompanyAppTemplateModuleCycleService {
+
+	List<CompanyAppTemplateModuleCycle> queryByModule(CompanyAppTemplateModule<?> m);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppTemplateModuleMultiService.java

@@ -0,0 +1,11 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.model.company.CompanyAppTemplateModule;
+import com.yuxin.wx.model.company.CompanyAppTemplateModuleMulti;
+
+import java.util.List;
+
+public interface ICompanyAppTemplateModuleMultiService {
+
+    List<CompanyAppTemplateModuleMulti> queryByModule(CompanyAppTemplateModule module);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppTemplateModuleNavService.java

@@ -0,0 +1,11 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.CompanyAppTemplateModule;
+import com.yuxin.wx.model.company.CompanyAppTemplateModuleNav;
+
+public interface ICompanyAppTemplateModuleNavService {
+
+	List<CompanyAppTemplateModuleNav> queryByModule(CompanyAppTemplateModule<?> m);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppTemplateModuleService.java

@@ -0,0 +1,29 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.model.company.CompanyAppIndexTemplate;
+import com.yuxin.wx.model.company.CompanyAppTemplateModule;
+import com.yuxin.wx.model.company.CompanyAppTemplateModuleCycle;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ICompanyAppTemplateModuleService {
+
+	CompanyAppTemplateModule<?> findById(Integer id);
+
+	List<CompanyAppTemplateModule<?>> queryByModule(CompanyAppTemplateModule<?> module);
+
+	List<CompanyAppTemplateModule<?>> queryByTemplate(CompanyAppIndexTemplate template);
+
+	List<CompanyAppTemplateModule<?>> findByTemplateId(Integer companyId, Integer templateId);
+
+	void resetTemplate(Integer companyId, Integer templateId);
+
+	void insert(CompanyAppTemplateModule<?> m);
+
+	List<CompanyAppTemplateModule<?>> loadModule(CompanyAppIndexTemplate template, String imgUrl);
+
+	Map<String, Integer> queryOpenService(Integer currentCompanyId);
+
+	void dealCycle(Integer companyId, Integer schoolId, String imgUrl, List<CompanyAppTemplateModuleCycle> cyclePicList);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppTemplateMusterService.java

@@ -0,0 +1,14 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.model.company.CompanyAppTemplateMuster;
+
+import java.util.List;
+
+public interface ICompanyAppTemplateMusterService {
+
+    CompanyAppTemplateMuster findById(Integer id);
+    void update(CompanyAppTemplateMuster muster);
+    void insert(CompanyAppTemplateMuster muster);
+    void updateEqTemplate(CompanyAppTemplateMuster muster);
+    List<CompanyAppTemplateMuster> findListUse(CompanyAppTemplateMuster muster);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppTemplateRelationService.java

@@ -0,0 +1,13 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.model.company.CompanyAppTemplateRelation;
+
+import java.util.List;
+
+public interface ICompanyAppTemplateRelationService {
+
+    void batchInsert(List<CompanyAppTemplateRelation> list);
+
+
+    void insert(CompanyAppTemplateRelation relation);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAppWelcomePicService.java

@@ -0,0 +1,113 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.CompanyAppWelcomePic;
+/**
+ * Service Interface:CompanyAppWelcomePic
+ * @author chopin
+ * @date 2016-5-27
+ */
+public interface ICompanyAppWelcomePicService  {
+	/**
+	 * 
+	* @Title: saveCompanyAppWelcomePic
+	* @Description: 新增CompanyAppWelcomePic
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void insert(CompanyAppWelcomePic entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyAppWelcomePic 
+	* @Description: 批量新增CompanyAppWelcomePic
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyAppWelcomePic> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyAppWelcomePic 
+	* @Description: 编辑CompanyAppWelcomePic
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void update(CompanyAppWelcomePic entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyAppWelcomePicById 
+	* @Description: 根据id删除CompanyAppWelcomePic
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void deleteCompanyAppWelcomePicById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyAppWelcomePicByIds 
+	* @Description: 根据id批量删除CompanyAppWelcomePic
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	void deleteCompanyAppWelcomePicByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyAppWelcomePicById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	CompanyAppWelcomePic findCompanyAppWelcomePicById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyAppWelcomePicByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyAppWelcomePic>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-27
+	* @user by wangzx
+	 */
+	List<CompanyAppWelcomePic> findCompanyAppWelcomePicByPage(CompanyAppWelcomePic search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyAppWelcomePicService.java
+	 * @Description: 查询公司启动图
+	 * @author zhang.zx
+	 * @date 2016年5月30日 上午11:42:10
+	 * @modifier
+	 * @modify-date 2016年5月30日 上午11:42:10
+	 * @version 1.0
+	 * @param companyId
+	 * @return
+	 */
+	CompanyAppWelcomePic findByparam(CompanyAppWelcomePic search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyAuthorityService.java

@@ -0,0 +1,141 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.Company;
+import com.yuxin.wx.model.company.CompanyAuthority;
+import com.yuxin.wx.model.user.Users;
+import com.yuxin.wx.vo.company.CompanyAuthorityVo;
+/**
+ * Service Interface:CompanyAuthority
+ * @author chopin
+ * @date 2015-4-23
+ */
+/**
+ * Service Interface:CompanyAuthority
+ * @author chopin
+ * @date 2015-4-23
+ */
+public interface ICompanyAuthorityService  {
+	/**
+	 * 
+	* @Title: saveCompanyAuthority
+	* @Description: 新增CompanyAuthority
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-4-23
+	* @user by wangzx
+	 */
+	void insert(CompanyAuthority entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyAuthority 
+	* @Description: 批量新增CompanyAuthority
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-4-23
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyAuthority> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyAuthority 
+	* @Description: 编辑CompanyAuthority
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-4-23
+	* @user by wangzx
+	 */
+	void update(CompanyAuthority entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyAuthorityById 
+	* @Description: 根据id删除CompanyAuthority
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-4-23
+	* @user by wangzx
+	 */
+	void deleteCompanyAuthorityById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyAuthorityByIds 
+	* @Description: 根据id批量删除CompanyAuthority
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-4-23
+	* @user by wangzx
+	 */
+	void deleteCompanyAuthorityByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyAuthorityById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-4-23
+	* @user by wangzx
+	 */
+	CompanyAuthority findCompanyAuthorityById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyAuthorityByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyAuthority>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2015-4-23
+	* @user by wangzx
+	 */
+	List<CompanyAuthority> findCompanyAuthorityByPage(CompanyAuthority search);
+	
+	/**
+	 * 根据companyId 查询审核信息
+	 * @param companyId
+	 * @return
+	 */
+	Integer findByCompanyId(Integer companyId);
+	/**
+	 * 
+	 * Class Name: ICompanyAuthorityService.java
+	 * @Description: 根据公司ID更新域名
+	 * @author ycl
+	 * @date 2015-4-29 下午2:10:57
+	 * @modifier
+	 * @modify-date 2015-4-29 下午2:10:57
+	 * @version 1.0
+	 * @param authority
+	 */
+	void updateDomainByCompanyId(Company authority);
+	
+	CompanyAuthority findAuthorithByCompanyId(Integer companyId);
+	/**
+	 * 
+	 * Class Name: ICompanyAuthorityService.java
+	 * @Description: 通过用户查询机构认证信息
+	 * @author Administrator
+	 * @date 2015-5-11 下午9:10:00
+	 * @modifier
+	 * @modify-date 2015-5-11 下午9:10:00
+	 * @version 1.0
+	 * @param user
+	 * @return
+	 */
+	CompanyAuthorityVo findExamineInfo(Integer companyId);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyBackDomainService.java

@@ -0,0 +1,99 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.model.company.CompanyBackDomain;
+
+import java.util.List;
+/**
+ * Service Interface:CompanyBackDomain
+ * @author chopin
+ * @date 2018-3-16
+ */
+public interface ICompanyBackDomainService  {
+	/**
+	 * 
+	* @Title: saveCompanyBackDomain
+	* @Description: 新增CompanyBackDomain
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	void insert(CompanyBackDomain entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyBackDomain 
+	* @Description: 批量新增CompanyBackDomain
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyBackDomain> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyBackDomain 
+	* @Description: 编辑CompanyBackDomain
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	void update(CompanyBackDomain entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyBackDomainById 
+	* @Description: 根据id删除CompanyBackDomain
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	void deleteCompanyBackDomainById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyBackDomainByIds 
+	* @Description: 根据id批量删除CompanyBackDomain
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	void deleteCompanyBackDomainByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyBackDomainById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	CompanyBackDomain findCompanyBackDomainById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyBackDomainByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyBackDomain>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2018-3-16
+	* @user by wangzx
+	 */
+	List<CompanyBackDomain> findCompanyBackDomainByPage(CompanyBackDomain search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyCashFlowService.java

@@ -0,0 +1,99 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.CompanyCashFlow;
+/**
+ * Service Interface:CompanyCashFlow
+ * @author chopin
+ * @date 2016-5-17
+ */
+public interface ICompanyCashFlowService  {
+	/**
+	 * 
+	* @Title: saveCompanyCashFlow
+	* @Description: 新增CompanyCashFlow
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	void insert(CompanyCashFlow entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyCashFlow 
+	* @Description: 批量新增CompanyCashFlow
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyCashFlow> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyCashFlow 
+	* @Description: 编辑CompanyCashFlow
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	void update(CompanyCashFlow entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyCashFlowById 
+	* @Description: 根据id删除CompanyCashFlow
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	void deleteCompanyCashFlowById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyCashFlowByIds 
+	* @Description: 根据id批量删除CompanyCashFlow
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	void deleteCompanyCashFlowByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyCashFlowById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	CompanyCashFlow findCompanyCashFlowById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyCashFlowByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyCashFlow>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-5-17
+	* @user by wangzx
+	 */
+	List<CompanyCashFlow> findCompanyCashFlowByPage(CompanyCashFlow search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyConfigCustompageGroupService.java

@@ -0,0 +1,127 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+import java.util.Map;
+
+import com.yuxin.wx.model.company.CompanyConfigCustompageGroup;
+/**
+ * Service Interface:CompanyConfigCustompageGroup
+ * @author chopin
+ * @date 2016-4-25
+ */
+public interface ICompanyConfigCustompageGroupService  {
+	/**
+	 * 
+	* @Title: saveCompanyConfigCustompageGroup
+	* @Description: 新增CompanyConfigCustompageGroup
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void insert(CompanyConfigCustompageGroup entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyConfigCustompageGroup 
+	* @Description: 批量新增CompanyConfigCustompageGroup
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyConfigCustompageGroup> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyConfigCustompageGroup 
+	* @Description: 编辑CompanyConfigCustompageGroup
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void update(CompanyConfigCustompageGroup entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyConfigCustompageGroupById 
+	* @Description: 根据id删除CompanyConfigCustompageGroup
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void deleteCompanyConfigCustompageGroupById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyConfigCustompageGroupByIds 
+	* @Description: 根据id批量删除CompanyConfigCustompageGroup
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void deleteCompanyConfigCustompageGroupByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyConfigCustompageGroupById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	CompanyConfigCustompageGroup findCompanyConfigCustompageGroupById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyConfigCustompageGroupByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyConfigCustompageGroup>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	List<CompanyConfigCustompageGroup> findCompanyConfigCustompageGroupByPage(CompanyConfigCustompageGroup search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyConfigCustompageGroupService.java
+	 * @Description: 查询自定义分组列表
+	 * @author zhang.zx
+	 * @date 2016年4月25日 下午6:58:27
+	 * @modifier
+	 * @modify-date 2016年4月25日 下午6:58:27
+	 * @version 1.0
+	 * @return
+	 */
+	List<CompanyConfigCustompageGroup> queryCustomGroupList(CompanyConfigCustompageGroup search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyConfigCustompageGroupService.java
+	 * @Description: 查询自定义分组
+	 * @author zhang.zx
+	 * @date 2016年4月27日 下午4:03:09
+	 * @modifier
+	 * @modify-date 2016年4月27日 下午4:03:09
+	 * @version 1.0
+	 * @param map
+	 * @return
+	 */
+	List<CompanyConfigCustompageGroup> queryCustomGroupByCondition(Map<String, Object> map);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyConfigCustompageService.java

@@ -0,0 +1,143 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.company.CompanyConfigCustompage;
+/**
+ * Service Interface:CompanyConfigCustompage
+ * @author chopin
+ * @date 2016-4-25
+ */
+public interface ICompanyConfigCustompageService  {
+	/**
+	 * 
+	* @Title: saveCompanyConfigCustompage
+	* @Description: 新增CompanyConfigCustompage
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void insert(CompanyConfigCustompage entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyConfigCustompage 
+	* @Description: 批量新增CompanyConfigCustompage
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyConfigCustompage> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyConfigCustompage 
+	* @Description: 编辑CompanyConfigCustompage
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void update(CompanyConfigCustompage entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyConfigCustompageById 
+	* @Description: 根据id删除CompanyConfigCustompage
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void deleteCompanyConfigCustompageById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyConfigCustompageByIds 
+	* @Description: 根据id批量删除CompanyConfigCustompage
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void deleteCompanyConfigCustompageByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyConfigCustompageById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	CompanyConfigCustompage findCompanyConfigCustompageById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyConfigCustompageByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyConfigCustompage>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	List<CompanyConfigCustompage> findCompanyConfigCustompageByPage(CompanyConfigCustompage search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyConfigCustompageService.java
+	 * @Description: 查询自定义页面列表
+	 * @author zhang.zx
+	 * @date 2016年4月25日 下午4:32:27
+	 * @modifier
+	 * @modify-date 2016年4月25日 下午4:32:27
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	PageFinder<CompanyConfigCustompage> queryCompanyCustomList(CompanyConfigCustompage search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyConfigCustompageService.java
+	 * @Description: 查询模板下页面数量
+	 * @author zhang.zx
+	 * @date 2016年4月27日 上午10:06:16
+	 * @modifier
+	 * @modify-date 2016年4月27日 上午10:06:16
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	Integer templeteCount(CompanyConfigCustompage search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyConfigCustompageService.java
+	 * @Description: 条件查询页面列表
+	 * @author zhang.zx
+	 * @date 2016年4月27日 下午8:52:35
+	 * @modifier
+	 * @modify-date 2016年4月27日 下午8:52:35
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	List<CompanyConfigCustompage> queryCompanyCustomListByCondition(CompanyConfigCustompage search);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyConfigCustompageTemplateService.java

@@ -0,0 +1,114 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.CompanyConfigCustompageTemplate;
+
+/**
+ * Service Interface:CompanyConfigCustompageTemplate
+ * @author chopin
+ * @date 2016-4-25
+ */
+public interface ICompanyConfigCustompageTemplateService  {
+	/**
+	 * 
+	* @Title: saveCompanyConfigCustompageTemplate
+	* @Description: 新增CompanyConfigCustompageTemplate
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void insert(CompanyConfigCustompageTemplate entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyConfigCustompageTemplate 
+	* @Description: 批量新增CompanyConfigCustompageTemplate
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyConfigCustompageTemplate> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyConfigCustompageTemplate 
+	* @Description: 编辑CompanyConfigCustompageTemplate
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void update(CompanyConfigCustompageTemplate entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyConfigCustompageTemplateById 
+	* @Description: 根据id删除CompanyConfigCustompageTemplate
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void deleteCompanyConfigCustompageTemplateById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyConfigCustompageTemplateByIds 
+	* @Description: 根据id批量删除CompanyConfigCustompageTemplate
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	void deleteCompanyConfigCustompageTemplateByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyConfigCustompageTemplateById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	CompanyConfigCustompageTemplate findCompanyConfigCustompageTemplateById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyConfigCustompageTemplateByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyConfigCustompageTemplate>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-4-25
+	* @user by wangzx
+	 */
+	List<CompanyConfigCustompageTemplate> findCompanyConfigCustompageTemplateByPage(CompanyConfigCustompageTemplate search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyConfigCustompageTemplateService.java
+	 * @Description: 查询类型列表
+	 * @author zhang.zx
+	 * @date 2016年4月25日 下午6:41:08
+	 * @modifier
+	 * @modify-date 2016年4月25日 下午6:41:08
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	List<CompanyConfigCustompageTemplate> queryCustomList(CompanyConfigCustompageTemplate search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyConfigProxyOrgService.java

@@ -0,0 +1,114 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+import java.util.Map;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.company.CompanyConfigProxyOrg;
+
+/**
+ * Service Interface:CompanyConfigProxyOrg
+ * 
+ * @author chopin
+ * @date 2017-3-13
+ */
+public interface ICompanyConfigProxyOrgService {
+    /**
+     * 
+     * @Title: saveCompanyConfigProxyOrg
+     * @Description: 新增CompanyConfigProxyOrg
+     * @return void 返回类型
+     * @throws @exception
+     * @date 2017-3-13
+     * @user by wangzx
+     */
+    void insert(CompanyConfigProxyOrg entity);
+
+    /**
+     * 
+     * @Title: batchSaveCompanyConfigProxyOrg
+     * @Description: 批量新增CompanyConfigProxyOrg
+     * @return void 返回类型
+     * @throws @exception
+     * @date 2017-3-13
+     * @user by wangzx
+     */
+    void batchInsert(List<CompanyConfigProxyOrg> list);
+
+    /**
+     * 
+     * @Title: updateCompanyConfigProxyOrg
+     * @Description: 编辑CompanyConfigProxyOrg
+     * @return void 返回类型
+     * @throws @exception
+     * @date 2017-3-13
+     * @user by wangzx
+     */
+    void update(CompanyConfigProxyOrg entity);
+
+    /**
+     * 
+     * @Title: deleteCompanyConfigProxyOrgById
+     * @Description: 根据id删除CompanyConfigProxyOrg
+     * @param id
+     * @return void 返回类型
+     * @throws @exception
+     * @date 2017-3-13
+     * @user by wangzx
+     */
+    void deleteCompanyConfigProxyOrgById(Integer id);
+
+    /**
+     * 
+     * @Title: deleteCompanyConfigProxyOrgByIds
+     * @Description: 根据id批量删除CompanyConfigProxyOrg
+     * @param ids
+     * @return void 返回类型
+     * @throws @exception
+     * @date 2017-3-13
+     * @user by wangzx
+     */
+    void deleteCompanyConfigProxyOrgByIds(Integer[] ids);
+
+    /**
+     * 
+     * @Title: findCompanyConfigProxyOrgById
+     * @Description: 根据id查询
+     * @param id
+     * @return void 返回类型
+     * @throws @exception
+     * @date 2017-3-13
+     * @user by wangzx
+     */
+    CompanyConfigProxyOrg findCompanyConfigProxyOrgById(Integer id);
+
+    /**
+     * 
+     * @Title: findCompanyConfigProxyOrgByPage
+     * @Description: 分页查询
+     * @return
+     * @return List<CompanyConfigProxyOrg> 返回类型
+     * @throws @exception
+     * @date 2017-3-13
+     * @user by wangzx
+     */
+    List<CompanyConfigProxyOrg> findCompanyConfigProxyOrgByPage(CompanyConfigProxyOrg search);
+
+    PageFinder<CompanyConfigProxyOrg> findProxysList(CompanyConfigProxyOrg search);
+
+    int findProxysListCount(CompanyConfigProxyOrg search);
+
+    List<CompanyConfigProxyOrg> queryProxyByCompanyId(CompanyConfigProxyOrg search);
+
+    int queryCountByNameOrPrefix(Map<String, Object> map);
+
+    CompanyConfigProxyOrg findByInviteCode(CompanyConfigProxyOrg search);
+    
+    List<CompanyConfigProxyOrg> queryCompanyUnsetRateOrg(Integer companyId);
+
+    List<CompanyConfigProxyOrg> queryByConditions(CompanyConfigProxyOrg search);
+
+    List<CompanyConfigProxyOrg> findAjaxSearchByOrgName(CompanyConfigProxyOrg org);
+
+    int findAjaxSearchByOrgNameCount(CompanyConfigProxyOrg org);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyConfigQuestionExpertService.java

@@ -0,0 +1,97 @@
+package com.yuxin.wx.api.company;
+
+import com.yuxin.wx.model.company.CompanyConfigQuestionExpert;
+
+import java.util.List;
+
+/**
+ * Service Interface:CompanyConfigQuestionExpert
+ * 
+ * @author chopin
+ * @date 2017-12-19
+ */
+public interface ICompanyConfigQuestionExpertService {
+	/**
+	 * 
+	 * @Title: saveCompanyConfigQuestionExpert
+	 * @Description: 新增CompanyConfigQuestionExpert
+	 * @return void 返回类型
+	 * @throws @exception
+	 * @date 2017-12-19
+	 * @user by wangzx
+	 */
+	void insert(CompanyConfigQuestionExpert entity);
+
+	/**
+	 * 
+	 * @Title: batchSaveCompanyConfigQuestionExpert
+	 * @Description: 批量新增CompanyConfigQuestionExpert
+	 * @return void 返回类型
+	 * @throws @exception
+	 * @date 2017-12-19
+	 * @user by wangzx
+	 */
+	void batchInsert(List<CompanyConfigQuestionExpert> list);
+
+	/**
+	 * 
+	 * @Title: updateCompanyConfigQuestionExpert
+	 * @Description: 编辑CompanyConfigQuestionExpert
+	 * @return void 返回类型
+	 * @throws @exception
+	 * @date 2017-12-19
+	 * @user by wangzx
+	 */
+	void update(CompanyConfigQuestionExpert entity);
+
+	/**
+	 * 
+	 * @Title: deleteCompanyConfigQuestionExpertById
+	 * @Description: 根据id删除CompanyConfigQuestionExpert
+	 * @param id
+	 * @return void 返回类型
+	 * @throws @exception
+	 * @date 2017-12-19
+	 * @user by wangzx
+	 */
+	void deleteCompanyConfigQuestionExpertById(Integer id);
+
+	/**
+	 * 
+	 * @Title: deleteCompanyConfigQuestionExpertByIds
+	 * @Description: 根据id批量删除CompanyConfigQuestionExpert
+	 * @param ids
+	 * @return void 返回类型
+	 * @throws @exception
+	 * @date 2017-12-19
+	 * @user by wangzx
+	 */
+	void deleteCompanyConfigQuestionExpertByIds(Integer[] ids);
+
+	/**
+	 * 
+	 * @Title: findCompanyConfigQuestionExpertById
+	 * @Description: 根据id查询
+	 * @param id
+	 * @return void 返回类型
+	 * @throws @exception
+	 * @date 2017-12-19
+	 * @user by wangzx
+	 */
+	CompanyConfigQuestionExpert findCompanyConfigQuestionExpertById(Integer id);
+
+	CompanyConfigQuestionExpert findByCompanyId(Integer companyId);
+
+	/**
+	 * 
+	 * @Title: findCompanyConfigQuestionExpertByPage
+	 * @Description: 分页查询
+	 * @return
+	 * @return List<CompanyConfigQuestionExpert> 返回类型
+	 * @throws @exception
+	 * @date 2017-12-19
+	 * @user by wangzx
+	 */
+	List<CompanyConfigQuestionExpert> findCompanyConfigQuestionExpertByPage(CompanyConfigQuestionExpert search);
+
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyCouponsConfigService.java

@@ -0,0 +1,110 @@
+package com.yuxin.wx.api.company;
+
+import java.util.List;
+
+import com.yuxin.wx.model.company.CompanyCouponsConfig;
+/**
+ * Service Interface:CompanyCouponsConfig
+ * @author chopin
+ * @date 2016-6-20
+ */
+public interface ICompanyCouponsConfigService  {
+	/**
+	 * 
+	* @Title: saveCompanyCouponsConfig
+	* @Description: 新增CompanyCouponsConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	void insert(CompanyCouponsConfig entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyCouponsConfig 
+	* @Description: 批量新增CompanyCouponsConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyCouponsConfig> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyCouponsConfig 
+	* @Description: 编辑CompanyCouponsConfig
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	void update(CompanyCouponsConfig entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyCouponsConfigById 
+	* @Description: 根据id删除CompanyCouponsConfig
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	void deleteCompanyCouponsConfigById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyCouponsConfigByIds 
+	* @Description: 根据id批量删除CompanyCouponsConfig
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	void deleteCompanyCouponsConfigByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyCouponsConfigById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	CompanyCouponsConfig findCompanyCouponsConfigById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyCouponsConfigByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyCouponsConfig>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	List<CompanyCouponsConfig> findCompanyCouponsConfigByPage(CompanyCouponsConfig search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyCouponsConfigService.java
+	 * @Description: byCompanyId
+	 * @author dongshuai
+	 * @date 2016年6月20日
+	 * @param search
+	 * @return
+	 */
+	CompanyCouponsConfig findByCompanyId(CompanyCouponsConfig search);
+}

yuxin-school-api/src/main/java/com/yuxin/wx/api/company/ICompanyCouponsLibService.java

@@ -0,0 +1,191 @@
+package com.yuxin.wx.api.company;
+
+import java.util.Date;
+import java.util.List;
+
+import com.yuxin.wx.common.PageFinder;
+import com.yuxin.wx.model.company.CompanyCouponsLib;
+import com.yuxin.wx.vo.company.CompanyCouponsLibOrderVo;
+import com.yuxin.wx.vo.company.CompanyCouponsLibVo;
+
+/**
+ * Service Interface:CompanyCouponsLib
+ * @author chopin
+ * @date 2016-6-20
+ */
+public interface ICompanyCouponsLibService  {
+	/**
+	 * 
+	* @Title: saveCompanyCouponsLib
+	* @Description: 新增CompanyCouponsLib
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	void insert(CompanyCouponsLib entity);
+	
+	/**
+	 * 
+	* @Title: batchSaveCompanyCouponsLib 
+	* @Description: 批量新增CompanyCouponsLib
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	void batchInsert(List<CompanyCouponsLib> list);
+	
+	/**
+	 * 
+	* @Title: updateCompanyCouponsLib 
+	* @Description: 编辑CompanyCouponsLib
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	void update(CompanyCouponsLib entity);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyCouponsLibById 
+	* @Description: 根据id删除CompanyCouponsLib
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	void deleteCompanyCouponsLibById(Integer id);
+	
+	/**
+	 * 
+	* @Title: deleteCompanyCouponsLibByIds 
+	* @Description: 根据id批量删除CompanyCouponsLib
+	* @param ids
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	void deleteCompanyCouponsLibByIds(Integer[] ids);
+	
+	/**
+	 * 
+	* @Title: findCompanyCouponsLibById 
+	* @Description: 根据id查询
+	* @param id
+	* @return void    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	CompanyCouponsLib findCompanyCouponsLibById(Integer id);
+	
+	/**
+	 * 
+	* @Title: findCompanyCouponsLibByPage 
+	* @Description: 分页查询
+	* @return
+	* @return List<CompanyCouponsLib>    返回类型 
+	* @throws 
+	* @exception 
+	* @date 2016-6-20
+	* @user by wangzx
+	 */
+	List<CompanyCouponsLib> findCompanyCouponsLibByPage(CompanyCouponsLib search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyCouponsLibService.java
+	 * @Description: 查询优惠码库BY PatchId
+	 * @author dongshuai
+	 * @date 2016年6月21日 下午6:58:49
+	 * @modifier
+	 * @modify-date 2016年6月21日 下午6:58:49
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	PageFinder<CompanyCouponsLib> queryLibsListByPatchId(CompanyCouponsLib search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyCouponsLibService.java
+	 * @Description: 查询优惠券使用情况
+	 * @author dongshuai
+	 * @date 2016年6月22日 下午1:14:33
+	 * @modifier
+	 * @modify-date 2016年6月22日 下午1:14:33
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	PageFinder<CompanyCouponsLibOrderVo> queryLibsForUseOrder(CompanyCouponsLibVo search);
+
+
+	/**
+	 * 优惠券使用情况导出
+	 * @param search
+	 * @return
+     */
+	List<CompanyCouponsLibOrderVo> queryLibsForUseOrderExport(CompanyCouponsLibVo search);
+	
+	/**
+	 * 
+	 * Class Name: ICompanyCouponsLibService.java
+	 * @Description: 导出优惠券
+	 * @author dongshuai
+	 * @date 2016年6月22日 下午2:47:24
+	 * @modifier
+	 * @modify-date 2016年6月22日 下午2:47:24
+	 * @version 1.0
+	 * @param search
+	 * @return
+	 */
+	List<CompanyCouponsLib> queryLibsListByPatchIdExport(CompanyCouponsLib search);
+	/**
+	 * 
+	 * Class Name: ICompanyCouponsLibService.java
+	 * @Description: 根据code查询优惠券
+	 * @author yuchanglong
+	 * @date 2016年6月22日 上午10:20:14
+	 * @version 1.0
+	 * @param code
+	 * @return
+	 */
+	CompanyCouponsLib findOneByCode(String code);
+
+	void resetStatus(String code);
+
+	/**
+	 * 查询优惠券领取数量
+	 *
+	 * @param patchId
+	 * @author PengSongHe
+	 * @date 2019/10/11 15:09
+	 */
+	Integer queryCouponReceiveNum(Integer patchId);
+
+	/**
+	 * 更新已发放的优惠券时长等信息
+	 *
+	 * @author PengSongHe
+	 * @date 2019/10/16 11:37
+	 */
+	Integer updateCouponLibByPatch(Date timeLimitFrom, Date timeLimitTo, Integer patchId, String description);
+
+	/**
+	 * 批量更新优惠券为失效状态
+	 * @author PengSongHe
+	 * @date 2019/10/21 19:00
+	 */
+	Integer updateCouponLibDelFlagByPatch(CompanyCouponsLib lib);
+}