Merge branch 'master' of http://47.97.51.208/root/zrch-risk-39

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

@@ -57,20 +57,20 @@
             <div class="content-wrapper">
               <!-- 左侧主表单 -->
               <div class="main-form-section">
-                <a-card title="审批表单" :bordered="false" class="form-card">
+                <!-- <a-card title="审批表单" :bordered="false" class="form-card">
                   <template #extra>
                     <a-button type="link" @click="refreshForm"> <ReloadOutlined /> 刷新 </a-button>
-                  </template>
+                  </template> -->
 
-                  <div class="form-content">
+                <div class="form-card">
                   <div v-show="formTp == 1" class="form-wrapper">
-                      <FlowInnerForm ref="refCruInnerForm" :key="formKey" style="width: 100%" />
+                    <FlowInnerForm ref="refCruInnerForm" :key="formKey" style="width: 100%; height: 100%" />
                   </div>
-                    <div v-show="formTp == 2" class="iframe-container" style="height: 470px">
+                  <div v-show="formTp == 2" class="form-wrapper">
                     <iFrame :key="formKey" :src="formUrl" class="responsive-iframe" style="width: 100%; height: 100%" />
                   </div>
                 </div>
-                </a-card>
+                <!-- </a-card> -->
               </div>
 
               <!-- 右侧审批栏 -->
@@ -220,7 +220,7 @@
   // API
   import { flowRecord } from '/@/components/Process/api/finished';
   import { flowXmlAndNode } from '/@/components/Process/api/definition';
-  import { complete, flowTaskForm, getNextFlowNode, getMyTaskFlow,assign,assignRead } from '/@/components/Process/api/todo';
+  import { complete, flowTaskForm, getNextFlowNode, getMyTaskFlow, assign, assignRead } from '/@/components/Process/api/todo';
   import { flowTaskInfo } from '/@/components/Process/api/process';
 
   // 组件
@@ -344,7 +344,7 @@
       field: 'checkSendRole',
       component: 'JSelectRole',
       required: false,
-      ifShow: computed(() => userType.value === 'role'),
+      ifShow: computed(() => userType.value !== 'user'),
       componentProps: {
         labelKey: 'roleName',
         rowKey: 'id',
@@ -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);
@@ -765,7 +768,6 @@
       const dataName = formUrl.value.substring(startIndex + 1, lastEqualIndex);
       submitData.values['dataName'] = dataName;
 
-
       // 执行发送
       const result = await assign(submitData);
 
@@ -815,8 +817,6 @@
         submitData.values['approvalType'] = 'role';
       }
 
-     
-
       // 执行发送
       const result = await assignRead(submitData);
 
@@ -835,8 +835,6 @@
     }
   };
 
-
-
   defineExpose({
     iniData,
   });
@@ -868,7 +866,7 @@
     height: 100vh;
     margin: 0;
     padding: 0;
-    background: linear-gradient(135deg, #b0b3c2 0%, #764ba2 100%);
+    // background: linear-gradient(135deg, #b0b3c2 0%, #764ba2 100%);
     overflow: hidden;
   }
 
@@ -945,6 +943,7 @@
       }
 
       .next-node-label {
+        width: 120px;
         color: #666;
         font-size: 14px;
       }

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

@@ -13,12 +13,7 @@
           <template #planBasis="{ model, field }">
             <div class="basis-container" v-if="model[field]">
               <div v-if="isValidJson(model[field])" class="basis-tags">
-                <a-tag
-                  v-for="item in safeJsonParse(model[field])"
-                  @click="viewBasisDetail(item)"
-                  :key="item.id"
-                  class="basis-tag"
-                >
+                <a-tag v-for="item in safeJsonParse(model[field])" @click="viewBasisDetail(item)" :key="item.id" class="basis-tag">
                   {{ item.name }}
                 </a-tag>
               </div>
@@ -46,7 +41,7 @@
 
 <script lang="ts" setup>
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { computed, ref, onMounted, watchEffect, toRaw } from 'vue';
+  import { computed, ref, onMounted, watchEffect, toRaw, watch, nextTick } from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { getBpmFormSchema } from '../StPlanMan.data';
   import { saveOrUpdate } from '../StPlanMan.api';
@@ -70,7 +65,6 @@
   const loading = ref(false);
   const submitting = ref(false);
   const formData = ref<Record<string, any>>({});
-  const idsystoken = ref('');
 
   const [registerForm, { setFieldsValue, setProps, getFieldsValue, resetFields, validate }] = useForm({
     labelWidth: 150,
@@ -79,6 +73,35 @@
     baseColProps: { span: 24 },
   });
 
+  // watch incoming prop and populate the form when provided
+  watch(
+    () => props.formData,
+    async (v) => {
+      if (v && Object.keys(v).length > 0) {
+        formData.value = { ...v };
+        // 延迟调用setFieldsValue，确保表单已经初始化
+        // 当选项卡切换时，表单可能还没有完全准备好
+        await nextTick();
+
+        try {
+          await setFieldsValue(v);
+          console.log('setFieldsValue 成功:', v);
+        } catch (e) {
+          console.warn('setFieldsValue failed (first attempt):', e);
+          // 如果第一次失败，延迟后重试
+          await new Promise((resolve) => setTimeout(resolve, 100));
+          try {
+            await setFieldsValue(v);
+            console.log('setFieldsValue 成功 (retry):', v);
+          } catch (e2) {
+            console.warn('setFieldsValue failed (retry):', e2);
+          }
+        }
+      }
+    },
+    { immediate: true, deep: true }
+  );
+
   const formDisabled = computed(() => {
     return props.formData?.disabled !== false;
   });
@@ -126,7 +149,6 @@
     const winurl = window.location.href;
     const params = new URLSearchParams(winurl.split('?')[1]);
 
-    console.log('winurl:', winurl);
     return {
       cctoken: params.get('Token') || '',
       WorkID: params.get('WorkID') || '',
@@ -136,12 +158,24 @@
   // 初始化表单数据
   const initFormData = async () => {
     try {
+      // 如果props.formData已经有数据，说明是从流程表单打开，不需要再调用接口
+      if (props.formData && Object.keys(props.formData).length > 0 && props.formData.id) {
+        console.log('表单数据已从props传入，跳过queryById接口调用');
+        return;
+      }
+
       loading.value = true;
 
       const timestamp = new Date().getTime();
 
       let tid = toRaw(route.query).id;
-      console.log('tid:', tid);
+
+      // 如果URL中也没有id，则不调用接口
+      if (!tid) {
+        console.warn('未找到id参数，既非URL query参数也非props传入');
+        loading.value = false;
+        return;
+      }
 
       const queryByIdUrl = '/plan.main/stPlanMan/queryById';
       const data = await defHttp.get({
@@ -159,7 +193,10 @@
       await setProps({ disabled: formDisabled.value });
     } catch (error) {
       console.error('初始化表单数据失败:', error);
+      // 只有在非预期情况下才提示错误
+      if (!props.formData?.id) {
         createMessage.error('初始化表单数据失败');
+      }
     } finally {
       loading.value = false;
     }
@@ -184,13 +221,26 @@
   };
 
   onMounted(() => {
+    // 如果formData已经通过props传入，则不需要再调用initFormData
+    if (props.formData && Object.keys(props.formData).length > 0 && props.formData.id) {
+      console.log('form data已通过props传入，跳过接口调用');
+    } else {
       initFormData();
+    }
+  });
+
+  // expose getFormData so parent modal can read current values
+  defineExpose({
+    submitForm,
+    // resetForm,
+    initFormData,
+    getFormData: () => toRaw(formData.value),
   });
 </script>
 
 <style scoped lang="less">
-/* ==================== 柔和中性风格 - CSS 变量 ==================== */
-.plan-form-container {
+  /* ==================== 柔和中性风格 - CSS 变量 ==================== */
+  .plan-form-container {
     --color-primary: #3b5bdb;
     --color-primary-hover: #364fc7;
     --color-primary-light: #e8ecfd;
@@ -210,49 +260,49 @@
     background: var(--color-bg-white);
     min-height: 100vh;
     font-family: -apple-system, BlinkMacSystemFont, 'PingFang SC', 'Helvetica Neue', sans-serif;
-}
+  }
 
-/* ==================== 表单头部 ==================== */
-.form-header {
+  /* ==================== 表单头部 ==================== */
+  .form-header {
     background: var(--color-bg-white);
     border-bottom: 1px solid var(--color-border);
     padding: 20px 32px;
     border-left: 3px solid var(--color-primary);
     padding-left: 28px;
-}
+  }
 
-.form-title {
+  .form-title {
     font-size: 18px;
     font-weight: 600;
     color: var(--color-text-primary);
     margin: 0 0 3px 0;
     letter-spacing: -0.2px;
-}
+  }
 
-.form-subtitle {
+  .form-subtitle {
     font-size: 13px;
     color: var(--color-text-muted);
     margin: 0;
-}
+  }
 
-/* ==================== 表单主体 ==================== */
-.form-body {
+  /* ==================== 表单主体 ==================== */
+  .form-body {
     padding: 24px 32px;
     background: var(--color-bg-white);
-}
+  }
 
-/* 依据标签样式 */
-.basis-container {
+  /* 依据标签样式 */
+  .basis-container {
     padding: 8px 0;
-}
+  }
 
-.basis-tags {
+  .basis-tags {
     display: flex;
     flex-wrap: wrap;
     gap: 8px;
-}
+  }
 
-.basis-tag {
+  .basis-tag {
     display: inline-flex;
     align-items: center;
     padding: 4px 10px;
@@ -267,43 +317,43 @@
     &:hover {
       background: #d0d9f8;
     }
-}
+  }
 
-.basis-alert {
+  .basis-alert {
     border-radius: var(--radius);
-}
+  }
 
-.basis-empty {
+  .basis-empty {
     padding: 16px;
     background: var(--color-bg-section);
     border-radius: var(--radius);
     border: 1px dashed var(--color-border-strong);
-}
+  }
 
-/* ==================== 表单底部按钮 ==================== */
-.form-footer {
+  /* ==================== 表单底部按钮 ==================== */
+  .form-footer {
     padding: 14px 32px;
     background: var(--color-bg-section);
     border-top: 1px solid var(--color-border);
     display: flex;
     justify-content: flex-end;
-}
+  }
 
-/* ==================== 表单控件样式覆盖 ==================== */
-:deep(.ant-form-item) {
+  /* ==================== 表单控件样式覆盖 ==================== */
+  :deep(.ant-form-item) {
     margin-bottom: 18px;
-}
+  }
 
-:deep(.ant-form-item-label > label) {
+  :deep(.ant-form-item-label > label) {
     font-size: 13px;
     font-weight: 500;
     color: var(--color-text-secondary);
-}
+  }
 
-:deep(.ant-input),
-:deep(.ant-select-selector),
-:deep(.ant-picker),
-:deep(.ant-input-textarea textarea) {
+  :deep(.ant-input),
+  :deep(.ant-select-selector),
+  :deep(.ant-picker),
+  :deep(.ant-input-textarea textarea) {
     border-radius: var(--radius) !important;
     border-color: var(--color-border) !important;
     font-size: 13px;
@@ -318,15 +368,15 @@
       border-color: var(--color-primary) !important;
       box-shadow: 0 0 0 2px var(--color-primary-light) !important;
     }
-}
+  }
 
-:deep(.ant-select-focused .ant-select-selector) {
+  :deep(.ant-select-focused .ant-select-selector) {
     border-color: var(--color-primary) !important;
     box-shadow: 0 0 0 2px var(--color-primary-light) !important;
-}
+  }
 
-/* ==================== 按钮样式 ==================== */
-:deep(.ant-btn) {
+  /* ==================== 按钮样式 ==================== */
+  :deep(.ant-btn) {
     border-radius: var(--radius);
     font-weight: 500;
     font-size: 13px;
@@ -355,15 +405,15 @@
         background: var(--color-primary-light);
       }
     }
-}
+  }
 
-/* ==================== 加载状态 ==================== */
-:deep(.ant-spin-container) {
+  /* ==================== 加载状态 ==================== */
+  :deep(.ant-spin-container) {
     min-height: 400px;
-}
+  }
 
-/* ==================== 响应式设计 ==================== */
-@media (max-width: 768px) {
+  /* ==================== 响应式设计 ==================== */
+  @media (max-width: 768px) {
     .form-header {
       padding: 16px 20px;
     }
@@ -375,5 +425,5 @@
     .form-footer {
       padding: 12px 20px;
     }
-}
+  }
 </style>

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

@@ -253,12 +253,6 @@
   const visible = ref(false);
   const formRef = ref();
 
-  // const exeRules = ref([
-  //   { value: 1, label: '事件触发' },
-  //   { value: 2, label: '周期执行' },
-  //   { value: 3, label: '一次性执行' },
-  // ]);
-
   const formModel = reactive({
     projectName: '',
     projectType: '',
@@ -347,7 +341,6 @@
       resetForm();
       closeModal();
     } catch (e) {
-      console.log(e);
     } finally {
       setModalProps({ confirmLoading: 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">
@@ -18,9 +18,12 @@
             bpm_status=#{formTp},
         </if>
         <if test="formTp != null and formTp == ''">
-            bpm_status=NULL,
+            bpm_status=NULL,deploy_id=null
         </if>
-        deploy_id=#{formUrl} where ${formContent}
+        <if test="formUrl != null and formUrl != ''">
+            deploy_id=#{formUrl}
+        </if>
+         where ${formContent}
     </update>
 
     <update id="updateBisTabUid" 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/FlowInstanceServiceImpl.java

@@ -139,7 +139,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
                         flowFormben.setFormTableName(tabname);
                         flowFormben.setFormContent(formContent);
                         flowFormben.setFormTp("");
-                        flowFormben.setFormUrl(DeployId);
+                        //flowFormben.setFormUrl(DeployId);
                         sysDeployFormService.updateBisTabBpmStatus(flowFormben);
                     }
                 }

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

+package org.jeecg.modules.stm.my.controller;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.stm.my.entity.MyTaskFlowHis;
+import org.jeecg.modules.stm.my.service.IMyTaskFlowHisService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+ /**
+ * @Description: my_task_flow_his
+ * @Author: jeecg-boot
+ * @Date:   2026-04-10
+ * @Version: V1.0
+ */
+@Tag(name="my_task_flow_his")
+@RestController
+@RequestMapping("/my/myTaskFlowHis")
+@Slf4j
+public class MyTaskFlowHisController extends JeecgController<MyTaskFlowHis, IMyTaskFlowHisService> {
+	@Autowired
+	private IMyTaskFlowHisService myTaskFlowHisService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param myTaskFlowHis
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "my_task_flow_his-分页列表查询")
+	@Operation(summary="my_task_flow_his-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<MyTaskFlowHis>> queryPageList(MyTaskFlowHis myTaskFlowHis,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+
+
+        QueryWrapper<MyTaskFlowHis> queryWrapper = QueryGenerator.initQueryWrapper(myTaskFlowHis, req.getParameterMap());
+		Page<MyTaskFlowHis> page = new Page<MyTaskFlowHis>(pageNo, pageSize);
+		IPage<MyTaskFlowHis> pageList = myTaskFlowHisService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param myTaskFlowHis
+	 * @return
+	 */
+	@AutoLog(value = "my_task_flow_his-添加")
+	@Operation(summary="my_task_flow_his-添加")
+	@RequiresPermissions("my:my_task_flow_his:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody MyTaskFlowHis myTaskFlowHis) {
+		myTaskFlowHisService.save(myTaskFlowHis);
+
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param myTaskFlowHis
+	 * @return
+	 */
+	@AutoLog(value = "my_task_flow_his-编辑")
+	@Operation(summary="my_task_flow_his-编辑")
+	@RequiresPermissions("my:my_task_flow_his:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody MyTaskFlowHis myTaskFlowHis) {
+		myTaskFlowHisService.updateById(myTaskFlowHis);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "my_task_flow_his-通过id删除")
+	@Operation(summary="my_task_flow_his-通过id删除")
+	@RequiresPermissions("my:my_task_flow_his:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		myTaskFlowHisService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "my_task_flow_his-批量删除")
+	@Operation(summary="my_task_flow_his-批量删除")
+	@RequiresPermissions("my:my_task_flow_his:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.myTaskFlowHisService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "my_task_flow_his-通过id查询")
+	@Operation(summary="my_task_flow_his-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<MyTaskFlowHis> queryById(@RequestParam(name="id",required=true) String id) {
+		MyTaskFlowHis myTaskFlowHis = myTaskFlowHisService.getById(id);
+		if(myTaskFlowHis==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(myTaskFlowHis);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param myTaskFlowHis
+    */
+    @RequiresPermissions("my:my_task_flow_his:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MyTaskFlowHis myTaskFlowHis) {
+        return super.exportXls(request, myTaskFlowHis, MyTaskFlowHis.class, "my_task_flow_his");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("my:my_task_flow_his:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, MyTaskFlowHis.class);
+    }
+
+}

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

@@ -96,4 +96,6 @@ public class MyTask implements Serializable {
 	@Excel(name = "描述", width = 15)
     
     private String des;
+
+    private String roleid;
 }

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

+package org.jeecg.modules.stm.my.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: my_task_flow_his
+ * @Author: jeecg-boot
+ * @Date:   2026-04-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("my_task_flow_his")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="my_task_flow_his")
+public class MyTaskFlowHis implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.AUTO)
+    @Schema(description = "id")
+    private java.lang.Integer id;
+	/**表单的表名ID*/
+	@Excel(name = "表单的表名ID", width = 15)
+    @Schema(description = "表单的表名ID")
+    private java.lang.String formTableName;
+	/**业务主表ID*/
+	@Excel(name = "业务主表ID", width = 15)
+    @Schema(description = "业务主表ID")
+    private java.lang.String targetId;
+	/**部署ID*/
+	@Excel(name = "部署ID", width = 15)
+    @Schema(description = "部署ID")
+    private java.lang.String deployId;
+	/**任务ID*/
+	@Excel(name = "任务ID", width = 15)
+    @Schema(description = "任务ID")
+    private java.lang.String taskId;
+	/**实例ID*/
+	@Excel(name = "实例ID", width = 15)
+    @Schema(description = "实例ID")
+    private java.lang.String procInsId;
+	/**执行ID*/
+	@Excel(name = "执行ID", width = 15)
+    @Schema(description = "执行ID")
+    private java.lang.String executionId;
+	/**流程定义ID*/
+	@Excel(name = "流程定义ID", width = 15)
+    @Schema(description = "流程定义ID")
+    private java.lang.String procDefId;
+	/**代办人*/
+	@Excel(name = "代办人", width = 15)
+    @Schema(description = "代办人")
+    private java.lang.String uid;
+	/**代办角色*/
+	@Excel(name = "代办角色", width = 15)
+    @Schema(description = "代办角色")
+    private java.lang.String roleid;
+	/**节点ID*/
+	@Excel(name = "节点ID", width = 15)
+    @Schema(description = "节点ID")
+    private java.lang.String taskDefinitionKey;
+	/**操作时间*/
+	@Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "操作时间")
+    private java.util.Date optionTime;
+	/**操作人*/
+	@Excel(name = "操作人", width = 15)
+    @Schema(description = "操作人")
+    private java.lang.String optionId;
+	/**操作类型*/
+	@Excel(name = "操作类型", width = 15)
+    @Schema(description = "操作类型")
+    private java.lang.String optionType;
+	/**节点类型*/
+	@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;
+}

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

+package org.jeecg.modules.stm.my.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.stm.my.entity.MyTaskFlowHis;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: my_task_flow_his
+ * @Author: jeecg-boot
+ * @Date:   2026-04-10
+ * @Version: V1.0
+ */
+public interface MyTaskFlowHisMapper extends BaseMapper<MyTaskFlowHis> {
+
+}

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

+package org.jeecg.modules.stm.my.service;
+
+import org.jeecg.modules.stm.my.entity.MyTaskFlowHis;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: my_task_flow_his
+ * @Author: jeecg-boot
+ * @Date:   2026-04-10
+ * @Version: V1.0
+ */
+public interface IMyTaskFlowHisService extends IService<MyTaskFlowHis> {
+
+}

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/my/service/impl/MyTaskFlowHisServiceImpl.java

+package org.jeecg.modules.stm.my.service.impl;
+
+import org.jeecg.modules.stm.my.entity.MyTaskFlowHis;
+import org.jeecg.modules.stm.my.mapper.MyTaskFlowHisMapper;
+import org.jeecg.modules.stm.my.service.IMyTaskFlowHisService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: my_task_flow_his
+ * @Author: jeecg-boot
+ * @Date:   2026-04-10
+ * @Version: V1.0
+ */
+@Service
+public class MyTaskFlowHisServiceImpl extends ServiceImpl<MyTaskFlowHisMapper, MyTaskFlowHis> implements IMyTaskFlowHisService {
+
+}

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/page/controller/PageTitleconfigController.java

@@ -13,6 +13,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.stm.baosong.entity.BaosongTaskRecord;
 import org.jeecg.modules.stm.baosong.service.IBaosongTaskRecordService;
 import org.jeecg.modules.stm.page.entity.PageTitleconfig;
+import org.jeecg.modules.system.entity.SysUserRole;
+import org.jeecg.modules.system.service.ISysUserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,10 +26,8 @@ import org.jeecg.modules.stm.rectify.plan.service.IStRectifyPlanService;
 import org.jeecg.modules.stm.utils.UserUtil;
 
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -46,6 +46,8 @@ public class PageTitleconfigController extends JeecgController<PageTitleconfig,
 
     @Autowired
     private IBaosongTaskRecordService baosongTaskRecordService;
+    @Autowired
+    private ISysUserRoleService sysUserRoleService;
 
     @GetMapping(value = "/list")
     public Result<IPage<PageTitleconfig>> queryPageList(PageTitleconfig pageTitleconfig,
@@ -90,7 +92,30 @@ public class PageTitleconfigController extends JeecgController<PageTitleconfig,
         //获取待办事项列表，待审批和待填报
         QueryWrapper<MyTask> queryWrapper = new QueryWrapper();
         String userId = UserUtil.getUserId();
-        queryWrapper.eq("sta",0).eq("uid",userId).orderByDesc("priority").orderByDesc("st_time");
+        String roleids="";
+        List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, userId));
+        for(int u=0;u<userRole.size();u++){
+            SysUserRole sysUserRole=userRole.get(u);
+            roleids=roleids+sysUserRole.getRoleId()+",";
+        }
+        if(!roleids.equals("")){
+            roleids=roleids.substring(0,roleids.length()-1);
+
+        }
+        // 创建一个最终变量或实际上的最终变量用于 lambda
+        final String finalRoleids = roleids;
+
+        //queryWrapper.eq("sta",0).eq("uid",userId).orderByDesc("priority").orderByDesc("st_time");
+        // 修改：uid 和 roleid 是 OR 关系
+        queryWrapper.eq("sta", 0)
+                .and(wrapper -> {
+                    wrapper.eq("uid", userId);
+                    if(!"".equals(finalRoleids)){
+                        wrapper.or().in("roleid", Arrays.asList(finalRoleids.split(",")));
+                    }
+                })
+                .orderByDesc("priority")
+                .orderByDesc("st_time");
         queryWrapper.last("limit 5");
         List<MyTask> list = myTaskService.list(queryWrapper);
         return Result.OK(list);

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/resources/mapping/my/MyTaskFlowHisMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.stm.my.mapper.MyTaskFlowHisMapper">
+
+</mapper>
\ No newline at end of file