xd
/
JNBusinessTest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-08-13 16:34:37 +08:00
parent 0cad1214be
commit d44fcf836c
20 changed files with 66 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
.idea/workspace.xml
View File

@ -2,15 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment=""> <list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysExpenses.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAExpensesMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAExpensesService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAExpensesServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ExpensesTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAExpensesMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" afterDir="false" />
@ -21,26 +13,14 @@
<change beforePath="$PROJECT_DIR$/ruoyi-framework/target/ruoyi-framework-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/ruoyi-framework-3.8.7.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-framework/target/ruoyi-framework-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/ruoyi-framework-3.8.7.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysAuthorize.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysAuthorize.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/Expenses.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/Expenses.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/service/IExpensesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/service/IExpensesService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/domain/Expenses.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/domain/Expenses.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/mapper/ExpensesMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/mapper/ExpensesMapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/service/IExpensesService.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/service/IExpensesService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/expenses/expenses/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/expenses/expenses/index.vue" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -147,7 +127,7 @@
<workItem from="1723420788933" duration="2164000" /> <workItem from="1723420788933" duration="2164000" />
<workItem from="1723422983942" duration="22325000" /> <workItem from="1723422983942" duration="22325000" />
<workItem from="1723507256466" duration="16854000" /> <workItem from="1723507256466" duration="16854000" />
<workItem from="1723528634025" duration="7016000" /> <workItem from="1723528634025" duration="9253000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -165,15 +145,15 @@
</option> </option>
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="267" y="27" key="#Project_Structure" timestamp="1723104735076"> <state x="267" y="27" key="#Project_Structure" timestamp="1723536731417">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="267" y="27" key="#Project_Structure/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723104735076" /> <state x="267" y="27" key="#Project_Structure/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723536731417" />
<state x="2120" y="23" key="#Project_Structure/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722590259734" /> <state x="2120" y="23" key="#Project_Structure/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722590259734" />
<state x="2494" y="176" key="#com.intellij.ide.util.MemberChooser" timestamp="1723530573675"> <state x="765" y="203" key="#com.intellij.ide.util.MemberChooser" timestamp="1723537092593">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723516211984" /> <state x="765" y="203" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537092593" />
<state x="2494" y="176" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723530573675" /> <state x="2494" y="176" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723530573675" />
<state x="2215" y="10" width="1379" height="879" key="CommitChangelistDialog2" timestamp="1723422366837"> <state x="2215" y="10" width="1379" height="879" key="CommitChangelistDialog2" timestamp="1723422366837">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
@ -195,65 +175,65 @@
</state> </state>
<state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722996900988" /> <state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722996900988" />
<state x="2475" y="237" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017044285" /> <state x="2475" y="237" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017044285" />
<state width="1396" height="314" key="GridCell.Tab.0.bottom" timestamp="1723535084092"> <state width="1876" height="180" key="GridCell.Tab.0.bottom" timestamp="1723537799760">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="112" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723535010384" /> <state width="1876" height="180" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537799760" />
<state width="1396" height="314" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084092" /> <state width="1396" height="314" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084092" />
<state width="1396" height="314" key="GridCell.Tab.0.center" timestamp="1723535084091"> <state width="1876" height="180" key="GridCell.Tab.0.center" timestamp="1723537799760">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="112" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723535010384" /> <state width="1876" height="180" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537799760" />
<state width="1396" height="314" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084091" /> <state width="1396" height="314" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084091" />
<state width="1396" height="314" key="GridCell.Tab.0.left" timestamp="1723535084091"> <state width="1876" height="180" key="GridCell.Tab.0.left" timestamp="1723537799760">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="112" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723535010384" /> <state width="1876" height="180" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537799760" />
<state width="1396" height="314" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084091" /> <state width="1396" height="314" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084091" />
<state width="1396" height="314" key="GridCell.Tab.0.right" timestamp="1723535084092"> <state width="1876" height="180" key="GridCell.Tab.0.right" timestamp="1723537799760">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="112" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723535010384" /> <state width="1876" height="180" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537799760" />
<state width="1396" height="314" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084092" /> <state width="1396" height="314" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084092" />
<state width="1876" height="112" key="GridCell.Tab.1.bottom" timestamp="1723535003848"> <state width="1876" height="299" key="GridCell.Tab.1.bottom" timestamp="1723537795081">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="112" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723535003848" /> <state width="1876" height="299" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
<state width="1396" height="103" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" /> <state width="1396" height="103" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" />
<state width="1876" height="112" key="GridCell.Tab.1.center" timestamp="1723535003847"> <state width="1876" height="299" key="GridCell.Tab.1.center" timestamp="1723537795081">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="112" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723535003847" /> <state width="1876" height="299" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
<state width="1396" height="103" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" /> <state width="1396" height="103" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" />
<state width="1876" height="112" key="GridCell.Tab.1.left" timestamp="1723535003847"> <state width="1876" height="299" key="GridCell.Tab.1.left" timestamp="1723537795081">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="112" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723535003847" /> <state width="1876" height="299" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
<state width="1396" height="103" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" /> <state width="1396" height="103" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" />
<state width="1876" height="112" key="GridCell.Tab.1.right" timestamp="1723535003848"> <state width="1876" height="299" key="GridCell.Tab.1.right" timestamp="1723537795081">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="112" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723535003848" /> <state width="1876" height="299" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
<state width="1396" height="103" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" /> <state width="1396" height="103" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" />
<state width="1876" height="299" key="GridCell.Tab.2.bottom" timestamp="1723534122243"> <state width="1876" height="299" key="GridCell.Tab.2.bottom" timestamp="1723537795081">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="299" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723534122243" /> <state width="1876" height="299" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
<state width="1396" height="250" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" /> <state width="1396" height="250" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" />
<state width="1876" height="299" key="GridCell.Tab.2.center" timestamp="1723534122243"> <state width="1876" height="299" key="GridCell.Tab.2.center" timestamp="1723537795081">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="299" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723534122243" /> <state width="1876" height="299" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
<state width="1396" height="250" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" /> <state width="1396" height="250" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" />
<state width="1876" height="299" key="GridCell.Tab.2.left" timestamp="1723534122243"> <state width="1876" height="299" key="GridCell.Tab.2.left" timestamp="1723537795081">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="299" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723534122243" /> <state width="1876" height="299" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
<state width="1396" height="250" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" /> <state width="1396" height="250" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" />
<state width="1876" height="299" key="GridCell.Tab.2.right" timestamp="1723534122243"> <state width="1876" height="299" key="GridCell.Tab.2.right" timestamp="1723537795081">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1876" height="299" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723534122243" /> <state width="1876" height="299" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
<state width="1396" height="250" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" /> <state width="1396" height="250" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" />
<state x="2203" y="104" key="Maven.ArtifactSearchDialog" timestamp="1722820075785"> <state x="2203" y="104" key="Maven.ArtifactSearchDialog" timestamp="1722820075785">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
@ -303,15 +283,4 @@
</state> </state>
<state x="616" y="235" key="run.anything.popup/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723094236509" /> <state x="616" y="235" key="run.anything.popup/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723094236509" />
</component> </component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java</url>
<line>280</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project> </project>

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java
View File

@ -284,8 +284,8 @@ public class ExpensesController extends BaseController
return error("该账户:"+getUsername()+"在OA中不存在"); return error("该账户:"+getUsername()+"在OA中不存在");
} }
sysOaExpenses.setUserId(oauser.getUserId());//申请人OA ID sysOaExpenses.setUserId(oauser.getUserId());//办理人OA ID
sysOaExpenses.setDepartmentId(oauser.getDepartmentId());//申请部门 sysOaExpenses.setDepartmentId(oauser.getDepartmentId());//办理部门
sysOaExpenses.setSubmissionTime(DateUtils.getDate());//提交时间 sysOaExpenses.setSubmissionTime(DateUtils.getDate());//提交时间
sysOaExpenses.setExpId(UUID.fastUUID().toString()); sysOaExpenses.setExpId(UUID.fastUUID().toString());
@ -304,8 +304,10 @@ public class ExpensesController extends BaseController
sysOaExpenses.setExpExpenditureDate(expenses.getExpExpenditureDate());//支出时间 sysOaExpenses.setExpExpenditureDate(expenses.getExpExpenditureDate());//支出时间
sysOaExpenses.setExpStaffTureorfales(expenses.getExpStaffTureorfales());//内勤审核（默认否，0-是、1-否） sysOaExpenses.setExpStaffTureorfales(expenses.getExpStaffTureorfales());//内勤审核（默认否，0-是、1-否）
sysOaExpenses.setExpBackOfficeId(expenses.getExpBackOfficeId());//选择内勤 sysOaExpenses.setExpBackOfficeId(expenses.getExpBackOfficeId());//选择内勤
sysOaExpenses.setExpSalesmanName(expenses.getExpSalesmanName());//申请人
sysOaExpenses.setExpSalesmanDeptName(expenses.getExpSalesmanDeptName());//申请部门 SysOaExpenses oauser2 = expensesService.selectOAUserByUserName(expenses.getExpSalesmanCode());// 查询OA用户
sysOaExpenses.setOaUserId(oauser2.getUserId());//申请人
sysOaExpenses.setOaDepartmentId(oauser2.getDepartmentId());//申请部门
sysOaExpenses.setExpAccountName(expenses.getExpAccountName());//账户名 sysOaExpenses.setExpAccountName(expenses.getExpAccountName());//账户名
sysOaExpenses.setExpAccountNumber(expenses.getExpAccountNumber());//账号 sysOaExpenses.setExpAccountNumber(expenses.getExpAccountNumber());//账号
sysOaExpenses.setExpDepositBank(expenses.getExpDepositBank());//开户银行 sysOaExpenses.setExpDepositBank(expenses.getExpDepositBank());//开户银行

BIN
ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class
View File

Binary file not shown.

2
ruoyi-admin/target/maven-archiver/pom.properties
View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Tue Aug 13 15:44:25 CST 2024 #Tue Aug 13 16:30:12 CST 2024
version=3.8.7 version=3.8.7
groupId=com.ruoyi groupId=com.ruoyi
artifactId=ruoyi-admin artifactId=ruoyi-admin

BIN
ruoyi-admin/target/ruoyi-admin.jar
View File

Binary file not shown.

BIN
ruoyi-admin/target/ruoyi-admin.jar.original
View File

Binary file not shown.

2
ruoyi-common/target/maven-archiver/pom.properties
View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Tue Aug 13 15:43:38 CST 2024 #Tue Aug 13 16:27:01 CST 2024
version=3.8.7 version=3.8.7
groupId=com.ruoyi groupId=com.ruoyi
artifactId=ruoyi-common artifactId=ruoyi-common

BIN
ruoyi-common/target/ruoyi-common-3.8.7.jar
View File

Binary file not shown.

2
ruoyi-framework/target/maven-archiver/pom.properties
View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Tue Aug 13 15:43:46 CST 2024 #Tue Aug 13 16:27:08 CST 2024
version=3.8.7 version=3.8.7
groupId=com.ruoyi groupId=com.ruoyi
artifactId=ruoyi-framework artifactId=ruoyi-framework

BIN
ruoyi-framework/target/ruoyi-framework-3.8.7.jar
View File

Binary file not shown.

2
ruoyi-generator/target/maven-archiver/pom.properties
View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Tue Aug 13 15:43:48 CST 2024 #Tue Aug 13 16:27:11 CST 2024
version=3.8.7 version=3.8.7
groupId=com.ruoyi groupId=com.ruoyi
artifactId=ruoyi-generator artifactId=ruoyi-generator

BIN
ruoyi-generator/target/ruoyi-generator-3.8.7.jar
View File

Binary file not shown.

2
ruoyi-quartz/target/maven-archiver/pom.properties
View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Tue Aug 13 15:43:47 CST 2024 #Tue Aug 13 16:27:10 CST 2024
version=3.8.7 version=3.8.7
groupId=com.ruoyi groupId=com.ruoyi
artifactId=ruoyi-quartz artifactId=ruoyi-quartz

BIN
ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar
View File

Binary file not shown.

12
ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java
View File

@ -12,6 +12,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
*/ */
public class SysOaExpenses extends Expenses public class SysOaExpenses extends Expenses
{ {
/** oa申请人id */
private Integer oaUserId;
/** oa申请人id */
private Integer oaDepartmentId;
/** oa办理人id */ /** oa办理人id */
private Integer userId; private Integer userId;
/** oa办理部门ID */ /** oa办理部门ID */
@ -23,6 +27,14 @@ public class SysOaExpenses extends Expenses
/** 费用支出附件*/ /** 费用支出附件*/
private String fileAddress; private String fileAddress;
public Integer getOaUserId() { return oaUserId; }
public void setOaUserId(Integer oaUserId) { this.oaUserId = oaUserId; }
public Integer getOaDepartmentId() { return oaDepartmentId; }
public void setOaDepartmentId(Integer oaDepartmentId) { this.oaDepartmentId = oaDepartmentId; }
public Integer getUserId() { public Integer getUserId() {
return userId; return userId;
} }

8
ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml
View File

@ -216,8 +216,8 @@
<if test="expExpenditureDate != null">exp_expenditure_date,</if> <if test="expExpenditureDate != null">exp_expenditure_date,</if>
<if test="expStaffTureorfales != null">exp_staff_tureorfales,</if> <if test="expStaffTureorfales != null">exp_staff_tureorfales,</if>
<if test="expBackOfficeId != null">exp_back_office_id,</if> <if test="expBackOfficeId != null">exp_back_office_id,</if>
<if test="expSalesmanName != null">exp_salesman_name,</if> <if test="oaUserId != null">exp_oa_userId,</if>
<if test="expSalesmanDeptName != null">exp_salesman_dept_name,</if> <if test="oaDepartmentId != null">exp_oa_departmentId,</if>
<if test="expAccountName != null">exp_account_name,</if> <if test="expAccountName != null">exp_account_name,</if>
<if test="expAccountNumber != null">exp_account_number,</if> <if test="expAccountNumber != null">exp_account_number,</if>
<if test="expDepositBank != null">exp_deposit_bank,</if> <if test="expDepositBank != null">exp_deposit_bank,</if>
@ -252,8 +252,8 @@
<if test="expExpenditureDate != null">#{expExpenditureDate},</if> <if test="expExpenditureDate != null">#{expExpenditureDate},</if>
<if test="expStaffTureorfales != null">#{expStaffTureorfales},</if> <if test="expStaffTureorfales != null">#{expStaffTureorfales},</if>
<if test="expBackOfficeId != null">#{expBackOfficeId},</if> <if test="expBackOfficeId != null">#{expBackOfficeId},</if>
<if test="expSalesmanName != null">#{expSalesmanName},</if> <if test="oaUserId != null">#{oaUserId},</if>
<if test="expSalesmanDeptName != null">#{expSalesmanDeptName},</if> <if test="oaDepartmentId != null">#{oaDepartmentId},</if>
<if test="expAccountName != null">#{expAccountName},</if> <if test="expAccountName != null">#{expAccountName},</if>
<if test="expAccountNumber != null">#{expAccountNumber},</if> <if test="expAccountNumber != null">#{expAccountNumber},</if>
<if test="expDepositBank != null">#{expDepositBank},</if> <if test="expDepositBank != null">#{expDepositBank},</if>

BIN
ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class
View File

Binary file not shown.

8
ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml
View File

@ -216,8 +216,8 @@
<if test="expExpenditureDate != null">exp_expenditure_date,</if> <if test="expExpenditureDate != null">exp_expenditure_date,</if>
<if test="expStaffTureorfales != null">exp_staff_tureorfales,</if> <if test="expStaffTureorfales != null">exp_staff_tureorfales,</if>
<if test="expBackOfficeId != null">exp_back_office_id,</if> <if test="expBackOfficeId != null">exp_back_office_id,</if>
<if test="expSalesmanName != null">exp_salesman_name,</if> <if test="oaUserId != null">exp_oa_userId,</if>
<if test="expSalesmanDeptName != null">exp_salesman_dept_name,</if> <if test="oaDepartmentId != null">exp_oa_departmentId,</if>
<if test="expAccountName != null">exp_account_name,</if> <if test="expAccountName != null">exp_account_name,</if>
<if test="expAccountNumber != null">exp_account_number,</if> <if test="expAccountNumber != null">exp_account_number,</if>
<if test="expDepositBank != null">exp_deposit_bank,</if> <if test="expDepositBank != null">exp_deposit_bank,</if>
@ -252,8 +252,8 @@
<if test="expExpenditureDate != null">#{expExpenditureDate},</if> <if test="expExpenditureDate != null">#{expExpenditureDate},</if>
<if test="expStaffTureorfales != null">#{expStaffTureorfales},</if> <if test="expStaffTureorfales != null">#{expStaffTureorfales},</if>
<if test="expBackOfficeId != null">#{expBackOfficeId},</if> <if test="expBackOfficeId != null">#{expBackOfficeId},</if>
<if test="expSalesmanName != null">#{expSalesmanName},</if> <if test="oaUserId != null">#{oaUserId},</if>
<if test="expSalesmanDeptName != null">#{expSalesmanDeptName},</if> <if test="oaDepartmentId != null">#{oaDepartmentId},</if>
<if test="expAccountName != null">#{expAccountName},</if> <if test="expAccountName != null">#{expAccountName},</if>
<if test="expAccountNumber != null">#{expAccountNumber},</if> <if test="expAccountNumber != null">#{expAccountNumber},</if>
<if test="expDepositBank != null">#{expDepositBank},</if> <if test="expDepositBank != null">#{expDepositBank},</if>

2
ruoyi-system/target/maven-archiver/pom.properties
View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Tue Aug 13 15:43:42 CST 2024 #Tue Aug 13 16:27:05 CST 2024
version=3.8.7 version=3.8.7
groupId=com.ruoyi groupId=com.ruoyi
artifactId=ruoyi-system artifactId=ruoyi-system

BIN
ruoyi-system/target/ruoyi-system-3.8.7.jar
View File

Binary file not shown.