From 8728733ad60e1698bb6cf0fa2e428c28a6bffbe7 Mon Sep 17 00:00:00 2001 From: linzhijie <19970921lzj> Date: 星期二, 06 四月 2021 10:34:12 +0800 Subject: [PATCH] 需求提交。 --- .idea/workspace.xml | 362 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 211 insertions(+), 151 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9b7f49b..f5031a2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -19,19 +19,35 @@ <select /> </component> <component name="ChangeListManager"> - <list default="true" id="cd72c5cc-17e9-4269-9d87-e1dc29ad79ec" name="Default Changelist" comment="琛ュ厖鐜閰嶇疆"> + <list default="true" id="cd72c5cc-17e9-4269-9d87-e1dc29ad79ec" name="Default Changelist" comment="鍘婚櫎娉板浗鎺ュ彛璋冪敤"> + <change afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/domain/EntEmailTemplate.java" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/mapper/EntEmailTemplateMapper.java" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/IEntEmailTemplateService.java" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/EntEmailTemplateServiceImpl.java" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/main/resources/application-tencent.yml" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/exam/EntEmailTemplateMapper.xml" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/exam/report/evaluationReport.html" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/exam/template/emailEdit.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/jar/tai-ots-framework.jar" beforeDir="false" afterPath="$PROJECT_DIR$/jar/tai-ots-framework.jar" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/mapper/EntDemographyInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/mapper/EntDemographyInfoMapper.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/IEntDemographyInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/IEntDemographyInfoService.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/EntDemographyInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/EntDemographyInfoServiceImpl.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/TExamReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/TExamReportController.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/TReportTemplateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/TReportTemplateController.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/domain/EntTestPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/domain/EntTestPackage.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/domain/TExamReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/domain/TExamReport.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/application-local.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-local.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/exam/EntDemographyInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/exam/EntDemographyInfoMapper.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/main/resources/static/ots/js/ry-ui.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/ots/js/ry-ui.js" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/exam/EntTestPackageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/exam/EntTestPackageMapper.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/exam/TExamReportMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/exam/TExamReportMapper.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/static/i18n/messages_en_US.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/i18n/messages_en_US.properties" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/static/i18n/messages_th_TH.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/i18n/messages_th_TH.properties" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/static/i18n/messages_zh_CN.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/i18n/messages_zh_CN.properties" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/static/ots/css/ry-ui.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/ots/css/ry-ui.css" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/exam/distributor/distributor.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/exam/distributor/distributor.html" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/exam/report/report.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/exam/report/report.html" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/exam/template/template.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/exam/template/template.html" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/exam/test_package/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/exam/test_package/add.html" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/exam/test_package/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/exam/test_package/edit.html" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -62,6 +78,7 @@ <option name="showLibraryContents" value="true" /> </component> <component name="PropertiesComponent"> + <property name="DatabaseDriversLRU" value="mysql" /> <property name="RequestMappingsPanelOrder0" value="0" /> <property name="RequestMappingsPanelOrder1" value="1" /> <property name="RequestMappingsPanelWidth0" value="75" /> @@ -72,7 +89,7 @@ <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> <property name="ignore_missing_gitignore" value="true" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../Project/estage" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/../tai-ots-framework" /> <property name="nodejs_package_manager_path" value="npm" /> <property name="project.structure.last.edited" value="Project" /> <property name="project.structure.proportion" value="0.0" /> @@ -81,11 +98,16 @@ <property name="vue.rearranger.settings.migration" value="true" /> </component> <component name="RecentsManager"> + <key name="CopyClassDialog.RECENTS_KEY"> + <recent name="com.ots.project.exam.service.impl" /> + <recent name="com.ots.project.exam.service" /> + </key> <key name="CopyFile.RECENT_KEYS"> + <recent name="D:\娴嬭瘎绯荤粺\tai-ots-master\src\main\resources\mybatis\exam" /> + <recent name="D:\娴嬭瘎绯荤粺\tai-ots-master\src\main\java\com\ots\project\exam\mapper" /> + <recent name="D:\娴嬭瘎绯荤粺\tai-ots-master\src\main\java\com\ots\project\exam\domain" /> + <recent name="D:\娴嬭瘎绯荤粺\tai-ots-master\src\main\resources\templates\exam\template" /> <recent name="D:\娴嬭瘎绯荤粺\tai-ots-master\src\main\resources" /> - <recent name="D:\娴嬭瘎绯荤粺\tai-ots-master\src\main\resources\templates" /> - <recent name="D:\娴嬭瘎绯荤粺\tai-ots-master" /> - <recent name="D:\娴嬭瘎绯荤粺\tai-ots-master\src\main" /> </key> </component> <component name="RunAnythingCache"> @@ -105,12 +127,77 @@ </extension> <option name="SPRING_BOOT_MAIN_CLASS" value="com.ots.OtsApplication" /> <option name="ALTERNATIVE_JRE_PATH" /> + <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateResources" /> + <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateResources" /> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false"> + <deployment /> + <server-settings> + <option name="BASE_DIRECTORY_NAME" value="_tai-ots-master" /> + </server-settings> + <predefined_log_file enabled="true" id="Tomcat" /> + <predefined_log_file enabled="true" id="Tomcat Catalina" /> + <predefined_log_file id="Tomcat Manager" /> + <predefined_log_file id="Tomcat Host Manager" /> + <predefined_log_file id="Tomcat Localhost Access" /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="59553" /> + </RunnerSettings> + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover"> + <option name="USE_ENV_VARIABLES" value="true" /> + <STARTUP> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </STARTUP> + <SHUTDOWN> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </SHUTDOWN> + </ConfigurationWrapper> + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug"> + <option name="USE_ENV_VARIABLES" value="true" /> + <STARTUP> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </STARTUP> + <SHUTDOWN> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </SHUTDOWN> + </ConfigurationWrapper> + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run"> + <option name="USE_ENV_VARIABLES" value="true" /> + <STARTUP> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </STARTUP> + <SHUTDOWN> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </SHUTDOWN> + </ConfigurationWrapper> <method v="2"> <option name="Make" enabled="true" /> </method> </configuration> <recent_temporary> <list> + <item itemvalue="Spring Boot.OtsApplication" /> <item itemvalue="Spring Boot.OtsApplication" /> </list> </recent_temporary> @@ -153,6 +240,16 @@ <workItem from="1616341817344" duration="977000" /> <workItem from="1616379322437" duration="2089000" /> <workItem from="1616384832741" duration="4189000" /> + <workItem from="1616944302613" duration="2595000" /> + <workItem from="1616982316816" duration="15696000" /> + <workItem from="1617025944252" duration="1147000" /> + <workItem from="1617031413719" duration="2534000" /> + <workItem from="1617069207465" duration="212000" /> + <workItem from="1617076614568" duration="21243000" /> + <workItem from="1617162388942" duration="14644000" /> + <workItem from="1617202312034" duration="2278000" /> + <workItem from="1617205486701" duration="476000" /> + <workItem from="1617267163012" duration="5048000" /> </task> <task id="LOCAL-00001" summary="娴嬭瘎椤圭洰鏈�鏂颁唬鐮�"> <created>1615212708854</created> @@ -209,11 +306,37 @@ </State> </value> </entry> + <entry key="2"> + <value> + <State> + <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" /> + <option name="FILTERS"> + <map> + <entry key="branch"> + <value> + <list> + <option value="HEAD" /> + </list> + </value> + </entry> + <entry key="structure"> + <value> + <list> + <option value="dir:D:/娴嬭瘎绯荤粺/tai-ots-master/.idea" /> + </list> + </value> + </entry> + </map> + </option> + </State> + </value> + </entry> </map> </option> <option name="OPEN_GENERIC_TABS"> <map> <entry key="1" value="TOOL_WINDOW" /> + <entry key="2" value="TOOL_WINDOW" /> </map> </option> <option name="oldMeFiltersMigrated" value="true" /> @@ -221,8 +344,8 @@ <component name="VcsManagerConfiguration"> <MESSAGE value="娴嬭瘎椤圭洰鏈�鏂颁唬鐮�" /> <MESSAGE value="娴嬭瘎绯荤粺澶栭儴浠g爜" /> - <MESSAGE value="琛ュ厖鐜閰嶇疆" /> - <option name="LAST_COMMIT_MESSAGE" value="琛ュ厖鐜閰嶇疆" /> + <MESSAGE value="鍘婚櫎娉板浗鎺ュ彛璋冪敤" /> + <option name="LAST_COMMIT_MESSAGE" value="鍘婚櫎娉板浗鎺ュ彛璋冪敤" /> </component> <component name="WindowStateProjectService"> <state x="590" y="113" key="#OtsApplication" timestamp="1615515366491"> @@ -233,193 +356,130 @@ <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="440" y="94" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1615515318160" /> - <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1615896285345"> + <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1617179034831"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1615896285345" /> - <state x="765" y="225" key="#com.intellij.ide.util.MemberChooser" timestamp="1616236596670"> + <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1617179034831" /> + <state x="710" y="220" key="#com.intellij.ide.util.MemberChooser" timestamp="1617180566416"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="765" y="225" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1616236596670" /> - <state x="533" y="147" key="CommitChangelistDialog2" timestamp="1616311985460"> + <state x="710" y="220" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1617180566416" /> + <state x="456" y="74" key="CommitChangelistDialog2" timestamp="1617202615253"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="533" y="147" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1616311985460" /> - <state x="135" y="208" width="1736" height="793" key="DiffContextDialog" timestamp="1616311978717"> + <state x="456" y="74" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1617202615253" /> + <state x="135" y="145" width="1736" height="856" key="DiffContextDialog" timestamp="1617202614473"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="135" y="208" width="1736" height="793" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1616311978717" /> - <state x="740" y="274" key="FileChooserDialogImpl" timestamp="1616397949799"> + <state x="135" y="145" width="1736" height="856" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1617202614473" /> + <state x="740" y="274" key="FileChooserDialogImpl" timestamp="1617203062677"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1616397949799" /> - <state width="289" height="379" key="Git.Branch.Popup" timestamp="1616217406445"> + <state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1617203062677" /> + <state width="283" height="373" key="Git.Branch.Popup" timestamp="1616585343736"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="289" height="379" key="Git.Branch.Popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616217406445" /> - <state width="1877" height="322" key="GridCell.Tab.0.bottom" timestamp="1616397952636"> + <state width="283" height="373" key="Git.Branch.Popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616585343736" /> + <state width="1877" height="251" key="GridCell.Tab.0.bottom" timestamp="1617275733566"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="322" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616397952636" /> - <state width="1877" height="322" key="GridCell.Tab.0.center" timestamp="1616397952636"> + <state width="1877" height="251" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617275733566" /> + <state width="1877" height="251" key="GridCell.Tab.0.center" timestamp="1617275733566"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="322" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616397952636" /> - <state width="1877" height="322" key="GridCell.Tab.0.left" timestamp="1616397952636"> + <state width="1877" height="251" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617275733566" /> + <state width="1877" height="251" key="GridCell.Tab.0.left" timestamp="1617275733566"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="322" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616397952636" /> - <state width="1877" height="322" key="GridCell.Tab.0.right" timestamp="1616397952636"> + <state width="1877" height="251" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617275733566" /> + <state width="1877" height="251" key="GridCell.Tab.0.right" timestamp="1617275733566"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="322" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616397952636" /> - <state width="1877" height="322" key="GridCell.Tab.1.bottom" timestamp="1616342796612"> + <state width="1877" height="251" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617275733566" /> + <state width="1877" height="251" key="GridCell.Tab.1.bottom" timestamp="1617273606880"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="322" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616342796612" /> - <state width="1877" height="322" key="GridCell.Tab.1.center" timestamp="1616342796612"> + <state width="1877" height="251" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617273606880" /> + <state width="1877" height="251" key="GridCell.Tab.1.center" timestamp="1617273606879"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="322" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616342796612" /> - <state width="1877" height="322" key="GridCell.Tab.1.left" timestamp="1616342796612"> + <state width="1877" height="251" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617273606879" /> + <state width="1877" height="251" key="GridCell.Tab.1.left" timestamp="1617273606879"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="322" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616342796612" /> - <state width="1877" height="322" key="GridCell.Tab.1.right" timestamp="1616342796612"> + <state width="1877" height="251" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617273606879" /> + <state width="1877" height="251" key="GridCell.Tab.1.right" timestamp="1617273606879"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="322" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616342796612" /> - <state width="1877" height="285" key="GridCell.Tab.2.bottom" timestamp="1616256896660"> + <state width="1877" height="251" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617273606879" /> + <state width="1877" height="270" key="GridCell.Tab.2.bottom" timestamp="1617108907135"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="285" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616256896660" /> - <state width="1877" height="285" key="GridCell.Tab.2.center" timestamp="1616256896660"> + <state width="1877" height="270" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617108907135" /> + <state width="1877" height="270" key="GridCell.Tab.2.center" timestamp="1617108907135"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="285" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616256896660" /> - <state width="1877" height="285" key="GridCell.Tab.2.left" timestamp="1616256896660"> + <state width="1877" height="270" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617108907135" /> + <state width="1877" height="270" key="GridCell.Tab.2.left" timestamp="1617108907135"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="285" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616256896660" /> - <state width="1877" height="285" key="GridCell.Tab.2.right" timestamp="1616256896660"> + <state width="1877" height="270" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617108907135" /> + <state width="1877" height="270" key="GridCell.Tab.2.right" timestamp="1617108907135"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="1877" height="285" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616256896660" /> + <state width="1877" height="270" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617108907135" /> <state x="490" y="174" key="Maven.ArtifactSearchDialog" timestamp="1615427932582"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="490" y="174" key="Maven.ArtifactSearchDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1615427932582" /> - <state x="461" y="164" key="SettingsEditor" timestamp="1616142353333"> + <state x="184" y="85" key="MergeDialog" timestamp="1616585312170"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="461" y="164" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1616142353333" /> - <state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1616217407848"> + <state x="184" y="85" key="MergeDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1616585312170" /> + <state x="461" y="164" key="SettingsEditor" timestamp="1615431876749"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1616217407848" /> - <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1616223565788"> + <state x="461" y="164" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1615431876749" /> + <state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1616585350523"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state width="968" height="528" key="XDebugger.FullValuePopup/0.0.1920.1040@0.0.1920.1040" timestamp="1616223565788" /> - <state x="754" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1616217352314"> + <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1616585350523" /> + <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1615866063087"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="754" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1616217352314" /> - <state x="967" y="100" width="719" height="931" key="find.popup" timestamp="1616396725972"> + <state width="968" height="528" key="XDebugger.FullValuePopup/0.0.1920.1040@0.0.1920.1040" timestamp="1615866063087" /> + <state x="540" y="174" key="com.intellij.database.dbimport.ImportDialog" timestamp="1617179046190"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="967" y="100" width="719" height="931" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616396725972" /> + <state x="540" y="174" key="com.intellij.database.dbimport.ImportDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1617179046190" /> + <state x="754" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1615427969273"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state x="754" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1615427969273" /> + <state x="563" y="274" width="827" height="748" key="find.popup" timestamp="1617273466453"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state x="563" y="274" width="827" height="748" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1617273466453" /> + <state x="727" y="231" key="git4idea.branch.GitSmartOperationDialog" timestamp="1616585254266"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state x="727" y="231" key="git4idea.branch.GitSmartOperationDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1616585254266" /> <state x="761" y="426" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1615460537318"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="761" y="426" key="git4idea.remote.GitConfigureRemotesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1615460537318" /> - <state x="616" y="240" width="672" height="677" key="run.anything.popup" timestamp="1616386192087"> + <state x="616" y="240" width="672" height="677" key="run.anything.popup" timestamp="1617273606783"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="616" y="240" width="672" height="677" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616386192087" /> - <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1616396723231"> + <state x="616" y="240" width="672" height="677" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1617273606783" /> + <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1617032712590"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616396723231" /> + <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1617032712590" /> </component> <component name="XDebuggerManager"> <breakpoint-manager> <breakpoints> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/TExamReportController.java</url> - <line>1078</line> - <option name="timeStamp" value="3" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/TExamReportController.java</url> - <line>1295</line> - <option name="timeStamp" value="4" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/monitor/job/task/SenderTask.java</url> - <line>219</line> - <option name="timeStamp" value="11" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/monitor/job/task/SenderEmailReportTask.java</url> - <line>62</line> - <option name="timeStamp" value="13" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java</url> - <line>854</line> - <option name="timeStamp" value="22" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>706</line> - <option name="timeStamp" value="23" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>685</line> - <option name="timeStamp" value="25" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>266</line> - <option name="timeStamp" value="26" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>345</line> - <option name="timeStamp" value="27" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>277</line> - <option name="timeStamp" value="30" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>306</line> - <option name="timeStamp" value="31" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>284</line> - <option name="timeStamp" value="32" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>250</line> - <option name="timeStamp" value="35" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>291</line> - <option name="timeStamp" value="36" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>jar://$PROJECT_DIR$/jar/tai-ots-framework.jar!/com/ots/common/utils/poi/WordUtil.class</url> - <line>707</line> - <option name="timeStamp" value="37" /> - </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>jar://$PROJECT_DIR$/jar/tai-ots-framework.jar!/com/ots/common/utils/poi/WordUtil.class</url> <line>818</line> @@ -437,12 +497,12 @@ </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>492</line> + <line>486</line> <option name="timeStamp" value="41" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>561</line> + <line>555</line> <option name="timeStamp" value="42" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> @@ -452,7 +512,7 @@ </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamReportServiceImpl.java</url> - <line>513</line> + <line>507</line> <option name="timeStamp" value="44" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> @@ -467,17 +527,12 @@ </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java</url> - <line>1259</line> - <option name="timeStamp" value="52" /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java</url> - <line>180</line> + <line>183</line> <option name="timeStamp" value="53" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/service/impl/TExamPaperServiceImpl.java</url> - <line>285</line> + <line>288</line> <option name="timeStamp" value="54" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> @@ -495,6 +550,11 @@ <line>514</line> <option name="timeStamp" value="64" /> </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/TExamReportController.java</url> + <line>678</line> + <option name="timeStamp" value="67" /> + </line-breakpoint> <line-breakpoint enabled="true" type="javascript"> <url>file://$PROJECT_DIR$/src/main/resources/static/ots/js/ry-ui.js</url> <line>750</line> -- Gitblit v1.9.1