init

java代码/.gitignore

@@ -0,0 +1,44 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml

java代码/.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+  "configurations": [
+    {
+      "type": "java",
+      "name": "Spring Boot-RuoYiApplication<ruoyi-admin>",
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "console": "internalConsole",
+      "mainClass": "com.ruoyi.RuoYiApplication",
+      "projectName": "ruoyi-admin",
+      "args": ""
+    }
+  ]
+}

java代码/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  
+}

java代码/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 RuoYi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

java代码/bin/clean.bat

@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [ÐÅÏ¢] ÇåÀíÉú³É·¾¶¡£
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean
+
+pause

java代码/bin/package.bat

@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [信息] 打包Web工程，生成war/jar包文件。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean package -Dmaven.test.skip=true
+
+pause

java代码/bin/run.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [ÐÅÏ¢] ÔËÐÐWeb¹¤³Ì¡£
+echo.
+
+cd %~dp0
+cd ../ruoyi-admin/target
+
+set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -jar %JAVA_OPTS% ruoyi-admin.jar
+
+cd bin
+pause

java代码/pom.xml

@@ -0,0 +1,266 @@
+<?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.ruoyi</groupId>
+    <artifactId>ruoyi</artifactId>
+    <version>3.5.0</version>
+
+    <name>ruoyi</name>
+    <url>http://www.ruoyi.vip</url>
+    <description>若依管理系统</description>
+    
+    <properties>
+        <ruoyi.version>3.5.0</ruoyi.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+        <druid.version>1.2.6</druid.version>
+        <bitwalker.version>1.21</bitwalker.version>
+        <swagger.version>3.0.0</swagger.version>
+		<kaptcha.version>2.3.2</kaptcha.version>
+		<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
+        <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
+        <fastjson.version>1.2.76</fastjson.version>
+        <oshi.version>5.6.0</oshi.version>
+        <jna.version>5.7.0</jna.version>
+        <commons.io.version>2.5</commons.io.version>
+        <commons.fileupload.version>1.3.3</commons.fileupload.version>
+        <commons.collections.version>3.2.2</commons.collections.version>
+        <poi.version>4.1.2</poi.version>
+        <velocity.version>1.7</velocity.version>
+        <jwt.version>0.9.1</jwt.version>
+    </properties>
+	
+    <!-- 依赖声明 -->
+    <dependencyManagement>
+        <dependencies>
+
+            <!-- SpringBoot的依赖配置-->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.2.13.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- 阿里数据库连接池 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid-spring-boot-starter</artifactId>
+                <version>${druid.version}</version>
+            </dependency>
+
+            <!-- 解析客户端操作系统、浏览器等 -->
+            <dependency>
+                <groupId>eu.bitwalker</groupId>
+                <artifactId>UserAgentUtils</artifactId>
+                <version>${bitwalker.version}</version>
+            </dependency>
+
+            <!-- SpringBoot集成mybatis框架 -->
+            <dependency>
+                <groupId>org.mybatis.spring.boot</groupId>
+                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <version>${mybatis-spring-boot.version}</version>
+            </dependency>
+
+            <!-- pagehelper 分页插件 -->
+            <dependency>
+                <groupId>com.github.pagehelper</groupId>
+                <artifactId>pagehelper-spring-boot-starter</artifactId>
+                <version>${pagehelper.boot.version}</version>
+            </dependency>
+
+            <!-- 获取系统信息 -->
+            <dependency>
+                <groupId>com.github.oshi</groupId>
+                <artifactId>oshi-core</artifactId>
+                <version>${oshi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna-platform</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
+
+            <!-- Swagger3依赖 -->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-boot-starter</artifactId>
+                <version>${swagger.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-models</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- io常用工具类 -->
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons.io.version}</version>
+            </dependency>
+
+            <!-- 文件上传工具类 -->
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>${commons.fileupload.version}</version>
+            </dependency>
+
+            <!-- excel工具 -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <!-- velocity代码生成使用模板 -->
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+                <version>${velocity.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- collections工具类 -->
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons.collections.version}</version>
+            </dependency>
+
+            <!-- 阿里JSON解析器 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
+            <!-- Token生成与解析-->
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+                <version>${jwt.version}</version>
+            </dependency>
+
+            <!-- 验证码 -->
+            <dependency>
+                <groupId>com.github.penggle</groupId>
+                <artifactId>kaptcha</artifactId>
+                <version>${kaptcha.version}</version>
+            </dependency>
+
+            <!-- 定时任务-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-quartz</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 代码生成-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-generator</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 核心模块-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-framework</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 系统模块-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-system</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 通用工具-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>ruoyi-admin</module>
+        <module>ruoyi-framework</module>
+        <module>ruoyi-system</module>
+        <module>ruoyi-quartz</module>
+        <module>ruoyi-generator</module>
+        <module>ruoyi-common</module>
+    </modules>
+    <packaging>pom</packaging>
+
+
+    <dependencies>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+</project>

java代码/ruoyi-admin/pom.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.5.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>ruoyi-admin</artifactId>
+
+    <description>
+        web服务入口
+    </description>
+
+    <dependencies>
+
+        <!-- spring-boot-devtools -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional> <!-- 表示依赖不会传递 -->
+        </dependency>
+
+        <!-- swagger3-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
+         <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-framework</artifactId>
+        </dependency>
+
+        <!-- 定时任务-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-quartz</artifactId>
+        </dependency>
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-generator</artifactId>
+        </dependency>
+        
+        <dependency>
+        <groupId>javax.xml.bind</groupId>
+	        <artifactId>jaxb-api</artifactId>
+	        <version>2.3.0</version>
+	    </dependency>
+	    <dependency>
+	        <groupId>com.sun.xml.bind</groupId>
+	        <artifactId>jaxb-impl</artifactId>
+	        <version>2.3.0</version>
+	    </dependency>
+	    <dependency>
+	        <groupId>com.sun.xml.bind</groupId>
+	        <artifactId>jaxb-core</artifactId>
+	        <version>2.3.0</version>
+	    </dependency>
+	    <dependency>
+	        <groupId>javax.activation</groupId>
+	        <artifactId>activation</artifactId>
+	        <version>1.1.1</version>
+	    </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>   
+                <groupId>org.apache.maven.plugins</groupId>   
+                <artifactId>maven-war-plugin</artifactId>   
+                <version>3.1.0</version>   
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>   
+           </plugin>   
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>

java代码/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -0,0 +1,30 @@
+package com.ruoyi;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * 启动程序
+ * 
+ * @author ruoyi
+ */
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+public class RuoYiApplication
+{
+    public static void main(String[] args)
+    {
+        // System.setProperty("spring.devtools.restart.enabled", "false");
+        SpringApplication.run(RuoYiApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java

@@ -0,0 +1,18 @@
+package com.ruoyi;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * web容器中进行部署
+ * 
+ * @author ruoyi
+ */
+public class RuoYiServletInitializer extends SpringBootServletInitializer
+{
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    {
+        return application.sources(RuoYiApplication.class);
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccAcademicCommitteeController.java

@@ -0,0 +1,125 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccAcademicCommittee;
+import com.ruoyi.web.service.IJccAcademicCommitteeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 学术委员会Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@RestController
+@RequestMapping("/system/committee")
+public class JccAcademicCommitteeController extends BaseController
+{
+    @Autowired
+    private IJccAcademicCommitteeService jccAcademicCommitteeService;
+
+    /**
+     * 查询学术委员会列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:committee:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccAcademicCommittee jccAcademicCommittee)
+    {
+        startPage();
+        List<JccAcademicCommittee> list = jccAcademicCommitteeService.selectJccAcademicCommitteeList(jccAcademicCommittee);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询主任列表
+     */
+    @GetMapping("/listone")
+    public TableDataInfo listone(JccAcademicCommittee jccAcademicCommittee)
+    {
+        startPage();
+        List<JccAcademicCommittee> list = jccAcademicCommitteeService.selectJccAcademicCommitteeListone(jccAcademicCommittee);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询副主任列表
+     */
+    @GetMapping("/listtwo")
+    public TableDataInfo listtwo(JccAcademicCommittee jccAcademicCommittee)
+    {
+        startPage();
+        List<JccAcademicCommittee> list = jccAcademicCommitteeService.selectJccAcademicCommitteeListtwo(jccAcademicCommittee);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学术委员会列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:committee:export')")
+    @Log(title = "学术委员会", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccAcademicCommittee jccAcademicCommittee)
+    {
+        List<JccAcademicCommittee> list = jccAcademicCommitteeService.selectJccAcademicCommitteeList(jccAcademicCommittee);
+        ExcelUtil<JccAcademicCommittee> util = new ExcelUtil<JccAcademicCommittee>(JccAcademicCommittee.class);
+        return util.exportExcel(list, "学术委员会数据");
+    }
+
+    /**
+     * 获取学术委员会详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:committee:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccAcademicCommitteeService.selectJccAcademicCommitteeById(id));
+    }
+
+    /**
+     * 新增学术委员会
+     */
+    @PreAuthorize("@ss.hasPermi('system:committee:add')")
+    @Log(title = "学术委员会", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccAcademicCommittee jccAcademicCommittee)
+    {
+        return toAjax(jccAcademicCommitteeService.insertJccAcademicCommittee(jccAcademicCommittee));
+    }
+
+    /**
+     * 修改学术委员会
+     */
+    @PreAuthorize("@ss.hasPermi('system:committee:edit')")
+    @Log(title = "学术委员会", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccAcademicCommittee jccAcademicCommittee)
+    {
+        return toAjax(jccAcademicCommitteeService.updateJccAcademicCommittee(jccAcademicCommittee));
+    }
+
+    /**
+     * 删除学术委员会
+     */
+    @PreAuthorize("@ss.hasPermi('system:committee:remove')")
+    @Log(title = "学术委员会", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccAcademicCommitteeService.deleteJccAcademicCommitteeByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccActivitiesTimesController.java

@@ -0,0 +1,147 @@
+package com.ruoyi.web.controller;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccActivitiesTimes;
+import com.ruoyi.web.service.IJccActivitiesTimesService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 实验室活动时间Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-28
+ */
+@RestController
+@RequestMapping("/system/times")
+public class JccActivitiesTimesController extends BaseController
+{
+    @Autowired
+    private IJccActivitiesTimesService jccActivitiesTimesService;
+
+    /**
+     * 查询实验室活动时间列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:times:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccActivitiesTimes jccActivitiesTimes)
+    {
+        startPage();
+        List<JccActivitiesTimes> list = jccActivitiesTimesService.selectJccActivitiesTimesList(jccActivitiesTimes);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出实验室活动时间列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:times:export')")
+    @Log(title = "实验室活动时间", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccActivitiesTimes jccActivitiesTimes)
+    {
+        List<JccActivitiesTimes> list = jccActivitiesTimesService.selectJccActivitiesTimesList(jccActivitiesTimes);
+        ExcelUtil<JccActivitiesTimes> util = new ExcelUtil<JccActivitiesTimes>(JccActivitiesTimes.class);
+        return util.exportExcel(list, "实验室活动时间数据");
+    }
+
+    /**
+     * 获取实验室活动时间详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:times:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccActivitiesTimesService.selectJccActivitiesTimesById(id));
+    }
+
+    /**
+     * 新增实验室活动时间
+     */
+    @PreAuthorize("@ss.hasPermi('system:times:add')")
+    @Log(title = "实验室活动时间", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccActivitiesTimes jccActivitiesTimes)
+    {
+        return toAjax(jccActivitiesTimesService.insertJccActivitiesTimes(jccActivitiesTimes));
+    }
+
+    /**
+     * 修改实验室活动时间
+     */
+    @PreAuthorize("@ss.hasPermi('system:times:edit')")
+    @Log(title = "实验室活动时间", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccActivitiesTimes jccActivitiesTimes)
+    {
+        return toAjax(jccActivitiesTimesService.updateJccActivitiesTimes(jccActivitiesTimes));
+    }
+
+    /**
+     * 删除实验室活动时间
+     */
+    @PreAuthorize("@ss.hasPermi('system:times:remove')")
+    @Log(title = "实验室活动时间", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccActivitiesTimesService.deleteJccActivitiesTimesByIds(ids));
+    }
+
+    /**
+     * 查询实验室活动时间列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:times:getTimes')")
+    @GetMapping("/getTimes")
+    public AjaxResult getTimes()
+    {
+        JccActivitiesTimes jccActivitiesTimes=new JccActivitiesTimes();
+        jccActivitiesTimes.setIsOpen("0");
+        List<JccActivitiesTimes> list = jccActivitiesTimesService.selectJccActivitiesTimesList(jccActivitiesTimes);
+        Integer flag=0;
+        if(list.size()>0){
+            JccActivitiesTimes activitiesTimes=list.get(0);
+            DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+            String startTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(activitiesTimes.getStartTime());
+            String endTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(activitiesTimes.getEndTime());
+            String nowTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+            Date startTime= null;
+            Date endTime=null;
+            Date nowTime=null;
+            try {
+                startTime = df.parse(startTimeStr);
+                endTime= df.parse(endTimeStr);
+                nowTime= df.parse(nowTimeStr);
+                if (nowTime.getTime() >= startTime.getTime()&&nowTime.getTime()<=endTime.getTime()) {
+                    flag=1;
+
+                }
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        Map map = new HashMap();
+        map.put("flag", flag);
+        return AjaxResult.success("成功", map);
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccBasicInformationController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccBasicInformation;
+import com.ruoyi.web.service.IJccBasicInformationService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 基础信息Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@RestController
+@RequestMapping("/system/information")
+public class JccBasicInformationController extends BaseController
+{
+    @Autowired
+    private IJccBasicInformationService jccBasicInformationService;
+
+    /**
+     * 查询基础信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccBasicInformation jccBasicInformation)
+    {
+        startPage();
+        List<JccBasicInformation> list = jccBasicInformationService.selectJccBasicInformationList(jccBasicInformation);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出基础信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:export')")
+    @Log(title = "基础信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccBasicInformation jccBasicInformation)
+    {
+        List<JccBasicInformation> list = jccBasicInformationService.selectJccBasicInformationList(jccBasicInformation);
+        ExcelUtil<JccBasicInformation> util = new ExcelUtil<JccBasicInformation>(JccBasicInformation.class);
+        return util.exportExcel(list, "基础信息数据");
+    }
+
+    /**
+     * 获取基础信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:query')")
+    @GetMapping()
+    public AjaxResult getInfo()
+    {
+        return AjaxResult.success(jccBasicInformationService.selectJccBasicInformationById());
+    }
+
+    /**
+     * 新增基础信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:add')")
+    @Log(title = "基础信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccBasicInformation jccBasicInformation)
+    {
+        return toAjax(jccBasicInformationService.insertJccBasicInformation(jccBasicInformation));
+    }
+
+    /**
+     * 修改基础信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:edit')")
+    @Log(title = "基础信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccBasicInformation jccBasicInformation)
+    {
+        return toAjax(jccBasicInformationService.updateJccBasicInformation(jccBasicInformation));
+    }
+
+    /**
+     * 删除基础信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:remove')")
+    @Log(title = "基础信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccBasicInformationService.deleteJccBasicInformationByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccBearScienceController.java

@@ -0,0 +1,106 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.uuid.IdUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccBearScience;
+import com.ruoyi.web.service.IJccBearScienceService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 承担科研任务Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-10
+ */
+@RestController
+@RequestMapping("/system/science")
+public class JccBearScienceController extends BaseController
+{
+    @Autowired
+    private IJccBearScienceService jccBearScienceService;
+
+    /**
+     * 查询承担科研任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:science:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccBearScience jccBearScience)
+    {
+        startPage();
+        List<JccBearScience> list = jccBearScienceService.selectJccBearScienceList(jccBearScience);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出承担科研任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:science:export')")
+    @Log(title = "承担科研任务", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccBearScience jccBearScience)
+    {
+        List<JccBearScience> list = jccBearScienceService.selectJccBearScienceList(jccBearScience);
+        ExcelUtil<JccBearScience> util = new ExcelUtil<JccBearScience>(JccBearScience.class);
+        return util.exportExcel(list, "承担科研任务数据");
+    }
+
+    /**
+     * 获取承担科研任务详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:science:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccBearScienceService.selectJccBearScienceById(id));
+    }
+
+    /**
+     * 新增承担科研任务
+     */
+    @PreAuthorize("@ss.hasPermi('system:science:add')")
+    @Log(title = "承担科研任务", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccBearScience jccBearScience)
+    {
+
+        return toAjax(jccBearScienceService.insertJccBearScience(jccBearScience));
+    }
+
+    /**
+     * 修改承担科研任务
+     */
+    @PreAuthorize("@ss.hasPermi('system:science:edit')")
+    @Log(title = "承担科研任务", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccBearScience jccBearScience)
+    {
+        return toAjax(jccBearScienceService.updateJccBearScience(jccBearScience));
+    }
+
+    /**
+     * 删除承担科研任务
+     */
+    @PreAuthorize("@ss.hasPermi('system:science:remove')")
+    @Log(title = "承担科研任务", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccBearScienceService.deleteJccBearScienceByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccBearScienceUsersController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccBearScienceUsers;
+import com.ruoyi.web.service.IJccBearScienceUsersService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 承担科研任务参加人Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-17
+ */
+@RestController
+@RequestMapping("/system/users")
+public class JccBearScienceUsersController extends BaseController
+{
+    @Autowired
+    private IJccBearScienceUsersService jccBearScienceUsersService;
+
+    /**
+     * 查询承担科研任务参加人列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:users:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccBearScienceUsers jccBearScienceUsers)
+    {
+        startPage();
+        List<JccBearScienceUsers> list = jccBearScienceUsersService.selectJccBearScienceUsersList(jccBearScienceUsers);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出承担科研任务参加人列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:users:export')")
+    @Log(title = "承担科研任务参加人", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccBearScienceUsers jccBearScienceUsers)
+    {
+        List<JccBearScienceUsers> list = jccBearScienceUsersService.selectJccBearScienceUsersList(jccBearScienceUsers);
+        ExcelUtil<JccBearScienceUsers> util = new ExcelUtil<JccBearScienceUsers>(JccBearScienceUsers.class);
+        return util.exportExcel(list, "承担科研任务参加人数据");
+    }
+
+    /**
+     * 获取承担科研任务参加人详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:users:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccBearScienceUsersService.selectJccBearScienceUsersById(id));
+    }
+
+    /**
+     * 新增承担科研任务参加人
+     */
+    @PreAuthorize("@ss.hasPermi('system:users:add')")
+    @Log(title = "承担科研任务参加人", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccBearScienceUsers jccBearScienceUsers)
+    {
+        return toAjax(jccBearScienceUsersService.insertJccBearScienceUsers(jccBearScienceUsers));
+    }
+
+    /**
+     * 修改承担科研任务参加人
+     */
+    @PreAuthorize("@ss.hasPermi('system:users:edit')")
+    @Log(title = "承担科研任务参加人", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccBearScienceUsers jccBearScienceUsers)
+    {
+        return toAjax(jccBearScienceUsersService.updateJccBearScienceUsers(jccBearScienceUsers));
+    }
+
+    /**
+     * 删除承担科研任务参加人
+     */
+    @PreAuthorize("@ss.hasPermi('system:users:remove')")
+    @Log(title = "承担科研任务参加人", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccBearScienceUsersService.deleteJccBearScienceUsersByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccChiefAssistantController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccChiefAssistant;
+import com.ruoyi.web.service.IJccChiefAssistantService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 主任及科研助理Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-01
+ */
+@RestController
+@RequestMapping("/system/assistant")
+public class JccChiefAssistantController extends BaseController
+{
+    @Autowired
+    private IJccChiefAssistantService jccChiefAssistantService;
+
+    /**
+     * 查询主任及科研助理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:assistant:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccChiefAssistant jccChiefAssistant)
+    {
+        startPage();
+        List<JccChiefAssistant> list = jccChiefAssistantService.selectJccChiefAssistantList(jccChiefAssistant);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出主任及科研助理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:assistant:export')")
+    @Log(title = "主任及科研助理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccChiefAssistant jccChiefAssistant)
+    {
+        List<JccChiefAssistant> list = jccChiefAssistantService.selectJccChiefAssistantList(jccChiefAssistant);
+        ExcelUtil<JccChiefAssistant> util = new ExcelUtil<JccChiefAssistant>(JccChiefAssistant.class);
+        return util.exportExcel(list, "主任及科研助理数据");
+    }
+
+    /**
+     * 获取主任及科研助理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:assistant:query')")
+    @GetMapping()
+    public AjaxResult getInfo()
+    {
+        return AjaxResult.success(jccChiefAssistantService.selectJccChiefAssistantById());
+    }
+
+    /**
+     * 新增主任及科研助理
+     */
+    @PreAuthorize("@ss.hasPermi('system:assistant:add')")
+    @Log(title = "主任及科研助理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccChiefAssistant jccChiefAssistant)
+    {
+        return toAjax(jccChiefAssistantService.insertJccChiefAssistant(jccChiefAssistant));
+    }
+
+    /**
+     * 修改主任及科研助理
+     */
+    @PreAuthorize("@ss.hasPermi('system:assistant:edit')")
+    @Log(title = "主任及科研助理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccChiefAssistant jccChiefAssistant)
+    {
+        return toAjax(jccChiefAssistantService.updateJccChiefAssistant(jccChiefAssistant));
+    }
+
+    /**
+     * 删除主任及科研助理
+     */
+    @PreAuthorize("@ss.hasPermi('system:assistant:remove')")
+    @Log(title = "主任及科研助理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccChiefAssistantService.deleteJccChiefAssistantByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccDirectionPersonRelationsController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccDirectionPersonRelations;
+import com.ruoyi.web.service.IJccDirectionPersonRelationsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 方向与人员（核心人员）关系Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-15
+ */
+@RestController
+@RequestMapping("/system/relations")
+public class JccDirectionPersonRelationsController extends BaseController
+{
+    @Autowired
+    private IJccDirectionPersonRelationsService jccDirectionPersonRelationsService;
+
+    /**
+     * 查询方向与人员（核心人员）关系列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:relations:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccDirectionPersonRelations jccDirectionPersonRelations)
+    {
+        startPage();
+        List<JccDirectionPersonRelations> list = jccDirectionPersonRelationsService.selectJccDirectionPersonRelationsList(jccDirectionPersonRelations);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出方向与人员（核心人员）关系列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:relations:export')")
+    @Log(title = "方向与人员（核心人员）关系", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccDirectionPersonRelations jccDirectionPersonRelations)
+    {
+        List<JccDirectionPersonRelations> list = jccDirectionPersonRelationsService.selectJccDirectionPersonRelationsList(jccDirectionPersonRelations);
+        ExcelUtil<JccDirectionPersonRelations> util = new ExcelUtil<JccDirectionPersonRelations>(JccDirectionPersonRelations.class);
+        return util.exportExcel(list, "方向与人员（核心人员）关系数据");
+    }
+
+    /**
+     * 获取方向与人员（核心人员）关系详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:relations:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccDirectionPersonRelationsService.selectJccDirectionPersonRelationsById(id));
+    }
+
+    /**
+     * 新增方向与人员（核心人员）关系
+     */
+    @PreAuthorize("@ss.hasPermi('system:relations:add')")
+    @Log(title = "方向与人员（核心人员）关系", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccDirectionPersonRelations jccDirectionPersonRelations)
+    {
+        return toAjax(jccDirectionPersonRelationsService.insertJccDirectionPersonRelations(jccDirectionPersonRelations));
+    }
+
+    /**
+     * 修改方向与人员（核心人员）关系
+     */
+    @PreAuthorize("@ss.hasPermi('system:relations:edit')")
+    @Log(title = "方向与人员（核心人员）关系", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccDirectionPersonRelations jccDirectionPersonRelations)
+    {
+        return toAjax(jccDirectionPersonRelationsService.updateJccDirectionPersonRelations(jccDirectionPersonRelations));
+    }
+
+    /**
+     * 删除方向与人员（核心人员）关系
+     */
+    @PreAuthorize("@ss.hasPermi('system:relations:remove')")
+    @Log(title = "方向与人员（核心人员）关系", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccDirectionPersonRelationsService.deleteJccDirectionPersonRelationsByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccEquipmentConditionController.java

@@ -0,0 +1,114 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccEquipmentCondition;
+import com.ruoyi.web.service.IJccEquipmentConditionService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 设备情况Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@RestController
+@RequestMapping("/system/condition")
+public class JccEquipmentConditionController extends BaseController
+{
+    @Autowired
+    private IJccEquipmentConditionService jccEquipmentConditionService;
+
+    /**
+     * 查询设备情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:condition:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccEquipmentCondition jccEquipmentCondition)
+    {
+        startPage();
+        List<JccEquipmentCondition> list = jccEquipmentConditionService.selectJccEquipmentConditionList(jccEquipmentCondition);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:condition:export')")
+    @Log(title = "设备情况", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccEquipmentCondition jccEquipmentCondition)
+    {
+        List<JccEquipmentCondition> list = jccEquipmentConditionService.selectJccEquipmentConditionList(jccEquipmentCondition);
+        ExcelUtil<JccEquipmentCondition> util = new ExcelUtil<JccEquipmentCondition>(JccEquipmentCondition.class);
+        return util.exportExcel(list, "设备情况数据");
+    }
+
+    /**
+     * 获取设备情况详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:condition:query')")
+    @GetMapping()
+    public AjaxResult getInfo()
+    {
+        return AjaxResult.success(jccEquipmentConditionService.selectJccEquipmentConditionById());
+    }
+
+    /**
+     * 新增设备情况
+     */
+    @PreAuthorize("@ss.hasPermi('system:condition:add')")
+    @Log(title = "设备情况", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccEquipmentCondition jccEquipmentCondition)
+    {
+        return toAjax(jccEquipmentConditionService.insertJccEquipmentCondition(jccEquipmentCondition));
+    }
+
+    /**
+     * 修改设备情况
+     */
+    @PreAuthorize("@ss.hasPermi('system:condition:edit')")
+    @Log(title = "设备情况", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccEquipmentCondition jccEquipmentCondition)
+    {
+        return toAjax(jccEquipmentConditionService.updateJccEquipmentCondition(jccEquipmentCondition));
+    }
+
+    /**
+     * 删除设备情况
+     */
+    @PreAuthorize("@ss.hasPermi('system:condition:remove')")
+    @Log(title = "设备情况", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccEquipmentConditionService.deleteJccEquipmentConditionByIds(ids));
+    }
+
+    /**
+     * 查询设备情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:condition:count')")
+    @GetMapping("/count")
+    public TableDataInfo selectCount()
+    {
+        List<JccEquipmentCondition> list = jccEquipmentConditionService.selectCount();
+        return getDataTable(list);
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccFileController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+
+import com.ruoyi.web.domain.JccFile;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccFile;
+import com.ruoyi.web.service.IJccFileService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 文件Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-16
+ */
+@RestController
+@RequestMapping("/system/file")
+public class JccFileController extends BaseController
+{
+    @Autowired
+    private IJccFileService jccFileService;
+
+    /**
+     * 查询文件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccFile jccFile)
+    {
+        startPage();
+        List<JccFile> list = jccFileService.selectJccFileList(jccFile);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出文件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:export')")
+    @Log(title = "文件", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccFile jccFile)
+    {
+        List<JccFile> list = jccFileService.selectJccFileList(jccFile);
+        ExcelUtil<JccFile> util = new ExcelUtil<JccFile>(JccFile.class);
+        return util.exportExcel(list, "文件数据");
+    }
+
+    /**
+     * 获取文件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccFileService.selectJccFileById(id));
+    }
+
+    /**
+     * 新增文件
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:add')")
+    @Log(title = "文件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccFile jccFile)
+    {
+        return toAjax(jccFileService.insertJccFile(jccFile));
+    }
+
+    /**
+     * 修改文件
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:edit')")
+    @Log(title = "文件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccFile jccFile)
+    {
+        return toAjax(jccFileService.updateJccFile(jccFile));
+    }
+
+    /**
+     * 删除文件
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:remove')")
+    @Log(title = "文件", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccFileService.deleteJccFileByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccFileModuleController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccFileModule;
+import com.ruoyi.web.service.IJccFileModuleService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 模块文件Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-16
+ */
+@RestController
+@RequestMapping("/system/module")
+public class JccFileModuleController extends BaseController
+{
+    @Autowired
+    private IJccFileModuleService jccFileModuleService;
+
+    /**
+     * 查询模块文件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:module:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccFileModule jccFileModule)
+    {
+        startPage();
+        List<JccFileModule> list = jccFileModuleService.selectJccFileModuleList(jccFileModule);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出模块文件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:module:export')")
+    @Log(title = "模块文件", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccFileModule jccFileModule)
+    {
+        List<JccFileModule> list = jccFileModuleService.selectJccFileModuleList(jccFileModule);
+        ExcelUtil<JccFileModule> util = new ExcelUtil<JccFileModule>(JccFileModule.class);
+        return util.exportExcel(list, "模块文件数据");
+    }
+
+    /**
+     * 获取模块文件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:module:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccFileModuleService.selectJccFileModuleById(id));
+    }
+
+    /**
+     * 新增模块文件
+     */
+    @PreAuthorize("@ss.hasPermi('system:module:add')")
+    @Log(title = "模块文件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccFileModule jccFileModule)
+    {
+        return toAjax(jccFileModuleService.insertJccFileModule(jccFileModule));
+    }
+
+    /**
+     * 修改模块文件
+     */
+    @PreAuthorize("@ss.hasPermi('system:module:edit')")
+    @Log(title = "模块文件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccFileModule jccFileModule)
+    {
+        return toAjax(jccFileModuleService.updateJccFileModule(jccFileModule));
+    }
+
+    /**
+     * 删除模块文件
+     */
+    @PreAuthorize("@ss.hasPermi('system:module:remove')")
+    @Log(title = "模块文件", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccFileModuleService.deleteJccFileModuleByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccFixedInputController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccFixedInput;
+import com.ruoyi.web.service.IJccFixedInputService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 固定投入Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@RestController
+@RequestMapping("/system/input")
+public class JccFixedInputController extends BaseController
+{
+    @Autowired
+    private IJccFixedInputService jccFixedInputService;
+
+    /**
+     * 查询固定投入列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:input:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccFixedInput jccFixedInput)
+    {
+        startPage();
+        List<JccFixedInput> list = jccFixedInputService.selectJccFixedInputList(jccFixedInput);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出固定投入列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:input:export')")
+    @Log(title = "固定投入", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccFixedInput jccFixedInput)
+    {
+        List<JccFixedInput> list = jccFixedInputService.selectJccFixedInputList(jccFixedInput);
+        ExcelUtil<JccFixedInput> util = new ExcelUtil<JccFixedInput>(JccFixedInput.class);
+        return util.exportExcel(list, "固定投入数据");
+    }
+
+    /**
+     * 获取固定投入详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:input:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccFixedInputService.selectJccFixedInputById(id));
+    }
+
+    /**
+     * 新增固定投入
+     */
+    @PreAuthorize("@ss.hasPermi('system:input:add')")
+    @Log(title = "固定投入", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccFixedInput jccFixedInput)
+    {
+        return toAjax(jccFixedInputService.insertJccFixedInput(jccFixedInput));
+    }
+
+    /**
+     * 修改固定投入
+     */
+    @PreAuthorize("@ss.hasPermi('system:input:edit')")
+    @Log(title = "固定投入", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccFixedInput jccFixedInput)
+    {
+        return toAjax(jccFixedInputService.updateJccFixedInput(jccFixedInput));
+    }
+
+    /**
+     * 删除固定投入
+     */
+    @PreAuthorize("@ss.hasPermi('system:input:remove')")
+    @Log(title = "固定投入", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccFixedInputService.deleteJccFixedInputByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccFixedPersonnelController.java

@@ -0,0 +1,135 @@
+package com.ruoyi.web.controller;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.web.domain.JccAcademicCommittee;
+import com.ruoyi.web.domain.JccFixedPersonnel;
+import com.ruoyi.web.domain.JccFlowPersonnel;
+import com.ruoyi.web.service.IJccAcademicCommitteeService;
+import com.ruoyi.web.service.IJccFlowPersonnelService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.service.IJccFixedPersonnelService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 固定人员Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@RestController
+@RequestMapping("/system/personnel")
+public class JccFixedPersonnelController extends BaseController
+{
+    @Autowired
+    private IJccFixedPersonnelService jccFixedPersonnelService;
+    @Autowired
+    private IJccAcademicCommitteeService jccAcademicCommitteeService;
+    @Autowired
+    private IJccFlowPersonnelService jccFlowPersonnelService;
+    @Autowired
+    private ServerConfig serverConfig;
+
+    /**
+     * 查询固定人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnel:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccFixedPersonnel jccFixedPersonnel)
+    {
+        startPage();
+        List<JccFixedPersonnel> list = jccFixedPersonnelService.selectJccFixedPersonnelList(jccFixedPersonnel);
+        return getDataTable(list);
+    }
+    /**
+     * 查询固定人员列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:personnel:list')")
+    @GetMapping("/listsss")
+    public TableDataInfo listsss(JccFixedPersonnel jccFixedPersonnel)
+    {
+        JccAcademicCommittee jccAcademicCommittee = new JccAcademicCommittee();
+        jccAcademicCommittee.setCreateBy(jccFixedPersonnel.getCreateBy());
+
+        JccFlowPersonnel jccFlowPersonnel = new JccFlowPersonnel();
+        jccFlowPersonnel.setCreateBy(jccFixedPersonnel.getCreateBy());
+
+
+        startPage();
+        List  list1 = jccFixedPersonnelService.selectJccFixedPersonnelListsss(jccFixedPersonnel);
+        List  list2 = jccAcademicCommitteeService.selectJccAcademicCommitteeList(jccAcademicCommittee);
+        List  list3 = jccFlowPersonnelService.selectJccFlowPersonnelList(jccFlowPersonnel);
+
+        list1.addAll(list2);
+        list1.addAll(list3);
+        return getDataTable(list1);
+    }
+
+    /**
+     * 导出固定人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnel:export')")
+    @Log(title = "固定人员", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccFixedPersonnel jccFixedPersonnel)
+    {
+        List<JccFixedPersonnel> list = jccFixedPersonnelService.selectJccFixedPersonnelList(jccFixedPersonnel);
+        ExcelUtil<JccFixedPersonnel> util = new ExcelUtil<JccFixedPersonnel>(JccFixedPersonnel.class);
+        return util.exportExcel(list, "固定人员数据");
+    }
+
+    /**
+     * 获取固定人员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnel:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccFixedPersonnelService.selectJccFixedPersonnelById(id));
+    }
+
+    /**
+     * 新增固定人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnel:add')")
+    @Log(title = "固定人员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccFixedPersonnel jccFixedPersonnel)
+    {
+        return toAjax(jccFixedPersonnelService.insertJccFixedPersonnel(jccFixedPersonnel));
+    }
+
+    /**
+     * 修改固定人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnel:edit')")
+    @Log(title = "固定人员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccFixedPersonnel jccFixedPersonnel)
+    {
+        return toAjax(jccFixedPersonnelService.updateJccFixedPersonnel(jccFixedPersonnel));
+    }
+
+    /**
+     * 删除固定人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnel:remove')")
+    @Log(title = "固定人员", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccFixedPersonnelService.deleteJccFixedPersonnelByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccFlowPersonnelController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccFlowPersonnel;
+import com.ruoyi.web.service.IJccFlowPersonnelService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 流动人员Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@RestController
+@RequestMapping("/system/flowPersonnel")
+public class JccFlowPersonnelController extends BaseController
+{
+    @Autowired
+    private IJccFlowPersonnelService jccFlowPersonnelService;
+
+    /**
+     * 查询流动人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowPersonnel:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccFlowPersonnel jccFlowPersonnel)
+    {
+        startPage();
+        List<JccFlowPersonnel> list = jccFlowPersonnelService.selectJccFlowPersonnelList(jccFlowPersonnel);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出流动人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowPersonnel:export')")
+    @Log(title = "流动人员", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccFlowPersonnel jccFlowPersonnel)
+    {
+        List<JccFlowPersonnel> list = jccFlowPersonnelService.selectJccFlowPersonnelList(jccFlowPersonnel);
+        ExcelUtil<JccFlowPersonnel> util = new ExcelUtil<JccFlowPersonnel>(JccFlowPersonnel.class);
+        return util.exportExcel(list, "流动人员数据");
+    }
+
+    /**
+     * 获取流动人员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowPersonnel:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccFlowPersonnelService.selectJccFlowPersonnelById(id));
+    }
+
+    /**
+     * 新增流动人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowPersonnel:add')")
+    @Log(title = "流动人员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccFlowPersonnel jccFlowPersonnel)
+    {
+        return toAjax(jccFlowPersonnelService.insertJccFlowPersonnel(jccFlowPersonnel));
+    }
+
+    /**
+     * 修改流动人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowPersonnel:edit')")
+    @Log(title = "流动人员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccFlowPersonnel jccFlowPersonnel)
+    {
+        return toAjax(jccFlowPersonnelService.updateJccFlowPersonnel(jccFlowPersonnel));
+    }
+
+    /**
+     * 删除流动人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowPersonnel:remove')")
+    @Log(title = "流动人员", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccFlowPersonnelService.deleteJccFlowPersonnelByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccLaiyuanController.java

@@ -0,0 +1,102 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccLaiyuan;
+import com.ruoyi.web.service.IJccLaiyuanService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目来源Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-17
+ */
+@RestController
+@RequestMapping("/system/laiyuan")
+public class JccLaiyuanController extends BaseController
+{
+    @Autowired
+    private IJccLaiyuanService jccLaiyuanService;
+
+    /**
+     * 查询项目来源列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(JccLaiyuan jccLaiyuan)
+    {
+        startPage();
+        List<JccLaiyuan> list = jccLaiyuanService.selectJccLaiyuanList(jccLaiyuan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目来源列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:laiyuan:export')")
+    @Log(title = "项目来源", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccLaiyuan jccLaiyuan)
+    {
+        List<JccLaiyuan> list = jccLaiyuanService.selectJccLaiyuanList(jccLaiyuan);
+        ExcelUtil<JccLaiyuan> util = new ExcelUtil<JccLaiyuan>(JccLaiyuan.class);
+        return util.exportExcel(list, "项目来源数据");
+    }
+
+    /**
+     * 获取项目来源详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:laiyuan:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccLaiyuanService.selectJccLaiyuanById(id));
+    }
+
+    /**
+     * 新增项目来源
+     */
+    @PreAuthorize("@ss.hasPermi('system:laiyuan:add')")
+    @Log(title = "项目来源", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccLaiyuan jccLaiyuan)
+    {
+        return toAjax(jccLaiyuanService.insertJccLaiyuan(jccLaiyuan));
+    }
+
+    /**
+     * 修改项目来源
+     */
+    @PreAuthorize("@ss.hasPermi('system:laiyuan:edit')")
+    @Log(title = "项目来源", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccLaiyuan jccLaiyuan)
+    {
+        return toAjax(jccLaiyuanService.updateJccLaiyuan(jccLaiyuan));
+    }
+
+    /**
+     * 删除项目来源
+     */
+    @PreAuthorize("@ss.hasPermi('system:laiyuan:remove')")
+    @Log(title = "项目来源", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccLaiyuanService.deleteJccLaiyuanByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccLearningOpenupReportController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccLearningOpenupReport;
+import com.ruoyi.web.service.IJccLearningOpenupReportService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 发/提交报告Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+@RestController
+@RequestMapping("/system/report")
+public class JccLearningOpenupReportController extends BaseController
+{
+    @Autowired
+    private IJccLearningOpenupReportService jccLearningOpenupReportService;
+
+    /**
+     * 查询发/提交报告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:report:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccLearningOpenupReport jccLearningOpenupReport)
+    {
+        startPage();
+        List<JccLearningOpenupReport> list = jccLearningOpenupReportService.selectJccLearningOpenupReportList(jccLearningOpenupReport);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出发/提交报告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:report:export')")
+    @Log(title = "发/提交报告", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccLearningOpenupReport jccLearningOpenupReport)
+    {
+        List<JccLearningOpenupReport> list = jccLearningOpenupReportService.selectJccLearningOpenupReportList(jccLearningOpenupReport);
+        ExcelUtil<JccLearningOpenupReport> util = new ExcelUtil<JccLearningOpenupReport>(JccLearningOpenupReport.class);
+        return util.exportExcel(list, "发/提交报告数据");
+    }
+
+    /**
+     * 获取发/提交报告详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:report:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccLearningOpenupReportService.selectJccLearningOpenupReportById(id));
+    }
+
+    /**
+     * 新增发/提交报告
+     */
+    @PreAuthorize("@ss.hasPermi('system:report:add')")
+    @Log(title = "发/提交报告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccLearningOpenupReport jccLearningOpenupReport)
+    {
+        return toAjax(jccLearningOpenupReportService.insertJccLearningOpenupReport(jccLearningOpenupReport));
+    }
+
+    /**
+     * 修改发/提交报告
+     */
+    @PreAuthorize("@ss.hasPermi('system:report:edit')")
+    @Log(title = "发/提交报告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccLearningOpenupReport jccLearningOpenupReport)
+    {
+        return toAjax(jccLearningOpenupReportService.updateJccLearningOpenupReport(jccLearningOpenupReport));
+    }
+
+    /**
+     * 删除发/提交报告
+     */
+    @PreAuthorize("@ss.hasPermi('system:report:remove')")
+    @Log(title = "发/提交报告", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccLearningOpenupReportService.deleteJccLearningOpenupReportByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccLearningOpenupScienceactivitiesController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccLearningOpenupScienceactivities;
+import com.ruoyi.web.service.IJccLearningOpenupScienceactivitiesService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 科普活动Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+@RestController
+@RequestMapping("/system/scienceactivities")
+public class JccLearningOpenupScienceactivitiesController extends BaseController
+{
+    @Autowired
+    private IJccLearningOpenupScienceactivitiesService jccLearningOpenupScienceactivitiesService;
+
+    /**
+     * 查询科普活动列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:scienceactivities:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccLearningOpenupScienceactivities jccLearningOpenupScienceactivities)
+    {
+        startPage();
+        List<JccLearningOpenupScienceactivities> list = jccLearningOpenupScienceactivitiesService.selectJccLearningOpenupScienceactivitiesList(jccLearningOpenupScienceactivities);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出科普活动列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:scienceactivities:export')")
+    @Log(title = "科普活动", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccLearningOpenupScienceactivities jccLearningOpenupScienceactivities)
+    {
+        List<JccLearningOpenupScienceactivities> list = jccLearningOpenupScienceactivitiesService.selectJccLearningOpenupScienceactivitiesList(jccLearningOpenupScienceactivities);
+        ExcelUtil<JccLearningOpenupScienceactivities> util = new ExcelUtil<JccLearningOpenupScienceactivities>(JccLearningOpenupScienceactivities.class);
+        return util.exportExcel(list, "科普活动数据");
+    }
+
+    /**
+     * 获取科普活动详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:scienceactivities:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccLearningOpenupScienceactivitiesService.selectJccLearningOpenupScienceactivitiesById(id));
+    }
+
+    /**
+     * 新增科普活动
+     */
+    @PreAuthorize("@ss.hasPermi('system:scienceactivities:add')")
+    @Log(title = "科普活动", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccLearningOpenupScienceactivities jccLearningOpenupScienceactivities)
+    {
+        return toAjax(jccLearningOpenupScienceactivitiesService.insertJccLearningOpenupScienceactivities(jccLearningOpenupScienceactivities));
+    }
+
+    /**
+     * 修改科普活动
+     */
+    @PreAuthorize("@ss.hasPermi('system:scienceactivities:edit')")
+    @Log(title = "科普活动", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccLearningOpenupScienceactivities jccLearningOpenupScienceactivities)
+    {
+        return toAjax(jccLearningOpenupScienceactivitiesService.updateJccLearningOpenupScienceactivities(jccLearningOpenupScienceactivities));
+    }
+
+    /**
+     * 删除科普活动
+     */
+    @PreAuthorize("@ss.hasPermi('system:scienceactivities:remove')")
+    @Log(title = "科普活动", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccLearningOpenupScienceactivitiesService.deleteJccLearningOpenupScienceactivitiesByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccLearningOpenupSocialservicesController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccLearningOpenupSocialservices;
+import com.ruoyi.web.service.IJccLearningOpenupSocialservicesService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 省级及以上Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+@RestController
+@RequestMapping("/system/socialservices")
+public class JccLearningOpenupSocialservicesController extends BaseController
+{
+    @Autowired
+    private IJccLearningOpenupSocialservicesService jccLearningOpenupSocialservicesService;
+
+    /**
+     * 查询省级及以上列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:socialservices:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccLearningOpenupSocialservices jccLearningOpenupSocialservices)
+    {
+        startPage();
+        List<JccLearningOpenupSocialservices> list = jccLearningOpenupSocialservicesService.selectJccLearningOpenupSocialservicesList(jccLearningOpenupSocialservices);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出省级及以上列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:socialservices:export')")
+    @Log(title = "省级及以上", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccLearningOpenupSocialservices jccLearningOpenupSocialservices)
+    {
+        List<JccLearningOpenupSocialservices> list = jccLearningOpenupSocialservicesService.selectJccLearningOpenupSocialservicesList(jccLearningOpenupSocialservices);
+        ExcelUtil<JccLearningOpenupSocialservices> util = new ExcelUtil<JccLearningOpenupSocialservices>(JccLearningOpenupSocialservices.class);
+        return util.exportExcel(list, "省级及以上数据");
+    }
+
+    /**
+     * 获取省级及以上详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:socialservices:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccLearningOpenupSocialservicesService.selectJccLearningOpenupSocialservicesById(id));
+    }
+
+    /**
+     * 新增省级及以上
+     */
+    @PreAuthorize("@ss.hasPermi('system:socialservices:add')")
+    @Log(title = "省级及以上", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccLearningOpenupSocialservices jccLearningOpenupSocialservices)
+    {
+        return toAjax(jccLearningOpenupSocialservicesService.insertJccLearningOpenupSocialservices(jccLearningOpenupSocialservices));
+    }
+
+    /**
+     * 修改省级及以上
+     */
+    @PreAuthorize("@ss.hasPermi('system:socialservices:edit')")
+    @Log(title = "省级及以上", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccLearningOpenupSocialservices jccLearningOpenupSocialservices)
+    {
+        return toAjax(jccLearningOpenupSocialservicesService.updateJccLearningOpenupSocialservices(jccLearningOpenupSocialservices));
+    }
+
+    /**
+     * 删除省级及以上
+     */
+    @PreAuthorize("@ss.hasPermi('system:socialservices:remove')")
+    @Log(title = "省级及以上", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccLearningOpenupSocialservicesService.deleteJccLearningOpenupSocialservicesByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccLearningOpenupTechnicalserviceController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccLearningOpenupTechnicalservice;
+import com.ruoyi.web.service.IJccLearningOpenupTechnicalserviceService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 技术服务、转移、检测Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+@RestController
+@RequestMapping("/system/technicalservice")
+public class JccLearningOpenupTechnicalserviceController extends BaseController
+{
+    @Autowired
+    private IJccLearningOpenupTechnicalserviceService jccLearningOpenupTechnicalserviceService;
+
+    /**
+     * 查询技术服务、转移、检测列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:technicalservice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccLearningOpenupTechnicalservice jccLearningOpenupTechnicalservice)
+    {
+        startPage();
+        List<JccLearningOpenupTechnicalservice> list = jccLearningOpenupTechnicalserviceService.selectJccLearningOpenupTechnicalserviceList(jccLearningOpenupTechnicalservice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出技术服务、转移、检测列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:technicalservice:export')")
+    @Log(title = "技术服务、转移、检测", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccLearningOpenupTechnicalservice jccLearningOpenupTechnicalservice)
+    {
+        List<JccLearningOpenupTechnicalservice> list = jccLearningOpenupTechnicalserviceService.selectJccLearningOpenupTechnicalserviceList(jccLearningOpenupTechnicalservice);
+        ExcelUtil<JccLearningOpenupTechnicalservice> util = new ExcelUtil<JccLearningOpenupTechnicalservice>(JccLearningOpenupTechnicalservice.class);
+        return util.exportExcel(list, "技术服务、转移、检测数据");
+    }
+
+    /**
+     * 获取技术服务、转移、检测详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:technicalservice:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccLearningOpenupTechnicalserviceService.selectJccLearningOpenupTechnicalserviceById(id));
+    }
+
+    /**
+     * 新增技术服务、转移、检测
+     */
+    @PreAuthorize("@ss.hasPermi('system:technicalservice:add')")
+    @Log(title = "技术服务、转移、检测", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccLearningOpenupTechnicalservice jccLearningOpenupTechnicalservice)
+    {
+        return toAjax(jccLearningOpenupTechnicalserviceService.insertJccLearningOpenupTechnicalservice(jccLearningOpenupTechnicalservice));
+    }
+
+    /**
+     * 修改技术服务、转移、检测
+     */
+    @PreAuthorize("@ss.hasPermi('system:technicalservice:edit')")
+    @Log(title = "技术服务、转移、检测", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccLearningOpenupTechnicalservice jccLearningOpenupTechnicalservice)
+    {
+        return toAjax(jccLearningOpenupTechnicalserviceService.updateJccLearningOpenupTechnicalservice(jccLearningOpenupTechnicalservice));
+    }
+
+    /**
+     * 删除技术服务、转移、检测
+     */
+    @PreAuthorize("@ss.hasPermi('system:technicalservice:remove')")
+    @Log(title = "技术服务、转移、检测", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccLearningOpenupTechnicalserviceService.deleteJccLearningOpenupTechnicalserviceByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccOutcomeController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccOutcome;
+import com.ruoyi.web.service.IJccOutcomeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 重要成果Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-13
+ */
+@RestController
+@RequestMapping("/system/outcome")
+public class JccOutcomeController extends BaseController
+{
+    @Autowired
+    private IJccOutcomeService jccOutcomeService;
+
+    /**
+     * 查询重要成果列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:outcome:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccOutcome jccOutcome)
+    {
+        startPage();
+        List<JccOutcome> list = jccOutcomeService.selectJccOutcomeList(jccOutcome);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出重要成果列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:outcome:export')")
+    @Log(title = "重要成果", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccOutcome jccOutcome)
+    {
+        List<JccOutcome> list = jccOutcomeService.selectJccOutcomeList(jccOutcome);
+        ExcelUtil<JccOutcome> util = new ExcelUtil<JccOutcome>(JccOutcome.class);
+        return util.exportExcel(list, "重要成果数据");
+    }
+
+    /**
+     * 获取重要成果详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:outcome:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccOutcomeService.selectJccOutcomeById(id));
+    }
+
+    /**
+     * 新增重要成果
+     */
+    @PreAuthorize("@ss.hasPermi('system:outcome:add')")
+    @Log(title = "重要成果", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccOutcome jccOutcome)
+    {
+        return toAjax(jccOutcomeService.insertJccOutcome(jccOutcome));
+    }
+
+    /**
+     * 修改重要成果
+     */
+    @PreAuthorize("@ss.hasPermi('system:outcome:edit')")
+    @Log(title = "重要成果", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccOutcome jccOutcome)
+    {
+        return toAjax(jccOutcomeService.updateJccOutcome(jccOutcome));
+    }
+
+    /**
+     * 删除重要成果
+     */
+    @PreAuthorize("@ss.hasPermi('system:outcome:remove')")
+    @Log(title = "重要成果", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccOutcomeService.deleteJccOutcomeByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccRanksDoctorController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccRanksDoctor;
+import com.ruoyi.web.service.IJccRanksDoctorService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 博硕培养Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-08
+ */
+@RestController
+@RequestMapping("/system/doctor")
+public class JccRanksDoctorController extends BaseController
+{
+    @Autowired
+    private IJccRanksDoctorService jccRanksDoctorService;
+
+    /**
+     * 查询博硕培养列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:doctor:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccRanksDoctor jccRanksDoctor)
+    {
+        startPage();
+        List<JccRanksDoctor> list = jccRanksDoctorService.selectJccRanksDoctorList(jccRanksDoctor);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出博硕培养列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:doctor:export')")
+    @Log(title = "博硕培养", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccRanksDoctor jccRanksDoctor)
+    {
+        List<JccRanksDoctor> list = jccRanksDoctorService.selectJccRanksDoctorList(jccRanksDoctor);
+        ExcelUtil<JccRanksDoctor> util = new ExcelUtil<JccRanksDoctor>(JccRanksDoctor.class);
+        return util.exportExcel(list, "博硕培养数据");
+    }
+
+    /**
+     * 获取博硕培养详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:doctor:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccRanksDoctorService.selectJccRanksDoctorById(id));
+    }
+
+    /**
+     * 新增博硕培养
+     */
+    @PreAuthorize("@ss.hasPermi('system:doctor:add')")
+    @Log(title = "博硕培养", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccRanksDoctor jccRanksDoctor)
+    {
+        return toAjax(jccRanksDoctorService.insertJccRanksDoctor(jccRanksDoctor));
+    }
+
+    /**
+     * 修改博硕培养
+     */
+    @PreAuthorize("@ss.hasPermi('system:doctor:edit')")
+    @Log(title = "博硕培养", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccRanksDoctor jccRanksDoctor)
+    {
+        return toAjax(jccRanksDoctorService.updateJccRanksDoctor(jccRanksDoctor));
+    }
+
+    /**
+     * 删除博硕培养
+     */
+    @PreAuthorize("@ss.hasPermi('system:doctor:remove')")
+    @Log(title = "博硕培养", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccRanksDoctorService.deleteJccRanksDoctorByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccRanksPersonnelnameController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccRanksPersonnelname;
+import com.ruoyi.web.service.IJccRanksPersonnelnameService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 省部级及以上人才称号Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-07
+ */
+@RestController
+@RequestMapping("/system/personnelname")
+public class JccRanksPersonnelnameController extends BaseController
+{
+    @Autowired
+    private IJccRanksPersonnelnameService jccRanksPersonnelnameService;
+
+    /**
+     * 查询省部级及以上人才称号列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnelname:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccRanksPersonnelname jccRanksPersonnelname)
+    {
+        startPage();
+        List<JccRanksPersonnelname> list = jccRanksPersonnelnameService.selectJccRanksPersonnelnameList(jccRanksPersonnelname);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出省部级及以上人才称号列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnelname:export')")
+    @Log(title = "省部级及以上人才称号", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccRanksPersonnelname jccRanksPersonnelname)
+    {
+        List<JccRanksPersonnelname> list = jccRanksPersonnelnameService.selectJccRanksPersonnelnameList(jccRanksPersonnelname);
+        ExcelUtil<JccRanksPersonnelname> util = new ExcelUtil<JccRanksPersonnelname>(JccRanksPersonnelname.class);
+        return util.exportExcel(list, "省部级及以上人才称号数据");
+    }
+
+    /**
+     * 获取省部级及以上人才称号详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnelname:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccRanksPersonnelnameService.selectJccRanksPersonnelnameById(id));
+    }
+
+    /**
+     * 新增省部级及以上人才称号
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnelname:add')")
+    @Log(title = "省部级及以上人才称号", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccRanksPersonnelname jccRanksPersonnelname)
+    {
+        return toAjax(jccRanksPersonnelnameService.insertJccRanksPersonnelname(jccRanksPersonnelname));
+    }
+
+    /**
+     * 修改省部级及以上人才称号
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnelname:edit')")
+    @Log(title = "省部级及以上人才称号", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccRanksPersonnelname jccRanksPersonnelname)
+    {
+        return toAjax(jccRanksPersonnelnameService.updateJccRanksPersonnelname(jccRanksPersonnelname));
+    }
+
+    /**
+     * 删除省部级及以上人才称号
+     */
+    @PreAuthorize("@ss.hasPermi('system:personnelname:remove')")
+    @Log(title = "省部级及以上人才称号", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccRanksPersonnelnameService.deleteJccRanksPersonnelnameByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccRanksTitleController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccRanksTitle;
+import com.ruoyi.web.service.IJccRanksTitleService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 职称晋升Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-07
+ */
+@RestController
+@RequestMapping("/system/title")
+public class JccRanksTitleController extends BaseController
+{
+    @Autowired
+    private IJccRanksTitleService jccRanksTitleService;
+
+
+    /**
+     * 查询职称晋升列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:title:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccRanksTitle jccRanksTitle)
+    {
+        startPage();
+        List<JccRanksTitle> list = jccRanksTitleService.selectJccRanksTitleList(jccRanksTitle);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出职称晋升列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:title:export')")
+    @Log(title = "职称晋升", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccRanksTitle jccRanksTitle)
+    {
+        List<JccRanksTitle> list = jccRanksTitleService.selectJccRanksTitleList(jccRanksTitle);
+        ExcelUtil<JccRanksTitle> util = new ExcelUtil<JccRanksTitle>(JccRanksTitle.class);
+        return util.exportExcel(list, "职称晋升数据");
+    }
+
+    /**
+     * 获取职称晋升详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:title:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccRanksTitleService.selectJccRanksTitleById(id));
+    }
+
+    /**
+     * 新增职称晋升
+     */
+    @PreAuthorize("@ss.hasPermi('system:title:add')")
+    @Log(title = "职称晋升", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccRanksTitle jccRanksTitle)
+    {
+        return toAjax(jccRanksTitleService.insertJccRanksTitle(jccRanksTitle));
+    }
+
+    /**
+     * 修改职称晋升
+     */
+    @PreAuthorize("@ss.hasPermi('system:title:edit')")
+    @Log(title = "职称晋升", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccRanksTitle jccRanksTitle)
+    {
+        return toAjax(jccRanksTitleService.updateJccRanksTitle(jccRanksTitle));
+    }
+
+    /**
+     * 删除职称晋升
+     */
+    @PreAuthorize("@ss.hasPermi('system:title:remove')")
+    @Log(title = "职称晋升", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccRanksTitleService.deleteJccRanksTitleByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccResearchDirectionController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccResearchDirection;
+import com.ruoyi.web.service.IJccResearchDirectionService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 研究方向Controller
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@RestController
+@RequestMapping("/system/direction")
+public class JccResearchDirectionController extends BaseController
+{
+    @Autowired
+    private IJccResearchDirectionService jccResearchDirectionService;
+
+    /**
+     * 查询研究方向列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:direction:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccResearchDirection jccResearchDirection)
+    {
+        startPage();
+        List<JccResearchDirection> list = jccResearchDirectionService.selectJccResearchDirectionList(jccResearchDirection);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出研究方向列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:direction:export')")
+    @Log(title = "研究方向", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccResearchDirection jccResearchDirection)
+    {
+        List<JccResearchDirection> list = jccResearchDirectionService.selectJccResearchDirectionList(jccResearchDirection);
+        ExcelUtil<JccResearchDirection> util = new ExcelUtil<JccResearchDirection>(JccResearchDirection.class);
+        return util.exportExcel(list, "研究方向数据");
+    }
+
+    /**
+     * 获取研究方向详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:direction:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccResearchDirectionService.selectJccResearchDirectionById(id));
+    }
+
+    /**
+     * 新增研究方向
+     */
+    @PreAuthorize("@ss.hasPermi('system:direction:add')")
+    @Log(title = "研究方向", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccResearchDirection jccResearchDirection)
+    {
+        return toAjax(jccResearchDirectionService.insertJccResearchDirection(jccResearchDirection));
+    }
+
+    /**
+     * 修改研究方向
+     */
+    @PreAuthorize("@ss.hasPermi('system:direction:edit')")
+    @Log(title = "研究方向", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccResearchDirection jccResearchDirection)
+    {
+        return toAjax(jccResearchDirectionService.updateJccResearchDirection(jccResearchDirection));
+    }
+
+    /**
+     * 删除研究方向
+     */
+    @PreAuthorize("@ss.hasPermi('system:direction:remove')")
+    @Log(title = "研究方向", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccResearchDirectionService.deleteJccResearchDirectionByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccScientificOutputAwardController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccScientificOutputAward;
+import com.ruoyi.web.service.IJccScientificOutputAwardService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 制定标准明细Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+@RestController
+@RequestMapping("/system/award")
+public class JccScientificOutputAwardController extends BaseController
+{
+    @Autowired
+    private IJccScientificOutputAwardService jccScientificOutputAwardService;
+
+    /**
+     * 查询制定标准明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:award:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccScientificOutputAward jccScientificOutputAward)
+    {
+        startPage();
+        List<JccScientificOutputAward> list = jccScientificOutputAwardService.selectJccScientificOutputAwardList(jccScientificOutputAward);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出制定标准明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:award:export')")
+    @Log(title = "制定标准明细", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccScientificOutputAward jccScientificOutputAward)
+    {
+        List<JccScientificOutputAward> list = jccScientificOutputAwardService.selectJccScientificOutputAwardList(jccScientificOutputAward);
+        ExcelUtil<JccScientificOutputAward> util = new ExcelUtil<JccScientificOutputAward>(JccScientificOutputAward.class);
+        return util.exportExcel(list, "制定标准明细数据");
+    }
+
+    /**
+     * 获取制定标准明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:award:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccScientificOutputAwardService.selectJccScientificOutputAwardById(id));
+    }
+
+    /**
+     * 新增制定标准明细
+     */
+    @PreAuthorize("@ss.hasPermi('system:award:add')")
+    @Log(title = "制定标准明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccScientificOutputAward jccScientificOutputAward)
+    {
+        return toAjax(jccScientificOutputAwardService.insertJccScientificOutputAward(jccScientificOutputAward));
+    }
+
+    /**
+     * 修改制定标准明细
+     */
+    @PreAuthorize("@ss.hasPermi('system:award:edit')")
+    @Log(title = "制定标准明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccScientificOutputAward jccScientificOutputAward)
+    {
+        return toAjax(jccScientificOutputAwardService.updateJccScientificOutputAward(jccScientificOutputAward));
+    }
+
+    /**
+     * 删除制定标准明细
+     */
+    @PreAuthorize("@ss.hasPermi('system:award:remove')")
+    @Log(title = "制定标准明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccScientificOutputAwardService.deleteJccScientificOutputAwardByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccScientificOutputPaperController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+
+import com.ruoyi.web.domain.JccScientificOutputPaper;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccScientificOutputPaper;
+import com.ruoyi.web.service.IJccScientificOutputPaperService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 发论文情况Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+@RestController
+@RequestMapping("/system/paper")
+public class JccScientificOutputPaperController extends BaseController
+{
+    @Autowired
+    private IJccScientificOutputPaperService jccScientificOutputPaperService;
+
+    /**
+     * 查询发论文情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:paper:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccScientificOutputPaper jccScientificOutputPaper)
+    {
+        startPage();
+        List<JccScientificOutputPaper> list = jccScientificOutputPaperService.selectJccScientificOutputPaperList(jccScientificOutputPaper);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出发论文情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:paper:export')")
+    @Log(title = "发论文情况", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccScientificOutputPaper jccScientificOutputPaper)
+    {
+        List<JccScientificOutputPaper> list = jccScientificOutputPaperService.selectJccScientificOutputPaperList(jccScientificOutputPaper);
+        ExcelUtil<JccScientificOutputPaper> util = new ExcelUtil<JccScientificOutputPaper>(JccScientificOutputPaper.class);
+        return util.exportExcel(list, "发论文情况数据");
+    }
+
+    /**
+     * 获取发论文情况详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:paper:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccScientificOutputPaperService.selectJccScientificOutputPaperById(id));
+    }
+
+    /**
+     * 新增发论文情况
+     */
+    @PreAuthorize("@ss.hasPermi('system:paper:add')")
+    @Log(title = "发论文情况", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccScientificOutputPaper jccScientificOutputPaper)
+    {
+        return toAjax(jccScientificOutputPaperService.insertJccScientificOutputPaper(jccScientificOutputPaper));
+    }
+
+    /**
+     * 修改发论文情况
+     */
+    @PreAuthorize("@ss.hasPermi('system:paper:edit')")
+    @Log(title = "发论文情况", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccScientificOutputPaper jccScientificOutputPaper)
+    {
+        return toAjax(jccScientificOutputPaperService.updateJccScientificOutputPaper(jccScientificOutputPaper));
+    }
+
+    /**
+     * 删除发论文情况
+     */
+    @PreAuthorize("@ss.hasPermi('system:paper:remove')")
+    @Log(title = "发论文情况", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccScientificOutputPaperService.deleteJccScientificOutputPaperByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccScientificOutputPatentController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccScientificOutputPatent;
+import com.ruoyi.web.service.IJccScientificOutputPatentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 获奖情况Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-03
+ */
+@RestController
+@RequestMapping("/system/patent")
+public class JccScientificOutputPatentController extends BaseController
+{
+    @Autowired
+    private IJccScientificOutputPatentService jccScientificOutputPatentService;
+
+    /**
+     * 查询获奖情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:patent:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccScientificOutputPatent jccScientificOutputPatent)
+    {
+        startPage();
+        List<JccScientificOutputPatent> list = jccScientificOutputPatentService.selectJccScientificOutputPatentList(jccScientificOutputPatent);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出获奖情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:patent:export')")
+    @Log(title = "获奖情况", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccScientificOutputPatent jccScientificOutputPatent)
+    {
+        List<JccScientificOutputPatent> list = jccScientificOutputPatentService.selectJccScientificOutputPatentList(jccScientificOutputPatent);
+        ExcelUtil<JccScientificOutputPatent> util = new ExcelUtil<JccScientificOutputPatent>(JccScientificOutputPatent.class);
+        return util.exportExcel(list, "获奖情况数据");
+    }
+
+    /**
+     * 获取获奖情况详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patent:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccScientificOutputPatentService.selectJccScientificOutputPatentById(id));
+    }
+
+    /**
+     * 新增获奖情况
+     */
+    @PreAuthorize("@ss.hasPermi('system:patent:add')")
+    @Log(title = "获奖情况", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccScientificOutputPatent jccScientificOutputPatent)
+    {
+        return toAjax(jccScientificOutputPatentService.insertJccScientificOutputPatent(jccScientificOutputPatent));
+    }
+
+    /**
+     * 修改获奖情况
+     */
+    @PreAuthorize("@ss.hasPermi('system:patent:edit')")
+    @Log(title = "获奖情况", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccScientificOutputPatent jccScientificOutputPatent)
+    {
+        return toAjax(jccScientificOutputPatentService.updateJccScientificOutputPatent(jccScientificOutputPatent));
+    }
+
+    /**
+     * 删除获奖情况
+     */
+    @PreAuthorize("@ss.hasPermi('system:patent:remove')")
+    @Log(title = "获奖情况", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccScientificOutputPatentService.deleteJccScientificOutputPatentByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccScientificOutputPatentUserController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccScientificOutputPatentUser;
+import com.ruoyi.web.service.IJccScientificOutputPatentUserService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 获奖情况人员Controller
+ * 
+ * @author ruoyi
+ * @date 2021-10-11
+ */
+@RestController
+@RequestMapping("/system/patentuser")
+public class JccScientificOutputPatentUserController extends BaseController
+{
+    @Autowired
+    private IJccScientificOutputPatentUserService jccScientificOutputPatentUserService;
+
+    /**
+     * 查询获奖情况人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:patentuser:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccScientificOutputPatentUser jccScientificOutputPatentUser)
+    {
+        startPage();
+        List<JccScientificOutputPatentUser> list = jccScientificOutputPatentUserService.selectJccScientificOutputPatentUserList(jccScientificOutputPatentUser);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出获奖情况人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:patentuser:export')")
+    @Log(title = "获奖情况人员", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccScientificOutputPatentUser jccScientificOutputPatentUser)
+    {
+        List<JccScientificOutputPatentUser> list = jccScientificOutputPatentUserService.selectJccScientificOutputPatentUserList(jccScientificOutputPatentUser);
+        ExcelUtil<JccScientificOutputPatentUser> util = new ExcelUtil<JccScientificOutputPatentUser>(JccScientificOutputPatentUser.class);
+        return util.exportExcel(list, "获奖情况人员数据");
+    }
+
+    /**
+     * 获取获奖情况人员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patentuser:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccScientificOutputPatentUserService.selectJccScientificOutputPatentUserById(id));
+    }
+
+    /**
+     * 新增获奖情况人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:patentuser:add')")
+    @Log(title = "获奖情况人员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccScientificOutputPatentUser jccScientificOutputPatentUser)
+    {
+        return toAjax(jccScientificOutputPatentUserService.insertJccScientificOutputPatentUser(jccScientificOutputPatentUser));
+    }
+
+    /**
+     * 修改获奖情况人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:patentuser:edit')")
+    @Log(title = "获奖情况人员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccScientificOutputPatentUser jccScientificOutputPatentUser)
+    {
+        return toAjax(jccScientificOutputPatentUserService.updateJccScientificOutputPatentUser(jccScientificOutputPatentUser));
+    }
+
+    /**
+     * 删除获奖情况人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:patentuser:remove')")
+    @Log(title = "获奖情况人员", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccScientificOutputPatentUserService.deleteJccScientificOutputPatentUserByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/JccScientificOutputResultOtherController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.domain.JccScientificOutputResultOther;
+import com.ruoyi.web.service.IJccScientificOutputResultOtherService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 其他成果Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+@RestController
+@RequestMapping("/system/other")
+public class JccScientificOutputResultOtherController extends BaseController
+{
+    @Autowired
+    private IJccScientificOutputResultOtherService jccScientificOutputResultOtherService;
+
+    /**
+     * 查询其他成果列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:other:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JccScientificOutputResultOther jccScientificOutputResultOther)
+    {
+        startPage();
+        List<JccScientificOutputResultOther> list = jccScientificOutputResultOtherService.selectJccScientificOutputResultOtherList(jccScientificOutputResultOther);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出其他成果列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:other:export')")
+    @Log(title = "其他成果", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(JccScientificOutputResultOther jccScientificOutputResultOther)
+    {
+        List<JccScientificOutputResultOther> list = jccScientificOutputResultOtherService.selectJccScientificOutputResultOtherList(jccScientificOutputResultOther);
+        ExcelUtil<JccScientificOutputResultOther> util = new ExcelUtil<JccScientificOutputResultOther>(JccScientificOutputResultOther.class);
+        return util.exportExcel(list, "其他成果数据");
+    }
+
+    /**
+     * 获取其他成果详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:other:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(jccScientificOutputResultOtherService.selectJccScientificOutputResultOtherById(id));
+    }
+
+    /**
+     * 新增其他成果
+     */
+    @PreAuthorize("@ss.hasPermi('system:other:add')")
+    @Log(title = "其他成果", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JccScientificOutputResultOther jccScientificOutputResultOther)
+    {
+        return toAjax(jccScientificOutputResultOtherService.insertJccScientificOutputResultOther(jccScientificOutputResultOther));
+    }
+
+    /**
+     * 修改其他成果
+     */
+    @PreAuthorize("@ss.hasPermi('system:other:edit')")
+    @Log(title = "其他成果", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JccScientificOutputResultOther jccScientificOutputResultOther)
+    {
+        return toAjax(jccScientificOutputResultOtherService.updateJccScientificOutputResultOther(jccScientificOutputResultOther));
+    }
+
+    /**
+     * 删除其他成果
+     */
+    @PreAuthorize("@ss.hasPermi('system:other:remove')")
+    @Log(title = "其他成果", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(jccScientificOutputResultOtherService.deleteJccScientificOutputResultOtherByIds(ids));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -0,0 +1,86 @@
+package com.ruoyi.web.controller.common;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.google.code.kaptcha.Producer;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.sign.Base64;
+import com.ruoyi.common.utils.uuid.IdUtils;
+
+/**
+ * 验证码操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class CaptchaController
+{
+    @Resource(name = "captchaProducer")
+    private Producer captchaProducer;
+
+    @Resource(name = "captchaProducerMath")
+    private Producer captchaProducerMath;
+
+    @Autowired
+    private RedisCache redisCache;
+    
+    // 验证码类型
+    @Value("${ruoyi.captchaType}")
+    private String captchaType;
+
+    /**
+     * 生成验证码
+     */
+    @GetMapping("/captchaImage")
+    public AjaxResult getCode(HttpServletResponse response) throws IOException
+    {
+        // 保存验证码信息
+        String uuid = IdUtils.simpleUUID();
+        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+
+        String capStr = null, code = null;
+        BufferedImage image = null;
+
+        // 生成验证码
+        if ("math".equals(captchaType))
+        {
+            String capText = captchaProducerMath.createText();
+            capStr = capText.substring(0, capText.lastIndexOf("@"));
+            code = capText.substring(capText.lastIndexOf("@") + 1);
+            image = captchaProducerMath.createImage(capStr);
+        }
+        else if ("char".equals(captchaType))
+        {
+            capStr = code = captchaProducer.createText();
+            image = captchaProducer.createImage(capStr);
+        }
+
+        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+        // 转换流信息写出
+        FastByteArrayOutputStream os = new FastByteArrayOutputStream();
+        try
+        {
+            ImageIO.write(image, "jpg", os);
+        }
+        catch (IOException e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("uuid", uuid);
+        ajax.put("img", Base64.encode(os.toByteArray()));
+        return ajax;
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -0,0 +1,120 @@
+package com.ruoyi.web.controller.common;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.framework.config.ServerConfig;
+
+/**
+ * 通用请求处理
+ *
+ * @author ruoyi
+ */
+@RestController
+public class CommonController
+{
+    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+
+    @Autowired
+    private ServerConfig serverConfig;
+
+    /**
+     * 通用下载请求
+     *
+     * @param fileName 文件名称
+     * @param delete 是否删除
+     */
+    @GetMapping("common/download")
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(fileName))
+            {
+                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
+            }
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, realFileName);
+            FileUtils.writeBytes(filePath, response.getOutputStream());
+            if (delete)
+            {
+                FileUtils.deleteFile(filePath);
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+
+    /**
+     * 通用上传请求
+     */
+    @PostMapping("/common/upload")
+    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 本地资源通用下载
+     */
+    @GetMapping("/common/download/resource")
+    public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
+            throws Exception
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(resource))
+            {
+                throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
+            }
+            // 本地资源路径
+            String localPath = RuoYiConfig.getProfile();
+            // 数据库资源地址
+            String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
+            // 下载名称
+            String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, downloadName);
+            FileUtils.writeBytes(downloadPath, response.getOutputStream());
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+
+
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonFileController.java

@@ -0,0 +1,729 @@
+package com.ruoyi.web.controller.common;
+
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.web.domain.JccFile;
+import com.ruoyi.web.domain.JccFileModule;
+import com.ruoyi.web.mapper.JccFileMapper;
+import com.ruoyi.web.mapper.JccFileModuleMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 通用请求处理
+ *
+ * @author ruoyi
+ */
+@RestController
+public class CommonFileController
+{
+    private static final Logger log = LoggerFactory.getLogger(CommonFileController.class);
+
+    @Autowired
+    private ServerConfig serverConfig;
+    @Autowired
+    private JccFileModuleMapper jccFileModuleMapper;
+    @Autowired
+    private JccFileMapper jccFileMapper;
+
+    /**
+     * 固定人员上传请求
+     */
+    @PostMapping("/common/upload/getFixedPersonFile")
+    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    {
+        try
+        {
+            SysUser thisUser = SecurityUtils.getLoginUser().getUser();
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFileModule jccFileModule =new JccFileModule();
+            jccFileModule.setName(name);
+            jccFileModule.setUrl(url);
+            jccFileModule.setId(uuid);
+            jccFileModule.setCreateTime(DateUtils.getNowDate());
+            jccFileModule.setModuleName("jcc_fixed_personnel");
+            jccFileModule.setLabId(thisUser.getLabId());
+            jccFileModuleMapper.insertJccFileModule(jccFileModule);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 流动人员上传请求
+     */
+    @PostMapping("/common/upload/uploadFileFlowPerson")
+    public AjaxResult uploadFileFlowPerson(MultipartFile file) throws Exception
+    {
+        try
+        {
+            SysUser thisUser = SecurityUtils.getLoginUser().getUser();
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFileModule jccFileModule =new JccFileModule();
+            jccFileModule.setName(name);
+            jccFileModule.setUrl(url);
+            jccFileModule.setId(uuid);
+            jccFileModule.setCreateTime(DateUtils.getNowDate());
+            jccFileModule.setModuleName("jcc_flow_personnel");
+            jccFileModule.setLabId(thisUser.getLabId());
+            jccFileModuleMapper.insertJccFileModule(jccFileModule);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 学术委员会上传请求
+     */
+    @PostMapping("/common/upload/uploadFileCommittee")
+    public AjaxResult uploadFileCommittee(MultipartFile file) throws Exception
+    {
+        try
+        {
+            SysUser thisUser = SecurityUtils.getLoginUser().getUser();
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFileModule jccFileModule =new JccFileModule();
+            jccFileModule.setName(name);
+            jccFileModule.setUrl(url);
+            jccFileModule.setId(uuid);
+            jccFileModule.setCreateTime(DateUtils.getNowDate());
+            jccFileModule.setModuleName("jcc_academic_committee");
+            jccFileModule.setLabId(thisUser.getLabId());
+            jccFileModuleMapper.insertJccFileModule(jccFileModule);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+    /**
+     * 研究方向上传请求
+     */
+    @PostMapping("/common/upload/uploadFileDirection")
+    public AjaxResult uploadFileDirection(MultipartFile file) throws Exception
+    {
+        try
+        {
+            SysUser thisUser = SecurityUtils.getLoginUser().getUser();
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFileModule jccFileModule =new JccFileModule();
+            jccFileModule.setName(name);
+            jccFileModule.setUrl(url);
+            jccFileModule.setId(uuid);
+            jccFileModule.setCreateTime(DateUtils.getNowDate());
+            jccFileModule.setModuleName("jcc_research_direction");
+            jccFileModule.setLabId(thisUser.getLabId());
+            jccFileModuleMapper.insertJccFileModule(jccFileModule);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/uploadFileInput")
+    public AjaxResult uploadFileInput(MultipartFile file) throws Exception
+    {
+        try
+        {
+            SysUser thisUser = SecurityUtils.getLoginUser().getUser();
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFileModule jccFileModule =new JccFileModule();
+            jccFileModule.setName(name);
+            jccFileModule.setUrl(url);
+            jccFileModule.setId(uuid);
+            jccFileModule.setCreateTime(DateUtils.getNowDate());
+            jccFileModule.setModuleName("jcc_fixed_input");
+            jccFileModule.setLabId(thisUser.getLabId());
+            jccFileModuleMapper.insertJccFileModule(jccFileModule);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    @PostMapping("/common/upload/shebei1")
+    public AjaxResult shebei1(MultipartFile file) throws Exception
+    {
+        try
+        {
+            SysUser thisUser = SecurityUtils.getLoginUser().getUser();
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFileModule jccFileModule =new JccFileModule();
+            jccFileModule.setName(name);
+            jccFileModule.setUrl(url);
+            jccFileModule.setId(uuid);
+            jccFileModule.setCreateTime(DateUtils.getNowDate());
+            jccFileModule.setModuleName("jcc_equipment_condition");
+            jccFileModule.setLabId(thisUser.getLabId());
+            jccFileModuleMapper.insertJccFileModule(jccFileModule);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+
+
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/patent")
+    public AjaxResult uploadFilePatent(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_scientific_output_patent");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/science")
+    public AjaxResult uploadFileScience(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_bear_science");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/award")
+    public AjaxResult uploadFileAward(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_scientific_output_award");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/paper")
+    public AjaxResult uploadFilePaper(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_scientific_output_paper");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/other")
+    public AjaxResult uploadFileOther(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_scientific_output_result_other");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/technicalservice")
+    public AjaxResult uploadFileTechnicalservice(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_learning_openup_technicalservice");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/scienceactivities")
+    public AjaxResult uploadFileScienceactivities(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_learning_openup_scienceactivities");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/socialservices")
+    public AjaxResult uploadFileSocialservices(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_learning_openup_socialservices");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/report")
+    public AjaxResult uploadFileReport(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_learning_openup_report");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/personnelname")
+    public AjaxResult uploadFilePersonnelname(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_ranks_personnelname");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    @PostMapping("/common/upload/doctor")
+    public AjaxResult uploadFileDoctor(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_ranks_doctor");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    @PostMapping("/common/upload/title")
+    public AjaxResult uploadFileTitle(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_ranks_title");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 固定人员上传请求
+     */
+//    @PostMapping("/common/upload/outcome")
+//    public AjaxResult uploadFileIOutcome(MultipartFile file) throws Exception
+//    {
+//        try
+//        {
+//            SysUser thisUser = SecurityUtils.getLoginUser().getUser();
+//            // 上传文件路径
+//            String filePath = RuoYiConfig.getUploadPath();
+//            // 上传并返回新文件名称
+//            String name=file.getOriginalFilename();
+//            String fileName = FileUploadUtils.upload(filePath, file);
+//            String url = serverConfig.getUrl() + fileName;
+//            String uuid = IdUtils.simpleUUID();
+//            JccFileModule jccFileModule =new JccFileModule();
+//            jccFileModule.setName(name);
+//            jccFileModule.setUrl(url);
+//            jccFileModule.setId(uuid);
+//            jccFileModule.setCreateTime(DateUtils.getNowDate());
+//            jccFileModule.setModuleName("jcc_outcome");
+//            jccFileModule.setLabId(thisUser.getLabId());
+//            jccFileModuleMapper.insertJccFileModule(jccFileModule);
+//            AjaxResult ajax = AjaxResult.success();
+//            ajax.put("fileName", fileName);
+//            ajax.put("url", url);
+//            return ajax;
+//        }
+//        catch (Exception e)
+//        {
+//            return AjaxResult.error(e.getMessage());
+//        }
+//    }
+
+
+    /**
+     * 固定投入上传请求
+     */
+    @PostMapping("/common/upload/outcome")
+    public AjaxResult uploadFileOutcome(MultipartFile file, @RequestParam(name = "listId") String listId) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String name=file.getOriginalFilename();
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            String uuid = IdUtils.simpleUUID();
+            JccFile jccFile =new JccFile();
+            jccFile.setName(name);
+            jccFile.setUrl(url);
+            jccFile.setId(uuid);
+            jccFile.setCreateTime(DateUtils.getNowDate());
+            jccFile.setModuleName("jcc_outcome");
+            jccFile.setModuleId(listId);
+            jccFileMapper.insertJccFile(jccFile);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -0,0 +1,53 @@
+package com.ruoyi.web.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 缓存监控
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/cache")
+public class CacheController
+{
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception
+    {
+        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
+        Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
+        Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());
+
+        Map<String, Object> result = new HashMap<>(3);
+        result.put("info", info);
+        result.put("dbSize", dbSize);
+
+        List<Map<String, String>> pieList = new ArrayList<>();
+        commandStats.stringPropertyNames().forEach(key -> {
+            Map<String, String> data = new HashMap<>(2);
+            String property = commandStats.getProperty(key);
+            data.put("name", StringUtils.removeStart(key, "cmdstat_"));
+            data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
+            pieList.add(data);
+        });
+        result.put("commandStats", pieList);
+        return AjaxResult.success(result);
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.controller.monitor;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.Server;
+
+/**
+ * 服务器监控
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/server")
+public class ServerController
+{
+    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception
+    {
+        Server server = new Server();
+        server.copyTo();
+        return AjaxResult.success(server);
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -0,0 +1,67 @@
+package com.ruoyi.web.controller.monitor;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysLogininfor;
+import com.ruoyi.system.service.ISysLogininforService;
+
+/**
+ * 系统访问记录
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/logininfor")
+public class SysLogininforController extends BaseController
+{
+    @Autowired
+    private ISysLogininforService logininforService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysLogininfor logininfor)
+    {
+        startPage();
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        return getDataTable(list);
+    }
+
+    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysLogininfor logininfor)
+    {
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
+        return util.exportExcel(list, "登录日志");
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{infoIds}")
+    public AjaxResult remove(@PathVariable String[] infoIds)
+    {
+        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public AjaxResult clean()
+    {
+        logininforService.cleanLogininfor();
+        return AjaxResult.success();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -0,0 +1,67 @@
+package com.ruoyi.web.controller.monitor;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysOperLog;
+import com.ruoyi.system.service.ISysOperLogService;
+
+/**
+ * 操作日志记录
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/operlog")
+public class SysOperlogController extends BaseController
+{
+    @Autowired
+    private ISysOperLogService operLogService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysOperLog operLog)
+    {
+        startPage();
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        return getDataTable(list);
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysOperLog operLog)
+    {
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+        return util.exportExcel(list, "操作日志");
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.DELETE)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/{operIds}")
+    public AjaxResult remove(@PathVariable String[] operIds)
+    {
+        return toAjax(operLogService.deleteOperLogByIds(operIds));
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/clean")
+    public AjaxResult clean()
+    {
+        operLogService.cleanOperLog();
+        return AjaxResult.success();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -0,0 +1,92 @@
+package com.ruoyi.web.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysUserOnline;
+import com.ruoyi.system.service.ISysUserOnlineService;
+
+/**
+ * 在线用户监控
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/online")
+public class SysUserOnlineController extends BaseController
+{
+    @Autowired
+    private ISysUserOnlineService userOnlineService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(String ipaddr, String userName)
+    {
+        Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
+        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+        for (String key : keys)
+        {
+            LoginUser user = redisCache.getCacheObject(key);
+            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+            {
+                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
+                {
+                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+                }
+            }
+            else if (StringUtils.isNotEmpty(ipaddr))
+            {
+                if (StringUtils.equals(ipaddr, user.getIpaddr()))
+                {
+                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+                }
+            }
+            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+            {
+                if (StringUtils.equals(userName, user.getUsername()))
+                {
+                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+                }
+            }
+            else
+            {
+                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+            }
+        }
+        Collections.reverse(userOnlineList);
+        userOnlineList.removeAll(Collections.singleton(null));
+        return getDataTable(userOnlineList);
+    }
+
+    /**
+     * 强退用户
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+    @DeleteMapping("/{tokenId}")
+    public AjaxResult forceLogout(@PathVariable String tokenId)
+    {
+        redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
+        return AjaxResult.success();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -0,0 +1,136 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.service.ISysConfigService;
+
+/**
+ * 参数配置 信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/config")
+public class SysConfigController extends BaseController
+{
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysConfig config)
+    {
+        startPage();
+        List<SysConfig> list = configService.selectConfigList(config);
+        return getDataTable(list);
+    }
+
+    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysConfig config)
+    {
+        List<SysConfig> list = configService.selectConfigList(config);
+        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+        return util.exportExcel(list, "参数数据");
+    }
+
+    /**
+     * 根据参数编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @GetMapping(value = "/{configId}")
+    public AjaxResult getInfo(@PathVariable String configId)
+    {
+        return AjaxResult.success(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     */
+    @GetMapping(value = "/configKey/{configKey}")
+    public AjaxResult getConfigKey(@PathVariable String configKey)
+    {
+        return AjaxResult.success(configService.selectConfigByKey(configKey));
+    }
+
+    /**
+     * 新增参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    @RepeatSubmit
+    public AjaxResult add(@Validated @RequestBody SysConfig config)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        {
+            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        config.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(configService.insertConfig(config));
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysConfig config)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        {
+            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        config.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(configService.updateConfig(config));
+    }
+
+    /**
+     * 删除参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public AjaxResult remove(@PathVariable String[] configIds)
+    {
+        configService.deleteConfigByIds(configIds);
+        return success();
+    }
+
+    /**
+     * 刷新参数缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        configService.resetConfigCache();
+        return AjaxResult.success();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -0,0 +1,163 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.Iterator;
+import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
+
+/**
+ * 部门信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dept")
+public class SysDeptController extends BaseController
+{
+    @Autowired
+    private ISysDeptService deptService;
+
+    /**
+     * 获取部门列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list")
+    public AjaxResult list(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return AjaxResult.success(depts);
+    }
+
+    /**
+     * 查询部门列表（排除节点）
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list/exclude/{deptId}")
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) String deptId)
+    {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        Iterator<SysDept> it = depts.iterator();
+        while (it.hasNext())
+        {
+            SysDept d = (SysDept) it.next();
+            if (deptId.equals(d.getDeptId())
+                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
+            {
+                it.remove();
+            }
+        }
+        return AjaxResult.success(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    @GetMapping(value = "/{deptId}")
+    public AjaxResult getInfo(@PathVariable String deptId)
+    {
+        return AjaxResult.success(deptService.selectDeptById(deptId));
+    }
+
+    /**
+     * 获取部门下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+    }
+
+    /**
+     * 加载对应角色部门列表树
+     */
+    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
+    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") String roleId)
+    {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
+        return ajax;
+    }
+
+    /**
+     * 新增部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDept dept)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        {
+            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        dept.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(deptService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDept dept)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        {
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        else if (dept.getParentId().equals(dept.getDeptId()))
+        {
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+        }
+        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
+        {
+            return AjaxResult.error("该部门包含未停用的子部门！");
+        }
+        dept.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(deptService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deptId}")
+    public AjaxResult remove(@PathVariable String deptId)
+    {
+        if (deptService.hasChildByDeptId(deptId))
+        {
+            return AjaxResult.error("存在下级部门,不允许删除");
+        }
+        if (deptService.checkDeptExistUser(deptId))
+        {
+            return AjaxResult.error("部门存在用户,不允许删除");
+        }
+        return toAjax(deptService.deleteDeptById(deptId));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -0,0 +1,121 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.system.service.ISysDictTypeService;
+
+/**
+ * 数据字典信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dict/data")
+public class SysDictDataController extends BaseController
+{
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictData dictData)
+    {
+        startPage();
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return getDataTable(list);
+    }
+
+    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysDictData dictData)
+    {
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+        return util.exportExcel(list, "字典数据");
+    }
+
+    /**
+     * 查询字典数据详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictCode}")
+    public AjaxResult getInfo(@PathVariable String dictCode)
+    {
+        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @GetMapping(value = "/type/{dictType}")
+    public AjaxResult dictType(@PathVariable String dictType)
+    {
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+        if (StringUtils.isNull(data))
+        {
+            data = new ArrayList<SysDictData>();
+        }
+        return AjaxResult.success(data);
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(dictDataService.insertDictData(dict));
+    }
+
+    /**
+     * 修改保存字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(dictDataService.updateDictData(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    public AjaxResult remove(@PathVariable String[] dictCodes)
+    {
+        dictDataService.deleteDictDataByIds(dictCodes);
+        return success();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -0,0 +1,132 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictType;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDictTypeService;
+
+/**
+ * 数据字典信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dict/type")
+public class SysDictTypeController extends BaseController
+{
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictType dictType)
+    {
+        startPage();
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        return getDataTable(list);
+    }
+
+    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysDictType dictType)
+    {
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+        return util.exportExcel(list, "字典类型");
+    }
+
+    /**
+     * 查询字典类型详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictId}")
+    public AjaxResult getInfo(@PathVariable String dictId)
+    {
+        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictType dict)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        {
+            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dict.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(dictTypeService.insertDictType(dict));
+    }
+
+    /**
+     * 修改字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        {
+            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dict.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(dictTypeService.updateDictType(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictIds}")
+    public AjaxResult remove(@PathVariable String[] dictIds)
+    {
+        dictTypeService.deleteDictTypeByIds(dictIds);
+        return success();
+    }
+
+    /**
+     * 刷新字典缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        dictTypeService.resetDictCache();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 获取字典选择框列表
+     */
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+        return AjaxResult.success(dictTypes);
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -0,0 +1,94 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.framework.web.service.SysLoginService;
+import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.service.ISysMenuService;
+
+/**
+ * 登录验证
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class SysLoginController
+{
+    @Autowired
+    private SysLoginService loginService;
+
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 登录方法
+     * 
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login")
+    public AjaxResult login(@RequestBody LoginBody loginBody)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
+    /**
+     * 获取用户信息
+     * 
+     * @return 用户信息
+     */
+    @GetMapping("getInfo")
+    public AjaxResult getInfo()
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(user);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(user);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("user", user);
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
+        return ajax;
+    }
+
+    /**
+     * 获取路由信息
+     * 
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    public AjaxResult getRouters()
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        // 用户信息
+        SysUser user = loginUser.getUser();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
+        return AjaxResult.success(menuService.buildMenus(menus));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -0,0 +1,157 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.service.ISysMenuService;
+
+/**
+ * 菜单信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/menu")
+public class SysMenuController extends BaseController
+{
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 获取菜单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @GetMapping("/list")
+    public AjaxResult list(SysMenu menu)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String userId = loginUser.getUser().getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+        return AjaxResult.success(menus);
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    @GetMapping(value = "/{menuId}")
+    public AjaxResult getInfo(@PathVariable String menuId)
+    {
+        return AjaxResult.success(menuService.selectMenuById(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysMenu menu)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String userId = loginUser.getUser().getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") String roleId)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        return ajax;
+    }
+
+    /**
+     * 新增菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        {
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
+        {
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        menu.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(menuService.insertMenu(menu));
+    }
+
+    /**
+     * 修改菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
+        {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        else if (menu.getMenuId().equals(menu.getParentId()))
+        {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+        }
+        menu.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(menuService.updateMenu(menu));
+    }
+
+    /**
+     * 删除菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{menuId}")
+    public AjaxResult remove(@PathVariable("menuId") String menuId)
+    {
+        if (menuService.hasChildByMenuId(menuId))
+        {
+            return AjaxResult.error("存在子菜单,不允许删除");
+        }
+        if (menuService.checkMenuExistRole(menuId))
+        {
+            return AjaxResult.error("菜单已分配,不允许删除");
+        }
+        return toAjax(menuService.deleteMenuById(menuId));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -0,0 +1,92 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.service.ISysNoticeService;
+
+/**
+ * 公告 信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/notice")
+public class SysNoticeController extends BaseController
+{
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    /**
+     * 获取通知公告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysNotice notice)
+    {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据通知公告编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    @GetMapping(value = "/{noticeId}")
+    public AjaxResult getInfo(@PathVariable String noticeId)
+    {
+        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    @Log(title = "通知公告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(noticeService.insertNotice(notice));
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 删除通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    @Log(title = "通知公告", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{noticeIds}")
+    public AjaxResult remove(@PathVariable String[] noticeIds)
+    {
+        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -0,0 +1,130 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.service.ISysPostService;
+
+/**
+ * 岗位信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/post")
+public class SysPostController extends BaseController
+{
+    @Autowired
+    private ISysPostService postService;
+
+    /**
+     * 获取岗位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysPost post)
+    {
+        startPage();
+        List<SysPost> list = postService.selectPostList(post);
+        return getDataTable(list);
+    }
+    
+    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysPost post)
+    {
+        List<SysPost> list = postService.selectPostList(post);
+        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+        return util.exportExcel(list, "岗位数据");
+    }
+
+    /**
+     * 根据岗位编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:query')")
+    @GetMapping(value = "/{postId}")
+    public AjaxResult getInfo(@PathVariable String postId)
+    {
+        return AjaxResult.success(postService.selectPostById(postId));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:add')")
+    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysPost post)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        {
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        {
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        post.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(postService.insertPost(post));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysPost post)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        {
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        {
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        post.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(postService.updatePost(post));
+    }
+
+    /**
+     * 删除岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:remove')")
+    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{postIds}")
+    public AjaxResult remove(@PathVariable String[] postIds)
+    {
+        return toAjax(postService.deletePostByIds(postIds));
+    }
+
+    /**
+     * 获取岗位选择框列表
+     */
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        List<SysPost> posts = postService.selectPostAll();
+        return AjaxResult.success(posts);
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -0,0 +1,139 @@
+package com.ruoyi.web.controller.system;
+
+import java.io.IOException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.service.ISysUserService;
+
+/**
+ * 个人信息 业务处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user/profile")
+public class SysProfileController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping
+    public AjaxResult profile()
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        AjaxResult ajax = AjaxResult.success(user);
+        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+        return ajax;
+    }
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult updateProfile(@RequestBody SysUser user)
+    {
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        if (userService.updateUserProfile(user) > 0)
+        {
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            // 更新缓存用户信息
+            loginUser.getUser().setNickName(user.getNickName());
+            loginUser.getUser().setPhonenumber(user.getPhonenumber());
+            loginUser.getUser().setEmail(user.getEmail());
+            loginUser.getUser().setSex(user.getSex());
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改个人信息异常，请联系管理员");
+    }
+
+    /**
+     * 重置密码
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePwd")
+    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String userName = loginUser.getUsername();
+        String password = loginUser.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return AjaxResult.error("修改密码失败，旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return AjaxResult.error("新密码不能与旧密码相同");
+        }
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+        {
+            // 更新缓存用户密码
+            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改密码异常，请联系管理员");
+    }
+
+    /**
+     * 头像上传
+     */
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping("/avatar")
+    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+    {
+        if (!file.isEmpty())
+        {
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
+            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+            {
+                AjaxResult ajax = AjaxResult.success();
+                ajax.put("imgUrl", avatar);
+                // 更新缓存用户头像
+                loginUser.getUser().setAvatar(avatar);
+                tokenService.setLoginUser(loginUser);
+                return ajax;
+            }
+        }
+        return AjaxResult.error("上传图片异常，请联系管理员");
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -0,0 +1,182 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
+
+/**
+ * 角色信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/role")
+public class SysRoleController extends BaseController
+{
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private TokenService tokenService;
+    
+    @Autowired
+    private SysPermissionService permissionService;
+    
+    @Autowired
+    private ISysUserService userService;
+
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysRole role)
+    {
+        startPage();
+        List<SysRole> list = roleService.selectRoleList(role);
+        return getDataTable(list);
+    }
+
+    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysRole role)
+    {
+        List<SysRole> list = roleService.selectRoleList(role);
+        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+        return util.exportExcel(list, "角色数据");
+    }
+
+    /**
+     * 根据角色编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable String roleId)
+    {
+        return AjaxResult.success(roleService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysRole role)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(roleService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        {
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        {
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setUpdateBy(SecurityUtils.getUsername());
+        
+        if (roleService.updateRole(role) > 0)
+        {
+            // 更新缓存用户权限
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+            {
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                tokenService.setLoginUser(loginUser);
+            }
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/dataScope")
+    public AjaxResult dataScope(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        return toAjax(roleService.authDataScope(role));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        role.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(roleService.updateRoleStatus(role));
+    }
+
+    /**
+     * 删除角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public AjaxResult remove(@PathVariable String[] roleIds)
+    {
+        return toAjax(roleService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        return AjaxResult.success(roleService.selectRoleAll());
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -0,0 +1,205 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
+
+/**
+ * 用户信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user")
+public class SysUserController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private ISysPostService postService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 获取用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return getDataTable(list);
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysUser user)
+    {
+        List<SysUser> list = userService.selectUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.exportExcel(list, "用户数据");
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        List<SysUser> userList = util.importExcel(file.getInputStream());
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String operName = loginUser.getUsername();
+        String message = userService.importUser(userList, updateSupport, operName);
+        return AjaxResult.success(message);
+    }
+
+    @GetMapping("/importTemplate")
+    public AjaxResult importTemplate()
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.importTemplateExcel("用户数据");
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping(value = { "/", "/{userId}" })
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) String userId)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        List<SysRole> roles = roleService.selectRoleAll();
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("posts", postService.selectPostAll());
+        if (StringUtils.isNotNull(userId))
+        {
+            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
+            ajax.put("postIds", postService.selectPostListByUserId(userId));
+            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
+        }
+        return ajax;
+    }
+
+    /**
+     * 新增用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysUser user)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
+        {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setCreateBy(SecurityUtils.getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        return toAjax(userService.insertUser(user));
+    }
+
+    /**
+     * 修改用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(userService.updateUser(user));
+    }
+
+    /**
+     * 删除用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable String[] userIds)
+    {
+        return toAjax(userService.deleteUserByIds(userIds));
+    }
+
+    /**
+     * 重置密码
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetPwd")
+    public AjaxResult resetPwd(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(userService.resetPwd(user));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(userService.updateUserStatus(user));
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.controller.tool;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.core.controller.BaseController;
+
+/**
+ * swagger 接口
+ * 
+ * @author ruoyi
+ */
+@Controller
+@RequestMapping("/tool/swagger")
+public class SwaggerController extends BaseController
+{
+    @PreAuthorize("@ss.hasPermi('tool:swagger:view')")
+    @GetMapping()
+    public String index()
+    {
+        return redirect("/swagger-ui.html");
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java

@@ -0,0 +1,181 @@
+package com.ruoyi.web.controller.tool;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * swagger 用户测试方法
+ * 
+ * @author ruoyi
+ */
+@Api("用户信息管理")
+@RestController
+@RequestMapping("/test/user")
+public class TestController extends BaseController
+{
+    private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
+    {
+        users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
+        users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
+    }
+
+    @ApiOperation("获取用户列表")
+    @GetMapping("/list")
+    public AjaxResult userList()
+    {
+        List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
+        return AjaxResult.success(userList);
+    }
+
+    @ApiOperation("获取用户详细")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
+    @GetMapping("/{userId}")
+    public AjaxResult getUser(@PathVariable Integer userId)
+    {
+        if (!users.isEmpty() && users.containsKey(userId))
+        {
+            return AjaxResult.success(users.get(userId));
+        }
+        else
+        {
+            return error("用户不存在");
+        }
+    }
+
+    @ApiOperation("新增用户")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer"),
+        @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String"),
+        @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String"),
+        @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String")
+    })
+    @PostMapping("/save")
+    public AjaxResult save(UserEntity user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
+        {
+            return error("用户ID不能为空");
+        }
+        return AjaxResult.success(users.put(user.getUserId(), user));
+    }
+
+    @ApiOperation("更新用户")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody UserEntity user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
+        {
+            return error("用户ID不能为空");
+        }
+        if (users.isEmpty() || !users.containsKey(user.getUserId()))
+        {
+            return error("用户不存在");
+        }
+        users.remove(user.getUserId());
+        return AjaxResult.success(users.put(user.getUserId(), user));
+    }
+
+    @ApiOperation("删除用户信息")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
+    @DeleteMapping("/{userId}")
+    public AjaxResult delete(@PathVariable Integer userId)
+    {
+        if (!users.isEmpty() && users.containsKey(userId))
+        {
+            users.remove(userId);
+            return success();
+        }
+        else
+        {
+            return error("用户不存在");
+        }
+    }
+}
+
+@ApiModel(value = "UserEntity", description = "用户实体")
+class UserEntity
+{
+    @ApiModelProperty("用户ID")
+    private Integer userId;
+
+    @ApiModelProperty("用户名称")
+    private String username;
+
+    @ApiModelProperty("用户密码")
+    private String password;
+
+    @ApiModelProperty("用户手机")
+    private String mobile;
+
+    public UserEntity()
+    {
+
+    }
+
+    public UserEntity(Integer userId, String username, String password, String mobile)
+    {
+        this.userId = userId;
+        this.username = username;
+        this.password = password;
+        this.mobile = mobile;
+    }
+
+    public Integer getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Integer userId)
+    {
+        this.userId = userId;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getMobile()
+    {
+        return mobile;
+    }
+
+    public void setMobile(String mobile)
+    {
+        this.mobile = mobile;
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -0,0 +1,125 @@
+package com.ruoyi.web.core.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import com.ruoyi.common.config.RuoYiConfig;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+
+/**
+ * Swagger2的接口配置
+ * 
+ * @author ruoyi
+ */
+@Configuration
+public class SwaggerConfig
+{
+    /** 系统基础配置 */
+    @Autowired
+    private RuoYiConfig ruoyiConfig;
+
+    /** 是否开启swagger */
+    @Value("${swagger.enabled}")
+    private boolean enabled;
+
+    /** 设置请求的统一前缀 */
+    @Value("${swagger.pathMapping}")
+    private String pathMapping;
+
+    /**
+     * 创建API
+     */
+    @Bean
+    public Docket createRestApi()
+    {
+        return new Docket(DocumentationType.OAS_30)
+                // 是否启用Swagger
+                .enable(enabled)
+                // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
+                .apiInfo(apiInfo())
+                // 设置哪些接口暴露给Swagger展示
+                .select()
+                // 扫描所有有注解的api，用这种方式更灵活
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                // 扫描指定包中的swagger注解
+                // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
+                // 扫描所有 .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build()
+                /* 设置安全模式，swagger可以设置访问token */
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts())
+                .pathMapping(pathMapping);
+    }
+
+    /**
+     * 安全模式，这里指定token通过Authorization头请求头传递
+     */
+    private List<SecurityScheme> securitySchemes()
+    {
+        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
+        apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
+        return apiKeyList;
+    }
+
+    /**
+     * 安全上下文
+     */
+    private List<SecurityContext> securityContexts()
+    {
+        List<SecurityContext> securityContexts = new ArrayList<>();
+        securityContexts.add(
+                SecurityContext.builder()
+                        .securityReferences(defaultAuth())
+                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
+                        .build());
+        return securityContexts;
+    }
+
+    /**
+     * 默认的安全上引用
+     */
+    private List<SecurityReference> defaultAuth()
+    {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        List<SecurityReference> securityReferences = new ArrayList<>();
+        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
+        return securityReferences;
+    }
+
+    /**
+     * 添加摘要信息
+     */
+    private ApiInfo apiInfo()
+    {
+        // 用ApiInfoBuilder进行定制
+        return new ApiInfoBuilder()
+                // 设置标题
+                .title("标题：若依管理系统_接口文档")
+                // 描述
+                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+                // 作者信息
+                .contact(new Contact(ruoyiConfig.getName(), null, null))
+                // 版本
+                .version("版本号:" + ruoyiConfig.getVersion())
+                .build();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccAcademicCommittee.java

@@ -0,0 +1,153 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 学术委员会对象 jcc_academic_committee
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public class JccAcademicCommittee extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private Long age;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 职务 */
+    @Excel(name = "职务")
+    private String job;
+
+    /** 职称 */
+    @Excel(name = "职称")
+    private String title;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 研究方向 */
+    @Excel(name = "研究方向")
+    private String directionId;
+    /** 角色 */
+    @Excel(name = "角色")
+    private String type;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setAge(Long age)
+    {
+        this.age = age;
+    }
+
+    public Long getAge()
+    {
+        return age;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setJob(String job)
+    {
+        this.job = job;
+    }
+
+    public String getJob()
+    {
+        return job;
+    }
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setDirectionId(String directionId)
+    {
+        this.directionId = directionId;
+    }
+
+    public String getDirectionId()
+    {
+        return directionId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("age", getAge())
+            .append("unit", getUnit())
+            .append("job", getJob())
+            .append("title", getTitle())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("directionId", getDirectionId())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccActivitiesTimes.java

@@ -0,0 +1,101 @@
+package com.ruoyi.web.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 实验室活动时间对象 jcc_activities_times
+ *
+ * @author ruoyi
+ * @date 2021-09-28
+ */
+public class JccActivitiesTimes extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 活动名称 */
+    @Excel(name = "活动名称")
+    private String title;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 是否启用 */
+    @Excel(name = "是否启用")
+    private String isOpen;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime)
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime()
+    {
+        return endTime;
+    }
+    public void setIsOpen(String isOpen)
+    {
+        this.isOpen = isOpen;
+    }
+
+    public String getIsOpen()
+    {
+        return isOpen;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("title", getTitle())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("isOpen", getIsOpen())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccBasicInformation.java

@@ -0,0 +1,229 @@
+package com.ruoyi.web.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 基础信息对象 jcc_basic_information
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public class JccBasicInformation extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 实验室名称 */
+    @Excel(name = "实验室名称")
+    private String name;
+
+    /** 英文名称 */
+    @Excel(name = "英文名称")
+    private String englishName;
+
+    /** 实验室主任 */
+    @Excel(name = "实验室主任")
+    private String chiefName;
+
+    /** 实验室联系人 */
+    @Excel(name = "实验室联系人")
+    private String labPerson;
+
+    /** 实验室联系人电话 */
+    @Excel(name = "实验室联系人电话")
+    private String labPhone;
+
+    /** E-mail地址 */
+    @Excel(name = "E-mail地址")
+    private String labEmail;
+    /** 实验室面积 */
+    @Excel(name = "实验室面积")
+    private String labAcreage;
+ /** 实验室地址 */
+    @Excel(name = "实验室地址")
+    private String labAddress;
+
+    /** 单位联系人 */
+    @Excel(name = "单位联系人")
+    private String unitPerson;
+
+    /** 单位联系人电话 */
+    @Excel(name = "单位联系人电话")
+    private String unitPhone;
+
+    /** 依托单位名称 */
+    @Excel(name = "依托单位名称")
+    private String unitName;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 批建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "批建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date buildTime;
+    //实验室填写数量
+    private String numb;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setEnglishName(String englishName)
+    {
+        this.englishName = englishName;
+    }
+
+    public String getEnglishName()
+    {
+        return englishName;
+    }
+    public void setChiefName(String chiefName)
+    {
+        this.chiefName = chiefName;
+    }
+
+    public String getChiefName()
+    {
+        return chiefName;
+    }
+    public void setLabPerson(String labPerson)
+    {
+        this.labPerson = labPerson;
+    }
+
+    public String getLabPerson()
+    {
+        return labPerson;
+    }
+    public void setLabPhone(String labPhone)
+    {
+        this.labPhone = labPhone;
+    }
+
+    public String getLabPhone()
+    {
+        return labPhone;
+    }
+    public void setLabEmail(String labEmail)
+    {
+        this.labEmail = labEmail;
+    }
+
+    public String getLabEmail()
+    {
+        return labEmail;
+    }
+    public void setUnitPerson(String unitPerson)
+    {
+        this.unitPerson = unitPerson;
+    }
+
+    public String getUnitPerson()
+    {
+        return unitPerson;
+    }
+    public void setUnitPhone(String unitPhone)
+    {
+        this.unitPhone = unitPhone;
+    }
+
+    public String getUnitPhone()
+    {
+        return unitPhone;
+    }
+    public void setUnitName(String unitName)
+    {
+        this.unitName = unitName;
+    }
+
+    public String getUnitName()
+    {
+        return unitName;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setBuildTime(Date buildTime)
+    {
+        this.buildTime = buildTime;
+    }
+
+    public Date getBuildTime()
+    {
+        return buildTime;
+    }
+
+    public String getNumb() {
+        return numb;
+    }
+
+    public void setNumb(String numb) {
+        this.numb = numb;
+    }
+
+    public String getLabAcreage() {
+        return labAcreage;
+    }
+
+    public void setLabAcreage(String labAcreage) {
+        this.labAcreage = labAcreage;
+    }
+
+    public String getLabAddress() {
+        return labAddress;
+    }
+
+    public void setLabAddress(String labAddress) {
+        this.labAddress = labAddress;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("englishName", getEnglishName())
+            .append("chiefName", getChiefName())
+            .append("labPerson", getLabPerson())
+            .append("labPhone", getLabPhone())
+            .append("labEmail", getLabEmail())
+            .append("unitPerson", getUnitPerson())
+            .append("unitPhone", getUnitPhone())
+            .append("unitName", getUnitName())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("buildTime", getBuildTime())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccBearScience.java

@@ -0,0 +1,314 @@
+package com.ruoyi.web.domain;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 承担科研任务对象 jcc_bear_science
+ *
+ * @author ruoyi
+ * @date 2021-09-17
+ */
+public class JccBearScience extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String name;
+
+    /** 项目号/起止时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "项目号/起止时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date time;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 项目号 */
+    @Excel(name = "项目号")
+    private String projectsource;
+
+    /** 项目级别 */
+    @Excel(name = "项目级别")
+    private String projectlevelone;
+    /** 名称 */
+    @Excel(name = "负责人")
+    private String userName;
+
+    /** 经费 */
+    @Excel(name = "经费")
+    private Long money;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String fzuser;
+
+    /** 主要参加人 */
+    @Excel(name = "主要参加人")
+    private String participants;
+
+    /** 核心成员所占比例 */
+    @Excel(name = "核心成员所占比例")
+    private String userproportion;
+
+    /** 所属研究方向 */
+    @Excel(name = "所属研究方向")
+    private String direction;
+    /** 所属研究方向 */
+    @Excel(name = "所属研究方向")
+    private String directionName;
+
+    /** 合作单位 */
+    @Excel(name = "合作单位")
+    private String cooperativeunit;
+
+    /** 状态/转化效益（万元） */
+    @Excel(name = "状态/转化效益", readConverterExp = "万=元")
+    private Long statemoney;
+
+    /** 项目来源2 */
+    @Excel(name = "项目来源2")
+    private String projectsourcetwo;
+
+    /** 项目总人数 */
+    @Excel(name = "项目总人数")
+    private String usernum;
+
+    /** 项目来源文本 */
+    @Excel(name = "项目来源文本")
+    private String laiyuancontent;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String state;
+    /** 立项标准部门（单位） */
+    @Excel(name = "立项标准部门（单位）")
+    private String labname;
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getLabname() {
+        return labname;
+    }
+
+    public void setLabname(String labname) {
+        this.labname = labname;
+    }
+
+    public String getDirectionName() {
+        return directionName;
+    }
+
+    public void setDirectionName(String directionName) {
+        this.directionName = directionName;
+    }
+
+    private List persons;
+
+
+    public List getPersons() {
+        return persons;
+    }
+
+    public void setPersons(List persons) {
+        this.persons = persons;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setTime(Date time)
+    {
+        this.time = time;
+    }
+
+    public Date getTime()
+    {
+        return time;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setProjectsource(String projectsource)
+    {
+        this.projectsource = projectsource;
+    }
+
+    public String getProjectsource()
+    {
+        return projectsource;
+    }
+    public void setProjectlevelone(String projectlevelone)
+    {
+        this.projectlevelone = projectlevelone;
+    }
+
+    public String getProjectlevelone()
+    {
+        return projectlevelone;
+    }
+    public void setMoney(Long money)
+    {
+        this.money = money;
+    }
+
+    public Long getMoney()
+    {
+        return money;
+    }
+    public void setFzuser(String fzuser)
+    {
+        this.fzuser = fzuser;
+    }
+
+    public String getFzuser()
+    {
+        return fzuser;
+    }
+    public void setParticipants(String participants)
+    {
+        this.participants = participants;
+    }
+
+    public String getParticipants()
+    {
+        return participants;
+    }
+    public void setUserproportion(String userproportion)
+    {
+        this.userproportion = userproportion;
+    }
+
+    public String getUserproportion()
+    {
+        return userproportion;
+    }
+    public void setDirection(String direction)
+    {
+        this.direction = direction;
+    }
+
+    public String getDirection()
+    {
+        return direction;
+    }
+    public void setCooperativeunit(String cooperativeunit)
+    {
+        this.cooperativeunit = cooperativeunit;
+    }
+
+    public String getCooperativeunit()
+    {
+        return cooperativeunit;
+    }
+    public void setStatemoney(Long statemoney)
+    {
+        this.statemoney = statemoney;
+    }
+
+    public Long getStatemoney()
+    {
+        return statemoney;
+    }
+    public void setProjectsourcetwo(String projectsourcetwo)
+    {
+        this.projectsourcetwo = projectsourcetwo;
+    }
+
+    public String getProjectsourcetwo()
+    {
+        return projectsourcetwo;
+    }
+    public void setUsernum(String usernum)
+    {
+        this.usernum = usernum;
+    }
+
+    public String getUsernum()
+    {
+        return usernum;
+    }
+    public void setLaiyuancontent(String laiyuancontent)
+    {
+        this.laiyuancontent = laiyuancontent;
+    }
+
+    public String getLaiyuancontent()
+    {
+        return laiyuancontent;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("time", getTime())
+                .append("delFlag", getDelFlag())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
+                .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy())
+                .append("projectsource", getProjectsource())
+                .append("projectlevelone", getProjectlevelone())
+                .append("money", getMoney())
+                .append("fzuser", getFzuser())
+                .append("participants", getParticipants())
+                .append("userproportion", getUserproportion())
+                .append("direction", getDirection())
+                .append("cooperativeunit", getCooperativeunit())
+                .append("statemoney", getStatemoney())
+                .append("projectsourcetwo", getProjectsourcetwo())
+                .append("usernum", getUsernum())
+                .append("laiyuancontent", getLaiyuancontent())
+                .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccBearScienceUsers.java

@@ -0,0 +1,95 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 承担科研任务参加人对象 jcc_bear_science_users
+ * 
+ * @author ruoyi
+ * @date 2021-09-17
+ */
+public class JccBearScienceUsers extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** userid */
+    @Excel(name = "userid")
+    private String userid;
+    private String userName;
+
+    /** 科研任务id */
+    @Excel(name = "科研任务id")
+    private String projectid;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setUserid(String userid) 
+    {
+        this.userid = userid;
+    }
+
+    public String getUserid() 
+    {
+        return userid;
+    }
+    public void setProjectid(String projectid) 
+    {
+        this.projectid = projectid;
+    }
+
+    public String getProjectid() 
+    {
+        return projectid;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userid", getUserid())
+            .append("projectid", getProjectid())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccChiefAssistant.java

@@ -0,0 +1,314 @@
+package com.ruoyi.web.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 主任及科研助理对象 jcc_chief_assistant
+ *
+ * @author ruoyi
+ * @date 2021-09-01
+ */
+public class JccChiefAssistant extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 实验室主任姓名 */
+    @Excel(name = "实验室主任姓名")
+    private String labName;
+
+    /** 实验室主任出生年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实验室主任出生年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date labCardtime;
+
+    /** 实验室主任职称 */
+    @Excel(name = "实验室主任职称")
+    private String labJob;
+
+    /** 实验室主任专业领域 */
+    @Excel(name = "实验室主任专业领域")
+    private String labArea;
+
+    /** 实验室主任任职时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实验室主任任职时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date labJobtime;
+
+    /** 实验室主任依托专业职务 */
+    @Excel(name = "实验室主任依托专业职务")
+    private String labPosition;
+
+    /** 学术委员会主任姓名 */
+    @Excel(name = "学术委员会主任姓名")
+    private String committeeName;
+
+    /** 学术委员会主任出生年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "学术委员会主任出生年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date committeeCardtime;
+
+    /** 学术委员会主任职称 */
+    @Excel(name = "学术委员会主任职称")
+    private String committeeJob;
+
+    /** 学术委员会主任专业领域 */
+    @Excel(name = "学术委员会主任专业领域")
+    private String committeeArea;
+
+    /** 学术委员会主任任职时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "学术委员会主任任职时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date committeeJobtime;
+
+    /** 学术委员会主任依托专业职务 */
+    @Excel(name = "学术委员会主任依托专业职务")
+    private String committeePosition;
+
+    /** 科研助理姓名 */
+    @Excel(name = "科研助理姓名")
+    private String assistantName;
+
+    /** 科研助理出生年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "科研助理出生年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date assistantCardtime;
+
+    /** 科研助理职称 */
+    @Excel(name = "科研助理职称")
+    private String assistantJob;
+
+    /** 科研助理专业领域 */
+    @Excel(name = "科研助理专业领域")
+    private String assistantArea;
+
+    /** 科研助理任职时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "科研助理任职时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date assistantJobtime;
+
+    /** 科研助理所在单位职务 */
+    @Excel(name = "科研助理所在单位职务")
+    private String assistantPosition;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setLabName(String labName)
+    {
+        this.labName = labName;
+    }
+
+    public String getLabName()
+    {
+        return labName;
+    }
+    public void setLabCardtime(Date labCardtime)
+    {
+        this.labCardtime = labCardtime;
+    }
+
+    public Date getLabCardtime()
+    {
+        return labCardtime;
+    }
+    public void setLabJob(String labJob)
+    {
+        this.labJob = labJob;
+    }
+
+    public String getLabJob()
+    {
+        return labJob;
+    }
+    public void setLabArea(String labArea)
+    {
+        this.labArea = labArea;
+    }
+
+    public String getLabArea()
+    {
+        return labArea;
+    }
+    public void setLabJobtime(Date labJobtime)
+    {
+        this.labJobtime = labJobtime;
+    }
+
+    public Date getLabJobtime()
+    {
+        return labJobtime;
+    }
+    public void setLabPosition(String labPosition)
+    {
+        this.labPosition = labPosition;
+    }
+
+    public String getLabPosition()
+    {
+        return labPosition;
+    }
+    public void setCommitteeName(String committeeName)
+    {
+        this.committeeName = committeeName;
+    }
+
+    public String getCommitteeName()
+    {
+        return committeeName;
+    }
+    public void setCommitteeCardtime(Date committeeCardtime)
+    {
+        this.committeeCardtime = committeeCardtime;
+    }
+
+    public Date getCommitteeCardtime()
+    {
+        return committeeCardtime;
+    }
+    public void setCommitteeJob(String committeeJob)
+    {
+        this.committeeJob = committeeJob;
+    }
+
+    public String getCommitteeJob()
+    {
+        return committeeJob;
+    }
+    public void setCommitteeArea(String committeeArea)
+    {
+        this.committeeArea = committeeArea;
+    }
+
+    public String getCommitteeArea()
+    {
+        return committeeArea;
+    }
+    public void setCommitteeJobtime(Date committeeJobtime)
+    {
+        this.committeeJobtime = committeeJobtime;
+    }
+
+    public Date getCommitteeJobtime()
+    {
+        return committeeJobtime;
+    }
+    public void setCommitteePosition(String committeePosition)
+    {
+        this.committeePosition = committeePosition;
+    }
+
+    public String getCommitteePosition()
+    {
+        return committeePosition;
+    }
+    public void setAssistantName(String assistantName)
+    {
+        this.assistantName = assistantName;
+    }
+
+    public String getAssistantName()
+    {
+        return assistantName;
+    }
+    public void setAssistantCardtime(Date assistantCardtime)
+    {
+        this.assistantCardtime = assistantCardtime;
+    }
+
+    public Date getAssistantCardtime()
+    {
+        return assistantCardtime;
+    }
+    public void setAssistantJob(String assistantJob)
+    {
+        this.assistantJob = assistantJob;
+    }
+
+    public String getAssistantJob()
+    {
+        return assistantJob;
+    }
+    public void setAssistantArea(String assistantArea)
+    {
+        this.assistantArea = assistantArea;
+    }
+
+    public String getAssistantArea()
+    {
+        return assistantArea;
+    }
+    public void setAssistantJobtime(Date assistantJobtime)
+    {
+        this.assistantJobtime = assistantJobtime;
+    }
+
+    public Date getAssistantJobtime()
+    {
+        return assistantJobtime;
+    }
+    public void setAssistantPosition(String assistantPosition)
+    {
+        this.assistantPosition = assistantPosition;
+    }
+
+    public String getAssistantPosition()
+    {
+        return assistantPosition;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("labName", getLabName())
+            .append("labCardtime", getLabCardtime())
+            .append("labJob", getLabJob())
+            .append("labArea", getLabArea())
+            .append("labJobtime", getLabJobtime())
+            .append("labPosition", getLabPosition())
+            .append("committeeName", getCommitteeName())
+            .append("committeeCardtime", getCommitteeCardtime())
+            .append("committeeJob", getCommitteeJob())
+            .append("committeeArea", getCommitteeArea())
+            .append("committeeJobtime", getCommitteeJobtime())
+            .append("committeePosition", getCommitteePosition())
+            .append("assistantName", getAssistantName())
+            .append("assistantCardtime", getAssistantCardtime())
+            .append("assistantJob", getAssistantJob())
+            .append("assistantArea", getAssistantArea())
+            .append("assistantJobtime", getAssistantJobtime())
+            .append("assistantPosition", getAssistantPosition())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccDirectionPersonRelations.java

@@ -0,0 +1,75 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 方向与人员（核心人员）关系对象 jcc_direction_person_relations
+ *
+ * @author ruoyi
+ * @date 2021-09-15
+ */
+public class JccDirectionPersonRelations extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 研究方向ID */
+    @Excel(name = "研究方向ID")
+    private String direction;
+
+    /** 人员ID */
+    @Excel(name = "人员ID")
+    private String personId;
+    private String personName;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setDirection(String direction)
+    {
+        this.direction = direction;
+    }
+
+    public String getDirection()
+    {
+        return direction;
+    }
+    public void setPersonId(String personId)
+    {
+        this.personId = personId;
+    }
+
+    public String getPersonId()
+    {
+        return personId;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("direction", getDirection())
+            .append("personId", getPersonId())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccEquipmentCondition.java

@@ -0,0 +1,205 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备情况对象 jcc_equipment_condition
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public class JccEquipmentCondition extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 设备数量 */
+    @Excel(name = "设备数量")
+    private Long equipmentNumb;
+
+    /** 大型仪器服务共享平台数量 */
+    @Excel(name = "大型仪器服务共享平台数量")
+    private String instrumentsNumb;
+
+    /** 设备总价值 */
+    @Excel(name = "设备总价值")
+    private Long equipmentMoney;
+
+    /** 平均每台仪器研究工作总计时 */
+    @Excel(name = "平均每台仪器研究工作总计时")
+    private Double researchHour;
+
+    /** 平均每台仪器服务工作总计时 */
+    @Excel(name = "平均每台仪器服务工作总计时")
+    private Double servicesHour;
+
+    /** 机时率 */
+    @Excel(name = "机时率")
+    private Double rate;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String name;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    private String count1;
+    private String count2;
+    private String count3;
+    private String count4;
+    private String count5;
+    private String count6;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setEquipmentNumb(Long equipmentNumb)
+    {
+        this.equipmentNumb = equipmentNumb;
+    }
+
+    public Long getEquipmentNumb()
+    {
+        return equipmentNumb;
+    }
+    public void setInstrumentsNumb(String instrumentsNumb)
+    {
+        this.instrumentsNumb = instrumentsNumb;
+    }
+
+    public String getInstrumentsNumb()
+    {
+        return instrumentsNumb;
+    }
+    public void setEquipmentMoney(Long equipmentMoney)
+    {
+        this.equipmentMoney = equipmentMoney;
+    }
+
+    public Long getEquipmentMoney()
+    {
+        return equipmentMoney;
+    }
+    public void setResearchHour(Double researchHour)
+    {
+        this.researchHour = researchHour;
+    }
+
+    public Double getResearchHour()
+    {
+        return researchHour;
+    }
+    public void setServicesHour(Double servicesHour)
+    {
+        this.servicesHour = servicesHour;
+    }
+
+    public Double getServicesHour()
+    {
+        return servicesHour;
+    }
+    public void setRate(Double rate)
+    {
+        this.rate = rate;
+    }
+
+    public Double getRate()
+    {
+        return rate;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCount1() {
+        return count1;
+    }
+
+    public void setCount1(String count1) {
+        this.count1 = count1;
+    }
+
+    public String getCount2() {
+        return count2;
+    }
+
+    public void setCount2(String count2) {
+        this.count2 = count2;
+    }
+
+    public String getCount3() {
+        return count3;
+    }
+
+    public void setCount3(String count3) {
+        this.count3 = count3;
+    }
+
+    public String getCount4() {
+        return count4;
+    }
+
+    public void setCount4(String count4) {
+        this.count4 = count4;
+    }
+
+    public String getCount5() {
+        return count5;
+    }
+
+    public void setCount5(String count5) {
+        this.count5 = count5;
+    }
+
+    public String getCount6() {
+        return count6;
+    }
+
+    public void setCount6(String count6) {
+        this.count6 = count6;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("equipmentNumb", getEquipmentNumb())
+            .append("instrumentsNumb", getInstrumentsNumb())
+            .append("equipmentMoney", getEquipmentMoney())
+            .append("researchHour", getResearchHour())
+            .append("servicesHour", getServicesHour())
+            .append("rate", getRate())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccFile.java

@@ -0,0 +1,98 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 文件对象 jcc_file
+ * 
+ * @author ruoyi
+ * @date 2021-09-16
+ */
+public class JccFile extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 文件名称 */
+    @Excel(name = "文件名称")
+    private String name;
+
+    /** 文件路径 */
+    @Excel(name = "文件路径")
+    private String url;
+
+    /** 关联表ID */
+    @Excel(name = "关联表ID")
+    private String moduleId;
+
+    /** 关联表名 */
+    @Excel(name = "关联表名")
+    private String moduleName;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public void setModuleId(String moduleId)
+    {
+        this.moduleId = moduleId;
+    }
+
+    public String getModuleId() 
+    {
+        return moduleId;
+    }
+    public void setModuleName(String moduleName) 
+    {
+        this.moduleName = moduleName;
+    }
+
+    public String getModuleName() 
+    {
+        return moduleName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("fliePath", getUrl())
+            .append("moduleId", getModuleId())
+            .append("moduleName", getModuleName())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccFileModule.java

@@ -0,0 +1,91 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 模块文件对象 jcc_file_module
+ *
+ * @author ruoyi
+ * @date 2021-09-16
+ */
+public class JccFileModule extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 文件名称 */
+    @Excel(name = "文件名称")
+    private String name;
+
+    /** 文件路径 */
+    @Excel(name = "文件路径")
+    private String url;
+
+    /** 关联表名 */
+    @Excel(name = "关联表名")
+    private String moduleName;
+
+    /** 实验室ID */
+    @Excel(name = "实验室ID")
+    private String labId;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public void setModuleName(String moduleName)
+    {
+        this.moduleName = moduleName;
+    }
+
+    public String getModuleName()
+    {
+        return moduleName;
+    }
+
+    public String getLabId() {
+        return labId;
+    }
+
+    public void setLabId(String labId) {
+        this.labId = labId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("url", getUrl())
+            .append("moduleName", getModuleName())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccFixedInput.java

@@ -0,0 +1,110 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 固定投入对象 jcc_fixed_input
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public class JccFixedInput extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 经费投入 */
+    @Excel(name = "经费投入")
+    private Long outlayMoney;
+
+    /** 项目投入 */
+    @Excel(name = "项目投入")
+    private Long projectMoney;
+
+    /** 设备投入 */
+    @Excel(name = "设备投入")
+    private Long equipmentMoney;
+
+    /** 其他投入 */
+    @Excel(name = "其他投入")
+    private Long otherMoney;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setOutlayMoney(Long outlayMoney)
+    {
+        this.outlayMoney = outlayMoney;
+    }
+
+    public Long getOutlayMoney()
+    {
+        return outlayMoney;
+    }
+    public void setProjectMoney(Long projectMoney)
+    {
+        this.projectMoney = projectMoney;
+    }
+
+    public Long getProjectMoney()
+    {
+        return projectMoney;
+    }
+    public void setEquipmentMoney(Long equipmentMoney)
+    {
+        this.equipmentMoney = equipmentMoney;
+    }
+
+    public Long getEquipmentMoney()
+    {
+        return equipmentMoney;
+    }
+    public void setOtherMoney(Long otherMoney)
+    {
+        this.otherMoney = otherMoney;
+    }
+
+    public Long getOtherMoney()
+    {
+        return otherMoney;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("outlayMoney", getOutlayMoney())
+            .append("projectMoney", getProjectMoney())
+            .append("equipmentMoney", getEquipmentMoney())
+            .append("otherMoney", getOtherMoney())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccFixedPersonnel.java

@@ -0,0 +1,138 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 固定人员对象 jcc_fixed_personnel
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public class JccFixedPersonnel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private Long age;
+
+    /** 学历 */
+    @Excel(name = "学历")
+    private String educationale;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 职务 */
+    @Excel(name = "职务")
+    private String job;
+
+    /** 构成 （研究、实验、管理） */
+    @Excel(name = "构成 ", readConverterExp = "研=究、实验、管理")
+    private String make;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setAge(Long age)
+    {
+        this.age = age;
+    }
+
+    public Long getAge()
+    {
+        return age;
+    }
+    public void setEducationale(String educationale)
+    {
+        this.educationale = educationale;
+    }
+
+    public String getEducationale()
+    {
+        return educationale;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setJob(String job)
+    {
+        this.job = job;
+    }
+
+    public String getJob()
+    {
+        return job;
+    }
+    public void setMake(String make)
+    {
+        this.make = make;
+    }
+
+    public String getMake()
+    {
+        return make;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("age", getAge())
+            .append("educationale", getEducationale())
+            .append("unit", getUnit())
+            .append("job", getJob())
+            .append("make", getMake())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccFlowPersonnel.java

@@ -0,0 +1,138 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 流动人员对象 jcc_flow_personnel
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public class JccFlowPersonnel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private Long age;
+
+    /** 学历 */
+    @Excel(name = "学历")
+    private String educationale;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 职务 */
+    @Excel(name = "职务")
+    private String job;
+
+    /** 构成 （客座教授、访问学者、研究生） */
+    @Excel(name = "构成 ", readConverterExp = "客=座教授、访问学者、研究生")
+    private String make;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setAge(Long age)
+    {
+        this.age = age;
+    }
+
+    public Long getAge()
+    {
+        return age;
+    }
+    public void setEducationale(String educationale)
+    {
+        this.educationale = educationale;
+    }
+
+    public String getEducationale()
+    {
+        return educationale;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setJob(String job)
+    {
+        this.job = job;
+    }
+
+    public String getJob()
+    {
+        return job;
+    }
+    public void setMake(String make)
+    {
+        this.make = make;
+    }
+
+    public String getMake()
+    {
+        return make;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("age", getAge())
+            .append("educationale", getEducationale())
+            .append("unit", getUnit())
+            .append("job", getJob())
+            .append("make", getMake())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccInputNumb.java

@@ -0,0 +1,66 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 实验室填写情况对象 jcc_input_numb
+ *
+ * @author ruoyi
+ * @date 2021-09-23
+ */
+public class JccInputNumb extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 模块名称 */
+    @Excel(name = "模块名称")
+    private String mouldName;
+
+    /** 实验室ID */
+    @Excel(name = "实验室ID")
+    private String labId;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setMouldName(String mouldName)
+    {
+        this.mouldName = mouldName;
+    }
+
+    public String getMouldName()
+    {
+        return mouldName;
+    }
+    public void setLabId(String labId)
+    {
+        this.labId = labId;
+    }
+
+    public String getLabId()
+    {
+        return labId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("mouldName", getMouldName())
+            .append("labId", getLabId())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccLaiyuan.java

@@ -0,0 +1,65 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目来源对象 jcc_laiyuan
+ * 
+ * @author ruoyi
+ * @date 2021-09-17
+ */
+public class JccLaiyuan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 上级id */
+    @Excel(name = "上级id")
+    private String upid;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setUpid(String upid) 
+    {
+        this.upid = upid;
+    }
+
+    public String getUpid() 
+    {
+        return upid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("upid", getUpid())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccLearningOpenupReport.java

@@ -0,0 +1,138 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 发/提交报告对象 jcc_learning_openup_report
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+public class JccLearningOpenupReport extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 报告名称 */
+    @Excel(name = "报告名称")
+    private String name;
+
+    /** 发表刊物或提交相关部门 */
+    @Excel(name = "发表刊物或提交相关部门")
+    private String department;
+
+    /** 报告性质 */
+    @Excel(name = "报告性质")
+    private String type;
+
+    /** 是否采纳 */
+    @Excel(name = "是否采纳")
+    private String isadopt;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String content;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 反馈信息 */
+    @Excel(name = "反馈信息")
+    private String message;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setDepartment(String department) 
+    {
+        this.department = department;
+    }
+
+    public String getDepartment() 
+    {
+        return department;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setIsadopt(String isadopt) 
+    {
+        this.isadopt = isadopt;
+    }
+
+    public String getIsadopt() 
+    {
+        return isadopt;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setMessage(String message) 
+    {
+        this.message = message;
+    }
+
+    public String getMessage() 
+    {
+        return message;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("department", getDepartment())
+            .append("type", getType())
+            .append("isadopt", getIsadopt())
+            .append("content", getContent())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("message", getMessage())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccLearningOpenupScienceactivities.java

@@ -0,0 +1,138 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 科普活动对象 jcc_learning_openup_scienceactivities
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+public class JccLearningOpenupScienceactivities extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 活动主题 */
+    @Excel(name = "活动主题")
+    private String name;
+
+    /** 活动时间 */
+    @Excel(name = "活动时间")
+    private String timestr;
+
+    /** 参加对象及人数 */
+    @Excel(name = "参加对象及人数")
+    private String numbers;
+
+    /** 宣传报导 */
+    @Excel(name = "宣传报导")
+    private String propaganda;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String content;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 本室人员参与人数 */
+    @Excel(name = "本室人员参与人数")
+    private String usersnumber;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setTimestr(String timestr) 
+    {
+        this.timestr = timestr;
+    }
+
+    public String getTimestr() 
+    {
+        return timestr;
+    }
+    public void setNumbers(String numbers) 
+    {
+        this.numbers = numbers;
+    }
+
+    public String getNumbers() 
+    {
+        return numbers;
+    }
+    public void setPropaganda(String propaganda) 
+    {
+        this.propaganda = propaganda;
+    }
+
+    public String getPropaganda() 
+    {
+        return propaganda;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setUsersnumber(String usersnumber) 
+    {
+        this.usersnumber = usersnumber;
+    }
+
+    public String getUsersnumber() 
+    {
+        return usersnumber;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("timestr", getTimestr())
+            .append("numbers", getNumbers())
+            .append("propaganda", getPropaganda())
+            .append("content", getContent())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("usersnumber", getUsersnumber())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccLearningOpenupSocialservices.java

@@ -0,0 +1,138 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 省级及以上对象 jcc_learning_openup_socialservices
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+public class JccLearningOpenupSocialservices extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 活动名称 */
+    @Excel(name = "活动名称")
+    private String name;
+
+    /** 组织者 */
+    @Excel(name = "组织者")
+    private String usernames;
+
+    /** 充当角色 */
+    @Excel(name = "充当角色")
+    private String role;
+
+    /** 人数 */
+    @Excel(name = "人数")
+    private Integer numbers;
+
+    /** 宣传报导 */
+    @Excel(name = "宣传报导")
+    private String propaganda;
+
+    /** 作者备注 */
+    @Excel(name = "作者备注")
+    private String content;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setUsernames(String usernames) 
+    {
+        this.usernames = usernames;
+    }
+
+    public String getUsernames() 
+    {
+        return usernames;
+    }
+    public void setRole(String role) 
+    {
+        this.role = role;
+    }
+
+    public String getRole() 
+    {
+        return role;
+    }
+    public void setNumbers(Integer numbers) 
+    {
+        this.numbers = numbers;
+    }
+
+    public Integer getNumbers() 
+    {
+        return numbers;
+    }
+    public void setPropaganda(String propaganda) 
+    {
+        this.propaganda = propaganda;
+    }
+
+    public String getPropaganda() 
+    {
+        return propaganda;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("usernames", getUsernames())
+            .append("role", getRole())
+            .append("numbers", getNumbers())
+            .append("propaganda", getPropaganda())
+            .append("content", getContent())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccLearningOpenupTechnicalservice.java

@@ -0,0 +1,152 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 技术服务、转移、检测对象 jcc_learning_openup_technicalservice
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+public class JccLearningOpenupTechnicalservice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 活动名称 */
+    @Excel(name = "活动名称")
+    private String name;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String content;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 类型（服务/转移/检测/其他） */
+    @Excel(name = "类型", readConverterExp = "服=务/转移/检测/其他")
+    private String type;
+
+    /** 服务形式 */
+    @Excel(name = "服务形式")
+    private String servicetype;
+
+    /** 服务受众及人数 */
+    @Excel(name = "服务受众及人数")
+    private String serviceusers;
+
+    /** 转移形式及内容 */
+    @Excel(name = "转移形式及内容")
+    private String transfertype;
+
+    /** 结果（效果、效益） */
+    @Excel(name = "结果", readConverterExp = "效=果、效益")
+    private String result;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setServicetype(String servicetype) 
+    {
+        this.servicetype = servicetype;
+    }
+
+    public String getServicetype() 
+    {
+        return servicetype;
+    }
+    public void setServiceusers(String serviceusers) 
+    {
+        this.serviceusers = serviceusers;
+    }
+
+    public String getServiceusers() 
+    {
+        return serviceusers;
+    }
+    public void setTransfertype(String transfertype) 
+    {
+        this.transfertype = transfertype;
+    }
+
+    public String getTransfertype() 
+    {
+        return transfertype;
+    }
+    public void setResult(String result) 
+    {
+        this.result = result;
+    }
+
+    public String getResult() 
+    {
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("content", getContent())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("type", getType())
+            .append("servicetype", getServicetype())
+            .append("serviceusers", getServiceusers())
+            .append("transfertype", getTransfertype())
+            .append("result", getResult())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccOutcome.java

@@ -0,0 +1,84 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 重要成果对象 jcc_outcome
+ * 
+ * @author ruoyi
+ * @date 2021-09-13
+ */
+public class JccOutcome extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 重要成果 */
+    @Excel(name = "重要成果")
+    private String content;
+    /** 成果名称 */
+    @Excel(name = "成果名称")
+    private String name;
+
+    /** 删除标识 */
+    private String delFlag;
+
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("content", getContent())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccRanksDoctor.java

@@ -0,0 +1,125 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 博硕培养对象 jcc_ranks_doctor
+ * 
+ * @author ruoyi
+ * @date 2021-09-08
+ */
+public class JccRanksDoctor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+    /** 名称 */
+    @Excel(name = "名称")
+    private String userName;
+
+    /** 指导教师 */
+    @Excel(name = "指导教师")
+    private String teacher;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 学历学位 */
+    @Excel(name = "学历学位")
+    private String education;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String state;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setTeacher(String teacher) 
+    {
+        this.teacher = teacher;
+    }
+
+    public String getTeacher() 
+    {
+        return teacher;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setEducation(String education) 
+    {
+        this.education = education;
+    }
+
+    public String getEducation() 
+    {
+        return education;
+    }
+    public void setState(String state) 
+    {
+        this.state = state;
+    }
+
+    public String getState() 
+    {
+        return state;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("teacher", getTeacher())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("education", getEducation())
+            .append("state", getState())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccRanksPersonnelname.java

@@ -0,0 +1,141 @@
+package com.ruoyi.web.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 省部级及以上人才称号对象 jcc_ranks_personnelname
+ * 
+ * @author ruoyi
+ * @date 2021-09-07
+ */
+public class JccRanksPersonnelname extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String userName;
+
+    /** 称号 */
+    @Excel(name = "称号")
+    private String nekename;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 所属研究方向 */
+    @Excel(name = "所属研究方向")
+    private String direction;
+    /** 所属研究方向 */
+    @Excel(name = "所属研究方向")
+    private String directionName;
+
+    /** 获批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "获批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date time;
+
+
+    public String getDirectionName() {
+        return directionName;
+    }
+
+    public void setDirectionName(String directionName) {
+        this.directionName = directionName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setNekename(String nekename) 
+    {
+        this.nekename = nekename;
+    }
+
+    public String getNekename() 
+    {
+        return nekename;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setDirection(String direction) 
+    {
+        this.direction = direction;
+    }
+
+    public String getDirection() 
+    {
+        return direction;
+    }
+    public void setTime(Date time) 
+    {
+        this.time = time;
+    }
+
+    public Date getTime() 
+    {
+        return time;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("nekename", getNekename())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("direction", getDirection())
+            .append("time", getTime())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccRanksTitle.java

@@ -0,0 +1,122 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 职称晋升对象 jcc_ranks_title
+ * 
+ * @author ruoyi
+ * @date 2021-09-07
+ */
+public class JccRanksTitle extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 情况 */
+    @Excel(name = "情况")
+    private String nekename;
+    /** 情况 */
+    @Excel(name = "姓名")
+    private String userName;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 所属研究方向 */
+    @Excel(name = "所属研究方向")
+    private String direction;
+    /** 所属研究方向 */
+    @Excel(name = "所属研究方向")
+    private String directionName;
+
+    public String getDirectionName() {
+        return directionName;
+    }
+
+    public void setDirectionName(String directionName) {
+        this.directionName = directionName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setNekename(String nekename) 
+    {
+        this.nekename = nekename;
+    }
+
+    public String getNekename() 
+    {
+        return nekename;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setDirection(String direction) 
+    {
+        this.direction = direction;
+    }
+
+    public String getDirection() 
+    {
+        return direction;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("nekename", getNekename())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("direction", getDirection())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccResearchDirection.java

@@ -0,0 +1,102 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 研究方向对象 jcc_research_direction
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public class JccResearchDirection extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 方向名称 */
+    @Excel(name = "方向名称")
+    private String name;
+
+    /** 方向带头人(固定人员表ID) */
+    @Excel(name = "方向带头人(固定人员表ID)")
+    private String personId;
+    private String personName;
+    private List persons;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setPersonId(String personId)
+    {
+        this.personId = personId;
+    }
+
+    public String getPersonId()
+    {
+        return personId;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public List getPersons() {
+        return persons;
+    }
+
+    public void setPersons(List persons) {
+        this.persons = persons;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("personId", getPersonId())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccScientificOutputAward.java

@@ -0,0 +1,164 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 制定标准明细对象 jcc_scientific_output_award
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+public class JccScientificOutputAward extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 类别 */
+    @Excel(name = "类别")
+    private String type;
+
+    /** 成果编号 */
+    @Excel(name = "成果编号")
+    private String resulnumber;
+
+    /** 成果名称 */
+    @Excel(name = "成果名称")
+    private String name;
+
+    /** 成果类别 */
+    @Excel(name = "成果类别")
+    private String resultype;
+
+    /** 研究方向 */
+    @Excel(name = "研究方向")
+    private String direction;
+    /** 研究方向 */
+    @Excel(name = "研究方向")
+    private String directionName;
+
+    /** 获奖人 */
+    @Excel(name = "获奖人")
+    private String userId;
+    /** 获奖人 */
+    @Excel(name = "获奖人")
+    private String userName;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getDirectionName() {
+        return directionName;
+    }
+
+    public void setDirectionName(String directionName) {
+        this.directionName = directionName;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setResulnumber(String resulnumber) 
+    {
+        this.resulnumber = resulnumber;
+    }
+
+    public String getResulnumber() 
+    {
+        return resulnumber;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setResultype(String resultype) 
+    {
+        this.resultype = resultype;
+    }
+
+    public String getResultype() 
+    {
+        return resultype;
+    }
+    public void setDirection(String direction) 
+    {
+        this.direction = direction;
+    }
+
+    public String getDirection() 
+    {
+        return direction;
+    }
+    public void setUserId(String userId) 
+    {
+        this.userId = userId;
+    }
+
+    public String getUserId() 
+    {
+        return userId;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("type", getType())
+            .append("resulnumber", getResulnumber())
+            .append("name", getName())
+            .append("resultype", getResultype())
+            .append("direction", getDirection())
+            .append("userId", getUserId())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccScientificOutputPaper.java

@@ -0,0 +1,166 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 发论文情况对象 jcc_scientific_output_paper
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+public class JccScientificOutputPaper extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 论文题目 */
+    @Excel(name = "论文题目")
+    private String title;
+    /** 论文题目 */
+    @Excel(name = "作者")
+    private String userName;
+
+    /** 期刊及卷号 */
+    @Excel(name = "期刊及卷号")
+    private String number;
+
+    /** 起止页码 */
+    @Excel(name = "起止页码")
+    private String startnum;
+
+    /** 论文类别 */
+    @Excel(name = "论文类别")
+    private String type;
+
+    /** 研究方向 */
+    @Excel(name = "研究方向")
+    private String direction;
+    /** 研究方向 */
+    @Excel(name = "研究方向")
+    private String directionName;
+
+    /** 作者
+ */
+    @Excel(name = "作者")
+    private String userId;
+
+    /** 删除标识 */
+    private String delFlag;
+
+
+    public String getDirectionName() {
+        return directionName;
+    }
+
+    public void setDirectionName(String directionName) {
+        this.directionName = directionName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setNumber(String number) 
+    {
+        this.number = number;
+    }
+
+    public String getNumber() 
+    {
+        return number;
+    }
+    public void setStartnum(String startnum) 
+    {
+        this.startnum = startnum;
+    }
+
+    public String getStartnum() 
+    {
+        return startnum;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setDirection(String direction) 
+    {
+        this.direction = direction;
+    }
+
+    public String getDirection() 
+    {
+        return direction;
+    }
+    public void setUserId(String userId) 
+    {
+        this.userId = userId;
+    }
+
+    public String getUserId() 
+    {
+        return userId;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("title", getTitle())
+            .append("number", getNumber())
+            .append("startnum", getStartnum())
+            .append("type", getType())
+            .append("direction", getDirection())
+            .append("userId", getUserId())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccScientificOutputPatent.java

@@ -0,0 +1,188 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 获奖情况对象 jcc_scientific_output_patent
+ * 
+ * @author ruoyi
+ * @date 2021-09-03
+ */
+public class JccScientificOutputPatent extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 类别 */
+    @Excel(name = "类别")
+    private String type;
+
+    /** 成果编号 */
+    @Excel(name = "成果编号")
+    private String resulnumber;
+
+    /** 成果名称 */
+    @Excel(name = "成果名称")
+    private String name;
+
+    /** 获奖等级 */
+    @Excel(name = "获奖等级")
+    private String level;
+
+    /** 研究方向 */
+    @Excel(name = "研究方向")
+    private String direction;
+    /** 研究方向 */
+    @Excel(name = "研究方向")
+    private String directionName;
+
+    /** 获奖人 */
+    @Excel(name = "获奖人")
+    private String userId;
+
+    /** 获奖人名称 */
+    @Excel(name = "获奖人名称")
+    private String userName;
+
+    /** 列表 */
+    private List person;
+    private List personlevel;
+
+    public List getPersonlevel() {
+        return personlevel;
+    }
+
+    public void setPersonlevel(List personlevel) {
+        this.personlevel = personlevel;
+    }
+
+    public List getPerson() {
+        return person;
+    }
+
+    public void setPerson(List person) {
+        this.person = person;
+    }
+
+    /** 删除标识 */
+    private String delFlag;
+
+    public String getDirectionName() {
+        return directionName;
+    }
+
+    public void setDirectionName(String directionName) {
+        this.directionName = directionName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setResulnumber(String resulnumber) 
+    {
+        this.resulnumber = resulnumber;
+    }
+
+    public String getResulnumber() 
+    {
+        return resulnumber;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setLevel(String level) 
+    {
+        this.level = level;
+    }
+
+    public String getLevel() 
+    {
+        return level;
+    }
+    public void setDirection(String direction) 
+    {
+        this.direction = direction;
+    }
+
+    public String getDirection() 
+    {
+        return direction;
+    }
+    public void setUserId(String userId) 
+    {
+        this.userId = userId;
+    }
+
+    public String getUserId() 
+    {
+        return userId;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("type", getType())
+            .append("resulnumber", getResulnumber())
+            .append("name", getName())
+            .append("level", getLevel())
+            .append("userName", getUserName())
+            .append("direction", getDirection())
+            .append("userId", getUserId())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccScientificOutputPatentUser.java

@@ -0,0 +1,110 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 获奖情况人员对象 jcc_scientific_output_patent_user
+ * 
+ * @author ruoyi
+ * @date 2021-10-11
+ */
+public class JccScientificOutputPatentUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private String level;
+
+    /** 获奖人 */
+    @Excel(name = "获奖人")
+    private String userId;
+    private String userName;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 获奖id */
+    @Excel(name = "获奖id")
+    private String patentId;
+
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setLevel(String level) 
+    {
+        this.level = level;
+    }
+
+    public String getLevel() 
+    {
+        return level;
+    }
+    public void setUserId(String userId) 
+    {
+        this.userId = userId;
+    }
+
+    public String getUserId() 
+    {
+        return userId;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setPatentId(String patentId) 
+    {
+        this.patentId = patentId;
+    }
+
+    public String getPatentId() 
+    {
+        return patentId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("level", getLevel())
+            .append("userId", getUserId())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("patentId", getPatentId())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/domain/JccScientificOutputResultOther.java

@@ -0,0 +1,125 @@
+package com.ruoyi.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 其他成果对象 jcc_scientific_output_result_other
+ * 
+ * @author ruoyi
+ * @date 2021-09-06
+ */
+public class JccScientificOutputResultOther extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 成果名称 */
+    @Excel(name = "成果名称")
+    private String name;
+
+    /** 成果类型 */
+    @Excel(name = "成果类型")
+    private String type;
+
+    /** 研究方向 */
+    @Excel(name = "研究方向")
+    private String direction;
+    /** 研究方向 */
+    @Excel(name = "研究方向")
+    private String directionName;
+
+    /** 删除标识 */
+    private String delFlag;
+
+    /** 成果简介 */
+    @Excel(name = "成果简介")
+    private String content;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getDirectionName() {
+        return directionName;
+    }
+
+    public void setDirectionName(String directionName) {
+        this.directionName = directionName;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setDirection(String direction) 
+    {
+        this.direction = direction;
+    }
+
+    public String getDirection() 
+    {
+        return direction;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("type", getType())
+            .append("direction", getDirection())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("content", getContent())
+            .toString();
+    }
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/mapper/JccAcademicCommitteeMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.web.mapper;
+
+import java.util.List;
+import com.ruoyi.web.domain.JccAcademicCommittee;
+
+/**
+ * 学术委员会Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public interface JccAcademicCommitteeMapper
+{
+    /**
+     * 查询学术委员会
+     *
+     * @param id 学术委员会ID
+     * @return 学术委员会
+     */
+    JccAcademicCommittee selectJccAcademicCommitteeById(String id);
+
+    /**
+     * 查询学术委员会列表
+     *
+     * @param jccAcademicCommittee 学术委员会
+     * @return 学术委员会集合
+     */
+    List<JccAcademicCommittee> selectJccAcademicCommitteeList(JccAcademicCommittee jccAcademicCommittee);
+    List<JccAcademicCommittee> selectJccAcademicCommitteeListone(JccAcademicCommittee jccAcademicCommittee);
+    List<JccAcademicCommittee> selectJccAcademicCommitteeListtwo(JccAcademicCommittee jccAcademicCommittee);
+
+    /**
+     * 新增学术委员会
+     *
+     * @param jccAcademicCommittee 学术委员会
+     * @return 结果
+     */
+    int insertJccAcademicCommittee(JccAcademicCommittee jccAcademicCommittee);
+
+    /**
+     * 修改学术委员会
+     *
+     * @param jccAcademicCommittee 学术委员会
+     * @return 结果
+     */
+    int updateJccAcademicCommittee(JccAcademicCommittee jccAcademicCommittee);
+
+    /**
+     * 删除学术委员会
+     *
+     * @param id 学术委员会ID
+     * @return 结果
+     */
+    int deleteJccAcademicCommitteeById(String id);
+
+    /**
+     * 批量删除学术委员会
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteJccAcademicCommitteeByIds(String[] ids);
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/mapper/JccActivitiesTimesMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.mapper;
+
+import java.util.List;
+import com.ruoyi.web.domain.JccActivitiesTimes;
+
+/**
+ * 实验室活动时间Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-09-28
+ */
+public interface JccActivitiesTimesMapper
+{
+    /**
+     * 查询实验室活动时间
+     *
+     * @param id 实验室活动时间ID
+     * @return 实验室活动时间
+     */
+    JccActivitiesTimes selectJccActivitiesTimesById(String id);
+
+    /**
+     * 查询实验室活动时间列表
+     *
+     * @param jccActivitiesTimes 实验室活动时间
+     * @return 实验室活动时间集合
+     */
+    List<JccActivitiesTimes> selectJccActivitiesTimesList(JccActivitiesTimes jccActivitiesTimes);
+
+    /**
+     * 新增实验室活动时间
+     *
+     * @param jccActivitiesTimes 实验室活动时间
+     * @return 结果
+     */
+    int insertJccActivitiesTimes(JccActivitiesTimes jccActivitiesTimes);
+
+    /**
+     * 修改实验室活动时间
+     *
+     * @param jccActivitiesTimes 实验室活动时间
+     * @return 结果
+     */
+    int updateJccActivitiesTimes(JccActivitiesTimes jccActivitiesTimes);
+
+    /**
+     * 删除实验室活动时间
+     *
+     * @param id 实验室活动时间ID
+     * @return 结果
+     */
+    int deleteJccActivitiesTimesById(String id);
+
+    /**
+     * 批量删除实验室活动时间
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteJccActivitiesTimesByIds(String[] ids);
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/mapper/JccBasicInformationMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.mapper;
+
+import java.util.List;
+import com.ruoyi.web.domain.JccBasicInformation;
+
+/**
+ * 基础信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public interface JccBasicInformationMapper
+{
+    /**
+     * 查询基础信息
+     *
+     * @param id 基础信息ID
+     * @return 基础信息
+     */
+    JccBasicInformation selectJccBasicInformationById(String id);
+
+    /**
+     * 查询基础信息列表
+     *
+     * @param jccBasicInformation 基础信息
+     * @return 基础信息集合
+     */
+    List<JccBasicInformation> selectJccBasicInformationList(JccBasicInformation jccBasicInformation);
+
+    /**
+     * 新增基础信息
+     *
+     * @param jccBasicInformation 基础信息
+     * @return 结果
+     */
+    int insertJccBasicInformation(JccBasicInformation jccBasicInformation);
+
+    /**
+     * 修改基础信息
+     *
+     * @param jccBasicInformation 基础信息
+     * @return 结果
+     */
+    int updateJccBasicInformation(JccBasicInformation jccBasicInformation);
+
+    /**
+     * 删除基础信息
+     *
+     * @param id 基础信息ID
+     * @return 结果
+     */
+    int deleteJccBasicInformationById(String id);
+
+    /**
+     * 批量删除基础信息
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteJccBasicInformationByIds(String[] ids);
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/mapper/JccBearScienceMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.mapper;
+
+import java.util.List;
+import com.ruoyi.web.domain.JccBearScience;
+
+/**
+ * 承担科研任务Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-09-10
+ */
+public interface JccBearScienceMapper
+{
+    /**
+     * 查询承担科研任务
+     *
+     * @param id 承担科研任务ID
+     * @return 承担科研任务
+     */
+    public JccBearScience selectJccBearScienceById(String id);
+
+    /**
+     * 查询承担科研任务列表
+     *
+     * @param jccBearScience 承担科研任务
+     * @return 承担科研任务集合
+     */
+    public List<JccBearScience> selectJccBearScienceList(JccBearScience jccBearScience);
+
+    /**
+     * 新增承担科研任务
+     *
+     * @param jccBearScience 承担科研任务
+     * @return 结果
+     */
+    public int insertJccBearScience(JccBearScience jccBearScience);
+
+    /**
+     * 修改承担科研任务
+     *
+     * @param jccBearScience 承担科研任务
+     * @return 结果
+     */
+    public int updateJccBearScience(JccBearScience jccBearScience);
+
+    /**
+     * 删除承担科研任务
+     *
+     * @param id 承担科研任务ID
+     * @return 结果
+     */
+    public int deleteJccBearScienceById(String id);
+
+    /**
+     * 批量删除承担科研任务
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteJccBearScienceByIds(String[] ids);
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/mapper/JccBearScienceUsersMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.mapper;
+
+import java.util.List;
+import com.ruoyi.web.domain.JccBearScienceUsers;
+
+/**
+ * 承担科研任务参加人Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-17
+ */
+public interface JccBearScienceUsersMapper 
+{
+    /**
+     * 查询承担科研任务参加人
+     * 
+     * @param id 承担科研任务参加人ID
+     * @return 承担科研任务参加人
+     */
+    public JccBearScienceUsers selectJccBearScienceUsersById(String id);
+
+    /**
+     * 查询承担科研任务参加人列表
+     * 
+     * @param jccBearScienceUsers 承担科研任务参加人
+     * @return 承担科研任务参加人集合
+     */
+    public List<JccBearScienceUsers> selectJccBearScienceUsersList(JccBearScienceUsers jccBearScienceUsers);
+
+    /**
+     * 新增承担科研任务参加人
+     * 
+     * @param jccBearScienceUsers 承担科研任务参加人
+     * @return 结果
+     */
+    public int insertJccBearScienceUsers(JccBearScienceUsers jccBearScienceUsers);
+
+    /**
+     * 修改承担科研任务参加人
+     * 
+     * @param jccBearScienceUsers 承担科研任务参加人
+     * @return 结果
+     */
+    public int updateJccBearScienceUsers(JccBearScienceUsers jccBearScienceUsers);
+
+    /**
+     * 删除承担科研任务参加人
+     * 
+     * @param id 承担科研任务参加人ID
+     * @return 结果
+     */
+    public int deleteJccBearScienceUsersById(String id);
+
+    /**
+     * 批量删除承担科研任务参加人
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteJccBearScienceUsersByIds(String[] ids);
+}

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/mapper/JccChiefAssistantMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.mapper;
+
+import java.util.List;
+import com.ruoyi.web.domain.JccChiefAssistant;
+
+/**
+ * 主任及科研助理Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-09-01
+ */
+public interface JccChiefAssistantMapper
+{
+    /**
+     * 查询主任及科研助理
+     *
+     * @param id 主任及科研助理ID
+     * @return 主任及科研助理
+     */
+    JccChiefAssistant selectJccChiefAssistantById(String id);
+
+    /**
+     * 查询主任及科研助理列表
+     *
+     * @param jccChiefAssistant 主任及科研助理
+     * @return 主任及科研助理集合
+     */
+    List<JccChiefAssistant> selectJccChiefAssistantList(JccChiefAssistant jccChiefAssistant);
+
+    /**
+     * 新增主任及科研助理
+     *
+     * @param jccChiefAssistant 主任及科研助理
+     * @return 结果
+     */
+    int insertJccChiefAssistant(JccChiefAssistant jccChiefAssistant);
+
+    /**
+     * 修改主任及科研助理
+     *
+     * @param jccChiefAssistant 主任及科研助理
+     * @return 结果
+     */
+    int updateJccChiefAssistant(JccChiefAssistant jccChiefAssistant);
+
+    /**
+     * 删除主任及科研助理
+     *
+     * @param id 主任及科研助理ID
+     * @return 结果
+     */
+    int deleteJccChiefAssistantById(String id);
+
+    /**
+     * 批量删除主任及科研助理
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteJccChiefAssistantByIds(String[] ids);
+}