Skip to content

涂亚平 / subsidy-center

Go to a project
Commit cdd439b5 by 涂亚平
Options

开发中职管理前备份

1 parent a6adf86e
Inline Side-by-side
Showing with 51 additions and 98 deletions
.idea/workspace.xml
......@@ -3,66 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="638a5aae-1fdf-4d8e-b485-bccb20a55a3c" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/springboot-logback-error.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/springboot-logback-info.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-05-08-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-05-09-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-05-10-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-05-11-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-05-19-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-05-23-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-06-06-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-09-13-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2023-11-02-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-01-10-0.log1454401061497900.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-01-11-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-01-15-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-01-16-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-02-23-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-02-26-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-11-01-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-11-05-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-11-07-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2023-07-10-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2023-07-21-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-15-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-16-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-17-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-18-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-19-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-22-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-24-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-25-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-26-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-04-28-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-05-07-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-05-08-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-05-13-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-08-19-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-08-20-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-11-01-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-11-02-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-11-04-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-11-05-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-11-06-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2024-11-11-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AcademyDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AcademyDictController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AcademyDictDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AcademyDictDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AdministerDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AdministerDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AcademyDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AcademyDictServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/CollectInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/CollectInfoServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/MoniMajorServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/MoniMajorServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/academy/AcademiesVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/academy/AcademiesVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/AcademyDictMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/AcademyDictMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/AdministerAcademyMappingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/AdministerAcademyMappingMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/application-prod.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-prod.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/subsidy-center.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/subsidy-center.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/subsidy-center.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/subsidy-center.jar.original" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -949,14 +891,8 @@
<workItem from="1733994857220" duration="1453000" />
<workItem from="1733997513620" duration="26000" />
<workItem from="1734092597176" duration="834000" />
<workItem from="1734093454372" duration="1998000" />
</task>
<task id="LOCAL-00026" summary="人脸识别上线版本">
<created>1665560782356</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1665560782356</updated>
<workItem from="1734093454372" duration="3956000" />
<workItem from="1736132640707" duration="100000" />
</task>
<task id="LOCAL-00027" summary="websocket上线了~~~">
<created>1665648136974</created>
......@@ -1294,7 +1230,14 @@
<option name="project" value="LOCAL" />
<updated>1726716227944</updated>
</task>
<option name="localTasksCounter" value="75" />
<task id="LOCAL-00075" summary="岳阳医院版本">
<created>1734316336087</created>
<option name="number" value="00075" />
<option name="presentableId" value="LOCAL-00075" />
<option name="project" value="LOCAL" />
<updated>1734316336087</updated>
</task>
<option name="localTasksCounter" value="76" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -1325,7 +1268,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="人社局测试" />
<MESSAGE value="15天数据全部推送备份" />
<MESSAGE value="社会化学徒制数据推送" />
<MESSAGE value="oss" />
......@@ -1350,7 +1292,8 @@
<MESSAGE value="2024.1 企业服务中心 开发前备份" />
<MESSAGE value="2024.1 多客户端上线，过年备份" />
<MESSAGE value="居家办公前版本" />
<option name="LAST_COMMIT_MESSAGE" value="居家办公前版本" />
<MESSAGE value="岳阳医院版本" />
<option name="LAST_COMMIT_MESSAGE" value="岳阳医院版本" />
</component>
<component name="WindowStateProjectService">
<state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1733996291532">
......@@ -1361,10 +1304,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="703" y="384" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1734093369097" />
<state x="615" y="131" key="CommitChangelistDialog2" timestamp="1732789950942">
<state x="615" y="131" key="CommitChangelistDialog2" timestamp="1736924330684">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="615" y="131" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1732789950942" />
<state x="615" y="131" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1736924330684" />
<state width="419" height="466" key="DebuggerActiveHint" timestamp="1731320671002">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......@@ -1373,54 +1316,54 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1734095992350" />
<state width="1877" height="315" key="GridCell.Tab.0.bottom" timestamp="1734095983608">
<state width="1877" height="315" key="GridCell.Tab.0.bottom" timestamp="1734410245639">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="315" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1734095983608" />
<state width="1877" height="315" key="GridCell.Tab.0.center" timestamp="1734095983608">
<state width="1877" height="315" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245639" />
<state width="1877" height="315" key="GridCell.Tab.0.center" timestamp="1734410245639">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="315" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1734095983608" />
<state width="1877" height="315" key="GridCell.Tab.0.left" timestamp="1734095983608">
<state width="1877" height="315" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245639" />
<state width="1877" height="315" key="GridCell.Tab.0.left" timestamp="1734410245639">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="315" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1734095983608" />
<state width="1877" height="315" key="GridCell.Tab.0.right" timestamp="1734095983608">
<state width="1877" height="315" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245639" />
<state width="1877" height="315" key="GridCell.Tab.0.right" timestamp="1734410245639">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="315" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1734095983608" />
<state width="1877" height="503" key="GridCell.Tab.1.bottom" timestamp="1734093512516">
<state width="1877" height="315" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245639" />
<state width="1877" height="503" key="GridCell.Tab.1.bottom" timestamp="1734410245636">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="503" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1734093512516" />
<state width="1877" height="503" key="GridCell.Tab.1.center" timestamp="1734093512516">
<state width="1877" height="503" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245636" />
<state width="1877" height="503" key="GridCell.Tab.1.center" timestamp="1734410245635">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="503" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1734093512516" />
<state width="1877" height="503" key="GridCell.Tab.1.left" timestamp="1734093512516">
<state width="1877" height="503" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245635" />
<state width="1877" height="503" key="GridCell.Tab.1.left" timestamp="1734410245635">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="503" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1734093512516" />
<state width="1877" height="503" key="GridCell.Tab.1.right" timestamp="1734093512516">
<state width="1877" height="503" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245635" />
<state width="1877" height="503" key="GridCell.Tab.1.right" timestamp="1734410245635">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="503" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1734093512516" />
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.bottom" timestamp="1734093512516">
<state width="1877" height="503" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245635" />
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.bottom" timestamp="1734410245636">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1734093512516" />
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.center" timestamp="1734093512516">
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245636" />
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.center" timestamp="1734410245636">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1734093512516" />
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.left" timestamp="1734093512516">
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245636" />
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.left" timestamp="1734410245636">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1734093512516" />
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.right" timestamp="1734093512516">
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245636" />
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.right" timestamp="1734410245636">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1734093512516" />
<state x="0" y="678" width="1877" height="503" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1734410245636" />
<state x="184" y="86" key="MergeDialog" timestamp="1732789981705">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......@@ -1429,10 +1372,14 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="669" y="235" key="MultipleFileMergeDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1732789981710" />
<state x="607" y="272" key="Vcs.Push.Dialog.v2" timestamp="1732789955338">
<state x="440" y="94" key="SettingsEditor" timestamp="1734317829347">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="440" y="94" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1734317829347" />
<state x="607" y="272" key="Vcs.Push.Dialog.v2" timestamp="1734316340080">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="607" y="272" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1732789955338" />
<state x="607" y="272" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1734316340080" />
<state x="396" y="75" width="1413" height="918" key="find.popup" timestamp="1734093407833">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......
src/main/java/com/subsidy/model/AdministerDO.java
......@@ -44,6 +44,11 @@ public class AdministerDO extends BaseModel {
private String password;
/**
* 院校id
*/
private Long academyId;
/**
* 公司id
*/
private Long companyId;
......
src/main/java/com/subsidy/service/impl/AcademyDictServiceImpl.java
......@@ -76,6 +76,7 @@ public class AcademyDictServiceImpl extends ServiceImpl<AcademyDictMapper, Acade
administerDO.setStatus("1");
administerDO.setPassword("admin321");
administerDO.setUserName(academyDictDO.getAcademyName());
administerDO.setAcademyId(academyDictDO.getId());
administerMapper.insert(administerDO);
//关联
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!