wefree/minoaClientWindows_gradle
1
0 Fork 0
mirror of https://gitee.com/willfree/minoaClientWindows_gradle.git synced 2026-10-05 01:15:44 +08:00
Code Issues Projects Releases Wiki Activity

邮件、报销审批界面增加支持了即时刷新（依赖于getNews接口）

Browse Source
This commit is contained in:
my-style committed 2020-03-03 22:19:46 +08:00
1 parent 24391104dc
commit e79f876aca
20 files changed
+267 -116
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.idea/workspace.xml
Generated
+175 -108
View File
@@ -7,14 +7,12 @@
</component>
<component name="ChangeListManager">
<list default="true" id="f2ca1002-1ec5-49f3-ab6f-fb7dec9c9e4d" 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$/ndn/pib.db" beforeDir="false" afterPath="$PROJECT_DIR$/ndn/pib.db" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/DataCacheQueue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/DataCacheQueue.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/model/SingleNotice.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/model/SingleNotice.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/WrittenNoticeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/WrittenNoticeController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementDealController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementDealController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/.gradle/" />
@@ -107,7 +105,7 @@
<entry key="css" value="14" />
<entry key="fxml" value="20" />
<entry key="gradle" value="5" />
<entry key="java" value="149" />
<entry key="java" value="157" />
<entry key="png" value="4" />
<entry key="txt" value="2" />
<entry key="xml" value="1" />
@@ -119,7 +117,7 @@
<entry key="CSS" value="14" />
<entry key="Groovy" value="5" />
<entry key="Image" value="4" />
<entry key="JAVA" value="149" />
<entry key="JAVA" value="157" />
<entry key="Manifest" value="1" />
<entry key="PLAIN_TEXT" value="2" />
<entry key="XML" value="21" />
@@ -130,14 +128,14 @@
<entry key="MF" value="92" />
<entry key="fxml" value="4" />
<entry key="gradle" value="366" />
<entry key="java" value="10275" />
<entry key="java" value="11016" />
<entry key="txt" value="89" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Groovy" value="366" />
<entry key="JAVA" value="10275" />
<entry key="JAVA" value="11016" />
<entry key="Manifest" value="92" />
<entry key="PLAIN_TEXT" value="89" />
<entry key="XML" value="4" />
@@ -150,38 +148,43 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="272" lean-forward="true" selection-start-line="272" selection-end-line="272" />
<state relative-caret-position="179">
<caret line="291" column="20" lean-forward="true" selection-start-line="291" selection-start-column="20" selection-end-line="291" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#6678#6679#0" expanded="true" />
<element signature="e#6702#6703#0" expanded="true" />
<element signature="e#30350#30351#0" expanded="true" />
<element signature="e#30406#30407#0" expanded="true" />
<element signature="e#30810#30811#0" expanded="true" />
<element signature="e#30836#30837#0" expanded="true" />
<element signature="e#9964#9965#0" expanded="true" />
<element signature="e#9989#9990#0" expanded="true" />
<element signature="e#32430#32431#0" expanded="true" />
<element signature="e#32486#32487#0" expanded="true" />
<element signature="e#32925#32926#0" expanded="true" />
<element signature="e#32951#32952#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/Main.java">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="16" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" />
<state relative-caret-position="209">
<caret line="124" column="22" lean-forward="true" selection-start-line="124" selection-start-column="22" selection-end-line="124" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementDealController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="156" column="45" selection-start-line="156" selection-start-column="45" selection-end-line="156" selection-end-column="45" />
<state relative-caret-position="253">
<caret line="46" column="53" lean-forward="true" selection-start-line="46" selection-start-column="53" selection-end-line="46" selection-end-column="53" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -189,11 +192,60 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/model/Email.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="39" column="19" lean-forward="true" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" />
<folding>
<element signature="e#969#970#0" expanded="true" />
<element signature="e#996#997#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyNoticeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208">
<caret line="62" column="53" lean-forward="true" selection-start-line="62" selection-start-column="53" selection-end-line="62" selection-end-column="53" />
<folding>
<element signature="e#484#973#0" expanded="true" />
<element signature="e#972#973#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/WrittenNoticeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
<caret line="73" column="16" lean-forward="true" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167">
<caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#33353#33354#0" expanded="true" />
<element signature="e#33380#33381#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="136" column="27" lean-forward="true" selection-start-line="136" selection-start-column="27" selection-end-line="136" selection-end-column="27" />
<state relative-caret-position="215">
<caret line="112" column="9" lean-forward="true" selection-start-line="112" selection-start-column="9" selection-end-line="112" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -213,7 +265,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>email</find>
<find>home</find>
<find>ini</find>
<find>时间</find>
@@ -237,12 +288,13 @@
<find>验证</find>
<find>邮件</find>
<find>exit</find>
<find>初始化</find>
<find>通知</find>
<find>SECOND_MINEPANE</find>
<find>NOTICEPANE</find>
<find>消息</find>
<find>GetNewN</find>
<find>初始化</find>
<find>详细信息</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -687,7 +739,6 @@
<option value="$PROJECT_DIR$/src/main/resources/fxml/home/ReimbursementDealOverview.fxml" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/HomeListController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/SingleEmailDetailsController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementDealController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/util/Tool.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyCloudFileController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/util/StringByteLengthUtil.java" />
@@ -695,14 +746,15 @@
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/DealSingleReimbursementController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/WrittenReimbursementController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/WrittenEmailController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/DataCacheQueue.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/model/SingleNotice.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/WrittenNoticeController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementDealController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java" />
</list>
</option>
</component>
@@ -718,7 +770,7 @@
<select />
</treeState>
</component>
<component name="ProjectFrameBounds" extendedState="7">
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-514" />
<option name="y" value="77" />
<option name="width" value="1386" />
@@ -802,15 +854,6 @@
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="minoa" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Demo_gradle_javafx11_01" type="b2602c69:ProjectViewProjectNode" />
<item name="Demo_gradle_javafx11_01" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="minoa" type="462c0819:PsiDirectoryNode" />
<item name="model" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Demo_gradle_javafx11_01" type="b2602c69:ProjectViewProjectNode" />
<item name="Demo_gradle_javafx11_01" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
@@ -828,7 +871,18 @@
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="minoa" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="mine" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Demo_gradle_javafx11_01" type="b2602c69:ProjectViewProjectNode" />
<item name="Demo_gradle_javafx11_01" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="minoa" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="ReimbursementApplyController.java" type="529ef68f:ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
</path>
<path>
<item name="Demo_gradle_javafx11_01" type="b2602c69:ProjectViewProjectNode" />
@@ -848,7 +902,7 @@
<component name="PropertiesComponent">
<property name="SearchEverywhereHistoryKey" value="file&#9;ACTION&#9;ChangeFileEncodingAction" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583223807372" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583245084004" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/lib/sqlite-jdbc-3.30.1.jar" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -1007,18 +1061,18 @@
<workItem from="1582199584649" duration="14818000" />
<workItem from="1582298070552" duration="40738000" />
<workItem from="1582631725284" duration="1253000" />
<workItem from="1583216488193" duration="7181000" />
<workItem from="1583216488193" duration="17272000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="124395000" />
<option name="totallyTimeSpent" value="134486000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4977029" visible="true" weight="0.28366113" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4977029" visible="true" weight="0.27836612" />
<window_info id="Structure" order="1" sideWeight="0.5022971" side_tool="true" weight="0.30542988" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@@ -1027,7 +1081,7 @@
<window_info id="Capture Tool" order="6" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32874617" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.14285715" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.24958949" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39901477" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -1188,13 +1242,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/model/Email.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="509">
<caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/fxml/home/WrittenReimbursementDetails.fxml">
<provider editor-type-id="JavaFX-Scene-Builder" />
<provider selected="true" editor-type-id="text-editor">
@@ -1329,16 +1376,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementDealController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="89" column="17" lean-forward="true" selection-start-line="89" selection-start-column="17" selection-end-line="89" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/NavigationBarController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339">
@@ -1353,16 +1390,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2975">
<caret line="137" column="10" selection-start-line="137" selection-start-column="10" selection-end-line="137" selection-end-column="10" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/home/WrittenReimbursementController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2500">
@@ -1373,23 +1400,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/WrittenEmailController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="194" column="8" selection-start-line="194" selection-start-column="8" selection-end-line="203" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="139" column="31" selection-start-line="139" selection-start-column="31" selection-end-line="139" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/DataCacheQueue.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
@@ -1418,10 +1428,22 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167">
<caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#33353#33354#0" expanded="true" />
<element signature="e#33380#33381#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="136" column="27" lean-forward="true" selection-start-line="136" selection-start-column="27" selection-end-line="136" selection-end-column="27" />
<state relative-caret-position="215">
<caret line="112" column="9" lean-forward="true" selection-start-line="112" selection-start-column="9" selection-end-line="112" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -1437,8 +1459,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyNoticeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="32" selection-start-line="32" selection-end-line="32" />
<state relative-caret-position="208">
<caret line="62" column="53" lean-forward="true" selection-start-line="62" selection-start-column="53" selection-end-line="62" selection-end-column="53" />
<folding>
<element signature="e#484#973#0" expanded="true" />
<element signature="e#972#973#0" expanded="true" />
@@ -1446,28 +1468,73 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/model/Email.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="272" lean-forward="true" selection-start-line="272" selection-end-line="272" />
<state relative-caret-position="259">
<caret line="39" column="19" lean-forward="true" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#6678#6679#0" expanded="true" />
<element signature="e#6702#6703#0" expanded="true" />
<element signature="e#30350#30351#0" expanded="true" />
<element signature="e#30406#30407#0" expanded="true" />
<element signature="e#30810#30811#0" expanded="true" />
<element signature="e#30836#30837#0" expanded="true" />
<element signature="e#969#970#0" expanded="true" />
<element signature="e#996#997#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="156" column="45" selection-start-line="156" selection-start-column="45" selection-end-line="156" selection-end-column="45" />
<state relative-caret-position="25">
<caret line="119" column="27" lean-forward="true" selection-start-line="119" selection-start-column="27" selection-end-line="119" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3415#3416#0" expanded="true" />
<element signature="e#3454#3455#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementDealController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="46" column="53" lean-forward="true" selection-start-line="46" selection-start-column="53" selection-end-line="46" selection-end-column="53" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/WrittenEmailController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="334">
<caret line="69" column="23" lean-forward="true" selection-start-line="69" selection-start-column="23" selection-end-line="69" selection-end-column="23" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="124" column="22" lean-forward="true" selection-start-line="124" selection-start-column="22" selection-end-line="124" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
<caret line="291" column="20" lean-forward="true" selection-start-line="291" selection-start-column="20" selection-end-line="291" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#6678#6679#0" expanded="true" />
<element signature="e#6702#6703#0" expanded="true" />
<element signature="e#9964#9965#0" expanded="true" />
<element signature="e#9989#9990#0" expanded="true" />
<element signature="e#32430#32431#0" expanded="true" />
<element signature="e#32486#32487#0" expanded="true" />
<element signature="e#32925#32926#0" expanded="true" />
<element signature="e#32951#32952#0" expanded="true" />
</folding>
</state>
</provider>
ndn/pib.db
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/MainApp$1.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/MainApp.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$3.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$4.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$5.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$6.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$7.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$8.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/view/home/ReimbursementApplyController.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/view/home/ReimbursementDealController.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/view/mine/EmailListItem.class
BIN
View File
Binary file not shown.
out/production/classes/cn/minoa/view/mine/MyEmailController.class
BIN
View File
Binary file not shown.
src/main/java/cn/minoa/MainApp.java
+50
View File
@@ -273,6 +273,56 @@ public class MainApp extends Application {
}
// 开启监听之后接收到需要自己报销审批消息时的处理=>被minoaDataAPI调用
public void handleGetNewReimToSelf(){
// 非FX线程调用FX的UI组件
Platform.runLater(() -> {
//重载报销【发给自己的】
if ((currentSecondPane.equals(SECOND_HOMEPANE))
&& (currentMainPane.equals(MAIN_REIMPANE))
&&(currentReimPane.equals(MAIN_REIMPANE_REC))){
try {
this.reloadReimbursementOverview("R");
} catch (IOException e) {
e.printStackTrace();
}
}if ((currentSecondPane.equals(SECOND_HOMEPANE))
&& (currentMainPane.equals(MAIN_REIMPANE))
&&(currentReimPane.equals(MAIN_REIMPANE_SEND))){
try {
this.reloadReimbursementOverview("S");
} catch (IOException e) {
e.printStackTrace();
}
}else if ((currentSecondPane.equals(SECOND_HOMEPANE))
&& (currentMainPane.equals(MAIN_REIMDEALPANE))){
//重载报销待审核【发给自己的】
try {
this.reloadReimbursementDealOverview();
} catch (IOException e) {
e.printStackTrace();
}
}
});
}
// 开启监听之后接收到发送给自己的邮件时的处理=>被minoaDataAPI调用
public void handleGetNewEmailToSelf(){
// 非FX线程调用FX的UI组件
Platform.runLater(() -> {
//重载邮件收件箱
if ((currentSecondPane.equals(SECOND_MINEPANE))
&& (currentMainPane.equals(MAIN_EMAILPANE))
&&(currentEmailPane.equals(MAIN_EMAILPANE_REC))){
try {
this.reloadEmailOverview("R");
} catch (IOException e) {
e.printStackTrace();
}
}
});
}
// 开启监听之后接收到新通知消息时的处理=>被minoaDataAPI调用
public void handleGetNewNotice(SingleNotice singleNotice) {
//先将该通知加入前端数据；
src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java
+26 -2
View File
@@ -135,6 +135,7 @@ public class MinoaDataAPI {
try {
dataString = jsonObject.getString("data");
if (!dataString.equals("")) {
// System.out.println("getNews-responseData: "+responseData.getResponseJsonDataString());
JSONArray dataJsonArray = new JSONArray(dataString);
String newsCacheString;
JSONObject newsCacheJsonObject;
@@ -151,12 +152,16 @@ public class MinoaDataAPI {
handleNewSingleMessage(contentString);
} else if (typeCodeInteger == 1) {
// 处理新通知
System.out.println("getNews-responseData: "+responseData.getResponseJsonDataString());
// System.out.println("getNews-responseData: "+responseData.getResponseJsonDataString());
handleNewSingleNotice(contentString);
} else if (typeCodeInteger == 2) {
// 处理新审批[报销审批、邮件]
System.out.println("getNews-responseData: "+responseData.getResponseJsonDataString());
handleNewSingleApproval(contentString);
}
}
}else{
// System.out.println("getNews-responseData: "+responseData.getResponseJsonDataString());
}
} catch (JSONException e) {
// TODO Auto-generated catch block
@@ -165,6 +170,25 @@ public class MinoaDataAPI {
}
}
//接收到一个新的审批[邮件/报销审批等，除掉通知]
private void handleNewSingleApproval(String singleApprovalString){
try{
JSONObject singleApprovalJsonObject=new JSONObject(singleApprovalString);
//拿到审批类型
Integer typeCodeInteger =singleApprovalJsonObject.getInt("typeCode");
if(typeCodeInteger==2){
System.out.println("接收到一条新的报销审批【我是审核人】");
mainApp.handleGetNewReimToSelf();
}else if(typeCodeInteger==3){
System.out.println("接收到一条新的邮件【我是接收方】");
mainApp.handleGetNewEmailToSelf();
}
} catch (JSONException e) {
e.printStackTrace();
}
}
//接收到一个新的通知
private void handleNewSingleNotice(String singleNoticeString){
String singleNoticeCacheString=singleNoticeString;
JSONObject singleNoticeCacheJsonObject;
@@ -244,7 +268,7 @@ public class MinoaDataAPI {
return jsonObject.toString();
}
// 处理一条接收到的新消息
// 处理一条接收到的新聊天消息
private void handleNewSingleMessage(String singleMessageString) {
try {
JSONObject singleMessageJsonObject = new JSONObject(singleMessageString);
src/main/java/cn/minoa/view/home/ReimbursementApplyController.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class ReimbursementApplyController {
Reimbursement reimbursement = new Reimbursement();
for (int i = 0; i < reimbursementInfoList.size(); i++) {
reimbursement = reimbursementInfoList.get(i);
if (reimbursement.getId() == paneId) {
if (reimbursement.getId().equals(paneId)) {
break;
}
}
src/main/java/cn/minoa/view/home/ReimbursementDealController.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class ReimbursementDealController {
Reimbursement reimbursement = new Reimbursement();
for (int i = 0; i < reimbursementInfoList.size(); i++) {
reimbursement = reimbursementInfoList.get(i);
if (reimbursement.getId() == paneId) {
if (reimbursement.getId().equals(paneId)) {
break;
}
}
src/main/java/cn/minoa/view/mine/MyEmailController.java
+14 -4
View File
@@ -117,16 +117,26 @@ public class MyEmailController {
// 展示邮件的详细信息的弹窗
private void showEmailDetails(Integer emailId) {
// printEmailIdList();
// System.out.println("current emailId: "+emailId);
// 在当前数据结构中找到这个emailId对应的邮件
Email email = new Email();
// Email email = new Email();
for (int i = 0; i < emailInfoList.size(); i++) {
email = emailInfoList.get(i);
if (email.getId() == emailId) {
// System.out.println("current emailInfoList emailId: "+emailInfoList.get(i).getId());
if (emailInfoList.get(i).getId() .equals(emailId)) {
mainApp.showEmailDetailsDialog(emailInfoList.get(i));
break;
}
}
// 传递给主函数
mainApp.showEmailDetailsDialog(email);
// mainApp.showEmailDetailsDialog(email);
}
//打印测试
private void printEmailIdList(){
for (int i = 0; i < emailInfoList.size(); i++) {
System.out.println(i+"[emailId]: "+emailInfoList.get(i).getId());
}
}
// 写信弹窗