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 v-show="formTp == 1" class="form-wrapper">
-                      <FlowInnerForm ref="refCruInnerForm" :key="formKey" style="width: 100%" />
-                    </div>
-                    <div v-show="formTp == 2" class="iframe-container" style="height: 470px">
-                      <iFrame :key="formKey" :src="formUrl" class="responsive-iframe" style="width: 100%; height: 100%" />
-                    </div>
+                <div class="form-card">
+                  <div v-show="formTp == 1" class="form-wrapper">
+                    <FlowInnerForm ref="refCruInnerForm" :key="formKey" style="width: 100%; height: 100%" />
                   </div>
-                </a-card>
+                  <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> -->
               </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,11 +536,13 @@
         submitData.values['userTaskid'] = nextNodeNameSelevue.value;
       }
 
+      
       if (!showApprovalUi.value) {
         await complete(submitData);
         emit('callback');
         return false;
       }
+      
 
       const formData = await validate();
       Object.assign(submitData, formData);
@@ -562,6 +564,7 @@
         submitData.values['approvalType'] = 'role';
       }
       // }
+      console.log("-----------submitData ",submitData);
 
       // 执行发送
       const result = await complete(submitData);
@@ -723,8 +726,8 @@
     }
   };
 
-   //转办处理 
-   const handleAssignTask = async () => {
+  //转办处理
+  const handleAssignTask = async () => {
     if (assigning.value) return;
     try {
       assigning.value = true;
@@ -738,33 +741,32 @@
       const formData = await validate();
       Object.assign(submitData, formData);
       submitData.comment = submitData.comment || '';
-       //test1 1958436761110269953   
-     // submitData.values['targetUserId'] = '1959869916657950721';
-      
-        if (userType.value === 'user') {
+      //test1 1958436761110269953
+      // submitData.values['targetUserId'] = '1959869916657950721';
+
+      if (userType.value === 'user') {
+        submitData.values['targetUserId'] = formData.checkSendUser;
+        submitData.values['approvalType'] = 'user';
+
+        if (formData.checkSendUser) {
           submitData.values['targetUserId'] = formData.checkSendUser;
           submitData.values['approvalType'] = 'user';
-
-          if (formData.checkSendUser) {
-            submitData.values['targetUserId'] = formData.checkSendUser;
-            submitData.values['approvalType'] = 'user';
-          }
-        } else if (formData.checkSendRole) {
-          submitData.values['targetUserId'] = formData.checkSendRole;
-          submitData.values['approvalType'] = 'role';
         }
-        const dataId = formUrl.value.split('=').pop();
-        submitData.values['dataId'] = dataId;
-
-        const lastEqualIndex = formUrl.value.lastIndexOf('=');
-        // 往前找到 & 或 ? 的位置
-        let startIndex = formUrl.value.lastIndexOf('&', lastEqualIndex);
-        if (startIndex === -1) {
-          startIndex = formUrl.value.lastIndexOf('?', lastEqualIndex);
-        }
-        const dataName = formUrl.value.substring(startIndex + 1, lastEqualIndex);
-        submitData.values['dataName'] = dataName;
-
+      } else if (formData.checkSendRole) {
+        submitData.values['targetUserId'] = formData.checkSendRole;
+        submitData.values['approvalType'] = 'role';
+      }
+      const dataId = formUrl.value.split('=').pop();
+      submitData.values['dataId'] = dataId;
+
+      const lastEqualIndex = formUrl.value.lastIndexOf('=');
+      // 往前找到 & 或 ? 的位置
+      let startIndex = formUrl.value.lastIndexOf('&', lastEqualIndex);
+      if (startIndex === -1) {
+        startIndex = formUrl.value.lastIndexOf('?', lastEqualIndex);
+      }
+      const dataName = formUrl.value.substring(startIndex + 1, lastEqualIndex);
+      submitData.values['dataName'] = dataName;
 
       // 执行发送
       const result = await assign(submitData);
@@ -784,8 +786,8 @@
     }
   };
 
-  //转阅处理 
-   const handleAssignReadTask = async () => {
+  //转阅处理
+  const handleAssignReadTask = async () => {
     if (assiReadgning.value) return;
     try {
       assiReadgning.value = true;
@@ -799,23 +801,21 @@
       const formData = await validate();
       Object.assign(submitData, formData);
       submitData.comment = submitData.comment || '';
-       //test1 1958436761110269953   
-     // submitData.values['targetUserId'] = '1959869916657950721';
-      
-        if (userType.value === 'user') {
+      //test1 1958436761110269953
+      // submitData.values['targetUserId'] = '1959869916657950721';
+
+      if (userType.value === 'user') {
+        submitData.values['targetUserId'] = formData.checkSendUser;
+        submitData.values['approvalType'] = 'user';
+
+        if (formData.checkSendUser) {
           submitData.values['targetUserId'] = formData.checkSendUser;
           submitData.values['approvalType'] = 'user';
-
-          if (formData.checkSendUser) {
-            submitData.values['targetUserId'] = formData.checkSendUser;
-            submitData.values['approvalType'] = 'user';
-          }
-        } else if (formData.checkSendRole) {
-          submitData.values['targetUserId'] = formData.checkSendRole;
-          submitData.values['approvalType'] = 'role';
         }
-        
-     
+      } else if (formData.checkSendRole) {
+        submitData.values['targetUserId'] = formData.checkSendRole;
+        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/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);
+    }
+
+}