判断当前节点是否发起人节点

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java

@@ -178,6 +178,12 @@ public class FlowTaskController {
         return flowTaskService.getNextFlowNodeByStart(flowTaskVo);
     }
 
+    @ApiOperation(value = "判断当前节点是否发起人节点")
+    @PostMapping(value = "/isStartUserNode")
+    public AjaxResult checkIsStartUserNode(@RequestBody FlowTaskVo flowTaskVo) {
+        return flowTaskService.checkIsStartUserNode(flowTaskVo);
+    }
+
     /**
      * 生成流程图
      *

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowTaskService.java

@@ -186,6 +186,13 @@ public interface IFlowTaskService {
 
     AjaxResult getNextFlowNodeByStart(FlowTaskVo flowTaskVo);
 
+    /**
+     * 判断当前节点是否发起人节点
+     * @param flowTaskVo 任务
+     * @return
+     */
+    AjaxResult checkIsStartUserNode(FlowTaskVo flowTaskVo);
+
     /**
      * 流程初始化表单
      * @param deployId

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1089,6 +1089,47 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         return AjaxResult.success(flowNextDto);
     }
 
+    /**
+     * 根据任务ID判断当前节点是否为开始节点后面的第一个用户任务节点
+     *
+     * @param flowTaskVo 任务
+     * @return
+     */
+    public AjaxResult checkIsStartUserNode(FlowTaskVo flowTaskVo) {
+        //判断当前是否是第一个发起任务节点，若是就put变量isStartNode为True,让相应的表单可以编辑
+        boolean isStartNode= false;
+        // 当前任务 task
+        Task task = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult();
+        // 获取流程定义信息
+        if (task != null) {
+            ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
+                    .processDefinitionId(task.getProcessDefinitionId()).singleResult();
+            // 获取所有节点信息
+            Process process = repositoryService.getBpmnModel(processDefinition.getId()).getProcesses().get(0);
+            // 获取全部节点列表，包含子节点
+            Collection<FlowElement> allElements = FlowableUtils.getAllElements(process.getFlowElements(), null);
+            // 获取当前任务节点元素
+            FlowElement source = null;
+            if (allElements != null) {
+                for (FlowElement flowElement : allElements) {
+                    // 类型为用户节点
+                    if (flowElement.getId().equals(task.getTaskDefinitionKey())) {
+                        // 获取节点信息
+                        source = flowElement;
+                        List<SequenceFlow> inFlows = FlowableUtils.getElementIncomingFlows(source);
+                        if (inFlows.size() == 1) {
+                            FlowElement sourceFlowElement = inFlows.get(0).getSourceFlowElement();
+                            if (sourceFlowElement instanceof StartEvent) {// 源是开始节点
+                                isStartNode = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return AjaxResult.success(isStartNode);
+    }
+
     /**
      * 流程初始化表单
      *

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

@@ -0,0 +1,92 @@
+<?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="com.ruoyi.oa.mapper.CmcAssessContentMapper">
+    
+    <resultMap type="CmcAssessContent" id="CmcAssessContentResult">
+        <result property="contentId"    column="content_id"    />
+        <result property="role"    column="role"    />
+        <result property="familiar"    column="familiar"    />
+        <result property="remark"    column="remark"    />
+        <result property="workload"    column="workload"    />
+        <result property="skill"    column="skill"    />
+        <result property="quality"    column="quality"    />
+        <result property="assessment"    column="assessment"    />
+        <result property="advice"    column="advice"    />
+    </resultMap>
+
+    <sql id="selectCmcAssessContentVo">
+        select content_id, role, familiar, remark, workload, skill, quality, assessment, advice from cmc_assess_content
+    </sql>
+
+    <select id="selectCmcAssessContentList" parameterType="CmcAssessContent" resultMap="CmcAssessContentResult">
+        <include refid="selectCmcAssessContentVo"/>
+        <where>  
+            <if test="role != null  and role != ''"> and role = #{role}</if>
+            <if test="familiar != null  and familiar != ''"> and familiar = #{familiar}</if>
+            <if test="workload != null  and workload != ''"> and workload = #{workload}</if>
+            <if test="skill != null  and skill != ''"> and skill = #{skill}</if>
+            <if test="quality != null  and quality != ''"> and quality = #{quality}</if>
+            <if test="assessment != null  and assessment != ''"> and assessment = #{assessment}</if>
+            <if test="advice != null  and advice != ''"> and advice = #{advice}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcAssessContentByContentId" parameterType="String" resultMap="CmcAssessContentResult">
+        <include refid="selectCmcAssessContentVo"/>
+        where content_id = #{contentId}
+    </select>
+        
+    <insert id="insertCmcAssessContent" parameterType="CmcAssessContent">
+        insert into cmc_assess_content
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="contentId != null">content_id,</if>
+            <if test="role != null">role,</if>
+            <if test="familiar != null">familiar,</if>
+            <if test="remark != null">remark,</if>
+            <if test="workload != null">workload,</if>
+            <if test="skill != null">skill,</if>
+            <if test="quality != null">quality,</if>
+            <if test="assessment != null">assessment,</if>
+            <if test="advice != null">advice,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="contentId != null">#{contentId},</if>
+            <if test="role != null">#{role},</if>
+            <if test="familiar != null">#{familiar},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="workload != null">#{workload},</if>
+            <if test="skill != null">#{skill},</if>
+            <if test="quality != null">#{quality},</if>
+            <if test="assessment != null">#{assessment},</if>
+            <if test="advice != null">#{advice},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcAssessContent" parameterType="CmcAssessContent">
+        update cmc_assess_content
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="role != null">role = #{role},</if>
+            <if test="familiar != null">familiar = #{familiar},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="workload != null">workload = #{workload},</if>
+            <if test="skill != null">skill = #{skill},</if>
+            <if test="quality != null">quality = #{quality},</if>
+            <if test="assessment != null">assessment = #{assessment},</if>
+            <if test="advice != null">advice = #{advice},</if>
+        </trim>
+        where content_id = #{contentId}
+    </update>
+
+    <delete id="deleteCmcAssessContentByContentId" parameterType="String">
+        delete from cmc_assess_content where content_id = #{contentId}
+    </delete>
+
+    <delete id="deleteCmcAssessContentByContentIds" parameterType="String">
+        delete from cmc_assess_content where content_id in 
+        <foreach item="contentId" collection="array" open="(" separator="," close=")">
+            #{contentId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,58 @@
+<?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="com.ruoyi.oa.mapper.CmcAssessContentWorkMapper">
+    
+    <resultMap type="CmcAssessContentWork" id="CmcAssessContentWorkResult">
+        <result property="workId"    column="work_id"    />
+        <result property="workLoad"    column="work_load"    />
+    </resultMap>
+
+    <sql id="selectCmcAssessContentWorkVo">
+        select work_id, work_load from cmc_assess_content_work
+    </sql>
+
+    <select id="selectCmcAssessContentWorkList" parameterType="CmcAssessContentWork" resultMap="CmcAssessContentWorkResult">
+        <include refid="selectCmcAssessContentWorkVo"/>
+        <where>
+            <if test="workLoad != null  and workLoad != ''"> and work_load = #{workLoad}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcAssessContentWorkByWorkId" parameterType="String" resultMap="CmcAssessContentWorkResult">
+        <include refid="selectCmcAssessContentWorkVo"/>
+        where work_id = #{workId}
+    </select>
+        
+    <insert id="insertCmcAssessContentWork" parameterType="CmcAssessContentWork">
+        insert into cmc_assess_content_work
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="workId != null">work_id,</if>
+            <if test="workLoad != null">work_load,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="workId != null">#{workId},</if>
+            <if test="workLoad != null">#{workLoad},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcAssessContentWork" parameterType="CmcAssessContentWork">
+        update cmc_assess_content_work
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="workLoad != null">work_load = #{workLoad},</if>
+        </trim>
+        where work_id = #{workId}
+    </update>
+
+    <delete id="deleteCmcAssessContentWorkByWorkId" parameterType="String">
+        delete from cmc_assess_content_work where work_id = #{workId}
+    </delete>
+
+    <delete id="deleteCmcAssessContentWorkByWorkIds" parameterType="String">
+        delete from cmc_assess_content_work where work_id in 
+        <foreach item="workId" collection="array" open="(" separator="," close=")">
+            #{workId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,133 @@
+<?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="com.ruoyi.oa.mapper.CmcAssessMapper">
+
+    <resultMap type="CmcAssess" id="CmcAssessResult">
+        <result property="assessId"    column="assess_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="assessTime"    column="assess_time"    />
+        <result property="deptAssessment"    column="dept_assessment"    />
+        <result property="deptAdvice"    column="dept_advice"    />
+        <result property="deptTime"    column="dept_time"    />
+        <result property="deptAssesser"    column="dept_assesser"    />
+        <result property="managerAssessment"    column="manager_assessment"    />
+        <result property="managerAdvice"    column="manager_advice"    />
+        <result property="managerTime"    column="manager_time"    />
+        <result property="managerAssesser"    column="manager_assesser"    />
+        <result property="selfAssess"    column="self_assess"    />
+        <result property="fillTime"    column="fill_time"    />
+        <result property="otherWork"    column="other_work"    />
+        <result property="otherWorkunit"    column="other_workunit"    />
+        <result property="otherWorkload"    column="other_workload"    />
+    </resultMap>
+
+    <sql id="selectCmcAssessVo">
+        select assess_id, user_id, project_id, assess_time, dept_assessment, dept_advice, dept_time, dept_assesser, manager_assessment, manager_advice, manager_time, manager_assesser, self_assess, fill_time, other_work, other_workunit, other_workload from cmc_assess
+    </sql>
+
+    <select id="selectCmcAssessList" parameterType="CmcAssess" resultMap="CmcAssessResult">
+        <include refid="selectCmcAssessVo"/>
+        <where>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="assessTime != null "> and assess_time = #{assessTime}</if>
+            <if test="deptAssessment != null  and deptAssessment != ''"> and dept_assessment = #{deptAssessment}</if>
+            <if test="deptAdvice != null  and deptAdvice != ''"> and dept_advice = #{deptAdvice}</if>
+            <if test="deptTime != null "> and dept_time = #{deptTime}</if>
+            <if test="deptAssesser != null  and deptAssesser != ''"> and dept_assesser = #{deptAssesser}</if>
+            <if test="managerAssessment != null  and managerAssessment != ''"> and manager_assessment = #{managerAssessment}</if>
+            <if test="managerAdvice != null  and managerAdvice != ''"> and manager_advice = #{managerAdvice}</if>
+            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
+            <if test="managerAssesser != null  and managerAssesser != ''"> and manager_assesser = #{managerAssesser}</if>
+            <if test="selfAssess != null  and selfAssess != ''"> and self_assess = #{selfAssess}</if>
+            <if test="fillTime != null "> and fill_time = #{fillTime}</if>
+            <if test="otherWork != null  and otherWork != ''"> and other_work = #{otherWork}</if>
+            <if test="otherWorkunit != null  and otherWorkunit != ''"> and other_workunit = #{otherWorkunit}</if>
+            <if test="otherWorkload != null  and otherWorkload != ''"> and other_workload = #{otherWorkload}</if>
+        </where>
+    </select>
+
+    <select id="selectCmcAssessByAssessId" parameterType="String" resultMap="CmcAssessResult">
+        <include refid="selectCmcAssessVo"/>
+        where assess_id = #{assessId}
+    </select>
+
+    <insert id="insertCmcAssess" parameterType="CmcAssess">
+        insert into cmc_assess
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="assessId != null">assess_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="assessTime != null">assess_time,</if>
+            <if test="deptAssessment != null">dept_assessment,</if>
+            <if test="deptAdvice != null">dept_advice,</if>
+            <if test="deptTime != null">dept_time,</if>
+            <if test="deptAssesser != null">dept_assesser,</if>
+            <if test="managerAssessment != null">manager_assessment,</if>
+            <if test="managerAdvice != null">manager_advice,</if>
+            <if test="managerTime != null">manager_time,</if>
+            <if test="managerAssesser != null">manager_assesser,</if>
+            <if test="selfAssess != null">self_assess,</if>
+            <if test="fillTime != null">fill_time,</if>
+            <if test="otherWork != null">other_work,</if>
+            <if test="otherWorkunit != null">other_workunit,</if>
+            <if test="otherWorkload != null">other_workload,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="assessId != null">#{assessId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="assessTime != null">#{assessTime},</if>
+            <if test="deptAssessment != null">#{deptAssessment},</if>
+            <if test="deptAdvice != null">#{deptAdvice},</if>
+            <if test="deptTime != null">#{deptTime},</if>
+            <if test="deptAssesser != null">#{deptAssesser},</if>
+            <if test="managerAssessment != null">#{managerAssessment},</if>
+            <if test="managerAdvice != null">#{managerAdvice},</if>
+            <if test="managerTime != null">#{managerTime},</if>
+            <if test="managerAssesser != null">#{managerAssesser},</if>
+            <if test="selfAssess != null">#{selfAssess},</if>
+            <if test="fillTime != null">#{fillTime},</if>
+            <if test="otherWork != null">#{otherWork},</if>
+            <if test="otherWorkunit != null">#{otherWorkunit},</if>
+            <if test="otherWorkload != null">#{otherWorkload},</if>
+        </trim>
+    </insert>
+
+    <update id="updateCmcAssess" parameterType="CmcAssess">
+        update cmc_assess
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="assessTime != null">assess_time = #{assessTime},</if>
+            <if test="deptAssessment != null">dept_assessment = #{deptAssessment},</if>
+            <if test="deptAdvice != null">dept_advice = #{deptAdvice},</if>
+            <if test="deptTime != null">dept_time = #{deptTime},</if>
+            <if test="deptAssesser != null">dept_assesser = #{deptAssesser},</if>
+            <if test="managerAssessment != null">manager_assessment = #{managerAssessment},</if>
+            <if test="managerAdvice != null">manager_advice = #{managerAdvice},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="managerAssesser != null">manager_assesser = #{managerAssesser},</if>
+            <if test="selfAssess != null">self_assess = #{selfAssess},</if>
+            <if test="fillTime != null">fill_time = #{fillTime},</if>
+            <if test="otherWork != null">other_work = #{otherWork},</if>
+            <if test="otherWorkunit != null">other_workunit = #{otherWorkunit},</if>
+            <if test="otherWorkload != null">other_workload = #{otherWorkload},</if>
+        </trim>
+        where assess_id = #{assessId}
+    </update>
+
+    <delete id="deleteCmcAssessByAssessId" parameterType="String">
+        delete from cmc_assess where assess_id = #{assessId}
+    </delete>
+
+    <delete id="deleteCmcAssessByAssessIds" parameterType="String">
+        delete from cmc_assess where assess_id in
+        <foreach item="assessId" collection="array" open="(" separator="," close=")">
+            #{assessId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/sql/ry_20231130.sql

@@ -720,7 +720,22 @@ create table sys_role_dept (
 -- ----------------------------
 insert into sys_role_dept values ('2', '100');
 insert into sys_role_dept values ('2', '101');
+insert into sys_role_dept values ('2', '102');
+insert into sys_role_dept values ('2', '103');
+insert into sys_role_dept values ('2', '104');
 insert into sys_role_dept values ('2', '105');
+insert into sys_role_dept values ('2', '106');
+insert into sys_role_dept values ('2', '107');
+insert into sys_role_dept values ('2', '108');
+insert into sys_role_dept values ('2', '109');
+insert into sys_role_dept values ('2', '110');
+insert into sys_role_dept values ('2', '111');
+insert into sys_role_dept values ('2', '112');
+insert into sys_role_dept values ('2', '113');
+insert into sys_role_dept values ('2', '114');
+insert into sys_role_dept values ('2', '115');
+insert into sys_role_dept values ('2', '116');
+insert into sys_role_dept values ('2', '117');
 
 
 -- ----------------------------

oa-ui/src/api/flowable/todo.js

@@ -73,6 +73,15 @@ export function getNextFlowNodeByStart(data) {
   })
 }
 
+// 判断当前节点是否发起人节点
+export function checkIsStartUserNode(data) {
+  return request({
+    url: '/flowable/task/isStartUserNode',
+    method: 'post',
+    data: data
+  })
+}
+
 // 部署流程实例
 export function deployStart(deployId) {
   return request({