项目流转项目id传参到子流程

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -32,6 +33,8 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目负责人")
     private Long projectLeader;
 
+    private SysUser projectLeaderUser;
+
     /** 项目状态（0进行中、1已结束） */
     @Excel(name = "项目状态", readConverterExp = "0=进行中、1已结束")
     private String isFinished;
@@ -68,6 +71,8 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目登记人")
     private Long projectRegistrant;
 
+    private SysUser projectRegistrantUser;
+
     /** 承担部门 */
     @Excel(name = "承担部门")
     private String undertakingDept;
@@ -292,6 +297,24 @@ public class CmcProject extends BaseEntity
     {
         return technicalId;
     }
+    public void setProjectLeaderUser(SysUser projectLeaderUser)
+    {
+        this.projectLeaderUser = projectLeaderUser;
+    }
+
+    public SysUser getProjectLeaderUser()
+    {
+        return projectLeaderUser;
+    }
+    public void setProjectRegistrantUser(SysUser projectRegistrantUser)
+    {
+        this.projectRegistrantUser = projectRegistrantUser;
+    }
+
+    public SysUser getProjectRegistrantUser()
+    {
+        return projectRegistrantUser;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -28,41 +28,55 @@
         <result property="remark"    column="remark"    />
         <result property="budgetId"    column="budget_id"    />
         <result property="technicalId"    column="technical_id"    />
+        <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
+        <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ProjectLeaderResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="leader_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ProjectRegistrantResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="registrant_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select project_id, project_number, project_name, project_leader, is_finished, project_source, party_a, contact_person, telephone, contract_id, project_type, project_level, project_registrant, undertaking_dept, project_planner, site_leader, create_time, plan_time, entry_time, exit_time, remark, budget_id, technical_id from cmc_project
+        select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone, p.contract_id, p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.create_time, p.plan_time, p.entry_time, p.exit_time, p.remark, p.budget_id, p.technical_id from cmc_project as p
+        left join sys_user as u on u.user_id = p.project_leader
+        left join sys_user as u1 on u1.user_id = p.project_registrant
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         <where>
-            <if test="projectNumber != null  and projectNumber != ''"> and project_number = #{projectNumber}</if>
-            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
-            <if test="projectLeader != null "> and project_leader = #{projectLeader}</if>
-            <if test="isFinished != null  and isFinished != ''"> and is_finished = #{isFinished}</if>
-            <if test="projectSource != null  and projectSource != ''"> and project_source = #{projectSource}</if>
-            <if test="partyA != null  and partyA != ''"> and party_a = #{partyA}</if>
-            <if test="contactPerson != null  and contactPerson != ''"> and contact_person = #{contactPerson}</if>
-            <if test="telephone != null  and telephone != ''"> and telephone = #{telephone}</if>
-            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
-            <if test="projectType != null  and projectType != ''"> and project_type = #{projectType}</if>
-            <if test="projectLevel != null  and projectLevel != ''"> and project_level = #{projectLevel}</if>
-            <if test="projectRegistrant != null "> and project_registrant = #{projectRegistrant}</if>
-            <if test="undertakingDept != null  and undertakingDept != ''"> and undertaking_dept = #{undertakingDept}</if>
-            <if test="projectPlanner != null "> and project_planner = #{projectPlanner}</if>
-            <if test="siteLeader != null "> and site_leader = #{siteLeader}</if>
-            <if test="planTime != null "> and plan_time = #{planTime}</if>
-            <if test="entryTime != null "> and entry_time = #{entryTime}</if>
-            <if test="exitTime != null "> and exit_time = #{exitTime}</if>
-            <if test="budgetId != null  and budgetId != ''"> and budget_id = #{budgetId}</if>
-            <if test="technicalId != null  and technicalId != ''"> and technical_id = #{technicalId}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number = #{projectNumber}</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="projectLeader != null "> and p.project_leader = #{projectLeader}</if>
+            <if test="isFinished != null  and isFinished != ''"> and p.is_finished = #{isFinished}</if>
+            <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+            <if test="partyA != null  and partyA != ''"> and p.party_a = #{partyA}</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and p.contact_person = #{contactPerson}</if>
+            <if test="telephone != null  and telephone != ''"> and p.telephone = #{telephone}</if>
+            <if test="contractId != null  and contractId != ''"> and p.contract_id = #{contractId}</if>
+            <if test="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
+            <if test="projectLevel != null  and projectLevel != ''"> and p.project_level = #{projectLevel}</if>
+            <if test="projectRegistrant != null "> and p.project_registrant = #{projectRegistrant}</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and p.undertaking_dept = #{undertakingDept}</if>
+            <if test="projectPlanner != null "> and p.project_planner = #{projectPlanner}</if>
+            <if test="siteLeader != null "> and p.site_leader = #{siteLeader}</if>
+            <if test="planTime != null "> and p.plan_time = #{planTime}</if>
+            <if test="entryTime != null "> and p.entry_time = #{entryTime}</if>
+            <if test="exitTime != null "> and p.exit_time = #{exitTime}</if>
+            <if test="budgetId != null  and budgetId != ''"> and p.budget_id = #{budgetId}</if>
+            <if test="technicalId != null  and technicalId != ''"> and p.technical_id = #{technicalId}</if>
         </where>
     </select>
 
     <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
-        where project_id = #{projectId}
+        where p.project_id = #{projectId}
     </select>
 
     <insert id="insertCmcProject" parameterType="CmcProject">

oa-back/sql/sql.sql

@@ -5412,7 +5412,7 @@ INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID
 INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6005', '项目流转', 'project', NULL, '', '2024-04-02 13:23:32.390', NULL, NULL, '6005', NULL);
 INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6009', '安全交底', 'project', NULL, '', '2024-04-02 11:42:24.390', NULL, NULL, '6009', NULL);
 INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6013', '技术交底', 'project', NULL, '', '2024-04-02 11:32:12.390', NULL, NULL, '6013', NULL);
-INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6017', '预算审核', 'project', NULL, '', '2024-04-02 10:02:23.390', NULL, NULL, '6017', NULL);
+INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6017', '项目预算', 'project', NULL, '', '2024-04-02 10:02:23.390', NULL, NULL, '6017', NULL);
 COMMIT;
 
 -- ----------------------------
@@ -5492,7 +5492,7 @@ INSERT INTO `ACT_RE_PROCDEF` (`ID_`, `REV_`, `CATEGORY_`, `NAME_`, `KEY_`, `VERS
 INSERT INTO `ACT_RE_PROCDEF` (`ID_`, `REV_`, `CATEGORY_`, `NAME_`, `KEY_`, `VERSION_`, `DEPLOYMENT_ID_`, `RESOURCE_NAME_`, `DGRM_RESOURCE_NAME_`, `DESCRIPTION_`, `HAS_START_FORM_KEY_`, `HAS_GRAPHICAL_NOTATION_`, `SUSPENSION_STATE_`, `TENANT_ID_`, `ENGINE_VERSION_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `DERIVED_VERSION_`) VALUES ('project_circulation:1:6008', 2, 'project', '项目流转', 'project_circulation', 1, '6005', '项目流转.bpmn', '项目流转.project_circulation.png', NULL, 0, 1, 1, '', NULL, NULL, NULL, 0);
 INSERT INTO `ACT_RE_PROCDEF` (`ID_`, `REV_`, `CATEGORY_`, `NAME_`, `KEY_`, `VERSION_`, `DEPLOYMENT_ID_`, `RESOURCE_NAME_`, `DGRM_RESOURCE_NAME_`, `DESCRIPTION_`, `HAS_START_FORM_KEY_`, `HAS_GRAPHICAL_NOTATION_`, `SUSPENSION_STATE_`, `TENANT_ID_`, `ENGINE_VERSION_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `DERIVED_VERSION_`) VALUES ('safe_disclosure:1:6012', 2, 'project', '安全交底', 'safe_disclosure', 1, '6009', '安全交底.bpmn', '安全交底.safe_disclosure.png', NULL, 0, 1, 1, '', NULL, NULL, NULL, 0);
 INSERT INTO `ACT_RE_PROCDEF` (`ID_`, `REV_`, `CATEGORY_`, `NAME_`, `KEY_`, `VERSION_`, `DEPLOYMENT_ID_`, `RESOURCE_NAME_`, `DGRM_RESOURCE_NAME_`, `DESCRIPTION_`, `HAS_START_FORM_KEY_`, `HAS_GRAPHICAL_NOTATION_`, `SUSPENSION_STATE_`, `TENANT_ID_`, `ENGINE_VERSION_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `DERIVED_VERSION_`) VALUES ('tech_disclosure:1:6016', 2, 'project', '技术交底', 'tech_disclosure', 1, '6013', '技术交底.bpmn', '技术交底.tech_disclosure.png', NULL, 0, 1, 1, '', NULL, NULL, NULL, 0);
-INSERT INTO `ACT_RE_PROCDEF` (`ID_`, `REV_`, `CATEGORY_`, `NAME_`, `KEY_`, `VERSION_`, `DEPLOYMENT_ID_`, `RESOURCE_NAME_`, `DGRM_RESOURCE_NAME_`, `DESCRIPTION_`, `HAS_START_FORM_KEY_`, `HAS_GRAPHICAL_NOTATION_`, `SUSPENSION_STATE_`, `TENANT_ID_`, `ENGINE_VERSION_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `DERIVED_VERSION_`) VALUES ('project_budget:1:6020', 2, 'project', '预算审核', 'project_budget', 1, '6017', '预算审核.bpmn', '预算审核.project_budget.png', NULL, 0, 1, 1, '', NULL, NULL, NULL, 0);
+INSERT INTO `ACT_RE_PROCDEF` (`ID_`, `REV_`, `CATEGORY_`, `NAME_`, `KEY_`, `VERSION_`, `DEPLOYMENT_ID_`, `RESOURCE_NAME_`, `DGRM_RESOURCE_NAME_`, `DESCRIPTION_`, `HAS_START_FORM_KEY_`, `HAS_GRAPHICAL_NOTATION_`, `SUSPENSION_STATE_`, `TENANT_ID_`, `ENGINE_VERSION_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `DERIVED_VERSION_`) VALUES ('project_budget:1:6020', 2, 'project', '项目预算', 'project_budget', 1, '6017', '项目预算.bpmn', '项目预算.project_budget.png', NULL, 0, 1, 1, '', NULL, NULL, NULL, 0);
 COMMIT;
 
 -- ----------------------------

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-02 15:56:25
+ * @LastEditTime: 2024-04-03 17:05:19
 -->
 
 <template>
@@ -95,7 +95,7 @@
 </template>
 
 <script>
-import { listProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
+import { listProject, addProject, updateProject, delProject } from "@/api/oa/project/project";
 import { getUser } from '@/api/system/user'
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
@@ -165,14 +165,12 @@ export default {
       })
     },
     confirmAddForm() {
+      this.addForm.projectId = this.taskForm.formId;
       this.addForm.workList = this.workList;
-      let formData = new FormData();
-      let form = JSON.stringify(this.addForm);
-      formData.append("form", form);
-      // submitProject(formData).then(response => {
-      //   this.$modal.msgSuccess("新增成功");
-      //   this.getList();
-      // });
+      addProject(this.addForm).then(response => {
+        this.$modal.msgSuccess("新增成功");
+        this.getList();
+      });
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
       getNextFlowNode(params).then(res => {

oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-03 10:13:04
+ * @LastEditTime: 2024-04-03 16:53:59
 -->
 <template>
   <div class="app-container">
@@ -102,6 +102,7 @@ export default {
     }
   },
   created() {
+    this.form.projectId = this.taskForm.formId;
     this.getDeptList();
     this.getUserList();
   },
@@ -169,6 +170,7 @@ export default {
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
       getNextFlowNode(params).then(res => {
+        this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
         this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
         getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
           let userId = res.data.userId;