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

'1111'

This commit is contained in:
xd 2024-08-14 13:48:19 +08:00
parent 13c529c0af
commit faaf6a4c73
25 changed files with 116 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
.idea/workspace.xml
View File

@ -2,25 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
<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.original" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar.original" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-common/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-common/target/ruoyi-common-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/target/ruoyi-common-3.8.7.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/maven-archiver/pom.properties" 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/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/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/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/resources/mapper/authorize/AuthorizeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" beforeDir="false" afterPath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" 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-quartz/src/main/resources/mapper/quartz/OAExpensesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAExpensesMapper.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/mapper/authorize/AuthorizeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.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/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/authorize/authorize/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/authorize/authorize/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" 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" />
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -128,7 +117,7 @@
<workItem from="1723422983942" duration="22325000" />
<workItem from="1723507256466" duration="16854000" />
<workItem from="1723528634025" duration="10204000" />
<workItem from="1723593971831" duration="3328000" />
<workItem from="1723593971831" duration="13763000" />
</task>
<servers />
</component>
@ -161,10 +150,10 @@
</state>
<state x="393" y="12" width="1379" height="879" key="CommitChangelistDialog2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723105028964" />
<state x="2215" y="10" key="CommitChangelistDialog2/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723422366837" />
<state width="1090" height="539" key="DebuggerActiveHint" timestamp="1723534059691">
<state width="1090" height="539" key="DebuggerActiveHint" timestamp="1723603228064">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1090" height="539" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723534059691" />
<state width="1090" height="539" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723603228064" />
<state width="410" height="466" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446271190" />
<state x="1989" y="80" width="1302" height="741" key="DiffContextDialog" timestamp="1723514986784">
<screen x="1920" y="0" width="1440" height="900" />
@ -176,65 +165,65 @@
</state>
<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 width="1396" height="148" key="GridCell.Tab.0.bottom" timestamp="1723595815873">
<screen x="1920" y="0" width="1440" height="900" />
<state width="1876" height="260" key="GridCell.Tab.0.bottom" timestamp="1723605277968">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="180" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595424919" />
<state width="1876" height="260" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277968" />
<state width="1396" height="148" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815873" />
<state width="1396" height="148" key="GridCell.Tab.0.center" timestamp="1723595815872">
<screen x="1920" y="0" width="1440" height="900" />
<state width="1876" height="260" key="GridCell.Tab.0.center" timestamp="1723605277968">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="180" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595424919" />
<state width="1876" height="260" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277968" />
<state width="1396" height="148" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815872" />
<state width="1396" height="148" key="GridCell.Tab.0.left" timestamp="1723595815872">
<screen x="1920" y="0" width="1440" height="900" />
<state width="1876" height="260" key="GridCell.Tab.0.left" timestamp="1723605277968">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="180" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595424919" />
<state width="1876" height="260" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277968" />
<state width="1396" height="148" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815872" />
<state width="1396" height="148" key="GridCell.Tab.0.right" timestamp="1723595815873">
<screen x="1920" y="0" width="1440" height="900" />
<state width="1876" height="260" key="GridCell.Tab.0.right" timestamp="1723605277968">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="180" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595424919" />
<state width="1876" height="260" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277968" />
<state width="1396" height="148" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815873" />
<state width="1396" height="148" key="GridCell.Tab.1.bottom" timestamp="1723595815874">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state width="1876" height="180" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595409293" />
<state width="1396" height="148" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815874" />
<state width="1396" height="148" key="GridCell.Tab.1.center" timestamp="1723595815874">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state width="1876" height="180" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595409293" />
<state width="1396" height="148" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815874" />
<state width="1396" height="148" key="GridCell.Tab.1.left" timestamp="1723595815873">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state width="1876" height="180" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595409293" />
<state width="1396" height="148" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815873" />
<state width="1396" height="148" key="GridCell.Tab.1.right" timestamp="1723595815874">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state width="1876" height="180" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595409293" />
<state width="1396" height="148" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815874" />
<state width="1876" height="299" key="GridCell.Tab.2.bottom" timestamp="1723541157087">
<state width="1876" height="260" key="GridCell.Tab.1.bottom" timestamp="1723605277969">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="299" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723541157087" />
<state width="1876" height="260" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277969" />
<state width="1396" height="299" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723603626058" />
<state width="1876" height="260" key="GridCell.Tab.1.center" timestamp="1723605277969">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="260" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277969" />
<state width="1396" height="299" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723603626058" />
<state width="1876" height="260" key="GridCell.Tab.1.left" timestamp="1723605277968">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="260" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277968" />
<state width="1396" height="299" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723603626058" />
<state width="1876" height="260" key="GridCell.Tab.1.right" timestamp="1723605277969">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="260" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277969" />
<state width="1396" height="299" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723603626058" />
<state width="1876" height="130" key="GridCell.Tab.2.bottom" timestamp="1723604249317">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="130" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723604249317" />
<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="1723541157087">
<state width="1876" height="130" key="GridCell.Tab.2.center" timestamp="1723604249317">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="299" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723541157087" />
<state width="1876" height="130" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723604249317" />
<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="1723541157087">
<state width="1876" height="130" key="GridCell.Tab.2.left" timestamp="1723604249317">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="299" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723541157087" />
<state width="1876" height="130" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723604249317" />
<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="1723541157087">
<state width="1876" height="130" key="GridCell.Tab.2.right" timestamp="1723604249317">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1876" height="299" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723541157087" />
<state width="1876" height="130" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723604249317" />
<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">
<screen x="1920" y="0" width="1440" height="900" />
@ -244,10 +233,10 @@
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state x="2378" y="150" key="RollbackChangesDialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820179295" />
<state x="2141" y="81" key="SettingsEditor" timestamp="1723015834754">
<state x="2141" y="81" key="SettingsEditor" timestamp="1723597483389">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state x="2141" y="81" key="SettingsEditor/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723015834754" />
<state x="2141" y="81" key="SettingsEditor/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723597483389" />
<state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1722924775619">
<screen x="0" y="0" width="1920" height="1040" />
</state>

4
ABAP_AS_WITH_POOL.jcoDestination
View File

@ -1,7 +1,7 @@
#for tests only !
#Mon Aug 12 13:58:32 CST 2024
#Wed Aug 14 13:16:40 CST 2024
jco.client.lang=ZH
jco.client.passwd=vAHHLPyr/O(DD#l(USpypoVFsBd}{mL?hFwfR/oNp/RvS,LI
jco.client.passwd=654321
jco.client.sysnr=00
jco.destination.pool_capacity=10
jco.client.client=800

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java
View File

@ -194,7 +194,7 @@ public class AuthorizeController extends BaseController
if(StringUtils.isEmpty(doa_id)){
authorize.setDoaId(UUID.fastUUID().toString());
String doaCode = authorizeService.getCode("ZGYS");
String doaCode = authorizeService.getCode("TBWTS");
authorize.setDoaCode(doaCode);
if(doaJlRoleFlag){

BIN
ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class
View File

Binary file not shown.

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

@ -1,5 +1,5 @@
#Generated by Maven
#Wed Aug 14 08:35:46 CST 2024
#Wed Aug 14 10:59:04 CST 2024
version=3.8.7
groupId=com.ruoyi
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
#Wed Aug 14 08:35:29 CST 2024
#Wed Aug 14 10:58:49 CST 2024
version=3.8.7
groupId=com.ruoyi
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
#Wed Aug 14 08:35:38 CST 2024
#Wed Aug 14 10:58:56 CST 2024
version=3.8.7
groupId=com.ruoyi
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
#Wed Aug 14 08:35:40 CST 2024
#Wed Aug 14 10:58:58 CST 2024
version=3.8.7
groupId=com.ruoyi
artifactId=ruoyi-generator

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

Binary file not shown.

4
ruoyi-quartz/src/main/resources/mapper/quartz/OAExpensesMapper.xml
View File

@ -7,8 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select q.exp_id as expId,q.exp_code as expCode,sq.exp_id oaExpId,sq.state,sq.remark
from expenses q
inner join (
select t.exp_id,t.exp_code,t.state,t.remark,t.exp_vice_president_approved from (
select a.exp_id,a.exp_code,a.state,a.remark,a.exp_vice_president_approved, row_number() over(partition by exp_code order by create_time desc) rw
select t.exp_id,t.exp_code,t.state,t.remark from (
select a.exp_id,a.exp_code,a.state,a.remark, row_number() over(partition by exp_code order by create_time desc) rw
from sys_oa_expenses a
where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0'
) t where t.rw = 1

4
ruoyi-quartz/target/classes/mapper/quartz/OAExpensesMapper.xml
View File

@ -7,8 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select q.exp_id as expId,q.exp_code as expCode,sq.exp_id oaExpId,sq.state,sq.remark
from expenses q
inner join (
select t.exp_id,t.exp_code,t.state,t.remark,t.exp_vice_president_approved from (
select a.exp_id,a.exp_code,a.state,a.remark,a.exp_vice_president_approved, row_number() over(partition by exp_code order by create_time desc) rw
select t.exp_id,t.exp_code,t.state,t.remark from (
select a.exp_id,a.exp_code,a.state,a.remark, row_number() over(partition by exp_code order by create_time desc) rw
from sys_oa_expenses a
where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0'
) t where t.rw = 1

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

@ -1,5 +1,5 @@
#Generated by Maven
#Wed Aug 14 08:35:39 CST 2024
#Wed Aug 14 10:58:58 CST 2024
version=3.8.7
groupId=com.ruoyi
artifactId=ruoyi-quartz

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

Binary file not shown.

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

@ -85,6 +85,7 @@
<if test="expSalesmanName != null and expSalesmanName != ''"> and u.nick_name like concat('%', #{expSalesmanName}, '%')</if>
<if test="expRequestRemark != null and expRequestRemark != ''"> and exp_request_remark like concat('%', #{expRequestRemark}, '%')</if>
<if test="expApprovalStatus != null and expApprovalStatus != ''"> and exp_approval_status = #{expApprovalStatus}</if>
<if test="expBidArea != null and expBidArea != ''"> and exp_bid_area = #{expBidArea}</if>
<if test="expDispatchStatus != null and expDispatchStatus != ''"> and exp_dispatch_status = #{expDispatchStatus}</if>
<if test="expReceiveUserId != null and expReceiveUserId != ''"> and exp_receive_user_id = #{expReceiveUserId}</if>

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

@ -85,6 +85,7 @@
<if test="expSalesmanName != null and expSalesmanName != ''"> and u.nick_name like concat('%', #{expSalesmanName}, '%')</if>
<if test="expRequestRemark != null and expRequestRemark != ''"> and exp_request_remark like concat('%', #{expRequestRemark}, '%')</if>
<if test="expApprovalStatus != null and expApprovalStatus != ''"> and exp_approval_status = #{expApprovalStatus}</if>
<if test="expBidArea != null and expBidArea != ''"> and exp_bid_area = #{expBidArea}</if>
<if test="expDispatchStatus != null and expDispatchStatus != ''"> and exp_dispatch_status = #{expDispatchStatus}</if>
<if test="expReceiveUserId != null and expReceiveUserId != ''"> and exp_receive_user_id = #{expReceiveUserId}</if>

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

@ -1,5 +1,5 @@
#Generated by Maven
#Wed Aug 14 08:35:33 CST 2024
#Wed Aug 14 10:58:53 CST 2024
version=3.8.7
groupId=com.ruoyi
artifactId=ruoyi-system

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

Binary file not shown.

9
ruoyi-ui/src/views/authorize/authorize/index.vue
View File

@ -350,7 +350,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="是否存档" prop="doaArchiving">
<el-select v-model="form.doaArchiving" placeholder="请选择是否存档" :disabled="tbDis">
<el-select v-model="form.doaArchiving" placeholder="请选择是否存档">
<el-option
v-for="dict in dict.type.doa_archiving"
:key="dict.value"
@ -701,8 +701,11 @@ export default {
}
//投标办所有人 并且是OA审批中 时 不可编辑
if(checkRole(['BID','BID_ZHGLY'])&&"1"==doaOaApprovalStatus){
this.tbDis = true;
if(checkRole(['BID','BID_ZHGLY'])){
this.ywyDis = true;
if("0"!=doaOaApprovalStatus){
this.tbDis = true;
}
}
this.getDoaYwyFileList();

7
ruoyi-ui/src/views/bid/bid/index.vue
View File

@ -187,7 +187,7 @@
<dict-tag :options="dict.type.bid_approval_status" :value="scope.row.bidApprovalStatus"/>
</template>
</el-table-column>
<el-table-column fixed label="OA审批状态" align="center" prop="bidOaApprovalStatus">
<el-table-column fixed label="OA审批状态" align="center" prop="bidOaApprovalStatus" width="100px">
<template slot-scope="scope">
<dict-tag :options="dict.type.bid_oa_approval_status" :value="scope.row.bidOaApprovalStatus"/>
</template>
@ -828,7 +828,9 @@
<el-divider content-position="left" class="customer_divider_text">
投标信息
<el-button v-if="checkPermi(['bid:bid:history'])" size="mini" style="margin-left: 10px" type="primary" plain @click="bidHistoryInfo">历史记录</el-button>
<el-button v-if="checkPermi(['bid:bid:tbSave'])" size="mini" style="margin-left: 10px" type="success" plain @click="saveForm">保存</el-button>
<sapn v-if="checkPermi(['bid:bid:tbSave'])">
<el-button v-if="!ywyDis&&!tbDis" size="mini" style="margin-left: 10px" type="success" plain @click="saveForm">保存</el-button>
</sapn>
</el-divider>
<el-row :gutter="8">
<el-col :span="6">
@ -1661,6 +1663,7 @@ export default {
}
//投标办所有人 并且是OA审批中 时 不可编辑
if(checkRole(['BID','BID_BSZZY','BID_ZHGLY'])&&"1"==bidOaApprovalStatus){
this.ywyDis = true;
this.tbDis = true;
}

38
ruoyi-ui/src/views/expenses/expenses/index.vue
View File

@ -442,7 +442,7 @@
</el-col>
</el-row>
<el-divider content-position="center">财务凭证</el-divider>
<el-divider content-position="left" class="customer_divider_text">财务凭证(先保存再上传)</el-divider>
<div v-hasPermi="['expenses:expenses:expensesYwyFile']">
<el-upload class="upload-demo"
ref="expensesYwyFileUpload"
@ -862,6 +862,23 @@ export default {
},
created() {
const roles = this.$store.state.user.roles;
if(roles.indexOf('SALES_MAN') == -1 && roles.indexOf('admin') == -1){//除业务员默认查看待审核 单据
if(roles.indexOf('BID')!= -1||roles.indexOf('BID_BSZZY')!= -1||roles.indexOf('BID_ZHGLY')!= -1){
this.queryParams.expBidArea = '0';//投标办查看投标区域为 国内 的单据
}
if(roles.indexOf('FOREIGN_TRADE')!= -1){
this.queryParams.expBidArea = '1';//外贸部区域为 国外 的单据
}
this.queryParams.expApprovalStatus = '1';
this.queryParams.orderByColumn = "a.exp_number";//查询字段是表格中字段名字
this.queryParams.isAsc = "desc";//动态取值排序顺序
}
if(roles.indexOf('SALES_MAN') != -1|| roles.indexOf('admin') !== -1){//业务员默认查看所有 单据 且按授权编号排序
this.queryParams.orderByColumn = "a.create_time";//查询字段是表格中字段名字
this.queryParams.isAsc = "desc";//动态取值排序顺序
}
this.getList();
},
methods: {
@ -933,6 +950,8 @@ export default {
this.ywyDis = false;
//投标办编辑状态
this.tbDis = false;
this.expensesYwyFileList = [],
this.resetForm("form");
},
/** 搜索按钮操作 */
@ -966,6 +985,9 @@ export default {
this.form.expSalesmanDeptId = this.$store.state.user.deptId;
this.form.expSalesmanDeptName = this.$store.state.user.deptName;
this.form.expBidArea = '0'; //默认投标区域是 国内
this.form.expStaffTureorfales = '1'; //默认是否有内勤是 否
},
/** 修改按钮操作 */
@ -987,8 +1009,18 @@ export default {
this.ywyDis = true;
}
//投标办所有人 并且是OA审批中 时 不可编辑
if(checkRole(['BID','BID_BSZZY','BID_ZHGLY'])&&"1"==expOaApprovalStatus){
this.tbDis = true;
if(checkRole(['BID','BID_BSZZY','BID_ZHGLY'])){
this.ywyDis = true;
if("0"!=expOaApprovalStatus){
this.tbDis = true;
}
}
//外贸部所有人 并且是OA审批中 时 不可编辑
if(checkRole(['FOREIGN_TRADE'])){
this.ywyDis = true;
if("0"!=expOaApprovalStatus){
this.tbDis = true;
}
}
this.getExpYwyFileList();

7
ruoyi-ui/src/views/zgys/zgys/index.vue
View File

@ -659,8 +659,11 @@ export default {
}
//投标办所有人 并且是OA审批中 时 不可编辑
if(checkRole(['BID','BID_ZHGLY'])&&"1"==pqOaApprovalStatus){
this.tbDis = true;
if(checkRole(['BID','BID_ZHGLY'])){
this.ywyDis = true;
if("0"!=pqOaApprovalStatus){
this.tbDis = true;
}
}
//获取资格预审信息-附件列表