sql/mysql/bfkj_supplier_apply_auto_approve.sql
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,37 @@ -- ===================================================================== -- åæ¹ç§æï¼ä¾åºååå ¥æ¹ä¸ºãä¸èµ°åå审æ¹ã -- -- èæ¯ï¼ -- åæµç¨æ¯ãåå ¥ç³è¯· â æäº¤ â éåååå ¬å®¡æ¹æµç¨ â éè´/è´¨é/è´¢å¡ä¸çº§å®¡æ¹ -- â éè¿åæçæä¾åºåãã客æ·è¦æ±åå ¥ä¸åèµ°åå审æ¹ã -- -- å®ç°ï¼ -- BPM å 审æ¹é ç½®è¡¨éæ¯æãå ¨å±æ»å¼å ³ãä¸ãææµç¨åç¬å¼å ³ã两ç§ç²åº¦ï¼ -- å端 submitApply å·²æ¹ä¸ºç¨ isAutoApprove(processDefinitionKey) å¤æï¼ -- è¿éåªæå¼ä¾åºååå ¥è¿ä¸ä¸ªæµç¨çå 审æ¹ï¼ä¸å½±å请åãæ¥éçå ¶ä»æµç¨ã -- -- ææï¼ -- åå ¥ç³è¯·ç¹ãæäº¤ãåç«å³çæï¼å®¡æ¹ç¶æç´æ¥ç½®ä¸ºéè¿ï¼åæ¶çæä¾åºåï¼ï¼ -- ä¸åå¼¹åºãéæ©å®¡æ¹æµç¨ãççªå£ï¼ä¹ä¸åäº§çæµç¨å®ä¾ã -- -- å¦éæ¢å¤å®¡æ¹ï¼ -- UPDATE bpm_process_auto_approve_config SET auto_approve = b'0' -- WHERE process_definition_key = 'supplier_apply_approve'; -- -- ç¹æ§ï¼å¯é夿§è¡ -- ===================================================================== DELETE FROM bpm_process_auto_approve_config WHERE process_definition_key = 'supplier_apply_approve'; INSERT INTO bpm_process_auto_approve_config (process_definition_key, auto_approve, remark, creator, create_time, updater, update_time, deleted) VALUES ('supplier_apply_approve', b'1', 'åæ¹ç§æï¼ä¾åºååå ¥ä¸èµ°åå审æ¹ï¼æäº¤å³çæ', '1', NOW(), '1', NOW(), b'0'); -- éªè¯ SELECT id, process_definition_key, auto_approve, remark FROM bpm_process_auto_approve_config WHERE deleted = b'0'; yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java
@@ -16,6 +16,17 @@ boolean isGlobalAutoApprove(); /** * æå®æµç¨æ¯å¦å 审æ¹ã * * å¤å®è§åï¼å ¨å±æ»å¼å ³å¼å¯ â ä¸å¾å 审æ¹ï¼å¦åç该æµç¨èªå·±çå¼å ³ã * ä¸å¡æ¨¡ååºä¼å ç¨æ¬æ¹æ³å¤æï¼è¿æ ·æ¢è½åå ¨å±å¼å ³ç»ä¸æ§å¶ï¼ * ä¹è½åªå¯¹ä¸ªå«æµç¨åç¬å¼å¯å 审æ¹ï¼ä¾å¦ä¾åºååå ¥ä¸èµ°åå审æ¹ï¼ã * * @param processDefinitionKey æµç¨å®ä¹ Keyï¼å¦ supplier_apply_approve */ boolean isAutoApprove(String processDefinitionKey); /** * å建æµç¨å®ä¾ï¼æä¾ç»å é¨ï¼ * * @param userId ç¨æ·ç¼å· yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java
@@ -30,6 +30,11 @@ } @Override public boolean isAutoApprove(String processDefinitionKey) { return processAutoApproveService.isAutoApprove(processDefinitionKey); } @Override public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO reqDTO) { return processInstanceService.createProcessInstance(userId, reqDTO); } yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessAutoApproveController.java
@@ -72,9 +72,15 @@ } @GetMapping("/ui-policy") @Operation(summary = "è·å¾å½åç»å½ç¨æ·çå®¡æ ¸çé¢çç¥") @Operation(summary = "è·å¾å½åç»å½ç¨æ·çå®¡æ ¸çé¢çç¥", description = "ä¸ä¼ key è¿åå ¨å±æ»å¼å ³ï¼ä¼ key åè¿å该æµç¨çæç»çç¥ï¼å ¨å±å¼æè¯¥æµç¨å¼é½ä¸º trueï¼") @Parameter(name = "key", description = "æµç¨å®ä¹ Keyï¼å¦ supplier_apply_approve", example = "supplier_apply_approve") @PreAuthorize("isAuthenticated()") public CommonResult<Boolean> getUiPolicy() { public CommonResult<Boolean> getUiPolicy(@RequestParam(value = "key", required = false) String key) { // ä¼ å ¥æµç¨ key æ¶æãå ¨å± || 该æµç¨ãå¤å®ï¼ä¾¿äºä¸å¡é¡µé¢åªå¯¹èªå·±å ³å¿çæµç¨æ¾å¼å å®¡æ¹ if (key != null && !key.isBlank()) { return success(processAutoApproveService.isAutoApprove(key)); } return success(processAutoApproveService.isGlobalAutoApprove()); } yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java
@@ -133,9 +133,10 @@ && !SupplierApplyStatusEnum.REJECTED.getCode().equals(apply.getApplyStatus())) { throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_DRAFT); } // 2. å建 BPM æµç¨å®ä¾ï¼éè´å®¡æ ¸âè´¨éå®¡æ ¸âè´¢å¡å®¡æ ¸ï¼æµç¨ä¸å®¡æ¹äººå¨åååå ¬é ç½®ï¼ // å ¨å±å 审æ¹ï¼ä¸å¡æ ¡éªéè¿åç´æ¥æ§è¡å®¡æ¹éè¿é»è¾ï¼æ éæµç¨æ¨¡åã if (processInstanceApi.isGlobalAutoApprove()) { // 2. ä¾åºååå ¥ä¸èµ°åå审æ¹ï¼å¤æè¯¥æµç¨æ¯å¦é ç½®äºå å®¡æ¹ // ï¼å ¨å±æ»å¼å ³å¼å¯ä¹ç®ï¼ï¼å½ä¸åç´æ¥æ§è¡å®¡æ¹éè¿é»è¾ï¼ä¸åå建 BPM æµç¨å®ä¾ã // å¦éæ¢å¤å®¡æ¹ï¼æé 置表é supplier_apply_approve æ¹ä¸º 0 å³å¯ï¼æ 鿹代ç ã if (processInstanceApi.isAutoApprove(processDefinitionKey)) { supplierApplyMapper.updateById(new SrmSupplierApplyDO() .setId(id) .setApplyStatus(SupplierApplyStatusEnum.PROCESS.getCode())