增加考核表其他工作相关字段，流程服务任务数据存储更新

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/MyServiceTask.java

@@ -0,0 +1,25 @@
+package com.ruoyi.flowable.oa;
+
+import org.flowable.engine.ProcessEngine;
+import org.flowable.engine.ProcessEngines;
+import org.flowable.engine.RuntimeService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.flowable.engine.task.Comment;
+
+import java.util.Map;
+
+public class MyServiceTask implements JavaDelegate {
+    @Override
+    public void execute(DelegateExecution execution) {
+        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+        RuntimeService runtimeService = processEngine.getRuntimeService();
+        Map<String,Object> variables = runtimeService.getVariables(execution.getId());
+        String processInstance = execution.getProcessInstanceId();
+        for (Comment comment: processEngine.getTaskService().getProcessInstanceComments(processInstance))
+            System.out.println(comment.getFullMessage());
+        System.out.println("========MyServiceTask==========");
+        System.out.println(variables);
+        System.out.println(processInstance);
+    }
+}

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

@@ -29,11 +29,11 @@ public class CmcAssess extends BaseEntity
     private Long projectId;
 
     /** 考核时间（月份） */
-    @Excel(name = "考核时间", dateFormat = "yyyy-MM")
+    @Excel(name = "考核时间", readConverterExp = "月=份")
     private Date assessTime;
 
     /** 部门考核等级（不合格、合格、良好、优秀） */
-    @Excel(name = "部门考核等级", readConverterExp = "0=不合格、1=合格、2=良好、3=优秀")
+    @Excel(name = "部门考核等级", readConverterExp = "不=合格、合格、良好、优秀")
     private String deptAssessment;
 
     /** 部门考核意见 */
@@ -75,150 +75,192 @@ public class CmcAssess extends BaseEntity
     @Excel(name = "考核填报时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fillTime;
 
-    public void setAssessId(String assessId) 
+    /** 其他工作 */
+    @Excel(name = "其他工作")
+    private String otherWork;
+
+    /** 其他工作单位 */
+    @Excel(name = "其他工作单位")
+    private String otherWorkunit;
+
+    /** 其他工作量 */
+    @Excel(name = "其他工作量")
+    private String otherWorkload;
+
+    public void setAssessId(String assessId)
     {
         this.assessId = assessId;
     }
 
-    public String getAssessId() 
+    public String getAssessId()
     {
         return assessId;
     }
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
-    public void setProjectId(Long projectId) 
+    public void setProjectId(Long projectId)
     {
         this.projectId = projectId;
     }
 
-    public Long getProjectId() 
+    public Long getProjectId()
     {
         return projectId;
     }
-    public void setAssessTime(Date assessTime) 
+    public void setAssessTime(Date assessTime)
     {
         this.assessTime = assessTime;
     }
 
-    public Date getAssessTime() 
+    public Date getAssessTime()
     {
         return assessTime;
     }
-    public void setDeptAssessment(String deptAssessment) 
+    public void setDeptAssessment(String deptAssessment)
     {
         this.deptAssessment = deptAssessment;
     }
 
-    public String getDeptAssessment() 
+    public String getDeptAssessment()
     {
         return deptAssessment;
     }
-    public void setDeptAdvice(String deptAdvice) 
+    public void setDeptAdvice(String deptAdvice)
     {
         this.deptAdvice = deptAdvice;
     }
 
-    public String getDeptAdvice() 
+    public String getDeptAdvice()
     {
         return deptAdvice;
     }
-    public void setDeptTime(Date deptTime) 
+    public void setDeptTime(Date deptTime)
     {
         this.deptTime = deptTime;
     }
 
-    public Date getDeptTime() 
+    public Date getDeptTime()
     {
         return deptTime;
     }
-    public void setDeptAssesser(String deptAssesser) 
+    public void setDeptAssesser(String deptAssesser)
     {
         this.deptAssesser = deptAssesser;
     }
 
-    public String getDeptAssesser() 
+    public String getDeptAssesser()
     {
         return deptAssesser;
     }
-    public void setManagerAssessment(String managerAssessment) 
+    public void setManagerAssessment(String managerAssessment)
     {
         this.managerAssessment = managerAssessment;
     }
 
-    public String getManagerAssessment() 
+    public String getManagerAssessment()
     {
         return managerAssessment;
     }
-    public void setManagerAdvice(String managerAdvice) 
+    public void setManagerAdvice(String managerAdvice)
     {
         this.managerAdvice = managerAdvice;
     }
 
-    public String getManagerAdvice() 
+    public String getManagerAdvice()
     {
         return managerAdvice;
     }
-    public void setManagerTime(Date managerTime) 
+    public void setManagerTime(Date managerTime)
     {
         this.managerTime = managerTime;
     }
 
-    public Date getManagerTime() 
+    public Date getManagerTime()
     {
         return managerTime;
     }
-    public void setManagerAssesser(String managerAssesser) 
+    public void setManagerAssesser(String managerAssesser)
     {
         this.managerAssesser = managerAssesser;
     }
 
-    public String getManagerAssesser() 
+    public String getManagerAssesser()
     {
         return managerAssesser;
     }
-    public void setSelfAssess(String selfAssess) 
+    public void setSelfAssess(String selfAssess)
     {
         this.selfAssess = selfAssess;
     }
 
-    public String getSelfAssess() 
+    public String getSelfAssess()
     {
         return selfAssess;
     }
-    public void setFillTime(Date fillTime) 
+    public void setFillTime(Date fillTime)
     {
         this.fillTime = fillTime;
     }
 
-    public Date getFillTime() 
+    public Date getFillTime()
     {
         return fillTime;
     }
+    public void setOtherWork(String otherWork)
+    {
+        this.otherWork = otherWork;
+    }
+
+    public String getOtherWork()
+    {
+        return otherWork;
+    }
+    public void setOtherWorkunit(String otherWorkunit)
+    {
+        this.otherWorkunit = otherWorkunit;
+    }
+
+    public String getOtherWorkunit()
+    {
+        return otherWorkunit;
+    }
+    public void setOtherWorkload(String otherWorkload)
+    {
+        this.otherWorkload = otherWorkload;
+    }
+
+    public String getOtherWorkload()
+    {
+        return otherWorkload;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("assessId", getAssessId())
-            .append("userId", getUserId())
-            .append("projectId", getProjectId())
-            .append("assessTime", getAssessTime())
-            .append("deptAssessment", getDeptAssessment())
-            .append("deptAdvice", getDeptAdvice())
-            .append("deptTime", getDeptTime())
-            .append("deptAssesser", getDeptAssesser())
-            .append("managerAssessment", getManagerAssessment())
-            .append("managerAdvice", getManagerAdvice())
-            .append("managerTime", getManagerTime())
-            .append("managerAssesser", getManagerAssesser())
-            .append("selfAssess", getSelfAssess())
-            .append("fillTime", getFillTime())
-            .toString();
-    }
-}
+                .append("assessId", getAssessId())
+                .append("userId", getUserId())
+                .append("projectId", getProjectId())
+                .append("assessTime", getAssessTime())
+                .append("deptAssessment", getDeptAssessment())
+                .append("deptAdvice", getDeptAdvice())
+                .append("deptTime", getDeptTime())
+                .append("deptAssesser", getDeptAssesser())
+                .append("managerAssessment", getManagerAssessment())
+                .append("managerAdvice", getManagerAdvice())
+                .append("managerTime", getManagerTime())
+                .append("managerAssesser", getManagerAssesser())
+                .append("selfAssess", getSelfAssess())
+                .append("fillTime", getFillTime())
+                .append("otherWork", getOtherWork())
+                .append("otherWorkunit", getOtherWorkunit())
+                .append("otherWorkload", getOtherWorkload())
+                .toString();
+    }
+}

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

@@ -3,7 +3,7 @@
 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"    />
@@ -19,15 +19,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 from cmc_assess
+        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>  
+        <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>
@@ -41,14 +44,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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=",">
@@ -66,7 +72,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerAssesser != null">manager_assesser,</if>
             <if test="selfAssess != null">self_assess,</if>
             <if test="fillTime != null">fill_time,</if>
-         </trim>
+            <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>
@@ -82,7 +91,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerAssesser != null">#{managerAssesser},</if>
             <if test="selfAssess != null">#{selfAssess},</if>
             <if test="fillTime != null">#{fillTime},</if>
-         </trim>
+            <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">
@@ -101,6 +113,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
@@ -110,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcAssessByAssessIds" parameterType="String">
-        delete from cmc_assess where assess_id in 
+        delete from cmc_assess where assess_id in
         <foreach item="assessId" collection="array" open="(" separator="," close=")">
             #{assessId}
         </foreach>

oa-back/sql/ry_20231130.sql

@@ -67,9 +67,9 @@ create table sys_user (
   update_by         varchar(64)     default ''                 comment '更新者',
   update_time       datetime                                   comment '更新时间',
   remark            varchar(500)    default null               comment '备注（作业类别）',
-  pm_level			char(2)			default null			   comment '项目经理级别（0一、1二、2三）',
+  pm_level			char(1)			default null			   comment '项目经理级别（0一、1二、2三）',
   titles			char(1)			default null			   comment '技术职称（0正高、1副高、2中级、3助工、4注测、5注规、6注岩、7注安、8注会）',
-  engineer_level	char(2)			default null			   comment '岗级（0二、1三、2四、3五、4六）',
+  engineer_level	char(1)			default null			   comment '岗级（0二、1三、2四、3五、4六）',
   entry_date		datetime								   comment '入职时间',
   age				int				default null			   comment '年龄',
   primary key (user_id)
@@ -1269,6 +1269,9 @@ create table cmc_assess (
   manager_assesser		varchar(30)		default null	comment '分管考核负责人',
   self_assess			varchar(255)	default null	comment '自述',
   fill_time				datetime		default null	comment '考核填报时间',
+  other_work			varchar(255)	default null	comment '其他工作',
+  other_workunit		varchar(255)	default null	comment '其他工作单位',
+  other_workload		varchar(255)	default null	comment '其他工作量',
   PRIMARY KEY (assess_id)
 ) engine=innodb	comment = 'cmc考核表';