diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 127a746..a8379f9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,14 +2,10 @@ - - - - - + + + - - @@ -150,11 +147,11 @@ - - + + - + @@ -165,66 +162,66 @@ - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + @@ -264,13 +261,25 @@ - - + + + + + + + + file://$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/BidTask.java + 54 + + + + \ No newline at end of file diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination deleted file mode 100644 index dfc3f9c..0000000 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ /dev/null @@ -1,11 +0,0 @@ -#for tests only ! -#Wed Aug 14 13:16:40 CST 2024 -jco.client.lang=ZH -jco.client.passwd=654321 -jco.client.sysnr=00 -jco.destination.pool_capacity=10 -jco.client.client=800 -jco.destination.peak_limit=10 -jco.client.user=RFC -jco.client.saprouter= -jco.client.ashost=172.19.0.125 diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class index 6bf95fd..47ba403 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class differ diff --git a/ruoyi-admin/target/maven-archiver/pom.properties b/ruoyi-admin/target/maven-archiver/pom.properties index 49e2544..ecf2f35 100644 --- a/ruoyi-admin/target/maven-archiver/pom.properties +++ b/ruoyi-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 10:59:04 CST 2024 +#Wed Aug 14 16:08:35 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-admin diff --git a/ruoyi-admin/target/ruoyi-admin.jar b/ruoyi-admin/target/ruoyi-admin.jar index 27fbb5a..9a02b83 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar and b/ruoyi-admin/target/ruoyi-admin.jar differ diff --git a/ruoyi-admin/target/ruoyi-admin.jar.original b/ruoyi-admin/target/ruoyi-admin.jar.original index f419304..1175651 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar.original and b/ruoyi-admin/target/ruoyi-admin.jar.original differ diff --git a/ruoyi-common/target/maven-archiver/pom.properties b/ruoyi-common/target/maven-archiver/pom.properties index de540be..894fccd 100644 --- a/ruoyi-common/target/maven-archiver/pom.properties +++ b/ruoyi-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 10:58:49 CST 2024 +#Wed Aug 14 16:08:21 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-common diff --git a/ruoyi-common/target/ruoyi-common-3.8.7.jar b/ruoyi-common/target/ruoyi-common-3.8.7.jar index 9f8db9e..df061ed 100644 Binary files a/ruoyi-common/target/ruoyi-common-3.8.7.jar and b/ruoyi-common/target/ruoyi-common-3.8.7.jar differ diff --git a/ruoyi-framework/target/maven-archiver/pom.properties b/ruoyi-framework/target/maven-archiver/pom.properties index 5a3fd59..ecce124 100644 --- a/ruoyi-framework/target/maven-archiver/pom.properties +++ b/ruoyi-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 10:58:56 CST 2024 +#Wed Aug 14 16:08:28 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-framework diff --git a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar index 7885609..c80f131 100644 Binary files a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar and b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar differ diff --git a/ruoyi-generator/target/maven-archiver/pom.properties b/ruoyi-generator/target/maven-archiver/pom.properties index 0ebafa7..85cdeac 100644 --- a/ruoyi-generator/target/maven-archiver/pom.properties +++ b/ruoyi-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 10:58:58 CST 2024 +#Wed Aug 14 16:08:31 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-generator diff --git a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar index 55daa1b..d495475 100644 Binary files a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar and b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar differ diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml index 69dd401..37823d5 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bid set bid_approval_status = #{state},bid_returnRemark = #{remark} + update bid set bid_approval_status = #{state},bid_oa_remark = #{remark} where bid_id = #{bidId} @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bid set bid_approval_status = #{state},bid_oa_approval_status = #{state}, bid_oa_remark = #{remark},bid_vice_president_approved = {bidVicePresidentApproved} + update bid set bid_approval_status = #{state},bid_oa_approval_status = #{state}, bid_oa_remark = #{remark},bid_vice_president_approved = #{bidVicePresidentApproved} where bid_id = #{bidId} diff --git a/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml b/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml index 69dd401..37823d5 100644 --- a/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml +++ b/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bid set bid_approval_status = #{state},bid_returnRemark = #{remark} + update bid set bid_approval_status = #{state},bid_oa_remark = #{remark} where bid_id = #{bidId} @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bid set bid_approval_status = #{state},bid_oa_approval_status = #{state}, bid_oa_remark = #{remark},bid_vice_president_approved = {bidVicePresidentApproved} + update bid set bid_approval_status = #{state},bid_oa_approval_status = #{state}, bid_oa_remark = #{remark},bid_vice_president_approved = #{bidVicePresidentApproved} where bid_id = #{bidId} diff --git a/ruoyi-quartz/target/maven-archiver/pom.properties b/ruoyi-quartz/target/maven-archiver/pom.properties index 1460475..a7c90a9 100644 --- a/ruoyi-quartz/target/maven-archiver/pom.properties +++ b/ruoyi-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 10:58:58 CST 2024 +#Wed Aug 14 16:08:30 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-quartz diff --git a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar index 8eb3705..26903dc 100644 Binary files a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar and b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar differ diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java b/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java index 4d0c5c1..7bf4276 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java @@ -225,14 +225,14 @@ public class Bid extends BaseEntity @DataName(name = "制标员") private String bidZbr; - /** 校对人 */ - @Excel(name = "校对人") - @DataName(name = "校对人") + /** 校对员 */ + @Excel(name = "校对员") + @DataName(name = "校对员") private String bidJdr; - /** 审核人 */ - @Excel(name = "审核人") - @DataName(name = "审核人") + /** 审核员 */ + @Excel(name = "审核员") + @DataName(name = "审核员") private String bidShr; /** 投标经理确认 */ diff --git a/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class b/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class index 1276611..4565c87 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class and b/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class differ diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index 75c7564..b8d41f1 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 10:58:53 CST 2024 +#Wed Aug 14 16:08:24 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-system diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar index aab6139..4ce5720 100644 Binary files a/ruoyi-system/target/ruoyi-system-3.8.7.jar and b/ruoyi-system/target/ruoyi-system-3.8.7.jar differ diff --git a/ruoyi-ui/src/views/bid/bid/index.vue b/ruoyi-ui/src/views/bid/bid/index.vue index 25854b1..67a6e1e 100644 --- a/ruoyi-ui/src/views/bid/bid/index.vue +++ b/ruoyi-ui/src/views/bid/bid/index.vue @@ -182,7 +182,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -1024,13 +1024,13 @@ - - + + - - + +