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

'111'

This commit is contained in:
xd 2024-08-07 16:25:31 +08:00
parent 2f62470a3c
commit b6472c4649
8 changed files with 200 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
.idea/workspace.xml
View File

@ -2,101 +2,13 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment=""> <list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/BidTbHistory.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/SysOaBidTbHistory.java" 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/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/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/clMaterial/CYlMaterialController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/clMaterial/CYlMaterialController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/CaptchaController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/CaptchaController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/CommonController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/CommonController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SapRfcController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SapRfcController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/customer/CustomerController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/customer/CustomerController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/hainanOrder/HaiNanOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/hainanOrder/HaiNanOrderController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/material/CMaterialController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/material/CMaterialController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/monitor/SysUserOnlineController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/monitor/SysUserOnlineController.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/redBook/RedBookController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/redBook/RedBookController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/storageLocation/storageLocationController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/storageLocation/storageLocationController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/LoginController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/LoginController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SsoLoginController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SsoLoginController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysDeptController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysDeptController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysLoginController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysLoginController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysNoticeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysNoticeController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysProfileController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysProfileController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysRegisterController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysRegisterController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysRoleController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysRoleController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysUserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysUserController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/UserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/UserController.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/technicalConfirm/QuotJsqrController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/tool/TestController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/tool/TestController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/tool/quot/quotJswController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/tool/quot/quotJswController.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/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/classes/com/ruoyi/web/utils/DateRangeUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/DateRangeUtils.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/IdUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/IdUtils.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/JDBCBatch.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/JDBCBatch.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/ListSplitUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/ListSplitUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SapFunction/ConnectToSAP.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SapFunction/ConnectToSAP.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SapFunction/SapRfcUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SapFunction/SapRfcUtils.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SapHana/HanaDB.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SapHana/HanaDB.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SapHana/SapHanaUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SapHana/SapHanaUtils.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SendNotice/NoticeUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SendNotice/NoticeUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/qcc/HttpHelper$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/qcc/HttpHelper$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/qcc/HttpHelper.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/qcc/HttpHelper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/qcc/QiChaChaUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/qcc/QiChaChaUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/rbExcel/excelUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/rbExcel/excelUtil.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/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/authorize/domain/Authorize.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/service/impl/AuthorizeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/service/impl/AuthorizeServiceImpl.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/java/com/ruoyi/bid/domain/Bid.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java" 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/zgys/domain/Zgys.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/zgys/service/impl/ZgysServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/zgys/service/impl/ZgysServiceImpl.java" 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/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/target/classes/com/ruoyi/authorize/domain/Authorize.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/authorize/service/impl/AuthorizeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/authorize/service/impl/AuthorizeServiceImpl.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/com/ruoyi/bid/domain/Bid.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class" 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-system/target/classes/com/ruoyi/bid/mapper/BidMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/mapper/BidMapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/service/IBidService.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/service/IBidService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/service/impl/BidServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/service/impl/BidServiceImpl.class" 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/zgys/domain/Zgys.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/zgys/domain/Zgys.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/zgys/service/impl/ZgysServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/zgys/service/impl/ZgysServiceImpl.class" 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/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/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" 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/api/bid/bid.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/bid/bid.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/api/quot/quot.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/quot/quot.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/layout/components/Navbar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/layout/components/Navbar.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/quot/quot/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/quot/quot/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -138,7 +50,7 @@
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.0" /> <property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.0" /> <property name="project.structure.side.proportion" value="0.0" />
<property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" /> <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
</component> </component>
<component name="ReactorSettings"> <component name="ReactorSettings">
<option name="notificationShown" value="true" /> <option name="notificationShown" value="true" />
@ -184,7 +96,8 @@
<workItem from="1722836329682" duration="9611000" /> <workItem from="1722836329682" duration="9611000" />
<workItem from="1722902153713" duration="25139000" /> <workItem from="1722902153713" duration="25139000" />
<workItem from="1722934128238" duration="2182000" /> <workItem from="1722934128238" duration="2182000" />
<workItem from="1722988626839" duration="16300000" /> <workItem from="1722988626839" duration="17971000" />
<workItem from="1723017804486" duration="1282000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -196,11 +109,11 @@
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state x="2120" y="23" key="#Project_Structure/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722590259734" /> <state x="2120" y="23" key="#Project_Structure/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722590259734" />
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser" timestamp="1722921565119"> <state x="2494" y="176" key="#com.intellij.ide.util.MemberChooser" timestamp="1723017851339">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722921565119" /> <state x="765" y="203" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722921565119" />
<state x="2494" y="176" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722904400708" /> <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="2215" y="10" key="CommitChangelistDialog2" timestamp="1722590562023"> <state x="2215" y="10" key="CommitChangelistDialog2" timestamp="1722590562023">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
@ -210,70 +123,71 @@
</state> </state>
<state width="1090" height="539" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997368961" /> <state width="1090" height="539" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997368961" />
<state width="360" height="466" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820599424" /> <state width="360" height="466" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820599424" />
<state x="740" y="274" key="FileChooserDialogImpl" timestamp="1722996900988"> <state x="2475" y="237" key="FileChooserDialogImpl" timestamp="1723017044285">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722996900988" /> <state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722996900988" />
<state width="1396" height="132" key="GridCell.Tab.0.bottom" timestamp="1723015684455"> <state x="2475" y="237" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017044285" />
<state width="1396" height="200" key="GridCell.Tab.0.bottom" timestamp="1723018787238">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="132" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723015684455" /> <state width="1396" height="200" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" />
<state width="1396" height="132" key="GridCell.Tab.0.center" timestamp="1723015684454"> <state width="1396" height="200" key="GridCell.Tab.0.center" timestamp="1723018787238">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224730" /> <state width="1876" height="272" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224730" />
<state width="1396" height="132" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723015684454" /> <state width="1396" height="200" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" />
<state width="1396" height="132" key="GridCell.Tab.0.left" timestamp="1723015684452"> <state width="1396" height="200" key="GridCell.Tab.0.left" timestamp="1723018787237">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224730" /> <state width="1876" height="272" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224730" />
<state width="1396" height="132" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723015684452" /> <state width="1396" height="200" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787237" />
<state width="1396" height="132" key="GridCell.Tab.0.right" timestamp="1723015684455"> <state width="1396" height="200" key="GridCell.Tab.0.right" timestamp="1723018787238">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="132" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723015684455" /> <state width="1396" height="200" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" />
<state width="1396" height="132" key="GridCell.Tab.1.bottom" timestamp="1723015684456"> <state width="1396" height="200" key="GridCell.Tab.1.bottom" timestamp="1723018787238">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="132" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723015684456" /> <state width="1396" height="200" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" />
<state width="1396" height="132" key="GridCell.Tab.1.center" timestamp="1723015684455"> <state width="1396" height="200" key="GridCell.Tab.1.center" timestamp="1723018787238">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="132" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723015684455" /> <state width="1396" height="200" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" />
<state width="1396" height="132" key="GridCell.Tab.1.left" timestamp="1723015684455"> <state width="1396" height="200" key="GridCell.Tab.1.left" timestamp="1723018787238">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="132" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723015684455" /> <state width="1396" height="200" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" />
<state width="1396" height="132" key="GridCell.Tab.1.right" timestamp="1723015684456"> <state width="1396" height="200" key="GridCell.Tab.1.right" timestamp="1723018787238">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="132" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723015684456" /> <state width="1396" height="200" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" />
<state width="1876" height="288" key="GridCell.Tab.2.bottom" timestamp="1722997386056"> <state width="1876" height="288" key="GridCell.Tab.2.bottom" timestamp="1723017774091">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="288" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386056" /> <state width="1876" height="288" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386056" />
<state width="1396" height="241" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722933584937" /> <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="1722997386055"> <state width="1876" height="288" key="GridCell.Tab.2.center" timestamp="1723017774091">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="288" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386055" /> <state width="1876" height="288" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386055" />
<state width="1396" height="241" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722933584937" /> <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="1722997386055"> <state width="1876" height="288" key="GridCell.Tab.2.left" timestamp="1723017774091">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="288" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386055" /> <state width="1876" height="288" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386055" />
<state width="1396" height="241" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722933584937" /> <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="1722997386056"> <state width="1876" height="288" key="GridCell.Tab.2.right" timestamp="1723017774091">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="288" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386056" /> <state width="1876" height="288" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386056" />
<state width="1396" height="241" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722933584937" /> <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"> <state x="2203" y="104" key="Maven.ArtifactSearchDialog" timestamp="1722820075785">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
@ -282,10 +196,10 @@
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state x="2378" y="150" key="RollbackChangesDialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820179295" /> <state x="2378" y="150" key="RollbackChangesDialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820179295" />
<state x="2141" y="81" key="SettingsEditor" timestamp="1722819924883"> <state x="2141" y="81" key="SettingsEditor" timestamp="1723015834754">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state x="2141" y="81" key="SettingsEditor/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722819924883" /> <state x="2141" y="81" key="SettingsEditor/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723015834754" />
<state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1722924775619"> <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1722924775619">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
@ -294,16 +208,20 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="753" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722823330683" /> <state x="753" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722823330683" />
<state x="522" y="0" width="1065" height="875" maximized="true" key="dock-window-1" timestamp="1722993875449"> <state x="295" y="0" width="965" height="875" maximized="true" key="dock-window-1" timestamp="1723017838407">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="1920" y="0" width="1456" height="771" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722923639492" /> <state x="1920" y="0" width="1456" height="771" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722923639492" />
<state x="522" y="0" width="1065" height="875" maximized="true" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722993875449" /> <state x="295" y="0" width="965" height="875" maximized="true" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017838407" />
<state x="1920" y="0" width="1319" height="713" maximized="true" key="dock-window-2" timestamp="1722931557810"> <state x="222" y="0" width="1213" height="875" maximized="true" key="dock-window-2" timestamp="1723018653242">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="1920" y="0" width="1319" height="713" maximized="true" key="dock-window-2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722926898762" /> <state x="1920" y="0" width="1319" height="713" maximized="true" key="dock-window-2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722926898762" />
<state x="1920" y="0" width="1319" height="713" maximized="true" key="dock-window-2/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722931557810" /> <state x="222" y="0" width="1213" height="875" maximized="true" key="dock-window-2/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018653242" />
<state x="597" y="332" width="1083" height="875" key="dock-window-3" timestamp="1723017774201">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="597" y="332" width="1083" height="875" key="dock-window-3/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774201" />
<state x="2342" y="158" width="596" height="584" key="find.popup" timestamp="1722992434648"> <state x="2342" y="158" width="596" height="584" key="find.popup" timestamp="1722992434648">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>

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

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class
View File

Binary file not shown.

7
ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java
View File

@ -134,6 +134,10 @@ public class Authorize extends BaseEntity
@DataName(name = "副总审批状态",readConverterExp="0=待提交,1=审批中,2=已完成,3=已驳回") @DataName(name = "副总审批状态",readConverterExp="0=待提交,1=审批中,2=已完成,3=已驳回")
private String doaOaApprovalStatus; private String doaOaApprovalStatus;
/** OA反馈说明 */
@DataName(name = "OA反馈说明")
private String doaOaRemark;
/** 提交经理审批(0-待提交 1-已提交) */ /** 提交经理审批(0-待提交 1-已提交) */
@DataName(name = "提交经理审批",readConverterExp="0=待提交,1=已提交") @DataName(name = "提交经理审批",readConverterExp="0=待提交,1=已提交")
private String doaJlApprovalStatus; private String doaJlApprovalStatus;
@ -361,6 +365,9 @@ public class Authorize extends BaseEntity
{ {
return doaApprovalStatus; return doaApprovalStatus;
} }
public String getDoaOaRemark() { return doaOaRemark; }
public void setDoaOaRemark(String doaOaRemark) { this.doaOaRemark = doaOaRemark; }
public void setDoaOaApprovalStatus(String doaOaApprovalStatus) public void setDoaOaApprovalStatus(String doaOaApprovalStatus)
{ {
this.doaOaApprovalStatus = doaOaApprovalStatus; this.doaOaApprovalStatus = doaOaApprovalStatus;

124
ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml
View File

@ -33,7 +33,8 @@
<result property="doaVicePresidentApproved" column="doa_vice_president_approved" /> <result property="doaVicePresidentApproved" column="doa_vice_president_approved" />
<result property="doaApprovalStatus" column="doa_approval_status" /> <result property="doaApprovalStatus" column="doa_approval_status" />
<result property="doaOaApprovalStatus" column="doa_oa_approval_status" /> <result property="doaOaApprovalStatus" column="doa_oa_approval_status" />
<result property="doaJlApprovalStatus" column="doa_jl_approval_status" /> <result property="doaOaRemark" column="doa_oa_remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createName" column="create_name" /> <result property="createName" column="create_name" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -52,7 +53,7 @@
a.doa_owner_unit, a.doa_generalcontract_unit, a.doa_subcontract_unit, a.doa_authorizer, a.doa_authorizer_phone, a.doa_owner_unit, a.doa_generalcontract_unit, a.doa_subcontract_unit, a.doa_authorizer, a.doa_authorizer_phone,
a.doa_authorizer_identification_number, a.doa_authorization_duration, a.doa_power_attorney_purpose, a.doa_authorizer_identification_number, a.doa_authorization_duration, a.doa_power_attorney_purpose,
a.doa_format, a.doa_remark, a.doa_rejection_reasons, a.doa_standardizer, a.doa_archiving, a.doa_vice_president_approved, a.doa_format, a.doa_remark, a.doa_rejection_reasons, a.doa_standardizer, a.doa_archiving, a.doa_vice_president_approved,
a.doa_approval_status, a.doa_oa_approval_status, a.doa_jl_approval_status, a.doa_approval_status, a.doa_oa_approval_status, a.doa_oa_remark, a.doa_jl_approval_status,
a.create_by, u.nick_name create_name, a.create_time, a.update_by, a.update_time a.create_by, u.nick_name create_name, a.create_time, a.update_by, a.update_time
from authorize a from authorize a
<include refid="authorizeJoins"/> <include refid="authorizeJoins"/>
@ -88,22 +89,22 @@
<if test="doaNumber != null">doa_number,</if> <if test="doaNumber != null">doa_number,</if>
<if test="doaSalesmanCode != null">doa_salesman_code,</if> <if test="doaSalesmanCode != null">doa_salesman_code,</if>
<if test="doaSalesmanBm != null">doa_salesman_bm,</if> <if test="doaSalesmanBm != null">doa_salesman_bm,</if>
<if test="doaSalesmanName != null and doaSalesmanName != ''">doa_salesman_name,</if> <if test="doaSalesmanName != null">doa_salesman_name,</if>
<if test="doaSalesmanDeptId != null">doa_salesman_dept_id,</if> <if test="doaSalesmanDeptId != null">doa_salesman_dept_id,</if>
<if test="doaSalesmanDeptName != null">doa_salesman_dept_name,</if> <if test="doaSalesmanDeptName != null">doa_salesman_dept_name,</if>
<if test="doaSalesmanPhone != null and doaSalesmanPhone != ''">doa_salesman_phone,</if> <if test="doaSalesmanPhone != null">doa_salesman_phone,</if>
<if test="doaProject != null and doaProject != ''">doa_project,</if> <if test="doaProject != null">doa_project,</if>
<if test="doaCustomerBm != null">doa_customer_bm,</if> <if test="doaCustomerBm != null">doa_customer_bm,</if>
<if test="doaCustomerName != null and doaCustomerName != ''">doa_customer_name,</if> <if test="doaCustomerName != null">doa_customer_name,</if>
<if test="doaOwnerUnit != null">doa_owner_unit,</if> <if test="doaOwnerUnit != null">doa_owner_unit,</if>
<if test="doaGeneralcontractUnit != null">doa_generalcontract_unit,</if> <if test="doaGeneralcontractUnit != null">doa_generalcontract_unit,</if>
<if test="doaSubcontractUnit != null">doa_subcontract_unit,</if> <if test="doaSubcontractUnit != null">doa_subcontract_unit,</if>
<if test="doaAuthorizer != null and doaAuthorizer != ''">doa_authorizer,</if> <if test="doaAuthorizer != null">doa_authorizer,</if>
<if test="doaAuthorizerPhone != null and doaAuthorizerPhone != ''">doa_authorizer_phone,</if> <if test="doaAuthorizerPhone != null">doa_authorizer_phone,</if>
<if test="doaAuthorizerIdentificationNumber != null and doaAuthorizerIdentificationNumber != ''">doa_authorizer_identification_number,</if> <if test="doaAuthorizerIdentificationNumber != null">doa_authorizer_identification_number,</if>
<if test="doaAuthorizationDuration != null">doa_authorization_duration,</if> <if test="doaAuthorizationDuration != null">doa_authorization_duration,</if>
<if test="doaPowerAttorneyPurpose != null and doaPowerAttorneyPurpose != ''">doa_power_attorney_purpose,</if> <if test="doaPowerAttorneyPurpose != null">doa_power_attorney_purpose,</if>
<if test="doaFormat != null and doaFormat != ''">doa_format,</if> <if test="doaFormat != null">doa_format,</if>
<if test="doaRemark != null">doa_remark,</if> <if test="doaRemark != null">doa_remark,</if>
<if test="doaRejectionReasons != null">doa_rejection_reasons,</if> <if test="doaRejectionReasons != null">doa_rejection_reasons,</if>
<if test="doaStandardizer != null">doa_standardizer,</if> <if test="doaStandardizer != null">doa_standardizer,</if>
@ -111,7 +112,8 @@
<if test="doaVicePresidentApproved != null">doa_vice_president_approved,</if> <if test="doaVicePresidentApproved != null">doa_vice_president_approved,</if>
<if test="doaApprovalStatus != null">doa_approval_status,</if> <if test="doaApprovalStatus != null">doa_approval_status,</if>
<if test="doaOaApprovalStatus != null">doa_oa_approval_status,</if> <if test="doaOaApprovalStatus != null">doa_oa_approval_status,</if>
<if test="doaJlApprovalStatus != null">doa_jl_approval_status,</if> <if test="doaOaRemark != null">doa_oa_remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
@ -123,22 +125,22 @@
<if test="doaNumber != null">#{doaNumber},</if> <if test="doaNumber != null">#{doaNumber},</if>
<if test="doaSalesmanCode != null">#{doaSalesmanCode},</if> <if test="doaSalesmanCode != null">#{doaSalesmanCode},</if>
<if test="doaSalesmanBm != null">#{doaSalesmanBm},</if> <if test="doaSalesmanBm != null">#{doaSalesmanBm},</if>
<if test="doaSalesmanName != null and doaSalesmanName != ''">#{doaSalesmanName},</if> <if test="doaSalesmanName != null">#{doaSalesmanName},</if>
<if test="doaSalesmanDeptId != null">#{doaSalesmanDeptId},</if> <if test="doaSalesmanDeptId != null">#{doaSalesmanDeptId},</if>
<if test="doaSalesmanDeptName != null">#{doaSalesmanDeptName},</if> <if test="doaSalesmanDeptName != null">#{doaSalesmanDeptName},</if>
<if test="doaSalesmanPhone != null and doaSalesmanPhone != ''">#{doaSalesmanPhone},</if> <if test="doaSalesmanPhone != null">#{doaSalesmanPhone},</if>
<if test="doaProject != null and doaProject != ''">#{doaProject},</if> <if test="doaProject != null">#{doaProject},</if>
<if test="doaCustomerBm != null">#{doaCustomerBm},</if> <if test="doaCustomerBm != null">#{doaCustomerBm},</if>
<if test="doaCustomerName != null and doaCustomerName != ''">#{doaCustomerName},</if> <if test="doaCustomerName != null">#{doaCustomerName},</if>
<if test="doaOwnerUnit != null">#{doaOwnerUnit},</if> <if test="doaOwnerUnit != null">#{doaOwnerUnit},</if>
<if test="doaGeneralcontractUnit != null">#{doaGeneralcontractUnit},</if> <if test="doaGeneralcontractUnit != null">#{doaGeneralcontractUnit},</if>
<if test="doaSubcontractUnit != null">#{doaSubcontractUnit},</if> <if test="doaSubcontractUnit != null">#{doaSubcontractUnit},</if>
<if test="doaAuthorizer != null and doaAuthorizer != ''">#{doaAuthorizer},</if> <if test="doaAuthorizer != null">#{doaAuthorizer},</if>
<if test="doaAuthorizerPhone != null and doaAuthorizerPhone != ''">#{doaAuthorizerPhone},</if> <if test="doaAuthorizerPhone != null">#{doaAuthorizerPhone},</if>
<if test="doaAuthorizerIdentificationNumber != null and doaAuthorizerIdentificationNumber != ''">#{doaAuthorizerIdentificationNumber},</if> <if test="doaAuthorizerIdentificationNumber != null">#{doaAuthorizerIdentificationNumber},</if>
<if test="doaAuthorizationDuration != null">#{doaAuthorizationDuration},</if> <if test="doaAuthorizationDuration != null">#{doaAuthorizationDuration},</if>
<if test="doaPowerAttorneyPurpose != null and doaPowerAttorneyPurpose != ''">#{doaPowerAttorneyPurpose},</if> <if test="doaPowerAttorneyPurpose != null">#{doaPowerAttorneyPurpose},</if>
<if test="doaFormat != null and doaFormat != ''">#{doaFormat},</if> <if test="doaFormat != null">#{doaFormat},</if>
<if test="doaRemark != null">#{doaRemark},</if> <if test="doaRemark != null">#{doaRemark},</if>
<if test="doaRejectionReasons != null">#{doaRejectionReasons},</if> <if test="doaRejectionReasons != null">#{doaRejectionReasons},</if>
<if test="doaStandardizer != null">#{doaStandardizer},</if> <if test="doaStandardizer != null">#{doaStandardizer},</if>
@ -146,7 +148,8 @@
<if test="doaVicePresidentApproved != null">#{doaVicePresidentApproved},</if> <if test="doaVicePresidentApproved != null">#{doaVicePresidentApproved},</if>
<if test="doaApprovalStatus != null">#{doaApprovalStatus},</if> <if test="doaApprovalStatus != null">#{doaApprovalStatus},</if>
<if test="doaOaApprovalStatus != null">#{doaOaApprovalStatus},</if> <if test="doaOaApprovalStatus != null">#{doaOaApprovalStatus},</if>
<if test="doaJlApprovalStatus != null">#{doaJlApprovalStatus},</if> <if test="doaOaRemark != null">#{doaOaRemark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
@ -157,58 +160,58 @@
<insert id="insertSysOAAuthorize" parameterType="SysOaAuthorize"> <insert id="insertSysOAAuthorize" parameterType="SysOaAuthorize">
insert into sys_oa_authorize insert into sys_oa_authorize
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="userId != null and userId != ''">user_id,</if> <if test="userId != null">user_id,</if>
<if test="departmentId != null and departmentId != ''">department_id,</if> <if test="departmentId != null">department_id,</if>
<if test="submissionTime != null and submissionTime != ''">submission_time,</if> <if test="submissionTime != null">submission_time,</if>
<if test="doaId != null">doa_id,</if> <if test="doaId != null">doa_id,</if>
<if test="doaCode != null">doa_code,</if> <if test="doaCode != null">doa_code,</if>
<if test="doaSalesmanName != null and doaSalesmanName != ''">doa_salesman_name,</if> <if test="doaSalesmanName != null">doa_salesman_name,</if>
<if test="doaSalesmanPhone != null and doaSalesmanPhone != ''">doa_salesman_phone,</if> <if test="doaSalesmanPhone != null">doa_salesman_phone,</if>
<if test="doaProject != null and doaProject != ''">doa_project,</if> <if test="doaProject != null">doa_project,</if>
<if test="doaCustomerName != null and doaCustomerName != ''">doa_customer_name,</if> <if test="doaCustomerName != null">doa_customer_name,</if>
<if test="doaOwnerUnit != null">doa_owner_unit,</if> <if test="doaOwnerUnit != null">doa_owner_unit,</if>
<if test="doaGeneralcontractUnit != null">doa_generalcontract_unit,</if> <if test="doaGeneralcontractUnit != null">doa_generalcontract_unit,</if>
<if test="doaSubcontractUnit != null">doa_subcontract_unit,</if> <if test="doaSubcontractUnit != null">doa_subcontract_unit,</if>
<if test="doaAuthorizer != null and doaAuthorizer != ''">doa_authorizer,</if> <if test="doaAuthorizer != null">doa_authorizer,</if>
<if test="doaAuthorizerPhone != null and doaAuthorizerPhone != ''">doa_authorizer_phone,</if> <if test="doaAuthorizerPhone != null">doa_authorizer_phone,</if>
<if test="doaAuthorizerIdentificationNumber != null and doaAuthorizerIdentificationNumber != ''">doa_authorizer_identification_number,</if> <if test="doaAuthorizerIdentificationNumber != null">doa_authorizer_identification_number,</if>
<if test="doaAuthorizationDuration != null">doa_authorization_duration,</if> <if test="doaAuthorizationDuration != null">doa_authorization_duration,</if>
<if test="doaPowerAttorneyPurpose != null and doaPowerAttorneyPurpose != ''">doa_power_attorney_purpose,</if> <if test="doaPowerAttorneyPurpose != null">doa_power_attorney_purpose,</if>
<if test="doaFormat != null and doaFormat != ''">doa_format,</if> <if test="doaFormat != null">doa_format,</if>
<if test="doaRemark != null">doa_remark,</if> <if test="doaRemark != null">doa_remark,</if>
<if test="doaStandardizer != null">doa_standardizer,</if> <if test="doaStandardizer != null">doa_standardizer,</if>
<if test="doaArchiving != null">doa_archiving,</if> <if test="doaArchiving != null">doa_archiving,</if>
<if test="doaVicePresidentApproved != null">doa_vice_president_approved,</if> <if test="doaVicePresidentApproved != null">doa_vice_president_approved,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="fileAddress != null and fileAddress != ''">file_address,</if> <if test="fileAddress != null">file_address,</if>
<if test="isFinish != null and isFinish != ''">isFinish,</if> <if test="isFinish != null">isFinish,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null and userId != ''">#{userId},</if> <if test="userId != null">#{userId},</if>
<if test="departmentId != null and departmentId != ''">#{departmentId},</if> <if test="departmentId != null">#{departmentId},</if>
<if test="submissionTime != null and submissionTime != ''">#{submissionTime},</if> <if test="submissionTime != null">#{submissionTime},</if>
<if test="doaId != null">#{doaId},</if> <if test="doaId != null">#{doaId},</if>
<if test="doaCode != null">#{doaCode},</if> <if test="doaCode != null">#{doaCode},</if>
<if test="doaSalesmanName != null and doaSalesmanName != ''">#{doaSalesmanName},</if> <if test="doaSalesmanName != null">#{doaSalesmanName},</if>
<if test="doaSalesmanPhone != null and doaSalesmanPhone != ''">#{doaSalesmanPhone},</if> <if test="doaSalesmanPhone != null">#{doaSalesmanPhone},</if>
<if test="doaProject != null and doaProject != ''">#{doaProject},</if> <if test="doaProject != null">#{doaProject},</if>
<if test="doaCustomerName != null and doaCustomerName != ''">#{doaCustomerName},</if> <if test="doaCustomerName != null">#{doaCustomerName},</if>
<if test="doaOwnerUnit != null">#{doaOwnerUnit},</if> <if test="doaOwnerUnit != null">#{doaOwnerUnit},</if>
<if test="doaGeneralcontractUnit != null">#{doaGeneralcontractUnit},</if> <if test="doaGeneralcontractUnit != null">#{doaGeneralcontractUnit},</if>
<if test="doaSubcontractUnit != null">#{doaSubcontractUnit},</if> <if test="doaSubcontractUnit != null">#{doaSubcontractUnit},</if>
<if test="doaAuthorizer != null and doaAuthorizer != ''">#{doaAuthorizer},</if> <if test="doaAuthorizer != null">#{doaAuthorizer},</if>
<if test="doaAuthorizerPhone != null and doaAuthorizerPhone != ''">#{doaAuthorizerPhone},</if> <if test="doaAuthorizerPhone != null">#{doaAuthorizerPhone},</if>
<if test="doaAuthorizerIdentificationNumber != null and doaAuthorizerIdentificationNumber != ''">#{doaAuthorizerIdentificationNumber},</if> <if test="doaAuthorizerIdentificationNumber != null">#{doaAuthorizerIdentificationNumber},</if>
<if test="doaAuthorizationDuration != null">#{doaAuthorizationDuration},</if> <if test="doaAuthorizationDuration != null">#{doaAuthorizationDuration},</if>
<if test="doaPowerAttorneyPurpose != null and doaPowerAttorneyPurpose != ''">#{doaPowerAttorneyPurpose},</if> <if test="doaPowerAttorneyPurpose != null">#{doaPowerAttorneyPurpose},</if>
<if test="doaFormat != null and doaFormat != ''">#{doaFormat},</if> <if test="doaFormat != null">#{doaFormat},</if>
<if test="doaRemark != null">#{doaRemark},</if> <if test="doaRemark != null">#{doaRemark},</if>
<if test="doaStandardizer != null">#{doaStandardizer},</if> <if test="doaStandardizer != null">#{doaStandardizer},</if>
<if test="doaArchiving != null">#{doaArchiving},</if> <if test="doaArchiving != null">#{doaArchiving},</if>
<if test="doaVicePresidentApproved != null">#{doaVicePresidentApproved},</if> <if test="doaVicePresidentApproved != null">#{doaVicePresidentApproved},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="fileAddress != null and fileAddress != ''">#{fileAddress},</if> <if test="fileAddress != null">#{fileAddress},</if>
<if test="isFinish != null and isFinish != ''">#{isFinish},</if> <if test="isFinish != null">#{isFinish},</if>
</trim> </trim>
</insert> </insert>
@ -219,22 +222,22 @@
<if test="doaNumber != null">doa_number = #{doaNumber},</if> <if test="doaNumber != null">doa_number = #{doaNumber},</if>
<if test="doaSalesmanCode != null">doa_salesman_code = #{doaSalesmanCode},</if> <if test="doaSalesmanCode != null">doa_salesman_code = #{doaSalesmanCode},</if>
<if test="doaSalesmanBm != null">doa_salesman_bm = #{doaSalesmanBm},</if> <if test="doaSalesmanBm != null">doa_salesman_bm = #{doaSalesmanBm},</if>
<if test="doaSalesmanName != null and doaSalesmanName != ''">doa_salesman_name = #{doaSalesmanName},</if> <if test="doaSalesmanName != null">doa_salesman_name = #{doaSalesmanName},</if>
<if test="doaSalesmanDeptId != null">doa_salesman_dept_id = #{doaSalesmanDeptId},</if> <if test="doaSalesmanDeptId != null">doa_salesman_dept_id = #{doaSalesmanDeptId},</if>
<if test="doaSalesmanDeptName != null">doa_salesman_dept_name = #{doaSalesmanDeptName},</if> <if test="doaSalesmanDeptName != null">doa_salesman_dept_name = #{doaSalesmanDeptName},</if>
<if test="doaSalesmanPhone != null and doaSalesmanPhone != ''">doa_salesman_phone = #{doaSalesmanPhone},</if> <if test="doaSalesmanPhone != null">doa_salesman_phone = #{doaSalesmanPhone},</if>
<if test="doaProject != null and doaProject != ''">doa_project = #{doaProject},</if> <if test="doaProject != null">doa_project = #{doaProject},</if>
<if test="doaCustomerBm != null">doa_customer_bm = #{doaCustomerBm},</if> <if test="doaCustomerBm != null">doa_customer_bm = #{doaCustomerBm},</if>
<if test="doaCustomerName != null and doaCustomerName != ''">doa_customer_name = #{doaCustomerName},</if> <if test="doaCustomerName != null">doa_customer_name = #{doaCustomerName},</if>
<if test="doaOwnerUnit != null">doa_owner_unit = #{doaOwnerUnit},</if> <if test="doaOwnerUnit != null">doa_owner_unit = #{doaOwnerUnit},</if>
<if test="doaGeneralcontractUnit != null">doa_generalcontract_unit = #{doaGeneralcontractUnit},</if> <if test="doaGeneralcontractUnit != null">doa_generalcontract_unit = #{doaGeneralcontractUnit},</if>
<if test="doaSubcontractUnit != null">doa_subcontract_unit = #{doaSubcontractUnit},</if> <if test="doaSubcontractUnit != null">doa_subcontract_unit = #{doaSubcontractUnit},</if>
<if test="doaAuthorizer != null and doaAuthorizer != ''">doa_authorizer = #{doaAuthorizer},</if> <if test="doaAuthorizer != null">doa_authorizer = #{doaAuthorizer},</if>
<if test="doaAuthorizerPhone != null and doaAuthorizerPhone != ''">doa_authorizer_phone = #{doaAuthorizerPhone},</if> <if test="doaAuthorizerPhone != null">doa_authorizer_phone = #{doaAuthorizerPhone},</if>
<if test="doaAuthorizerIdentificationNumber != null and doaAuthorizerIdentificationNumber != ''">doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber},</if> <if test="doaAuthorizerIdentificationNumber != null">doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber},</if>
<if test="doaAuthorizationDuration != null">doa_authorization_duration = #{doaAuthorizationDuration},</if> <if test="doaAuthorizationDuration != null">doa_authorization_duration = #{doaAuthorizationDuration},</if>
<if test="doaPowerAttorneyPurpose != null and doaPowerAttorneyPurpose != ''">doa_power_attorney_purpose = #{doaPowerAttorneyPurpose},</if> <if test="doaPowerAttorneyPurpose != null">doa_power_attorney_purpose = #{doaPowerAttorneyPurpose},</if>
<if test="doaFormat != null and doaFormat != ''">doa_format = #{doaFormat},</if> <if test="doaFormat != null">doa_format = #{doaFormat},</if>
<if test="doaRemark != null">doa_remark = #{doaRemark},</if> <if test="doaRemark != null">doa_remark = #{doaRemark},</if>
<if test="doaRejectionReasons != null">doa_rejection_reasons = #{doaRejectionReasons},</if> <if test="doaRejectionReasons != null">doa_rejection_reasons = #{doaRejectionReasons},</if>
<if test="doaStandardizer != null">doa_standardizer = #{doaStandardizer},</if> <if test="doaStandardizer != null">doa_standardizer = #{doaStandardizer},</if>
@ -242,7 +245,8 @@
<if test="doaVicePresidentApproved != null">doa_vice_president_approved = #{doaVicePresidentApproved},</if> <if test="doaVicePresidentApproved != null">doa_vice_president_approved = #{doaVicePresidentApproved},</if>
<if test="doaApprovalStatus != null">doa_approval_status = #{doaApprovalStatus},</if> <if test="doaApprovalStatus != null">doa_approval_status = #{doaApprovalStatus},</if>
<if test="doaOaApprovalStatus != null">doa_oa_approval_status = #{doaOaApprovalStatus},</if> <if test="doaOaApprovalStatus != null">doa_oa_approval_status = #{doaOaApprovalStatus},</if>
<if test="doaJlApprovalStatus != null">doa_jl_approval_status = #{doaJlApprovalStatus},</if> <if test="doaOaRemark != null">doa_oa_remark = #{doaOaRemark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>

BIN
ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class
View File

Binary file not shown.

120
ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml
View File

@ -34,6 +34,8 @@
<result property="doaApprovalStatus" column="doa_approval_status" /> <result property="doaApprovalStatus" column="doa_approval_status" />
<result property="doaOaApprovalStatus" column="doa_oa_approval_status" /> <result property="doaOaApprovalStatus" column="doa_oa_approval_status" />
<result property="doaJlApprovalStatus" column="doa_jl_approval_status" /> <result property="doaJlApprovalStatus" column="doa_jl_approval_status" />
<result property="doaOaRemark" column="doa_oa_remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createName" column="create_name" /> <result property="createName" column="create_name" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -52,7 +54,7 @@
a.doa_owner_unit, a.doa_generalcontract_unit, a.doa_subcontract_unit, a.doa_authorizer, a.doa_authorizer_phone, a.doa_owner_unit, a.doa_generalcontract_unit, a.doa_subcontract_unit, a.doa_authorizer, a.doa_authorizer_phone,
a.doa_authorizer_identification_number, a.doa_authorization_duration, a.doa_power_attorney_purpose, a.doa_authorizer_identification_number, a.doa_authorization_duration, a.doa_power_attorney_purpose,
a.doa_format, a.doa_remark, a.doa_rejection_reasons, a.doa_standardizer, a.doa_archiving, a.doa_vice_president_approved, a.doa_format, a.doa_remark, a.doa_rejection_reasons, a.doa_standardizer, a.doa_archiving, a.doa_vice_president_approved,
a.doa_approval_status, a.doa_oa_approval_status, a.doa_jl_approval_status, a.doa_approval_status, a.doa_oa_approval_status, a.doa_oa_remark, a.doa_jl_approval_status,
a.create_by, u.nick_name create_name, a.create_time, a.update_by, a.update_time a.create_by, u.nick_name create_name, a.create_time, a.update_by, a.update_time
from authorize a from authorize a
<include refid="authorizeJoins"/> <include refid="authorizeJoins"/>
@ -88,22 +90,22 @@
<if test="doaNumber != null">doa_number,</if> <if test="doaNumber != null">doa_number,</if>
<if test="doaSalesmanCode != null">doa_salesman_code,</if> <if test="doaSalesmanCode != null">doa_salesman_code,</if>
<if test="doaSalesmanBm != null">doa_salesman_bm,</if> <if test="doaSalesmanBm != null">doa_salesman_bm,</if>
<if test="doaSalesmanName != null and doaSalesmanName != ''">doa_salesman_name,</if> <if test="doaSalesmanName != null">doa_salesman_name,</if>
<if test="doaSalesmanDeptId != null">doa_salesman_dept_id,</if> <if test="doaSalesmanDeptId != null">doa_salesman_dept_id,</if>
<if test="doaSalesmanDeptName != null">doa_salesman_dept_name,</if> <if test="doaSalesmanDeptName != null">doa_salesman_dept_name,</if>
<if test="doaSalesmanPhone != null and doaSalesmanPhone != ''">doa_salesman_phone,</if> <if test="doaSalesmanPhone != null">doa_salesman_phone,</if>
<if test="doaProject != null and doaProject != ''">doa_project,</if> <if test="doaProject != null">doa_project,</if>
<if test="doaCustomerBm != null">doa_customer_bm,</if> <if test="doaCustomerBm != null">doa_customer_bm,</if>
<if test="doaCustomerName != null and doaCustomerName != ''">doa_customer_name,</if> <if test="doaCustomerName != null">doa_customer_name,</if>
<if test="doaOwnerUnit != null">doa_owner_unit,</if> <if test="doaOwnerUnit != null">doa_owner_unit,</if>
<if test="doaGeneralcontractUnit != null">doa_generalcontract_unit,</if> <if test="doaGeneralcontractUnit != null">doa_generalcontract_unit,</if>
<if test="doaSubcontractUnit != null">doa_subcontract_unit,</if> <if test="doaSubcontractUnit != null">doa_subcontract_unit,</if>
<if test="doaAuthorizer != null and doaAuthorizer != ''">doa_authorizer,</if> <if test="doaAuthorizer != null">doa_authorizer,</if>
<if test="doaAuthorizerPhone != null and doaAuthorizerPhone != ''">doa_authorizer_phone,</if> <if test="doaAuthorizerPhone != null">doa_authorizer_phone,</if>
<if test="doaAuthorizerIdentificationNumber != null and doaAuthorizerIdentificationNumber != ''">doa_authorizer_identification_number,</if> <if test="doaAuthorizerIdentificationNumber != null">doa_authorizer_identification_number,</if>
<if test="doaAuthorizationDuration != null">doa_authorization_duration,</if> <if test="doaAuthorizationDuration != null">doa_authorization_duration,</if>
<if test="doaPowerAttorneyPurpose != null and doaPowerAttorneyPurpose != ''">doa_power_attorney_purpose,</if> <if test="doaPowerAttorneyPurpose != null">doa_power_attorney_purpose,</if>
<if test="doaFormat != null and doaFormat != ''">doa_format,</if> <if test="doaFormat != null">doa_format,</if>
<if test="doaRemark != null">doa_remark,</if> <if test="doaRemark != null">doa_remark,</if>
<if test="doaRejectionReasons != null">doa_rejection_reasons,</if> <if test="doaRejectionReasons != null">doa_rejection_reasons,</if>
<if test="doaStandardizer != null">doa_standardizer,</if> <if test="doaStandardizer != null">doa_standardizer,</if>
@ -112,6 +114,8 @@
<if test="doaApprovalStatus != null">doa_approval_status,</if> <if test="doaApprovalStatus != null">doa_approval_status,</if>
<if test="doaOaApprovalStatus != null">doa_oa_approval_status,</if> <if test="doaOaApprovalStatus != null">doa_oa_approval_status,</if>
<if test="doaJlApprovalStatus != null">doa_jl_approval_status,</if> <if test="doaJlApprovalStatus != null">doa_jl_approval_status,</if>
<if test="doaOaRemark != null">doa_oa_remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
@ -123,22 +127,22 @@
<if test="doaNumber != null">#{doaNumber},</if> <if test="doaNumber != null">#{doaNumber},</if>
<if test="doaSalesmanCode != null">#{doaSalesmanCode},</if> <if test="doaSalesmanCode != null">#{doaSalesmanCode},</if>
<if test="doaSalesmanBm != null">#{doaSalesmanBm},</if> <if test="doaSalesmanBm != null">#{doaSalesmanBm},</if>
<if test="doaSalesmanName != null and doaSalesmanName != ''">#{doaSalesmanName},</if> <if test="doaSalesmanName != null">#{doaSalesmanName},</if>
<if test="doaSalesmanDeptId != null">#{doaSalesmanDeptId},</if> <if test="doaSalesmanDeptId != null">#{doaSalesmanDeptId},</if>
<if test="doaSalesmanDeptName != null">#{doaSalesmanDeptName},</if> <if test="doaSalesmanDeptName != null">#{doaSalesmanDeptName},</if>
<if test="doaSalesmanPhone != null and doaSalesmanPhone != ''">#{doaSalesmanPhone},</if> <if test="doaSalesmanPhone != null">#{doaSalesmanPhone},</if>
<if test="doaProject != null and doaProject != ''">#{doaProject},</if> <if test="doaProject != null">#{doaProject},</if>
<if test="doaCustomerBm != null">#{doaCustomerBm},</if> <if test="doaCustomerBm != null">#{doaCustomerBm},</if>
<if test="doaCustomerName != null and doaCustomerName != ''">#{doaCustomerName},</if> <if test="doaCustomerName != null">#{doaCustomerName},</if>
<if test="doaOwnerUnit != null">#{doaOwnerUnit},</if> <if test="doaOwnerUnit != null">#{doaOwnerUnit},</if>
<if test="doaGeneralcontractUnit != null">#{doaGeneralcontractUnit},</if> <if test="doaGeneralcontractUnit != null">#{doaGeneralcontractUnit},</if>
<if test="doaSubcontractUnit != null">#{doaSubcontractUnit},</if> <if test="doaSubcontractUnit != null">#{doaSubcontractUnit},</if>
<if test="doaAuthorizer != null and doaAuthorizer != ''">#{doaAuthorizer},</if> <if test="doaAuthorizer != null">#{doaAuthorizer},</if>
<if test="doaAuthorizerPhone != null and doaAuthorizerPhone != ''">#{doaAuthorizerPhone},</if> <if test="doaAuthorizerPhone != null">#{doaAuthorizerPhone},</if>
<if test="doaAuthorizerIdentificationNumber != null and doaAuthorizerIdentificationNumber != ''">#{doaAuthorizerIdentificationNumber},</if> <if test="doaAuthorizerIdentificationNumber != null">#{doaAuthorizerIdentificationNumber},</if>
<if test="doaAuthorizationDuration != null">#{doaAuthorizationDuration},</if> <if test="doaAuthorizationDuration != null">#{doaAuthorizationDuration},</if>
<if test="doaPowerAttorneyPurpose != null and doaPowerAttorneyPurpose != ''">#{doaPowerAttorneyPurpose},</if> <if test="doaPowerAttorneyPurpose != null">#{doaPowerAttorneyPurpose},</if>
<if test="doaFormat != null and doaFormat != ''">#{doaFormat},</if> <if test="doaFormat != null">#{doaFormat},</if>
<if test="doaRemark != null">#{doaRemark},</if> <if test="doaRemark != null">#{doaRemark},</if>
<if test="doaRejectionReasons != null">#{doaRejectionReasons},</if> <if test="doaRejectionReasons != null">#{doaRejectionReasons},</if>
<if test="doaStandardizer != null">#{doaStandardizer},</if> <if test="doaStandardizer != null">#{doaStandardizer},</if>
@ -147,6 +151,8 @@
<if test="doaApprovalStatus != null">#{doaApprovalStatus},</if> <if test="doaApprovalStatus != null">#{doaApprovalStatus},</if>
<if test="doaOaApprovalStatus != null">#{doaOaApprovalStatus},</if> <if test="doaOaApprovalStatus != null">#{doaOaApprovalStatus},</if>
<if test="doaJlApprovalStatus != null">#{doaJlApprovalStatus},</if> <if test="doaJlApprovalStatus != null">#{doaJlApprovalStatus},</if>
<if test="doaOaRemark != null">#{doaOaRemark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
@ -157,58 +163,58 @@
<insert id="insertSysOAAuthorize" parameterType="SysOaAuthorize"> <insert id="insertSysOAAuthorize" parameterType="SysOaAuthorize">
insert into sys_oa_authorize insert into sys_oa_authorize
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="userId != null and userId != ''">user_id,</if> <if test="userId != null">user_id,</if>
<if test="departmentId != null and departmentId != ''">department_id,</if> <if test="departmentId != null">department_id,</if>
<if test="submissionTime != null and submissionTime != ''">submission_time,</if> <if test="submissionTime != null">submission_time,</if>
<if test="doaId != null">doa_id,</if> <if test="doaId != null">doa_id,</if>
<if test="doaCode != null">doa_code,</if> <if test="doaCode != null">doa_code,</if>
<if test="doaSalesmanName != null and doaSalesmanName != ''">doa_salesman_name,</if> <if test="doaSalesmanName != null">doa_salesman_name,</if>
<if test="doaSalesmanPhone != null and doaSalesmanPhone != ''">doa_salesman_phone,</if> <if test="doaSalesmanPhone != null">doa_salesman_phone,</if>
<if test="doaProject != null and doaProject != ''">doa_project,</if> <if test="doaProject != null">doa_project,</if>
<if test="doaCustomerName != null and doaCustomerName != ''">doa_customer_name,</if> <if test="doaCustomerName != null">doa_customer_name,</if>
<if test="doaOwnerUnit != null">doa_owner_unit,</if> <if test="doaOwnerUnit != null">doa_owner_unit,</if>
<if test="doaGeneralcontractUnit != null">doa_generalcontract_unit,</if> <if test="doaGeneralcontractUnit != null">doa_generalcontract_unit,</if>
<if test="doaSubcontractUnit != null">doa_subcontract_unit,</if> <if test="doaSubcontractUnit != null">doa_subcontract_unit,</if>
<if test="doaAuthorizer != null and doaAuthorizer != ''">doa_authorizer,</if> <if test="doaAuthorizer != null">doa_authorizer,</if>
<if test="doaAuthorizerPhone != null and doaAuthorizerPhone != ''">doa_authorizer_phone,</if> <if test="doaAuthorizerPhone != null">doa_authorizer_phone,</if>
<if test="doaAuthorizerIdentificationNumber != null and doaAuthorizerIdentificationNumber != ''">doa_authorizer_identification_number,</if> <if test="doaAuthorizerIdentificationNumber != null">doa_authorizer_identification_number,</if>
<if test="doaAuthorizationDuration != null">doa_authorization_duration,</if> <if test="doaAuthorizationDuration != null">doa_authorization_duration,</if>
<if test="doaPowerAttorneyPurpose != null and doaPowerAttorneyPurpose != ''">doa_power_attorney_purpose,</if> <if test="doaPowerAttorneyPurpose != null">doa_power_attorney_purpose,</if>
<if test="doaFormat != null and doaFormat != ''">doa_format,</if> <if test="doaFormat != null">doa_format,</if>
<if test="doaRemark != null">doa_remark,</if> <if test="doaRemark != null">doa_remark,</if>
<if test="doaStandardizer != null">doa_standardizer,</if> <if test="doaStandardizer != null">doa_standardizer,</if>
<if test="doaArchiving != null">doa_archiving,</if> <if test="doaArchiving != null">doa_archiving,</if>
<if test="doaVicePresidentApproved != null">doa_vice_president_approved,</if> <if test="doaVicePresidentApproved != null">doa_vice_president_approved,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="fileAddress != null and fileAddress != ''">file_address,</if> <if test="fileAddress != null">file_address,</if>
<if test="isFinish != null and isFinish != ''">isFinish,</if> <if test="isFinish != null">isFinish,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null and userId != ''">#{userId},</if> <if test="userId != null">#{userId},</if>
<if test="departmentId != null and departmentId != ''">#{departmentId},</if> <if test="departmentId != null">#{departmentId},</if>
<if test="submissionTime != null and submissionTime != ''">#{submissionTime},</if> <if test="submissionTime != null">#{submissionTime},</if>
<if test="doaId != null">#{doaId},</if> <if test="doaId != null">#{doaId},</if>
<if test="doaCode != null">#{doaCode},</if> <if test="doaCode != null">#{doaCode},</if>
<if test="doaSalesmanName != null and doaSalesmanName != ''">#{doaSalesmanName},</if> <if test="doaSalesmanName != null">#{doaSalesmanName},</if>
<if test="doaSalesmanPhone != null and doaSalesmanPhone != ''">#{doaSalesmanPhone},</if> <if test="doaSalesmanPhone != null">#{doaSalesmanPhone},</if>
<if test="doaProject != null and doaProject != ''">#{doaProject},</if> <if test="doaProject != null">#{doaProject},</if>
<if test="doaCustomerName != null and doaCustomerName != ''">#{doaCustomerName},</if> <if test="doaCustomerName != null">#{doaCustomerName},</if>
<if test="doaOwnerUnit != null">#{doaOwnerUnit},</if> <if test="doaOwnerUnit != null">#{doaOwnerUnit},</if>
<if test="doaGeneralcontractUnit != null">#{doaGeneralcontractUnit},</if> <if test="doaGeneralcontractUnit != null">#{doaGeneralcontractUnit},</if>
<if test="doaSubcontractUnit != null">#{doaSubcontractUnit},</if> <if test="doaSubcontractUnit != null">#{doaSubcontractUnit},</if>
<if test="doaAuthorizer != null and doaAuthorizer != ''">#{doaAuthorizer},</if> <if test="doaAuthorizer != null">#{doaAuthorizer},</if>
<if test="doaAuthorizerPhone != null and doaAuthorizerPhone != ''">#{doaAuthorizerPhone},</if> <if test="doaAuthorizerPhone != null">#{doaAuthorizerPhone},</if>
<if test="doaAuthorizerIdentificationNumber != null and doaAuthorizerIdentificationNumber != ''">#{doaAuthorizerIdentificationNumber},</if> <if test="doaAuthorizerIdentificationNumber != null">#{doaAuthorizerIdentificationNumber},</if>
<if test="doaAuthorizationDuration != null">#{doaAuthorizationDuration},</if> <if test="doaAuthorizationDuration != null">#{doaAuthorizationDuration},</if>
<if test="doaPowerAttorneyPurpose != null and doaPowerAttorneyPurpose != ''">#{doaPowerAttorneyPurpose},</if> <if test="doaPowerAttorneyPurpose != null">#{doaPowerAttorneyPurpose},</if>
<if test="doaFormat != null and doaFormat != ''">#{doaFormat},</if> <if test="doaFormat != null">#{doaFormat},</if>
<if test="doaRemark != null">#{doaRemark},</if> <if test="doaRemark != null">#{doaRemark},</if>
<if test="doaStandardizer != null">#{doaStandardizer},</if> <if test="doaStandardizer != null">#{doaStandardizer},</if>
<if test="doaArchiving != null">#{doaArchiving},</if> <if test="doaArchiving != null">#{doaArchiving},</if>
<if test="doaVicePresidentApproved != null">#{doaVicePresidentApproved},</if> <if test="doaVicePresidentApproved != null">#{doaVicePresidentApproved},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="fileAddress != null and fileAddress != ''">#{fileAddress},</if> <if test="fileAddress != null">#{fileAddress},</if>
<if test="isFinish != null and isFinish != ''">#{isFinish},</if> <if test="isFinish != null">#{isFinish},</if>
</trim> </trim>
</insert> </insert>
@ -219,22 +225,22 @@
<if test="doaNumber != null">doa_number = #{doaNumber},</if> <if test="doaNumber != null">doa_number = #{doaNumber},</if>
<if test="doaSalesmanCode != null">doa_salesman_code = #{doaSalesmanCode},</if> <if test="doaSalesmanCode != null">doa_salesman_code = #{doaSalesmanCode},</if>
<if test="doaSalesmanBm != null">doa_salesman_bm = #{doaSalesmanBm},</if> <if test="doaSalesmanBm != null">doa_salesman_bm = #{doaSalesmanBm},</if>
<if test="doaSalesmanName != null and doaSalesmanName != ''">doa_salesman_name = #{doaSalesmanName},</if> <if test="doaSalesmanName != null">doa_salesman_name = #{doaSalesmanName},</if>
<if test="doaSalesmanDeptId != null">doa_salesman_dept_id = #{doaSalesmanDeptId},</if> <if test="doaSalesmanDeptId != null">doa_salesman_dept_id = #{doaSalesmanDeptId},</if>
<if test="doaSalesmanDeptName != null">doa_salesman_dept_name = #{doaSalesmanDeptName},</if> <if test="doaSalesmanDeptName != null">doa_salesman_dept_name = #{doaSalesmanDeptName},</if>
<if test="doaSalesmanPhone != null and doaSalesmanPhone != ''">doa_salesman_phone = #{doaSalesmanPhone},</if> <if test="doaSalesmanPhone != null">doa_salesman_phone = #{doaSalesmanPhone},</if>
<if test="doaProject != null and doaProject != ''">doa_project = #{doaProject},</if> <if test="doaProject != null">doa_project = #{doaProject},</if>
<if test="doaCustomerBm != null">doa_customer_bm = #{doaCustomerBm},</if> <if test="doaCustomerBm != null">doa_customer_bm = #{doaCustomerBm},</if>
<if test="doaCustomerName != null and doaCustomerName != ''">doa_customer_name = #{doaCustomerName},</if> <if test="doaCustomerName != null">doa_customer_name = #{doaCustomerName},</if>
<if test="doaOwnerUnit != null">doa_owner_unit = #{doaOwnerUnit},</if> <if test="doaOwnerUnit != null">doa_owner_unit = #{doaOwnerUnit},</if>
<if test="doaGeneralcontractUnit != null">doa_generalcontract_unit = #{doaGeneralcontractUnit},</if> <if test="doaGeneralcontractUnit != null">doa_generalcontract_unit = #{doaGeneralcontractUnit},</if>
<if test="doaSubcontractUnit != null">doa_subcontract_unit = #{doaSubcontractUnit},</if> <if test="doaSubcontractUnit != null">doa_subcontract_unit = #{doaSubcontractUnit},</if>
<if test="doaAuthorizer != null and doaAuthorizer != ''">doa_authorizer = #{doaAuthorizer},</if> <if test="doaAuthorizer != null">doa_authorizer = #{doaAuthorizer},</if>
<if test="doaAuthorizerPhone != null and doaAuthorizerPhone != ''">doa_authorizer_phone = #{doaAuthorizerPhone},</if> <if test="doaAuthorizerPhone != null">doa_authorizer_phone = #{doaAuthorizerPhone},</if>
<if test="doaAuthorizerIdentificationNumber != null and doaAuthorizerIdentificationNumber != ''">doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber},</if> <if test="doaAuthorizerIdentificationNumber != null">doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber},</if>
<if test="doaAuthorizationDuration != null">doa_authorization_duration = #{doaAuthorizationDuration},</if> <if test="doaAuthorizationDuration != null">doa_authorization_duration = #{doaAuthorizationDuration},</if>
<if test="doaPowerAttorneyPurpose != null and doaPowerAttorneyPurpose != ''">doa_power_attorney_purpose = #{doaPowerAttorneyPurpose},</if> <if test="doaPowerAttorneyPurpose != null">doa_power_attorney_purpose = #{doaPowerAttorneyPurpose},</if>
<if test="doaFormat != null and doaFormat != ''">doa_format = #{doaFormat},</if> <if test="doaFormat != null">doa_format = #{doaFormat},</if>
<if test="doaRemark != null">doa_remark = #{doaRemark},</if> <if test="doaRemark != null">doa_remark = #{doaRemark},</if>
<if test="doaRejectionReasons != null">doa_rejection_reasons = #{doaRejectionReasons},</if> <if test="doaRejectionReasons != null">doa_rejection_reasons = #{doaRejectionReasons},</if>
<if test="doaStandardizer != null">doa_standardizer = #{doaStandardizer},</if> <if test="doaStandardizer != null">doa_standardizer = #{doaStandardizer},</if>
@ -243,6 +249,8 @@
<if test="doaApprovalStatus != null">doa_approval_status = #{doaApprovalStatus},</if> <if test="doaApprovalStatus != null">doa_approval_status = #{doaApprovalStatus},</if>
<if test="doaOaApprovalStatus != null">doa_oa_approval_status = #{doaOaApprovalStatus},</if> <if test="doaOaApprovalStatus != null">doa_oa_approval_status = #{doaOaApprovalStatus},</if>
<if test="doaJlApprovalStatus != null">doa_jl_approval_status = #{doaJlApprovalStatus},</if> <if test="doaJlApprovalStatus != null">doa_jl_approval_status = #{doaJlApprovalStatus},</if>
<if test="doaOaRemark != null">doa_oa_remark = #{doaOaRemark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>

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

@ -61,10 +61,10 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="操作人" prop="doaStandardizer"> <el-form-item label="制标员" prop="doaStandardizer">
<el-input <el-input
v-model="queryParams.doaStandardizer" v-model="queryParams.doaStandardizer"
placeholder="请输入操作人" placeholder="请输入制标员"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -197,11 +197,6 @@
<dict-tag :options="dict.type.doa_approval_status" :value="this.form.doaApprovalStatus"/> <dict-tag :options="dict.type.doa_approval_status" :value="this.form.doaApprovalStatus"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="提交经理审批" prop="doaJlApprovalStatus">
<dict-tag :options="dict.type.doa_jl_approval_status" :value="this.form.doaJlApprovalStatus"/>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="副总审批状态" prop="doaOaApprovalStatus"> <el-form-item label="副总审批状态" prop="doaOaApprovalStatus">
<dict-tag :options="dict.type.doa_oa_approval_status" :value="this.form.doaOaApprovalStatus"/> <dict-tag :options="dict.type.doa_oa_approval_status" :value="this.form.doaOaApprovalStatus"/>
@ -332,9 +327,16 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="8"> <el-row :gutter="8">
<el-col :span="24"> <el-col :span="24" v-if="this.form.doaApprovalStatus != '0' && this.form.doaApprovalStatus != null">
<el-form-item label="驳回原因" prop="doaRejectionReasons"> <el-form-item label="驳回原因" prop="doaRejectionReasons">
<el-input type="textarea" autosize v-model="form.doaRejectionReasons" placeholder="请输入反馈说明" /> <el-input type="textarea" autosize v-model="form.doaRejectionReasons" placeholder="投标办填写" :disabled="checkRole(['SALES_MAN']) || (this.form.bidApprovalStatus == '2' || this.form.bidApprovalStatus == '3')"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="8">
<el-col :span="24" v-if="this.form.doaApprovalStatus != '0' && this.form.doaApprovalStatus != null">
<el-form-item label="OA反馈说明" prop="doaOaRemark">
<el-input type="textarea" autosize v-model="form.doaOaRemark" :disabled="true"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -404,9 +406,7 @@
<!-- 业务员提交保存--> <!-- 业务员提交保存-->
<span v-hasPermi="['authorize:authorize:save']"><el-button @click="saveForm" v-if="this.form.doaApprovalStatus == '0' || this.form.doaApprovalStatus == null">保 存</el-button></span> <span v-hasPermi="['authorize:authorize:save']"><el-button @click="saveForm" v-if="this.form.doaApprovalStatus == '0' || this.form.doaApprovalStatus == null">保 存</el-button></span>
<span style="margin-left: 10px" v-hasPermi="['authorize:authorize:commit']"><el-button type="primary" plain @click="commitForm" v-if="this.form.doaApprovalStatus == '0' || this.form.doaApprovalStatus == null">提 交</el-button></span> <span style="margin-left: 10px" v-hasPermi="['authorize:authorize:commit']"><el-button type="primary" plain @click="commitForm" v-if="this.form.doaApprovalStatus == '0' || this.form.doaApprovalStatus == null">提 交</el-button></span>
<!--
<span style="margin-left: 10px" v-hasPermi="['authorize:authorize:commitJl']"><el-button type="primary" plain @click="commitFormJl" v-if="this.form.doaApprovalStatus == '1'&&this.form.doaJlApprovalStatus == '0'">提交至经理</el-button></span>
-->
<!-- 投标提交OA、驳回--> <!-- 投标提交OA、驳回-->
<span style="margin-left: 10px" v-hasPermi="['authorize:authorize:commitOA']"><el-button type="primary" plain @click="commitFormOA" v-if="this.form.doaApprovalStatus == '1'&&this.form.doaOaApprovalStatus == '0'">提交至OA</el-button></span> <span style="margin-left: 10px" v-hasPermi="['authorize:authorize:commitOA']"><el-button type="primary" plain @click="commitFormOA" v-if="this.form.doaApprovalStatus == '1'&&this.form.doaOaApprovalStatus == '0'">提交至OA</el-button></span>
<span style="margin-left: 10px" v-hasPermi="['authorize:authorize:reject']"><el-button type="danger" plain @click="rejectForm" v-if="this.form.bidApprovalStatus == '1'">驳回</el-button></span> <span style="margin-left: 10px" v-hasPermi="['authorize:authorize:reject']"><el-button type="danger" plain @click="rejectForm" v-if="this.form.bidApprovalStatus == '1'">驳回</el-button></span>
@ -465,7 +465,7 @@ export default {
'PeopleSelect': PeopleSelect, 'PeopleSelect': PeopleSelect,
'ChangeRecord':ChangeRecord 'ChangeRecord':ChangeRecord
}, },
dicts: ['doa_approval_status', 'doa_oa_approval_status', 'doa_jl_approval_status', 'doa_power_attorney_purpose', 'doa_format', 'doa_archiving'], dicts: ['doa_approval_status', 'doa_oa_approval_status', 'doa_power_attorney_purpose', 'doa_format', 'doa_archiving'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -623,7 +623,7 @@ export default {
doaVicePresidentApproved: null, doaVicePresidentApproved: null,
doaApprovalStatus: null, doaApprovalStatus: null,
doaOaApprovalStatus: null, doaOaApprovalStatus: null,
doaJlApprovalStatus: null, doaOaRemark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,