--工作流和业务的处理履历信息和bug处理

zrch-risk-client-39/src/views/flowable/task/todo/components/TodoIndex.vue

@@ -536,12 +536,14 @@
         submitData.values['userTaskid'] = nextNodeNameSelevue.value;
       }
 
+      
       if (!showApprovalUi.value) {
         await complete(submitData);
         emit('callback');
         return false;
       }
       
+
       const formData = await validate();
       Object.assign(submitData, formData);
       submitData.comment = submitData.comment || '';
@@ -562,6 +564,7 @@
         submitData.values['approvalType'] = 'role';
       }
       // }
+      console.log("-----------submitData ",submitData);
 
       // 执行发送
       const result = await complete(submitData);

zrch-risk-client-39/src/views/project/plan/StPlanManList.vue

 <template>
   <div class="plan-management-page">
+    <!-- 页面头部区域 -->
+    <!-- <div class="page-header">
+      <div class="header-content">
+        <div class="header-left">
+          <h1 class="page-title">计划编制管理</h1>
+          <p class="page-desc">统一管理和追踪所有业务计划的编制与审批流程</p>
+        </div>
+        <div class="header-stats">
+          <div class="stat-item">
+            <span class="stat-value">--</span>
+            <span class="stat-label">计划总数</span>
+          </div>
+          <div class="stat-item warning">
+            <span class="stat-value">--</span>
+            <span class="stat-label">待处理</span>
+          </div>
+          <div class="stat-item success">
+            <span class="stat-value">--</span>
+            <span class="stat-label">已完成</span>
+          </div>
+        </div>
+      </div>
+    </div> -->
+
     <!-- 主内容区 -->
     <div class="main-content">
       <!-- 搜索区域 -->
@@ -19,12 +43,12 @@
                 <JSearchSelect placeholder="请选择类型" v-model:value="queryParam['projectType']" dict="projecttype" />
               </a-form-item>
             </a-col>
-            <a-col :xl="7" :lg="8" :md="12" :sm="24">
+            <a-col :xl="5" :lg="8" :md="12" :sm="24">
               <a-form-item label="执行部门">
                 <JSelectDept placeholder="请选择执行部门" v-model:value="queryParam['execDepCode']" />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="8" :md="12" :sm="24">
+            <a-col :xl="4" :lg="8" :md="12" :sm="24">
               <a-form-item label="计划状态">
                 <a-select
                   v-model:value="queryParam['status']"
@@ -42,8 +66,6 @@
                 />
               </a-form-item>
             </a-col>
-          </a-row>
-          <a-row :gutter="16">
             <a-col :xl="5" :lg="8" :md="12" :sm="24">
               <a-form-item label="计划日期">
                 <a-range-picker
@@ -54,6 +76,8 @@
                 />
               </a-form-item>
             </a-col>
+          </a-row>
+          <a-row :gutter="16">
             <a-col :xl="5" :lg="8" :md="12" :sm="24">
               <a-form-item label="优先级">
                 <a-select
@@ -82,7 +106,7 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :xl="7" :lg="16" :md="24" :sm="24">
+            <a-col :xl="14" :lg="16" :md="24" :sm="24">
               <a-form-item class="search-btn-group">
                 <a-space :size="8">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
@@ -142,12 +166,12 @@
     <!-- 待办抽屉 -->
     <div v-if="isShowDrawer">
       <a-drawer destroyOnClose v-model:open="isShowDrawer" class="flat-drawer" title="待办任务" placement="right" width="90%">
-        <!-- <template #extra>
+        <template #extra>
           <div class="drawer-tags">
             <span class="tag">发起人: {{ startUser }}</span>
             <span class="tag">任务节点: {{ taskName }}</span>
           </div>
-        </template> -->
+        </template>
         <TodoIndex v-if="isShowDrawer" ref="refTodoIndex" @callback="handleSuccess" />
       </a-drawer>
     </div>
@@ -521,6 +545,8 @@
       {
         label: '待办',
         ifShow: () => {
+          console.log("-------------record['uid'] ",record['uid']);
+           console.log("-------------userStore.getUserInfo.id ",userStore.getUserInfo.id);
           if (record['bpmStatus'] == '2' && record['uid'] == userStore.getUserInfo.id) return true;
           else return false;
         },

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/SysDeployFormMapper.xml

@@ -4,12 +4,12 @@
 
     <select id="selectSysDeployFormByDeployId" resultType="org.jeecg.modules.flowable.apithird.business.entity.FlowForm">
         select t2.form_table_name as formTableName,t1.form_options as formContent,t1.form_name as formName,t1.form_id as formId from sys_form t1 left join sys_deploy_form t2 on t1.form_id = t2.form_id
-        where t2.deploy_id = #{deployId} limit 1
+        where t2.deploy_id = #{deployId} order by t2.id desc limit 1
     </select>
 
     <select id="selectSysFormByDeployId" resultType="org.jeecg.modules.flowable.apithird.business.entity.FlowForm">
         select t1.* from sys_form t1 left join sys_deploy_form t2 on t1.form_id = t2.form_id
-        where t2.deploy_id = #{deployId} limit 1
+        where t2.deploy_id = #{deployId} order by t2.id desc limit 1
     </select>
 
     <update id="updateBisTabBpmStatus" parameterType="org.jeecg.modules.flowable.apithird.business.entity.FlowForm">

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/vo/FlowTaskVo.java

@@ -19,4 +19,5 @@ public class FlowTaskVo {
     private List<String> candidateUsers;
     private List<String> candidateGroups;
     private String userTaskid;
+    private boolean nodeisApprove;
 }

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/vo/MyTaskFlowVo.java

+package org.jeecg.modules.flowable.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class MyTaskFlowVo {
+    private java.lang.String formTableName;
+    private java.lang.String targetId;
+    private java.lang.String deployId;
+    private java.lang.String taskId;
+    private java.lang.String procInsId;
+    private java.lang.String executionId;
+    private java.lang.String procDefId;
+    private java.lang.String uid;
+    private java.lang.String roleid;
+    private java.lang.String taskDefinitionKey;
+    private boolean nodeisApprove;
+}

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowDefinitionServiceImpl.java

@@ -25,6 +25,8 @@ import org.jeecg.modules.flowable.common.constant.ProcessConstants;
 import org.jeecg.modules.flowable.domain.dto.FlowProcDefDto;
 import org.jeecg.modules.flowable.factory.FlowServiceFactory;
 import org.jeecg.modules.flowable.service.IFlowDefinitionService;
+import org.jeecg.modules.stm.my.entity.MyTaskFlowHis;
+import org.jeecg.modules.stm.my.service.IMyTaskFlowHisService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 
@@ -50,6 +53,8 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
     FlowTaskServiceImpl flowTaskService;
     @Autowired
     private ISysDeployFormService sysDeployFormService;
+    @Autowired
+    private IMyTaskFlowHisService myTaskFlowHisService;
 
 
     private static final String BPMN_FILE_SUFFIX = ".bpmn";
@@ -353,6 +358,9 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
     public Result startProcessInstanceByDeployId(String DeployId, Map<String, Object> variables) {
         // 构建返回结果
         Map<String, Object> result = new HashMap<>();
+        Date cdate = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String curdate = sdf.format(cdate);
 
         try {
 
@@ -431,6 +439,48 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
 
                 }
 
+
+                MyTaskFlowHis taskFlowHis=new MyTaskFlowHis();
+                taskFlowHis.setTaskId(task.getId());
+                taskFlowHis.setProcDefId(task.getProcessDefinitionId());
+                taskFlowHis.setProcInsId(task.getProcessInstanceId());
+                taskFlowHis.setExecutionId(task.getExecutionId());
+                if(zdval!=null&&!zdval.equals("")){
+                    taskFlowHis.setTargetId(zdval);
+                }
+
+                taskFlowHis.setDeployId(DeployId);
+
+
+                if(flowForm!=null&&flowForm.getFormTableName()!=null){
+                    taskFlowHis.setFormTableName(flowForm.getFormTableName());
+                }
+
+                String userType="user";
+                String approvalId=sysUser.getId();
+
+                if(userType.equals("user")) {
+                    taskFlowHis.setUid(approvalId);
+                } else {
+                    taskFlowHis.setRoleid(approvalId);
+                }
+
+                taskFlowHis.setTaskDefinitionKey(task.getTaskDefinitionKey());
+
+                taskFlowHis.setOptionTime(cdate);
+                taskFlowHis.setOptionId(sysUser.getId());
+                taskFlowHis.setOptionType("操作类型");
+                taskFlowHis.setTaskType("发起");//发起 办理 转办 结束
+                taskFlowHis.setTaskName(task.getName());
+                taskFlowHis.setTaskTitle("标题");
+                taskFlowHis.setFlowName("");
+
+                myTaskFlowHisService.save(taskFlowHis);
+
+
+
+
+
             }
 
 

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/my/entity/MyTaskFlow.java

@@ -74,4 +74,6 @@ public class MyTaskFlow implements Serializable {
     private java.lang.String taskDefinitionKey;
 
 
+
+
 }

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/my/entity/MyTaskFlowHis.java

@@ -95,4 +95,16 @@ public class MyTaskFlowHis implements Serializable {
 	@Excel(name = "节点类型", width = 15)
     @Schema(description = "节点类型")
     private java.lang.String taskType;
+    /**节点名称*/
+    @Excel(name = "节点名称", width = 15)
+    @Schema(description = "节点名称")
+    private java.lang.String taskName;
+    /**标题*/
+    @Excel(name = "标题", width = 15)
+    @Schema(description = "标题")
+    private java.lang.String taskTitle;
+    /**流程名称*/
+    @Excel(name = "流程名称", width = 15)
+    @Schema(description = "流程名称")
+    private java.lang.String flowName;
 }