From 468e4503586a71f636868dec35f7cbe4f66dd4c4 Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期三, 24 三月 2021 21:01:59 +0800
Subject: [PATCH] 首页新增一个测试包搜索类型
---
src/main/resources/static/i18n/messages_zh_CN.properties | 3
.idea/workspace.xml | 250 ++++++++++++++++-------------------------
src/main/resources/static/i18n/messages_en_US.properties | 3
src/main/resources/templates/main.html | 30 ++++-
src/main/java/com/ots/project/exam/controller/EntTestPackageController.java | 9 +
src/main/resources/application.yml | 2
src/main/resources/static/i18n/messages_th_TH.properties | 3
src/main/resources/templates/exam/test_package/test_package.html | 2
8 files changed, 139 insertions(+), 163 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9b7f49b..f4feeb4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -19,19 +19,15 @@
<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 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/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/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/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" 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/templates/exam/test_package/test_package.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/exam/test_package/test_package.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/main.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/main.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -72,7 +68,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$/../../Project/engine" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.0" />
@@ -209,11 +205,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 +243,8 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="娴嬭瘎椤圭洰鏈�鏂颁唬鐮�" />
<MESSAGE value="娴嬭瘎绯荤粺澶栭儴浠ｇ爜" />
- <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 +255,122 @@
<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="1615688571928">
<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="1615688571928" />
+ <state x="456" y="74" key="CommitChangelistDialog2" timestamp="1616585341087">
<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="456" y="74" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1616585341087" />
+ <state x="135" y="145" width="1736" height="856" key="DiffContextDialog" timestamp="1616585339922">
<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="135" y="145" width="1736" height="856" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1616585339922" />
+ <state x="740" y="274" key="FileChooserDialogImpl" timestamp="1616588718176">
<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="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1616588718176" />
+ <state width="283" height="373" key="Git.Branch.Popup" timestamp="1616585343736">
<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 width="283" height="373" key="Git.Branch.Popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616585343736" />
+ <state width="1877" height="266" key="GridCell.Tab.0.bottom" timestamp="1616590336140">
<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="1877" height="266" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616590336140" />
+ <state width="1877" height="266" key="GridCell.Tab.0.center" timestamp="1616590336140">
<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="266" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616590336140" />
+ <state width="1877" height="266" key="GridCell.Tab.0.left" timestamp="1616590336140">
<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="266" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616590336140" />
+ <state width="1877" height="266" key="GridCell.Tab.0.right" timestamp="1616590336140">
<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="266" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616590336140" />
+ <state width="1877" height="266" key="GridCell.Tab.1.bottom" timestamp="1616590336140">
<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="266" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616590336140" />
+ <state width="1877" height="266" key="GridCell.Tab.1.center" timestamp="1616590336140">
<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="266" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616590336140" />
+ <state width="1877" height="266" key="GridCell.Tab.1.left" timestamp="1616590336140">
<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="266" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616590336140" />
+ <state width="1877" height="266" key="GridCell.Tab.1.right" timestamp="1616590336140">
<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="266" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616590336140" />
+ <state width="1877" height="385" key="GridCell.Tab.2.bottom" timestamp="1615889660606">
<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="385" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1615889660606" />
+ <state width="1877" height="385" key="GridCell.Tab.2.center" timestamp="1615889660605">
<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="385" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1615889660605" />
+ <state width="1877" height="385" key="GridCell.Tab.2.left" timestamp="1615889660605">
<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="385" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1615889660605" />
+ <state width="1877" height="385" key="GridCell.Tab.2.right" timestamp="1615889660605">
<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">
- <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="385" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1615889660605" />
<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="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="967" y="100" width="719" height="931" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616396725972" />
+ <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="1083" y="283" width="603" height="748" key="find.popup" timestamp="1616590485815">
+ <screen x="0" y="0" width="1920" height="1040" />
+ </state>
+ <state x="1083" y="283" width="603" height="748" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616590485815" />
+ <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="1615795422622">
<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="1615795422622" />
+ <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1615864418427">
<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="1615864418427" />
</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 +388,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 +403,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 +418,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">
diff --git a/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java b/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java
index b8b107b..e34d01c 100644
--- a/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java
+++ b/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java
@@ -65,6 +65,15 @@
return prefix + "/test_package";
}
+ @RequiresPermissions("exam:test_package:search")
+ @GetMapping("/searchTestPackage")
+ public String search(String testName, ModelMap mmap) {
+ if (Objects.nonNull(testName)) {
+ mmap.put("testName", testName);
+ }
+ return prefix + "/test_package";
+ }
+
/**
* 鏌ヨ娴嬭瘯鍖呯鐞嗗垪琛�
*/
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ceffe07..b1af007 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -40,7 +40,7 @@
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
profiles:
- active: dev
+ active: local
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/src/main/resources/static/i18n/messages_en_US.properties b/src/main/resources/static/i18n/messages_en_US.properties
index 113ae9c..3bfb2c8 100644
--- a/src/main/resources/static/i18n/messages_en_US.properties
+++ b/src/main/resources/static/i18n/messages_en_US.properties
@@ -953,4 +953,5 @@
test.user.name.dict4=Search by Test-Taker Code
jsp.main.other.001=Recently Completed Tests
jsp.main.other.002=Recently Abandoned Tests or Tests Being Completed
-jsp.main.other.003=Recently Created Test Packages
\ No newline at end of file
+jsp.main.other.003=Recently Created Test Packages
+menu.exam.test_package.search=Search Test Package
\ No newline at end of file
diff --git a/src/main/resources/static/i18n/messages_th_TH.properties b/src/main/resources/static/i18n/messages_th_TH.properties
index 6e9ebc4..6e194c2 100644
--- a/src/main/resources/static/i18n/messages_th_TH.properties
+++ b/src/main/resources/static/i18n/messages_th_TH.properties
@@ -949,4 +949,5 @@
test.product.name=\u6D4B\u8BD5\u4EA7\u54C1\u540D\u79F0
jsp.main.other.001=\u6700\u8FD1\u5B8C\u6210\u6D4B\u8BD5\u8BB0\u5F55
jsp.main.other.002=\u6700\u8FD1\u6B63\u5728\u7B54\u9898\u6D4B\u8BD5\u8BB0\u5F55
-jsp.main.other.003=\u6700\u8FD1\u521B\u5EFA\u7684\u6D4B\u8BD5\u5305
\ No newline at end of file
+jsp.main.other.003=\u6700\u8FD1\u521B\u5EFA\u7684\u6D4B\u8BD5\u5305
+menu.exam.test_package.search=\u641C\u7D22\u6D4B\u8BD5\u5305
\ No newline at end of file
diff --git a/src/main/resources/static/i18n/messages_zh_CN.properties b/src/main/resources/static/i18n/messages_zh_CN.properties
index 1489d9b..da68307 100644
--- a/src/main/resources/static/i18n/messages_zh_CN.properties
+++ b/src/main/resources/static/i18n/messages_zh_CN.properties
@@ -953,4 +953,5 @@
test.user.name.dict4=\u6309\u5BC6\u7801\u641C\u7D22\u6D4B\u8BD5\u7528\u6237
jsp.main.other.001=\u6700\u8FD1\u5B8C\u6210\u6D4B\u8BD5\u8BB0\u5F55
jsp.main.other.002=\u6700\u8FD1\u6B63\u5728\u7B54\u9898\u6D4B\u8BD5\u8BB0\u5F55
-jsp.main.other.003=\u6700\u8FD1\u521B\u5EFA\u7684\u6D4B\u8BD5\u5305
\ No newline at end of file
+jsp.main.other.003=\u6700\u8FD1\u521B\u5EFA\u7684\u6D4B\u8BD5\u5305
+menu.exam.test_package.search=\u641C\u7D22\u6D4B\u8BD5\u5305
\ No newline at end of file
diff --git a/src/main/resources/templates/exam/test_package/test_package.html b/src/main/resources/templates/exam/test_package/test_package.html
index 9e6b883..0d36314 100644
--- a/src/main/resources/templates/exam/test_package/test_package.html
+++ b/src/main/resources/templates/exam/test_package/test_package.html
@@ -16,7 +16,7 @@
</li>
<li>
<p>[[#{basis.name}]]锛�</p>
- <input type="text" name="testName"/>
+ <input type="text" name="testName" th:value="${testName}"/>
</li>
<li>
<p>[[#{basis.type}]]锛�</p>
diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
index e62de72..ad95bc4 100644
--- a/src/main/resources/templates/main.html
+++ b/src/main/resources/templates/main.html
@@ -11,11 +11,13 @@
<div class="select-list">
<ul>
<li>
- <p>[[#{jsp.exam.enterprise.companyname}]]锛�</p><input type="text" name="userName"
- id="userName" value=""/>
+ <p>[[#{jsp.exam.enterprise.companyname}]]锛�</p>
+ <input type="text" name="userName" id="userName" value=""/>
</li>
- <li><a class="btn btn-primary btn-rounded btn-sm" onclick="openUserList()"><i
- class="fa fa-search"></i> [[#{menu.exam.enterprise.view}]]</a></li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="openUserList()">
+ <i class="fa fa-search"></i> [[#{menu.exam.enterprise.view}]]</a>
+ </li>
<li>
<input type="text" name="queryValue" id="queryValue" value=""/>
<select name="queryType" id="queryType" th:with="type=${@dict.getType('quickQueryType')}">
@@ -23,8 +25,19 @@
th:value="${dict.dictValue}"/>
</select>
</li>
- <li><a class="btn btn-primary btn-rounded btn-sm" onclick="openMemberSearch()"><i
- class="fa fa-search"></i> [[#{menu.exam.testMember.list}]]</a></li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="openMemberSearch()">
+ <i class="fa fa-search"></i> [[#{menu.exam.testMember.list}]]</a>
+ </li>
+
+ <li>
+ <p>[[#{jsp.exam.report.006}]]锛�</p>
+ <input type="text" name="testName" id="testName" value=""/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="openPackageList()">
+ <i class="fa fa-search"></i> [[#{menu.exam.test_package.search}]]</a>
+ </li>
</ul>
</div>
</form>
@@ -408,6 +421,11 @@
$.modal.openTab([[#{menu.exam.enterprise.view}]], url);
}
+ function openPackageList() {
+ var url = ctx + 'exam/test_package/searchTestPackage?testName=' + $("#testName").val();
+ $.modal.openTab([[#{menu.exam.test_package.search}]], url);
+ }
+
function openMemberSearch() {
var url = ctx + 'exam/testMember/memberQuery?queryType=' + $("#queryType").val() + '&queryValue=' + $("#queryValue").val();
$.modal.openTab([[#{menu.exam.testMember.list}]], url);
--
Gitblit v1.9.1