Merge branch 'feature/REQ-5965' into dev

This commit is contained in:
wangli 2025-11-19 15:33:21 +08:00
commit 475b86896a
2 changed files with 8 additions and 5 deletions

View File

@ -15,6 +15,7 @@ import cn.axzo.workflow.server.controller.web.bpmn.BpmnProcessTaskController;
import cn.axzo.workflow.server.service.AuthCodeService;
import cn.axzo.workflow.server.xxljob.DangerSuperOperationJobHandler;
import cn.azxo.framework.common.model.CommonResponse;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
@ -111,10 +112,7 @@ public class DangerOperationController {
public CommonResponse<String> handleProcess(@Validated @RequestBody DangerSuperOperationJobHandler.DangerOperationJobParam jobParam, Model model) {
// 处理表单提交的逻辑
log.info("操作类型: {}", jobParam.getOperationType());
log.info("流程实例编号: {} ", jobParam.getProcessInstanceId());
log.info("自然人ID: {}", jobParam.getPersonId());
log.info("意见: {}", jobParam.getComment());
log.info("请求参入: {}", JSON.toJSONString(jobParam));
try {
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(jobParam.getProcessInstanceId()).singleResult();

View File

@ -275,7 +275,12 @@
</div>
<!-- 提交按钮 -->
<div class="pt-4 flex justify-end">
<div class="pt-4 flex justify-end gap-4">
<button type="button"
onclick="processForm.reset(); updateFormFields(); operationMessage.classList.add('hidden')"
class="px-6 py-2.5 bg-gray-200 hover:bg-gray-300 text-gray-800 font-medium rounded-lg transition-all duration-300 transform hover:scale-[1.02] active:scale-[0.98] flex items-center">
<i class="fa fa-refresh mr-2"></i>重置
</button>
<button type="submit"
class="px-6 py-2.5 bg-primary hover:bg-primary/90 text-white font-medium rounded-lg transition-all duration-300 transform hover:scale-[1.02] active:scale-[0.98] flex items-center">
<i class="fa fa-check mr-2"></i>提交