-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Feature][admin] Task submit approval #4070
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
approval table query
todo: 1.handle reload 2.task info query 3.properties roll back 4.code optimization 5.h2 and pg sql 6.function test
todo: 1.task info query 2.properties roll back 3.code optimization 4.h2 and pg sql 5.function test
todo: 1.properties roll back 2.layout 3.code optimization 4.h2 and pg sql 5.function test
todo: 1.layout 2.code optimization 3.h2 and pg sql 4.function test
todo: 1.code optimization 2.h2 and pg sql 3.function test
todo: 1.code optimization 2.h2 and pg sql 3.function test
todo: 1.code optimization 2.h2 and pg sql 3.function test
The menu list data needs to be added to the upgrade file of the corresponding db type |
如果平台内只有一个用户时,开启强制交叉审核时,在审批人列表中无法选择审批人 |
@Zzm0809 感谢指正,我将于本周内向此分支提交新的commit来修复上述问题 |
support tenant
todo: full test for current feature
Zzm0809
approved these changes
Jan 9, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@gaoyan1998 please review again
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of the pull request
#4061
Brief change log
Verify this pull request
In configuration center, here is an option to enable task submit approval, when it is enabled:
![069f11dbe0ab529135d338b6b44e314](https://private-user-images.githubusercontent.com/166927232/400828928-308bbf13-985e-4dba-8faa-e28c282cf706.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODI4OTI4LTMwOGJiZjEzLTk4NWUtNGRiYS04ZmFhLWUyOGMyODJjZjcwNi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0xYzgwMWM2ZDk1M2NlYWYyMjVjYTZmMDY3Yjg2ZDNhMGUxMzViZWRmYmEyMzU0NWZmNTRmMzU2MjRjOWQ0NWRkJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.Ly2dzHr94mjM_pxHuooKQtzX7xAKxq0MV1MRYaBm5Ng)
Task cannot be submitted if there's no approved approval for current task version
User can submit an approval by this button, before an approval is created, task will be published first
![image](https://private-user-images.githubusercontent.com/166927232/400829584-90af2be6-d7cc-45d3-ab14-3e13f8233557.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODI5NTg0LTkwYWYyYmU2LWQ3Y2MtNDVkMy1hYjE0LTNlMTNmODIzMzU1Ny5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT1lZGMzYjdjZjBlN2Y2ZDEzZDliNzg4MzAxYjYwOGRiOGYzOWNmN2NhYzBkMThlZjhkYTQ3NDQ4YmM0MTkwOGY1JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.S_j3s6cKp-N6GcSncR6zNDeZnONHMNq6UFOijm6zlGo)
A reviewer is needed, also, user can leave some comments like 'Please take a look'
![4629a49e83fcab69f54b909f9af58f9](https://private-user-images.githubusercontent.com/166927232/400829668-78cf223d-4016-4bc3-aa3e-9cea9e673596.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODI5NjY4LTc4Y2YyMjNkLTQwMTYtNGJjMy1hYTNlLTljZWE5ZTY3MzU5Ni5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT1kN2ZmZDE2NWJmOTM5Njg5NDU1NjQ0YzQ4ZDczYzRlYmFmNDI3Y2Y0N2E5YzIwYWUwNTliMzdhNDAwMjFhZjZiJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.B65md6mx13gubEFjhuBj2pEjAfsaE_kfriCHzN55W7c)
Approval can be managed in auth center, an approval can be submitted, withdrawn, canceled, approved or rejected.
![1850684ee75a8d3174a404138761ef5](https://private-user-images.githubusercontent.com/166927232/400830066-97c14760-578a-41a5-8971-81ebdc8f9be5.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODMwMDY2LTk3YzE0NzYwLTU3OGEtNDFhNS04OTcxLTgxZWJkYzhmOWJlNS5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0yZDBlMGViODZlYzU4MWI0ZTdlYmE0ZjVkNmU0YjFjMGZjZTczM2MyZGIwZTE5ZGQ2Y2RlMzBiZTZiZmU2OWY4JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.66XQ9-ERRek1eR0J5E7ZAv_JllvtiWO-4hSVtMnTAiE)
![5fce8a16f58c5b609138b34035b44ef](https://private-user-images.githubusercontent.com/166927232/400830814-16c5337b-3d7a-4fac-a4c2-882177abbb9c.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODMwODE0LTE2YzUzMzdiLTNkN2EtNGZhYy1hNGMyLTg4MjE3N2FiYmI5Yy5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT00YmVkODliZjhkZTJiMTk5ZDgxZjMwNjUwZGI2NmQ5ZDJiMmU2YzNlMDU4ZjdhODUyYzVmNGFiMWE1NDI1YjQxJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.xH1-WUEMubbhEAUxo88DI3mdNI_TbtvsB5W-l6XJdYI)
The task info can also be checked
![efe2638987e327d9cb6b1fc65362cdb](https://private-user-images.githubusercontent.com/166927232/400830519-e4f478d8-7f47-4d44-93be-cefc50c892e2.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODMwNTE5LWU0ZjQ3OGQ4LTdmNDctNGQ0NC05M2JlLWNlZmM1MGM4OTJlMi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT1lMTYyNjVkNzU4NjcwZjQ3N2M3ZTdlMjkyNWEzMWQxOGUwNWJhYzc4YmJkNzhjMGQ4MTlmZTVlYzZlZWUwNDFhJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.d9EBw8sWaxswT15J2AEOXN_ab05ufJx8iLgNtMuFG0U)
After the approval of current task version is approved, task can be submitted
![624375ce4bbba1156a2467179c5496e](https://private-user-images.githubusercontent.com/166927232/400831490-ce0f66f8-bfbb-4e84-876e-6e8f0ed5c25f.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODMxNDkwLWNlMGY2NmY4LWJmYmItNGU4NC04NzZlLTZlOGYwZWQ1YzI1Zi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT1iOGRkN2M2MWEyYWM5MDY1MDRiN2Y5NDQ4ODY3ZmU1MDdlNjYyNjA4M2JhMWZlOGZiNzM0MTA1OTZiM2EwZGU5JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.Xp94eZv_YB_YeeF49GEMOvY4jlmAeV6QauYqnjoTzQI)
When task submit approval is disabled,
![9aaccdc3f29910d2bed2996257fd174](https://private-user-images.githubusercontent.com/166927232/400831678-bf0e9994-ae1b-405f-b1c4-a984dcdbd922.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODMxNjc4LWJmMGU5OTk0LWFlMWItNDA1Zi1iMWM0LWE5ODRkY2RiZDkyMi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT1iZGU3OWIxMGIxYWJjZWQ4NDRhYWI5OGNlZTg3ZjM5NjdkMjBmNzFkNTkxNGQ0ZmE0MjUwYjg5MGE1MTZhOTIyJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.ZMuVbd3yUyBkukpFJ7KNiGg88gs7-QHLvUaEcN27yFE)
![image](https://private-user-images.githubusercontent.com/166927232/400831885-2de0071a-f641-4c00-af19-c1f68af45ef2.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODMxODg1LTJkZTAwNzFhLWY2NDEtNGMwMC1hZjE5LWMxZjY4YWY0NWVmMi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0zOGNhN2FlNjFkMTQzYjY3NTY0MjNhNWQ3YWQzZjZlYWJhOTkyMmUyYmZhMWY2MDhiMTk2NzIzMDUzNzkyZGNlJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.iWufuVdDVrA0hfqSfEKjRgyqseLftPMLxLVrwCtGzI8)
![c4a10a954a785979949f2e5116c2320](https://private-user-images.githubusercontent.com/166927232/400832427-a1454dac-53d6-4fb2-8b27-b386f20fd2a7.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODMyNDI3LWExNDU0ZGFjLTUzZDYtNGZiMi04YjI3LWIzODZmMjBmZDJhNy5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0yZjZmY2I5NjI4Y2FmYWRmZDExZWY2NWY0MWMxNzBjOGNkOGQ2OTMzOGQ2N2RkNjVjZmI0ZWY0ZDE5NWE0Yzk3JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.bxW6rS0lfujCy4AleaVBth0rVenMUERZeCHwhzXjUEw)
![3466efc79555c0b7a2c069f9fc01f5e](https://private-user-images.githubusercontent.com/166927232/400832535-c09ed143-c485-45ac-8fa3-32f507cc1f4d.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0OTMxNDQsIm5iZiI6MTczOTQ5Mjg0NCwicGF0aCI6Ii8xNjY5MjcyMzIvNDAwODMyNTM1LWMwOWVkMTQzLWM0ODUtNDVhYy04ZmEzLTMyZjUwN2NjMWY0ZC5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwMDI3MjRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0yNWRhMTRlNGI3ZDJiMDE4MDhlMTY2MDU3NmY2ZjA1ZjY5MmY5OWQ4OTJkOWU3MDlhNDdkMmIzYWYyZjJlNjkwJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.yBc5Cs7vRwnTWzoEH4l1gonMZsqzekS6BlF-k_x1JGY)
Approval create and submit button will not be shown
Approval management page is not available neither
Task can be submitted directly