'123'
This commit is contained in:
parent
7ca965f0eb
commit
03bd64a8bd
.idea
ABAP_AS_WITH_POOL.jcoDestinationruoyi-admin
src/main/java/com/ruoyi/web/controller
authorize
bid
priceVerification
quot
technicalConfirm
zgys
target
classes/com/ruoyi/web/controller
authorize
bid
priceVerification
quot
technicalConfirm
zgys
maven-archiver
ruoyi-admin.jarruoyi-admin.jar.originalruoyi-common/target
ruoyi-framework/target
ruoyi-generator/target
ruoyi-quartz
src/main
java/com/ruoyi/quartz
resources/mapper/quartz
target
ruoyi-system
src/main
java/com/ruoyi
quot
registeredCompany/domain
resources/mapper
authorize
bid
priceVerification
quot
registeredCompany
technicalConfirm
zgys
target
classes
com/ruoyi
quot
registeredCompany/domain
mapper
authorize
bid
priceVerification
quot
registeredCompany
technicalConfirm
zgys
maven-archiver
ruoyi-system-3.8.7.jarruoyi-ui/src/views
|
|
@ -2,15 +2,86 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
|
||||
<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-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/BidHjController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/BidHjController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.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/bid/BidController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/priceVerification/BidHjController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/priceVerification/BidHjController.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.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/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/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/src/main/java/com/ruoyi/quartz/domain/OASysBid.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysBid.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysZgys.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysZgys.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAAuthorizeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAAuthorizeMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OABidMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OABidMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAZgysMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAZgysMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAAuthorizeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAAuthorizeService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OABidService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OABidService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAZgysService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAZgysService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OABidServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OABidServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AuthorizeTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AuthorizeTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/BidTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/BidTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ZgysTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ZgysTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAZgysMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysAuthorize.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysAuthorize.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysBid.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysBid.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysZgys.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysZgys.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OABidServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OABidServiceImpl.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OAAuthorizeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OAAuthorizeMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OAZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OAZgysMapper.xml" 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/java/com/ruoyi/quot/mapper/QuotMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/domain/RegisteredCompany.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/domain/RegisteredCompany.java" 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$/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/priceVerification/BidHjMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/priceVerification/BidHjMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/registeredCompany/RegisteredCompanyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/registeredCompany/RegisteredCompanyMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/technicalConfirm/BidJsqrMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/technicalConfirm/BidJsqrMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/mapper/QuotMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/mapper/QuotMapper.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/IQuotService.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/IQuotService.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/registeredCompany/domain/RegisteredCompany.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/registeredCompany/domain/RegisteredCompany.class" 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/bid/BidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/bid/BidMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/priceVerification/BidHjMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/priceVerification/BidHjMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/registeredCompany/RegisteredCompanyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/registeredCompany/RegisteredCompanyMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/technicalConfirm/BidJsqrMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/technicalConfirm/BidJsqrMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.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/zgys/zgys/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/registeredCompany/registeredCompany/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/registeredCompany/registeredCompany/index.vue" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -102,7 +173,8 @@
|
|||
<workItem from="1723017804486" duration="1336000" />
|
||||
<workItem from="1723075283080" duration="10029000" />
|
||||
<workItem from="1723086697484" duration="197000" />
|
||||
<workItem from="1723087435797" duration="15344000" />
|
||||
<workItem from="1723087435797" duration="15421000" />
|
||||
<workItem from="1723161740119" duration="15138000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
@ -115,10 +187,10 @@
|
|||
</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="2120" y="23" key="#Project_Structure/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722590259734" />
|
||||
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser" timestamp="1723105661841">
|
||||
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser" timestamp="1723180202517">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</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="1723105661841" />
|
||||
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723180202517" />
|
||||
<state x="2494" y="176" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017851339" />
|
||||
<state x="393" y="12" width="1379" height="879" key="CommitChangelistDialog2" timestamp="1723105028964">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
|
|
@ -135,65 +207,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="1876" height="367" key="GridCell.Tab.0.bottom" timestamp="1723107779350">
|
||||
<state width="1876" height="299" key="GridCell.Tab.0.bottom" timestamp="1723184484893">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="367" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723107779350" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215553" />
|
||||
<state width="1876" height="367" key="GridCell.Tab.0.center" timestamp="1723107779350">
|
||||
<state width="1876" height="299" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
||||
<state width="1396" height="250" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
||||
<state width="1876" height="299" key="GridCell.Tab.0.center" timestamp="1723184484893">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="367" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723107779350" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215553" />
|
||||
<state width="1876" height="367" key="GridCell.Tab.0.left" timestamp="1723107779350">
|
||||
<state width="1876" height="299" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
||||
<state width="1396" height="250" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
||||
<state width="1876" height="299" key="GridCell.Tab.0.left" timestamp="1723184484893">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="367" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723107779350" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215552" />
|
||||
<state width="1876" height="367" key="GridCell.Tab.0.right" timestamp="1723107779350">
|
||||
<state width="1876" height="299" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
||||
<state width="1396" height="250" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
||||
<state width="1876" height="299" key="GridCell.Tab.0.right" timestamp="1723184484893">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="367" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723107779350" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215553" />
|
||||
<state width="1876" height="367" key="GridCell.Tab.1.bottom" timestamp="1723107779350">
|
||||
<state width="1876" height="299" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
||||
<state width="1396" height="250" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
||||
<state width="1876" height="299" key="GridCell.Tab.1.bottom" timestamp="1723184484893">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="367" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723107779350" />
|
||||
<state width="1876" height="299" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||
<state width="1876" height="367" key="GridCell.Tab.1.center" timestamp="1723107779350">
|
||||
<state width="1876" height="299" key="GridCell.Tab.1.center" timestamp="1723184484893">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="367" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723107779350" />
|
||||
<state width="1876" height="299" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||
<state width="1876" height="367" key="GridCell.Tab.1.left" timestamp="1723107779350">
|
||||
<state width="1876" height="299" key="GridCell.Tab.1.left" timestamp="1723184484893">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="367" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723107779350" />
|
||||
<state width="1876" height="299" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||
<state width="1876" height="367" key="GridCell.Tab.1.right" timestamp="1723107779350">
|
||||
<state width="1876" height="299" key="GridCell.Tab.1.right" timestamp="1723184484893">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="367" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723107779350" />
|
||||
<state width="1876" height="299" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.bottom" timestamp="1723100703671">
|
||||
<state width="1876" height="39" key="GridCell.Tab.2.bottom" timestamp="1723166255833">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100703671" />
|
||||
<state width="1876" height="39" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723166255833" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.center" timestamp="1723100703671">
|
||||
<state width="1876" height="39" key="GridCell.Tab.2.center" timestamp="1723166255833">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100703671" />
|
||||
<state width="1876" height="39" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723166255833" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.left" timestamp="1723100703671">
|
||||
<state width="1876" height="39" key="GridCell.Tab.2.left" timestamp="1723166255833">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100703671" />
|
||||
<state width="1876" height="39" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723166255833" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.right" timestamp="1723100703671">
|
||||
<state width="1876" height="39" key="GridCell.Tab.2.right" timestamp="1723166255833">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100703671" />
|
||||
<state width="1876" height="39" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723166255833" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||
<state x="2203" y="104" key="Maven.ArtifactSearchDialog" timestamp="1722820075785">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#for tests only !
|
||||
#Thu Aug 08 14:57:29 CST 2024
|
||||
#Fri Aug 09 14:26:27 CST 2024
|
||||
jco.client.lang=ZH
|
||||
jco.client.passwd=fE;w~oY[RV}$Hq`k8+X*q%@jQBYm^Qo.).998p..HvCkC+6i
|
||||
jco.client.passwd=654321
|
||||
jco.client.sysnr=00
|
||||
jco.destination.pool_capacity=10
|
||||
jco.client.client=800
|
||||
|
|
|
|||
|
|
@ -106,12 +106,16 @@ public class AuthorizeController extends BaseController
|
|||
authorize.setDoaSalesmanDeptId(String.valueOf(deptId));
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
authorize.setDoaSalesmanDeptName(sysDept.getDeptName());
|
||||
authorize.setCreateBy(authorize.getDoaSalesmanCode());
|
||||
|
||||
//获取用户ID
|
||||
String userId = String.valueOf(userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getUserId());
|
||||
authorize.setCreateBy(userId);
|
||||
authorize.setUpdateBy(userId);
|
||||
}else{
|
||||
authorize.setCreateBy(getUsername());
|
||||
authorize.setCreateBy(String.valueOf(getUserId()));
|
||||
authorize.setUpdateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
|
||||
authorize.setUpdateBy(getUsername());
|
||||
authorizeService.insertAuthorize(authorize);
|
||||
return success(authorize);
|
||||
}
|
||||
|
|
@ -133,10 +137,12 @@ public class AuthorizeController extends BaseController
|
|||
authorize.setDoaSalesmanDeptId(String.valueOf(deptId));
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
authorize.setDoaSalesmanDeptName(sysDept.getDeptName());
|
||||
authorize.setCreateBy(authorize.getDoaSalesmanCode());
|
||||
authorize.setUpdateBy(authorize.getDoaSalesmanCode());
|
||||
|
||||
String userId = String.valueOf(userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getUserId());
|
||||
authorize.setCreateBy(userId);
|
||||
authorize.setUpdateBy(userId);
|
||||
}else{
|
||||
authorize.setUpdateBy(getUsername());
|
||||
authorize.setUpdateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
return toAjax(authorizeService.updateAuthorize(authorize));
|
||||
}
|
||||
|
|
@ -181,33 +187,37 @@ public class AuthorizeController extends BaseController
|
|||
deptId = userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getDeptId();
|
||||
}
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
|
||||
String doa_id = authorize.getDoaId();
|
||||
String doaNumber = authorizeService.getCodeAT("S");
|
||||
authorize.setDoaNumber(doaNumber);
|
||||
|
||||
if(StringUtils.isEmpty(doa_id)){
|
||||
authorize.setDoaId(UUID.fastUUID().toString());
|
||||
String doaCode = authorizeService.getCode("ZGYS");
|
||||
authorize.setDoaCode(doaCode);
|
||||
String doaNumber = authorizeService.getCodeAT("S");
|
||||
authorize.setDoaNumber(doaNumber);
|
||||
|
||||
if(doaJlRoleFlag){
|
||||
authorize.setDoaSalesmanDeptId(String.valueOf(deptId));
|
||||
authorize.setDoaSalesmanDeptName(sysDept.getDeptName());
|
||||
authorize.setCreateBy(authorize.getDoaSalesmanCode());
|
||||
|
||||
String userId = String.valueOf(userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getUserId());
|
||||
authorize.setCreateBy(userId);
|
||||
}else{
|
||||
authorize.setCreateBy(getUsername());
|
||||
authorize.setCreateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
authorizeService.insertAuthorize(authorize);
|
||||
return success();
|
||||
}else{
|
||||
String doaNumber = authorizeService.getCodeAT("S");
|
||||
authorize.setDoaNumber(doaNumber);
|
||||
if(doaJlRoleFlag){
|
||||
authorize.setDoaSalesmanDeptId(String.valueOf(deptId));
|
||||
authorize.setDoaSalesmanDeptName(sysDept.getDeptName());
|
||||
authorize.setCreateBy(authorize.getDoaSalesmanCode());
|
||||
authorize.setUpdateBy(authorize.getDoaSalesmanCode());
|
||||
|
||||
String userId = String.valueOf(userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getUserId());
|
||||
authorize.setCreateBy(userId);
|
||||
authorize.setUpdateBy(userId);
|
||||
}else{
|
||||
authorize.setUpdateBy(getUsername());
|
||||
authorize.setUpdateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
|
||||
authorize.setDoaRejectionReasons("");//驳回后再次提交清除驳回原因
|
||||
|
|
|
|||
|
|
@ -133,8 +133,10 @@ public class BidController extends BaseController
|
|||
copy.setBidPriceLinkageMethod(bidInfo.getBidPriceLinkageMethod());
|
||||
copy.setBidOtherRequire(bidInfo.getBidOtherRequire());
|
||||
|
||||
copy.setCreateBy(bidInfo.getBidSalesmanCode());
|
||||
copy.setUpdateBy(getUsername());
|
||||
//获取用户ID
|
||||
String userId = String.valueOf(userService.selectUserByUserName(bidInfo.getBidSalesmanCode()).getUserId());
|
||||
copy.setCreateBy(userId);
|
||||
copy.setUpdateBy(userId);
|
||||
bidService.insertBid(copy);
|
||||
|
||||
return success();
|
||||
|
|
@ -232,12 +234,16 @@ public class BidController extends BaseController
|
|||
bid.setBidSalesmanDeptId(String.valueOf(deptId));
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
bid.setBidSalesmanDeptName(sysDept.getDeptName());
|
||||
bid.setCreateBy(bid.getBidSalesmanCode());
|
||||
|
||||
//获取用户ID
|
||||
String userId = String.valueOf(userService.selectUserByUserName(bid.getBidSalesmanCode()).getUserId());
|
||||
bid.setCreateBy(userId);
|
||||
bid.setUpdateBy(userId);
|
||||
}else{
|
||||
bid.setCreateBy(getUsername());
|
||||
bid.setCreateBy(String.valueOf(getUserId()));
|
||||
bid.setUpdateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
|
||||
bid.setUpdateBy(getUsername());
|
||||
bidService.insertBid(bid);
|
||||
return success(bid);
|
||||
}
|
||||
|
|
@ -259,10 +265,13 @@ public class BidController extends BaseController
|
|||
bid.setBidSalesmanDeptId(String.valueOf(deptId));
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
bid.setBidSalesmanDeptName(sysDept.getDeptName());
|
||||
bid.setCreateBy(bid.getBidSalesmanCode());
|
||||
bid.setUpdateBy(bid.getBidSalesmanCode());
|
||||
|
||||
//获取用户ID
|
||||
String userId = String.valueOf(userService.selectUserByUserName(bid.getBidSalesmanCode()).getUserId());
|
||||
bid.setCreateBy(userId);
|
||||
bid.setUpdateBy(userId);
|
||||
}else{
|
||||
bid.setUpdateBy(getUsername());
|
||||
bid.setUpdateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
return toAjax(bidService.updateBid(bid));
|
||||
}
|
||||
|
|
@ -369,19 +378,25 @@ public class BidController extends BaseController
|
|||
if(bidJlRoleFlag){
|
||||
bid.setBidSalesmanDeptId(String.valueOf(deptId));
|
||||
bid.setBidSalesmanDeptName(sysDept.getDeptName());
|
||||
bid.setCreateBy(bid.getBidSalesmanCode());
|
||||
|
||||
//获取用户ID
|
||||
String userId = String.valueOf(userService.selectUserByUserName(bid.getBidSalesmanCode()).getUserId());
|
||||
bid.setCreateBy(userId);
|
||||
}else{
|
||||
bid.setCreateBy(getUsername());
|
||||
bid.setCreateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
bidService.insertBid(bid);
|
||||
}else{
|
||||
if(bidJlRoleFlag){
|
||||
bid.setBidSalesmanDeptId(String.valueOf(deptId));
|
||||
bid.setBidSalesmanDeptName(sysDept.getDeptName());
|
||||
bid.setCreateBy(bid.getBidSalesmanCode());
|
||||
bid.setUpdateBy(bid.getBidSalesmanCode());
|
||||
|
||||
//获取用户ID
|
||||
String userId = String.valueOf(userService.selectUserByUserName(bid.getBidSalesmanCode()).getUserId());
|
||||
bid.setCreateBy(userId);
|
||||
bid.setUpdateBy(userId);
|
||||
}else{
|
||||
bid.setUpdateBy(getUsername());
|
||||
bid.setUpdateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -549,8 +564,8 @@ public class BidController extends BaseController
|
|||
bidJsqr.setBidJsqrQtLeaderState("0");//其他 组长状态 设置为 待通过
|
||||
}
|
||||
|
||||
bidJsqr.setCreateBy(getUsername());
|
||||
bidJsqr.setUpdateBy(getUsername());
|
||||
bidJsqr.setCreateBy(String.valueOf(getUserId()));
|
||||
bidJsqr.setUpdateBy(String.valueOf(getUserId()));
|
||||
bidJsqrService.insertBidJsqr(bidJsqr);//生成投标单-技术确认单
|
||||
|
||||
bid.setBidJsxzConfirmId(bidJsqrId);
|
||||
|
|
@ -600,12 +615,12 @@ public class BidController extends BaseController
|
|||
bidHj.setBidJsqrCheckState("2".equals(bid.getBidJsxzApprovalStatus())?"0":"1");
|
||||
bidHj.setBidJsqrCheckInfo(bid.getBidJsqrCheckInfo());
|
||||
|
||||
bidHj.setCreateBy(getUsername());
|
||||
bidHj.setUpdateBy(getUsername());
|
||||
bidHj.setCreateBy(String.valueOf(getUserId()));
|
||||
bidHj.setUpdateBy(String.valueOf(getUserId()));
|
||||
bidHjService.insertBidHj(bidHj);//生成投标-核价单
|
||||
|
||||
bid.setBidHjId(bidHjId);
|
||||
bid.setUpdateBy(getUsername());
|
||||
bid.setUpdateBy(String.valueOf(getUserId()));
|
||||
bidService.updateBid(bid);
|
||||
|
||||
// 将技术要求附件与核价单绑定
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ public class BidHjController extends BaseController
|
|||
public AjaxResult commitHj(@RequestBody BidHj bidHj) {
|
||||
|
||||
bidHj.setBidHjApprovalStatus("2");//投标单-核价单 状态设置为 已协助
|
||||
bidHj.setUpdateBy(getUsername());
|
||||
bidHj.setUpdateBy(String.valueOf(getUserId()));
|
||||
bidHj.setBidHjPricingDate(DateUtils.getNowDate());//投标单-核价单 核价日期设置为 当前日期
|
||||
bidHjService.updateBidHj(bidHj);
|
||||
|
||||
|
|
@ -146,7 +146,7 @@ public class BidHjController extends BaseController
|
|||
@PostMapping("/rejectHj")
|
||||
public AjaxResult rejectHj(@RequestBody BidHj bidHj)
|
||||
{
|
||||
bidHj.setUpdateBy(getUsername());
|
||||
bidHj.setUpdateBy(String.valueOf(getUserId()));
|
||||
bidHj.setBidHjPricingDate(DateUtils.getNowDate());//投标单-核价单 核价日期设置为 当前日期
|
||||
bidHjService.updateBidHj(bidHj);
|
||||
|
||||
|
|
|
|||
|
|
@ -446,6 +446,18 @@ public class QuotController extends BaseController
|
|||
}
|
||||
}
|
||||
|
||||
//根据该客户税号是否在客户单位表名单里-是否允许询价 是否是禁止
|
||||
Boolean isExist = false;
|
||||
String quotCustomerBm = quot.getQuotCustomerBm();
|
||||
String tax = SapHanaUtils.selectTaxByBm(quotCustomerBm);
|
||||
if(StringUtils.isNotEmpty(tax)){
|
||||
isExist = quotService.selectRegisteredCompanyByTax2(tax);
|
||||
}
|
||||
|
||||
if(isExist){
|
||||
return error("该单位有不良记录,暂停报价");
|
||||
}
|
||||
|
||||
String quot_id = quot.getQuotId();
|
||||
|
||||
quot.setUpdateBy(getUsername());
|
||||
|
|
@ -749,7 +761,7 @@ public class QuotController extends BaseController
|
|||
}
|
||||
|
||||
/**
|
||||
* 校验该客户税号是否在经营部注册公司名单里
|
||||
* 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
|
||||
* @param quot
|
||||
* @return
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -481,7 +481,7 @@ public class BidJsqrController extends BaseController
|
|||
}
|
||||
|
||||
bidJsqr.setBidJsxzApprovalStatus("2");//投标-技术协助状态 设置为 已协助
|
||||
bidJsqr.setUpdateBy(getUsername());
|
||||
bidJsqr.setUpdateBy(String.valueOf(getUserId()));
|
||||
bidJsqrService.updateBidJsqr(bidJsqr);
|
||||
//sendNoticeToBid(bidJsqr);// 发送给提醒
|
||||
|
||||
|
|
|
|||
|
|
@ -113,12 +113,15 @@ public class ZgysController extends BaseController
|
|||
zgys.setPqSalesmanDeptId(String.valueOf(deptId));
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
zgys.setPqSalesmanDeptName(sysDept.getDeptName());
|
||||
zgys.setCreateBy(zgys.getPqSalesmanCode());
|
||||
|
||||
String userId = String.valueOf(userService.selectUserByUserName(zgys.getPqSalesmanCode()).getUserId());
|
||||
zgys.setCreateBy(userId);
|
||||
zgys.setUpdateBy(userId);
|
||||
}else{
|
||||
zgys.setCreateBy(getUsername());
|
||||
zgys.setCreateBy(String.valueOf(getUserId()));
|
||||
zgys.setUpdateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
|
||||
zgys.setUpdateBy(getUsername());
|
||||
zgysService.insertZgys(zgys);
|
||||
return success(zgys);
|
||||
}
|
||||
|
|
@ -140,10 +143,12 @@ public class ZgysController extends BaseController
|
|||
zgys.setPqSalesmanDeptId(String.valueOf(deptId));
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
zgys.setPqSalesmanDeptName(sysDept.getDeptName());
|
||||
zgys.setCreateBy(zgys.getPqSalesmanCode());
|
||||
zgys.setUpdateBy(zgys.getPqSalesmanCode());
|
||||
|
||||
String userId = String.valueOf(userService.selectUserByUserName(zgys.getPqSalesmanCode()).getUserId());
|
||||
zgys.setCreateBy(userId);
|
||||
zgys.setUpdateBy(userId);
|
||||
}else{
|
||||
zgys.setUpdateBy(getUsername());
|
||||
zgys.setUpdateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
return toAjax(zgysService.updateZgys(zgys));
|
||||
}
|
||||
|
|
@ -169,19 +174,22 @@ public class ZgysController extends BaseController
|
|||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
|
||||
String pq_id = zgys.getPqId();
|
||||
String pqNumber = zgysService.getCodePQ("Z");
|
||||
zgys.setPqNumber(pqNumber);
|
||||
|
||||
if(StringUtils.isEmpty(pq_id)){
|
||||
zgys.setPqId(UUID.fastUUID().toString());
|
||||
String pqCode = zgysService.getCode("ZGYS");
|
||||
zgys.setPqCode(pqCode);
|
||||
String pqNumber = zgysService.getCodePQ("Z");
|
||||
zgys.setPqNumber(pqNumber);
|
||||
|
||||
if(pqJlRoleFlag){
|
||||
zgys.setPqSalesmanDeptId(String.valueOf(deptId));
|
||||
zgys.setPqSalesmanDeptName(sysDept.getDeptName());
|
||||
zgys.setCreateBy(zgys.getPqSalesmanCode());
|
||||
|
||||
String userId = String.valueOf(userService.selectUserByUserName(zgys.getPqSalesmanCode()).getUserId());
|
||||
zgys.setCreateBy(userId);
|
||||
}else{
|
||||
zgys.setCreateBy(getUsername());
|
||||
zgys.setCreateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
zgysService.insertZgys(zgys);
|
||||
return success();
|
||||
|
|
@ -189,10 +197,12 @@ public class ZgysController extends BaseController
|
|||
if(pqJlRoleFlag){
|
||||
zgys.setPqSalesmanDeptId(String.valueOf(deptId));
|
||||
zgys.setPqSalesmanDeptName(sysDept.getDeptName());
|
||||
zgys.setCreateBy(zgys.getPqSalesmanCode());
|
||||
zgys.setUpdateBy(zgys.getPqSalesmanCode());
|
||||
|
||||
String userId = String.valueOf(userService.selectUserByUserName(zgys.getPqSalesmanCode()).getUserId());
|
||||
zgys.setCreateBy(userId);
|
||||
zgys.setUpdateBy(userId);
|
||||
}else{
|
||||
zgys.setUpdateBy(getUsername());
|
||||
zgys.setUpdateBy(String.valueOf(getUserId()));
|
||||
}
|
||||
|
||||
zgys.setPqReturnRemark("");//驳回后再次提交清除驳回原因
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 16:45:42 CST 2024
|
||||
#Fri Aug 09 14:20:44 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-admin
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 16:45:31 CST 2024
|
||||
#Fri Aug 09 14:20:29 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-common
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 16:45:36 CST 2024
|
||||
#Fri Aug 09 14:20:36 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-framework
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 16:45:37 CST 2024
|
||||
#Fri Aug 09 14:20:38 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-generator
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -8,6 +8,9 @@ package com.ruoyi.quartz.domain;
|
|||
*/
|
||||
public class OASysAuthorize
|
||||
{
|
||||
/** oa授权备案信息id */
|
||||
private String oaDoaId;
|
||||
|
||||
/** 授权备案信息id */
|
||||
private String doaId;
|
||||
|
||||
|
|
@ -23,6 +26,14 @@ public class OASysAuthorize
|
|||
/** 副总审批 */
|
||||
private String doaVicePresidentApproved;
|
||||
|
||||
public String getOaDoaId() {
|
||||
return oaDoaId;
|
||||
}
|
||||
|
||||
public void setOaDoaId(String oaDoaId) {
|
||||
this.oaDoaId = oaDoaId;
|
||||
}
|
||||
|
||||
public String getDoaId() {
|
||||
return doaId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@ package com.ruoyi.quartz.domain;
|
|||
*/
|
||||
public class OASysBid
|
||||
{
|
||||
/** oa投标信息id */
|
||||
private String oaBidId;
|
||||
|
||||
/** 投标信息id */
|
||||
private String bidId;
|
||||
|
||||
|
|
@ -23,6 +26,9 @@ public class OASysBid
|
|||
/** 副总审批 */
|
||||
private String bidVicePresidentApproved;
|
||||
|
||||
public String getOaBidId() { return oaBidId; }
|
||||
public void setOaBidId(String oaBidId) { this.oaBidId = oaBidId; }
|
||||
|
||||
public String getBidId() { return bidId; }
|
||||
public void setBidId(String bidId) { this.bidId = bidId; }
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@ package com.ruoyi.quartz.domain;
|
|||
*/
|
||||
public class OASysZgys
|
||||
{
|
||||
/** oa资格预审信息id */
|
||||
private String oaPqId;
|
||||
|
||||
/** 资格预审信息id */
|
||||
private String pqId;
|
||||
|
||||
|
|
@ -23,6 +26,9 @@ public class OASysZgys
|
|||
/** 副总审批 */
|
||||
private String pqVpApproval;
|
||||
|
||||
public String getOaPqId() { return oaPqId; }
|
||||
public void setOaPqId(String oaPqId) { this.oaPqId = oaPqId; }
|
||||
|
||||
public String getPqId() { return pqId; }
|
||||
public void setPqId(String pqId) { this.pqId = pqId; }
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public interface OAAuthorizeMapper
|
|||
|
||||
/**
|
||||
* 将中间表 根据授权备案信息单号更新 isfinish=1 表示授权备案审核流程已结束
|
||||
* @param pqCode
|
||||
* @param oaDoaId
|
||||
*/
|
||||
void updateOAAuthorizeByAuthorizeCode(String pqCode);
|
||||
void updateOAAuthorizeByAuthorizeCode(String oaDoaId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ public interface OABidMapper
|
|||
|
||||
/**
|
||||
* 将中间表 根据投标信息单号更新 isfinish=1 表示投标审核流程已结束
|
||||
* @param bidCode
|
||||
* @param oaBidId
|
||||
*/
|
||||
void updateOABidByBidCode(String bidCode);
|
||||
void updateOABidByBidCode(String oaBidId);
|
||||
|
||||
|
||||
/** ==========================================================================================*/
|
||||
|
|
@ -56,7 +56,7 @@ public interface OABidMapper
|
|||
|
||||
/**
|
||||
* 将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束
|
||||
* @param bidCode
|
||||
* @param oaBidId
|
||||
*/
|
||||
void updateOABidByBidCodeTb(String bidCode);
|
||||
void updateOABidByBidCodeTb(String oaBidId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public interface OAZgysMapper
|
|||
|
||||
/**
|
||||
* 将中间表 根据资格预审信息单号更新 isfinish=1 表示资格预审审核流程已结束
|
||||
* @param pqCode
|
||||
* @param oaPqId
|
||||
*/
|
||||
void updateOAZgysByZgysCode(String pqCode);
|
||||
void updateOAZgysByZgysCode(String oaPqId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,5 +32,5 @@ public interface OAAuthorizeService
|
|||
/**
|
||||
* 将中间表 根据授权备案信息单号更新 isfinish=1 表示授权备案审核流程已结束
|
||||
*/
|
||||
void updateOAAuthorizeByAuthorizeCode(String pqCode);
|
||||
void updateOAAuthorizeByAuthorizeCode(String oaDoaId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ public interface OABidService
|
|||
/**
|
||||
* 将中间表 根据投标信息单号更新 isfinish=1 表示投标审核流程已结束
|
||||
*/
|
||||
void updateOABidByBidCode(String bidCode);
|
||||
void updateOABidByBidCode(String oaBidId);
|
||||
|
||||
/**
|
||||
* 检查 投标办提交OA至副总 是否审核结束
|
||||
|
|
@ -47,7 +47,7 @@ public interface OABidService
|
|||
|
||||
/**
|
||||
* 将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束
|
||||
* @param bidCode
|
||||
* @param oaBidId
|
||||
*/
|
||||
void updateOABidByBidCodeTb(String bidCode);
|
||||
void updateOABidByBidCodeTb(String oaBidId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,5 +31,5 @@ public interface OAZgysService
|
|||
/**
|
||||
* 将中间表 根据资格预审信息单号更新 isfinish=1 表示资格预审审核流程已结束
|
||||
*/
|
||||
void updateOAZgysByZgysCode(String pqCode);
|
||||
void updateOAZgysByZgysCode(String oaPqId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@ public class OAAuthorizeServiceImpl implements OAAuthorizeService
|
|||
|
||||
/**
|
||||
* 将中间表 根据授权备案信息单号更新 isfinish=1 表示授权备案审核流程已结束
|
||||
* @param doaCode
|
||||
* @param oaDoaId
|
||||
*/
|
||||
@Override
|
||||
public void updateOAAuthorizeByAuthorizeCode(String doaCode) {
|
||||
aAAuthorizeMapper.updateOAAuthorizeByAuthorizeCode(doaCode);
|
||||
public void updateOAAuthorizeByAuthorizeCode(String oaDoaId) {
|
||||
aAAuthorizeMapper.updateOAAuthorizeByAuthorizeCode(oaDoaId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@ public class OABidServiceImpl implements OABidService
|
|||
|
||||
/**
|
||||
* 将中间表 根据投标信息单号更新 isfinish=1 表示投标审核流程已结束
|
||||
* @param bidCode
|
||||
* @param oaBidId
|
||||
*/
|
||||
@Override
|
||||
public void updateOABidByBidCode(String bidCode) {
|
||||
aABidMapper.updateOABidByBidCode(bidCode);
|
||||
public void updateOABidByBidCode(String oaBidId) {
|
||||
aABidMapper.updateOABidByBidCode(oaBidId);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -74,10 +74,10 @@ public class OABidServiceImpl implements OABidService
|
|||
|
||||
/**
|
||||
* 将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束
|
||||
* @param bidCode
|
||||
* @param oaBidId
|
||||
*/
|
||||
@Override
|
||||
public void updateOABidByBidCodeTb(String bidCode) {
|
||||
aABidMapper.updateOABidByBidCodeTb(bidCode);
|
||||
public void updateOABidByBidCodeTb(String oaBidId) {
|
||||
aABidMapper.updateOABidByBidCodeTb(oaBidId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@ public class OAZgysServiceImpl implements OAZgysService
|
|||
|
||||
/**
|
||||
* 将中间表 根据资格预审信息单号更新 isfinish=1 表示资格预审审核流程已结束
|
||||
* @param pqCode
|
||||
* @param oaPqId
|
||||
*/
|
||||
@Override
|
||||
public void updateOAZgysByZgysCode(String pqCode) {
|
||||
aAZgysMapper.updateOAZgysByZgysCode(pqCode);
|
||||
public void updateOAZgysByZgysCode(String oaPqId) {
|
||||
aAZgysMapper.updateOAZgysByZgysCode(oaPqId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class AuthorizeTask
|
|||
// 批量更新授权备案信息-提交、OA审批状态,备注,副总审批
|
||||
authorizeService.updateAuthorizeOAApprovalStatus(sysAuthorize.getDoaId(),sysAuthorize.getState(),sysAuthorize.getRemark(),sysAuthorize.getDoaVicePresidentApproved());
|
||||
//将中间表 根据授权备案信息单号更新 isfinish=1 表示审核流程已结束
|
||||
authorizeService.updateOAAuthorizeByAuthorizeCode(sysAuthorize.getDoaCode());
|
||||
authorizeService.updateOAAuthorizeByAuthorizeCode(sysAuthorize.getOaDoaId());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ public class BidTask
|
|||
// 批量更新投标信息-提交状态,备注
|
||||
bidService.updateBidOAApprovalStatus(sysBid.getBidId(),sysBid.getState(),sysBid.getRemark());
|
||||
//将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束
|
||||
bidService.updateOABidByBidCode(sysBid.getBidCode());
|
||||
bidService.updateOABidByBidCode(sysBid.getOaBidId());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
|
@ -57,7 +57,7 @@ public class BidTask
|
|||
// 批量更新投标信息-提交、OA审批状态,备注,副总审批
|
||||
bidService.updateBidOAApprovalStatusTb(sysBid.getBidId(),sysBid.getState(),sysBid.getRemark(),sysBid.getBidVicePresidentApproved());
|
||||
//将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束
|
||||
bidService.updateOABidByBidCodeTb(sysBid.getBidCode());
|
||||
bidService.updateOABidByBidCodeTb(sysBid.getOaBidId());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ public class ZgysTask
|
|||
// 批量更新资格预审信息-提交、OA审批状态,备注,副总审批
|
||||
zgysService.updateZgysOAApprovalStatus(sysZgys.getPqId(),sysZgys.getState(),sysZgys.getRemark(),sysZgys.getPqVpApproval());
|
||||
//将中间表 根据资格预审信息单号更新 isfinish=1 表示审核流程已结束
|
||||
zgysService.updateOAZgysByZgysCode(sysZgys.getPqCode());
|
||||
zgysService.updateOAZgysByZgysCode(sysZgys.getOaPqId());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.quartz.mapper.OAAuthorizeMapper">
|
||||
<select id="selectOAAUTHORIZE" resultType="OASysAuthorize">
|
||||
select q.doa_id as doaId,q.doa_code as doaCode,sq.state,sq.remark,sq.doa_vice_president_approved as doaVicePresidentApproved
|
||||
select q.doa_id as doaId,q.doa_code as doaCode,sq.doa_id oaDoaId,sq.state,sq.remark,sq.doa_vice_president_approved as doaVicePresidentApproved
|
||||
from authorize q
|
||||
inner join (
|
||||
select t.doa_code,t.state,t.remark,t.doa_vice_president_approved from (
|
||||
select a.doa_code,a.state,a.remark,a.doa_vice_president_approved, row_number() over(partition by doa_code order by create_time desc) rw
|
||||
select t.doa_id,t.doa_code,t.state,t.remark,t.doa_vice_president_approved from (
|
||||
select a.doa_id,a.doa_code,a.state,a.remark,a.doa_vice_president_approved, row_number() over(partition by doa_code order by create_time desc) rw
|
||||
from sys_oa_authorize a
|
||||
where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0'
|
||||
) t where t.rw = 1
|
||||
|
|
@ -23,6 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</update>
|
||||
|
||||
<update id="updateOAAuthorizeByAuthorizeCode">
|
||||
update sys_oa_authorize set isFinish = '1' where doa_code = #{doaCode}
|
||||
update sys_oa_authorize set isFinish = '1' where doa_id = #{oaDoaId}
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.quartz.mapper.OABidMapper">
|
||||
<select id="selectOABID" resultType="OASysBid">
|
||||
select q.bid_id as bidId,q.bid_code as bidCode,sq.state,sq.remark
|
||||
select q.bid_id as bidId,q.bid_code as bidCode,sq.bid_id oaBidId,sq.state,sq.remark
|
||||
from bid q
|
||||
inner join (
|
||||
select t.bid_code,t.state,t.remark from (
|
||||
select a.bid_code,a.state,a.remark, row_number() over(partition by bid_code order by create_time desc) rw
|
||||
select t.bid_id,t.bid_code,t.state,t.remark from (
|
||||
select a.bid_id,a.bid_code,a.state,a.remark, row_number() over(partition by bid_code order by create_time desc) rw
|
||||
from sys_oa_bid a
|
||||
where a.triggerflag = '1' and a.state in ('1','3') and a.isFinish = '0'
|
||||
) t where t.rw = 1
|
||||
|
|
@ -22,18 +22,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</update>
|
||||
|
||||
<update id="updateOABidByBidCode">
|
||||
update sys_oa_bid set isFinish = '1' where bid_code = #{bidCode}
|
||||
update sys_oa_bid set isFinish = '1' where bid_id = #{oaBidId}
|
||||
</update>
|
||||
|
||||
|
||||
|
||||
|
||||
<select id="selectOABIDTB" resultType="OASysBid">
|
||||
select q.bid_id as bidId,q.bid_code as bidCode,sq.state,sq.remark,sq.bid_vice_president_approved bidVicePresidentApproved
|
||||
select q.bid_id as bidId,q.bid_code as bidCode,sq.bid_id oaBidId,sq.state,sq.remark,sq.bid_vice_president_approved bidVicePresidentApproved
|
||||
from bid q
|
||||
inner join (
|
||||
select t.bid_code,t.state,t.remark,t.bid_vice_president_approved from (
|
||||
select a.bid_code,a.state,a.remark, a.bid_vice_president_approved,row_number() over(partition by bid_code order by create_time desc) rw
|
||||
select t.bid_id,t.bid_code,t.state,t.remark,t.bid_vice_president_approved from (
|
||||
select a.bid_id,a.bid_code,a.state,a.remark, a.bid_vice_president_approved,row_number() over(partition by bid_code order by create_time desc) rw
|
||||
from sys_oa_bid_tb a
|
||||
where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0'
|
||||
) t where t.rw = 1
|
||||
|
|
@ -47,6 +47,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</update>
|
||||
|
||||
<update id="updateOABidByBidCodeTb">
|
||||
update sys_oa_bid_tb set isFinish = '1' where bid_code = #{bidCode}
|
||||
update sys_oa_bid_tb set isFinish = '1' where bid_id = #{oaBidId}
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.quartz.mapper.OAZgysMapper">
|
||||
<select id="selectOAZGYS" resultType="OASysZgys">
|
||||
select q.pq_id as pqId,q.pq_code as pqCode,sq.state,sq.remark,sq.pq_vp_approval as pqVpApproval
|
||||
select q.pq_id as pqId,q.pq_code as pqCode,sq.state,sq.pq_id oaPqId,sq.remark,sq.pq_vp_approval as pqVpApproval
|
||||
from zgys q
|
||||
inner join (
|
||||
select t.pq_code,t.state,t.remark,t.pq_vp_approval from (
|
||||
select a.pq_code,a.state,a.remark,a.pq_vp_approval, row_number() over(partition by pq_code order by create_time desc) rw
|
||||
select t.pq_id,t.pq_code,t.state,t.remark,t.pq_vp_approval from (
|
||||
select a.pq_id,a.pq_code,a.state,a.remark,a.pq_vp_approval, row_number() over(partition by pq_code order by create_time desc) rw
|
||||
from sys_oa_zgys a
|
||||
where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0'
|
||||
) t where t.rw = 1
|
||||
|
|
@ -23,6 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</update>
|
||||
|
||||
<update id="updateOAZgysByZgysCode">
|
||||
update sys_oa_zgys set isFinish = '1' where pq_code = #{pqCode}
|
||||
update sys_oa_zgys set isFinish = '1' where pq_id = #{oaPqId}
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -4,11 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.quartz.mapper.OAAuthorizeMapper">
|
||||
<select id="selectOAAUTHORIZE" resultType="OASysAuthorize">
|
||||
select q.doa_id as doaId,q.doa_code as doaCode,sq.state,sq.remark,sq.doa_vice_president_approved as doaVicePresidentApproved
|
||||
select q.doa_id as doaId,q.doa_code as doaCode,sq.doa_id oaDoaId,sq.state,sq.remark,sq.doa_vice_president_approved as doaVicePresidentApproved
|
||||
from authorize q
|
||||
inner join (
|
||||
select t.doa_code,t.state,t.remark,t.doa_vice_president_approved from (
|
||||
select a.doa_code,a.state,a.remark,a.doa_vice_president_approved, row_number() over(partition by doa_code order by create_time desc) rw
|
||||
select t.doa_id,t.doa_code,t.state,t.remark,t.doa_vice_president_approved from (
|
||||
select a.doa_id,a.doa_code,a.state,a.remark,a.doa_vice_president_approved, row_number() over(partition by doa_code order by create_time desc) rw
|
||||
from sys_oa_authorize a
|
||||
where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0'
|
||||
) t where t.rw = 1
|
||||
|
|
@ -23,6 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</update>
|
||||
|
||||
<update id="updateOAAuthorizeByAuthorizeCode">
|
||||
update sys_oa_authorize set isFinish = '1' where doa_code = #{doaCode}
|
||||
update sys_oa_authorize set isFinish = '1' where doa_id = #{oaDoaId}
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.quartz.mapper.OABidMapper">
|
||||
<select id="selectOABID" resultType="OASysBid">
|
||||
select q.bid_id as bidId,q.bid_code as bidCode,sq.state,sq.remark
|
||||
select q.bid_id as bidId,q.bid_code as bidCode,sq.bid_id oaBidId,sq.state,sq.remark
|
||||
from bid q
|
||||
inner join (
|
||||
select t.bid_code,t.state,t.remark from (
|
||||
select a.bid_code,a.state,a.remark, row_number() over(partition by bid_code order by create_time desc) rw
|
||||
select t.bid_id,t.bid_code,t.state,t.remark from (
|
||||
select a.bid_id,a.bid_code,a.state,a.remark, row_number() over(partition by bid_code order by create_time desc) rw
|
||||
from sys_oa_bid a
|
||||
where a.triggerflag = '1' and a.state in ('1','3') and a.isFinish = '0'
|
||||
) t where t.rw = 1
|
||||
|
|
@ -22,18 +22,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</update>
|
||||
|
||||
<update id="updateOABidByBidCode">
|
||||
update sys_oa_bid set isFinish = '1' where bid_code = #{bidCode}
|
||||
update sys_oa_bid set isFinish = '1' where bid_id = #{oaBidId}
|
||||
</update>
|
||||
|
||||
|
||||
|
||||
|
||||
<select id="selectOABIDTB" resultType="OASysBid">
|
||||
select q.bid_id as bidId,q.bid_code as bidCode,sq.state,sq.remark,sq.bid_vice_president_approved bidVicePresidentApproved
|
||||
select q.bid_id as bidId,q.bid_code as bidCode,sq.bid_id oaBidId,sq.state,sq.remark,sq.bid_vice_president_approved bidVicePresidentApproved
|
||||
from bid q
|
||||
inner join (
|
||||
select t.bid_code,t.state,t.remark,t.bid_vice_president_approved from (
|
||||
select a.bid_code,a.state,a.remark, a.bid_vice_president_approved,row_number() over(partition by bid_code order by create_time desc) rw
|
||||
select t.bid_id,t.bid_code,t.state,t.remark,t.bid_vice_president_approved from (
|
||||
select a.bid_id,a.bid_code,a.state,a.remark, a.bid_vice_president_approved,row_number() over(partition by bid_code order by create_time desc) rw
|
||||
from sys_oa_bid_tb a
|
||||
where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0'
|
||||
) t where t.rw = 1
|
||||
|
|
@ -47,6 +47,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</update>
|
||||
|
||||
<update id="updateOABidByBidCodeTb">
|
||||
update sys_oa_bid_tb set isFinish = '1' where bid_code = #{bidCode}
|
||||
update sys_oa_bid_tb set isFinish = '1' where bid_id = #{oaBidId}
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.quartz.mapper.OAZgysMapper">
|
||||
<select id="selectOAZGYS" resultType="OASysZgys">
|
||||
select q.pq_id as pqId,q.pq_code as pqCode,sq.state,sq.remark,sq.pq_vp_approval as pqVpApproval
|
||||
select q.pq_id as pqId,q.pq_code as pqCode,sq.state,sq.pq_id oaPqId,sq.remark,sq.pq_vp_approval as pqVpApproval
|
||||
from zgys q
|
||||
inner join (
|
||||
select t.pq_code,t.state,t.remark,t.pq_vp_approval from (
|
||||
select a.pq_code,a.state,a.remark,a.pq_vp_approval, row_number() over(partition by pq_code order by create_time desc) rw
|
||||
select t.pq_id,t.pq_code,t.state,t.remark,t.pq_vp_approval from (
|
||||
select a.pq_id,a.pq_code,a.state,a.remark,a.pq_vp_approval, row_number() over(partition by pq_code order by create_time desc) rw
|
||||
from sys_oa_zgys a
|
||||
where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0'
|
||||
) t where t.rw = 1
|
||||
|
|
@ -23,6 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</update>
|
||||
|
||||
<update id="updateOAZgysByZgysCode">
|
||||
update sys_oa_zgys set isFinish = '1' where pq_code = #{pqCode}
|
||||
update sys_oa_zgys set isFinish = '1' where pq_id = #{oaPqId}
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 16:45:36 CST 2024
|
||||
#Fri Aug 09 14:20:38 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-quartz
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -160,12 +160,19 @@ public interface QuotMapper
|
|||
void saveQuotFeedbackExplanation(Quot quot);
|
||||
|
||||
/**
|
||||
* 根据客户税号查询经营部注册公司名单里是否存在
|
||||
* 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
|
||||
* @param tax
|
||||
* @return
|
||||
*/
|
||||
String selectRegisteredCompanyByTax(String tax);
|
||||
|
||||
/**
|
||||
* 根据该客户税号是否在客户单位表名单里-是否允许询价 是否是禁止
|
||||
* @param tax
|
||||
* @return
|
||||
*/
|
||||
String selectRegisteredCompanyByTax2(String tax);
|
||||
|
||||
/**
|
||||
* 统计有效报价单模块-获取报价单数据
|
||||
* @param quot
|
||||
|
|
@ -186,4 +193,5 @@ public interface QuotMapper
|
|||
* @return
|
||||
*/
|
||||
String selectHandleTime(Quot quot);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,12 +145,19 @@ public interface IQuotService
|
|||
void saveQuotFeedbackExplanation(Quot quot);
|
||||
|
||||
/**
|
||||
* 根据客户税号查询经营部注册公司名单里是否存在
|
||||
* 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
|
||||
* @param tax
|
||||
* @return
|
||||
*/
|
||||
Boolean selectRegisteredCompanyByTax(String tax);
|
||||
|
||||
/**
|
||||
* 根据该客户税号是否在客户单位表名单里-是否允许询价 是否是禁止
|
||||
* @param tax
|
||||
* @return
|
||||
*/
|
||||
Boolean selectRegisteredCompanyByTax2(String tax);
|
||||
|
||||
/**
|
||||
* 统计有效报价单模块-获取报价单数据
|
||||
* @param quot
|
||||
|
|
@ -171,4 +178,5 @@ public interface IQuotService
|
|||
* @return
|
||||
*/
|
||||
String selectHandleTime(Quot quot);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ public class QuotServiceImpl implements IQuotService
|
|||
}
|
||||
|
||||
/**
|
||||
* 根据客户税号查询经营部注册公司名单里是否存在
|
||||
* 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
|
||||
* @param tax
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -334,4 +334,16 @@ public class QuotServiceImpl implements IQuotService
|
|||
String count = quotMapper.selectRegisteredCompanyByTax(tax);
|
||||
return !"0".equals(count);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据该客户税号是否在客户单位表名单里-是否允许询价 是否是禁止
|
||||
* @param tax
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Boolean selectRegisteredCompanyByTax2(String tax) {
|
||||
String count = quotMapper.selectRegisteredCompanyByTax2(tax);
|
||||
return !"0".equals(count);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,14 @@ public class RegisteredCompany extends BaseEntity
|
|||
@Excel(name = "状态",dictType = "common_state")
|
||||
private String regState;
|
||||
|
||||
/** 是否允许特批报价-报价组提交OA(0-允许,1-禁止) */
|
||||
@Excel(name = "是否允许特批报价",dictType = "allow_tp_state")
|
||||
private String regAllowTpState;
|
||||
|
||||
/** 是否允许询价-业务员提交询价单(0-允许,1-禁止) */
|
||||
@Excel(name = "是否允许询价",dictType = "allow_quot_state")
|
||||
private String regAllowQuotState;
|
||||
|
||||
public void setRegId(String regId)
|
||||
{
|
||||
this.regId = regId;
|
||||
|
|
@ -92,20 +100,10 @@ public class RegisteredCompany extends BaseEntity
|
|||
{
|
||||
return regState;
|
||||
}
|
||||
public String getRegAllowTpState() { return regAllowTpState; }
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("regId", getRegId())
|
||||
.append("regSalesmanCode", getRegSalesmanCode())
|
||||
.append("regSalesmanName", getRegSalesmanName())
|
||||
.append("regCompany", getRegCompany())
|
||||
.append("regTax", getRegTax())
|
||||
.append("regState", getRegState())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.toString();
|
||||
}
|
||||
public void setRegAllowTpState(String regAllowTpState) { this.regAllowTpState = regAllowTpState; }
|
||||
public String getRegAllowQuotState() { return regAllowQuotState; }
|
||||
|
||||
public void setRegAllowQuotState(String regAllowQuotState) { this.regAllowQuotState = regAllowQuotState; }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
</resultMap>
|
||||
|
||||
<sql id="authorizeJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u on u.user_id=a.create_by
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
</sql>
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@
|
|||
</resultMap>
|
||||
|
||||
<sql id="bidJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u on u.user_id=a.create_by
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
left join bid_jsqr q on q.bid_jsqr_id = a.bid_jsxz_confirm_id
|
||||
left join bid_hj h on h.bid_hj_id = a.bid_hj_id
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="bidHjJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u on u.user_id=a.create_by
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
left join bid q on q.bid_id = a.bid_id
|
||||
<!--left join (select t.* from (
|
||||
|
|
|
|||
|
|
@ -223,8 +223,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<select id="selectRegisteredCompanyByTax" parameterType="String" resultType="String">
|
||||
select count(1) from registered_company where reg_tax = #{tax} and reg_state = '0'
|
||||
select count(1) from registered_company where reg_tax = #{tax} and reg_state = '0' and reg_allow_tp_state = '1'
|
||||
</select>
|
||||
<select id="selectRegisteredCompanyByTax2" parameterType="String" resultType="String">
|
||||
select count(1) from registered_company where reg_tax = #{tax} and reg_state = '0' and reg_allow_quot_state = '1'
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertQuot" parameterType="Quot">
|
||||
insert into quot
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
<result property="regCompany" column="reg_company" />
|
||||
<result property="regTax" column="reg_tax" />
|
||||
<result property="regState" column="reg_state" />
|
||||
<result property="regAllowTpState" column="reg_allow_tp_state" />
|
||||
<result property="regAllowQuotState" column="reg_allow_quot_state" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
|
|
@ -18,7 +20,9 @@
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectRegisteredCompanyVo">
|
||||
select reg_id, reg_salesman_code, reg_salesman_name, reg_company, reg_tax, reg_state, create_by, create_time, update_by, update_time from registered_company
|
||||
select reg_id, reg_salesman_code, reg_salesman_name, reg_company, reg_tax,
|
||||
reg_state, reg_allow_tp_state, reg_allow_quot_state, create_by, create_time, update_by, update_time
|
||||
from registered_company
|
||||
</sql>
|
||||
|
||||
<select id="selectRegisteredCompanyList" parameterType="RegisteredCompany" resultMap="RegisteredCompanyResult">
|
||||
|
|
@ -45,6 +49,8 @@
|
|||
<if test="regCompany != null and regCompany != ''">reg_company,</if>
|
||||
<if test="regTax != null and regTax != ''">reg_tax,</if>
|
||||
<if test="regState != null">reg_state,</if>
|
||||
<if test="regAllowTpState != null">reg_allow_tp_state,</if>
|
||||
<if test="regAllowQuotState != null">reg_allow_quot_state,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
|
|
@ -57,6 +63,8 @@
|
|||
<if test="regCompany != null and regCompany != ''">#{regCompany},</if>
|
||||
<if test="regTax != null and regTax != ''">#{regTax},</if>
|
||||
<if test="regState != null">#{regState},</if>
|
||||
<if test="regAllowTpState != null">#{regAllowTpState},</if>
|
||||
<if test="regAllowQuotState != null">#{regAllowQuotState},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
|
|
@ -72,6 +80,8 @@
|
|||
<if test="regCompany != null and regCompany != ''">reg_company = #{regCompany},</if>
|
||||
<if test="regTax != null and regTax != ''">reg_tax = #{regTax},</if>
|
||||
<if test="regState != null">reg_state = #{regState},</if>
|
||||
<if test="regAllowTpState != null">reg_allow_tp_state = #{regAllowTpState},</if>
|
||||
<if test="regAllowQuotState != null">reg_allow_quot_state = #{regAllowQuotState},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="bidJsqrJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u on u.user_id=a.create_by
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
left join bid q on q.bid_id = a.bid_id
|
||||
</sql>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
</resultMap>
|
||||
|
||||
<sql id="pqJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u on u.user_id=a.create_by
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
</sql>
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -43,7 +43,7 @@
|
|||
</resultMap>
|
||||
|
||||
<sql id="authorizeJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u on u.user_id=a.create_by
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
</sql>
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@
|
|||
</resultMap>
|
||||
|
||||
<sql id="bidJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u on u.user_id=a.create_by
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
left join bid_jsqr q on q.bid_jsqr_id = a.bid_jsxz_confirm_id
|
||||
left join bid_hj h on h.bid_hj_id = a.bid_hj_id
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="bidHjJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u on u.user_id=a.create_by
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
left join bid q on q.bid_id = a.bid_id
|
||||
<!--left join (select t.* from (
|
||||
|
|
|
|||
|
|
@ -223,8 +223,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<select id="selectRegisteredCompanyByTax" parameterType="String" resultType="String">
|
||||
select count(1) from registered_company where reg_tax = #{tax} and reg_state = '0'
|
||||
select count(1) from registered_company where reg_tax = #{tax} and reg_state = '0' and reg_allow_tp_state = '1'
|
||||
</select>
|
||||
<select id="selectRegisteredCompanyByTax2" parameterType="String" resultType="String">
|
||||
select count(1) from registered_company where reg_tax = #{tax} and reg_state = '0' and reg_allow_quot_state = '1'
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertQuot" parameterType="Quot">
|
||||
insert into quot
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
<result property="regCompany" column="reg_company" />
|
||||
<result property="regTax" column="reg_tax" />
|
||||
<result property="regState" column="reg_state" />
|
||||
<result property="regAllowTpState" column="reg_allow_tp_state" />
|
||||
<result property="regAllowQuotState" column="reg_allow_quot_state" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
|
|
@ -18,7 +20,9 @@
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectRegisteredCompanyVo">
|
||||
select reg_id, reg_salesman_code, reg_salesman_name, reg_company, reg_tax, reg_state, create_by, create_time, update_by, update_time from registered_company
|
||||
select reg_id, reg_salesman_code, reg_salesman_name, reg_company, reg_tax,
|
||||
reg_state, reg_allow_tp_state, reg_allow_quot_state, create_by, create_time, update_by, update_time
|
||||
from registered_company
|
||||
</sql>
|
||||
|
||||
<select id="selectRegisteredCompanyList" parameterType="RegisteredCompany" resultMap="RegisteredCompanyResult">
|
||||
|
|
@ -45,6 +49,8 @@
|
|||
<if test="regCompany != null and regCompany != ''">reg_company,</if>
|
||||
<if test="regTax != null and regTax != ''">reg_tax,</if>
|
||||
<if test="regState != null">reg_state,</if>
|
||||
<if test="regAllowTpState != null">reg_allow_tp_state,</if>
|
||||
<if test="regAllowQuotState != null">reg_allow_quot_state,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
|
|
@ -57,6 +63,8 @@
|
|||
<if test="regCompany != null and regCompany != ''">#{regCompany},</if>
|
||||
<if test="regTax != null and regTax != ''">#{regTax},</if>
|
||||
<if test="regState != null">#{regState},</if>
|
||||
<if test="regAllowTpState != null">#{regAllowTpState},</if>
|
||||
<if test="regAllowQuotState != null">#{regAllowQuotState},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
|
|
@ -72,6 +80,8 @@
|
|||
<if test="regCompany != null and regCompany != ''">reg_company = #{regCompany},</if>
|
||||
<if test="regTax != null and regTax != ''">reg_tax = #{regTax},</if>
|
||||
<if test="regState != null">reg_state = #{regState},</if>
|
||||
<if test="regAllowTpState != null">reg_allow_tp_state = #{regAllowTpState},</if>
|
||||
<if test="regAllowQuotState != null">reg_allow_quot_state = #{regAllowQuotState},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="bidJsqrJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u on u.user_id=a.create_by
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
left join bid q on q.bid_id = a.bid_id
|
||||
</sql>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
</resultMap>
|
||||
|
||||
<sql id="pqJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u on u.user_id=a.create_by
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
</sql>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 16:45:33 CST 2024
|
||||
#Fri Aug 09 14:20:32 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-system
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -253,13 +253,6 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="16">
|
||||
<el-form-item label="项目名称" prop="doaProject">
|
||||
<el-input type="textarea" autosize v-model="form.doaProject" placeholder="请输入项目名称" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="业务员电话" prop="doaSalesmanPhone">
|
||||
<el-input v-model="form.doaSalesmanPhone" placeholder="请输入业务员电话" :disabled="ywyDis||tbDis"/>
|
||||
|
|
@ -275,11 +268,13 @@
|
|||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="业主单位" prop="doaOwnerUnit">
|
||||
<el-input v-model="form.doaOwnerUnit" placeholder="请输入业主单位" :disabled="ywyDis||tbDis"/>
|
||||
<el-col :span="16">
|
||||
<el-form-item label="项目名称" prop="doaProject">
|
||||
<el-input type="textarea" autosize v-model="form.doaProject" placeholder="请输入项目名称" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="授权人" prop="doaAuthorizer">
|
||||
<el-input v-model="form.doaAuthorizer" placeholder="请输入授权人" :disabled="ywyDis||tbDis"/>
|
||||
|
|
@ -290,25 +285,30 @@
|
|||
<el-input v-model="form.doaAuthorizerPhone" placeholder="请输入授权人电话" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="总包单位" prop="doaGeneralcontractUnit">
|
||||
<el-input v-model="form.doaGeneralcontractUnit" placeholder="请输入总包单位" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="分包单位" prop="doaSubcontractUnit">
|
||||
<el-input v-model="form.doaSubcontractUnit" placeholder="请输入分包单位" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="授权人身份证号" prop="doaAuthorizerIdentificationNumber">
|
||||
<el-input v-model="form.doaAuthorizerIdentificationNumber" placeholder="请输入授权人身份证号" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="业主单位" prop="doaOwnerUnit">
|
||||
<el-input v-model="form.doaOwnerUnit" placeholder="请输入业主单位" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="总包单位" prop="doaGeneralcontractUnit">
|
||||
<el-input v-model="form.doaGeneralcontractUnit" placeholder="请输入总包单位" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="分包单位" prop="doaSubcontractUnit">
|
||||
<el-input v-model="form.doaSubcontractUnit" placeholder="请输入分包单位" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="授权期限" prop="doaAuthorizationDuration">
|
||||
<el-date-picker clearable
|
||||
|
|
@ -578,7 +578,7 @@ export default {
|
|||
this.queryParams.orderByColumn = "a.doa_number";//查询字段是表格中字段名字
|
||||
this.queryParams.isAsc = "desc";//动态取值排序顺序
|
||||
}
|
||||
if(roles.indexOf('SALES_MAN') != -1|| roles.indexOf('admin') !== -1){//业务员默认查看所有 单据 且按授权编号排序
|
||||
if(roles.indexOf('SALES_MAN') != -1 || roles.indexOf('admin') !== -1){//业务员默认查看所有 单据 且按授权编号排序
|
||||
this.queryParams.orderByColumn = "a.create_time";//查询字段是表格中字段名字
|
||||
this.queryParams.isAsc = "desc";//动态取值排序顺序
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,31 +90,23 @@
|
|||
<el-table height="100%" v-loading="loading" :data="registeredCompanyList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label=" id" align="center" prop="regId" v-if="false"/>
|
||||
<el-table-column label="状态" align="center" prop="regState" width="100">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.common_state" :value="scope.row.regState"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="业务员账号" align="center" prop="regSalesmanCode" />
|
||||
<el-table-column label="业务员" align="center" prop="regSalesmanName" />
|
||||
<el-table-column label="注册公司" align="center" prop="regCompany" width="350" />
|
||||
<el-table-column label="税号" align="center" prop="regTax" width="200"/>
|
||||
<el-table-column label="状态" align="center" prop="regState" width="100">
|
||||
<el-table-column label="是否允许询价" align="center" prop="regAllowQuotState" width="120">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.common_state" :value="scope.row.regState"/>
|
||||
<dict-tag :options="dict.type.allow_quot_state" :value="scope.row.regAllowQuotState"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
|
||||
<el-table-column label="是否允许特批报价" align="center" prop="regAllowTpState" width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['registeredCompany:registeredCompany:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['registeredCompany:registeredCompany:remove']"
|
||||
>删除</el-button>
|
||||
<dict-tag :options="dict.type.allow_tp_state" :value="scope.row.regAllowTpState"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -128,9 +120,9 @@
|
|||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改经营部注册公司对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<!-- 添加或修改客户单位对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="150px">
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="业务员账号" prop="regSalesmanCode">
|
||||
|
|
@ -168,6 +160,30 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否允许询价" prop="regAllowQuotState">
|
||||
<el-select v-model="form.regAllowQuotState" placeholder="请选择状态">
|
||||
<el-option
|
||||
v-for="dict in dict.type.allow_quot_state"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否允许特批报价" prop="regAllowTpState">
|
||||
<el-select v-model="form.regAllowTpState" placeholder="请选择状态">
|
||||
<el-option
|
||||
v-for="dict in dict.type.allow_tp_state"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
|
@ -183,7 +199,7 @@ import { listRegisteredCompany, getRegisteredCompany, delRegisteredCompany, addR
|
|||
|
||||
export default {
|
||||
name: "RegisteredCompany",
|
||||
dicts: ['common_state'],
|
||||
dicts: ['common_state','allow_quot_state','allow_tp_state'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
|
|
@ -198,7 +214,7 @@ export default {
|
|||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 经营部注册公司表格数据
|
||||
// 客户单位表格数据
|
||||
registeredCompanyList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
|
|
@ -230,7 +246,7 @@ export default {
|
|||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询经营部注册公司列表 */
|
||||
/** 查询客户单位列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listRegisteredCompany(this.queryParams).then(response => {
|
||||
|
|
@ -253,6 +269,8 @@ export default {
|
|||
regCompany: null,
|
||||
regTax: null,
|
||||
regState: null,
|
||||
regAllowTpState: null,
|
||||
regAllowQuotState: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
|
|
@ -280,8 +298,10 @@ export default {
|
|||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "经营部注册公司";
|
||||
this.title = "客户单位";
|
||||
this.form.regState = '0';
|
||||
this.form.regAllowTpState = '0';
|
||||
this.form.regAllowQuotState = '0';
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
|
|
@ -290,7 +310,7 @@ export default {
|
|||
getRegisteredCompany(regId).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "经营部注册公司";
|
||||
this.title = "客户单位";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
|
|
@ -316,7 +336,7 @@ export default {
|
|||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const regIds = row.regId || this.ids;
|
||||
this.$modal.confirm('是否确认删除该经营部注册公司？').then(function() {
|
||||
this.$modal.confirm('是否确认删除该客户单位？').then(function() {
|
||||
return delRegisteredCompany(regIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
|
|
|
|||
Loading…
Reference in New Issue