增加绩效上报部门字段

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

@@ -24,6 +24,10 @@ public class CmcPerformance extends BaseEntity
     @Excel(name = "上报人")
     private Long reporter;
 
+    /** 上报部门 */
+    @Excel(name = "上报部门")
+    private Long reportDept;
+
     /** 附件 */
     @Excel(name = "附件")
     private String document;
@@ -86,6 +90,15 @@ public class CmcPerformance extends BaseEntity
     {
         return reporter;
     }
+    public void setReportDept(Long reportDept)
+    {
+        this.reportDept = reportDept;
+    }
+
+    public Long getReportDept()
+    {
+        return reportDept;
+    }
     public void setDocument(String document)
     {
         this.document = document;
@@ -185,6 +198,7 @@ public class CmcPerformance extends BaseEntity
                 .append("document", getDocument())
                 .append("remark", getRemark())
                 .append("reportTime", getReportTime())
+                .append("reportDept", getReportDept())
                 .append("managerUserId", getManagerUserId())
                 .append("managerComment", getManagerComment())
                 .append("managerTime", getManagerTime())

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="document"    column="document"    />
         <result property="remark"    column="remark"    />
         <result property="reportTime"    column="report_time"    />
+        <result property="reportDept"    column="report_dept"    />
         <result property="managerUserId"    column="manager_user_id"    />
         <result property="managerComment"    column="manager_comment"    />
         <result property="managerTime"    column="manager_time"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcPerformanceVo">
-        select performance_id, reporter, document, remark, report_time, manager_user_id, manager_comment, manager_time, zjl_user_id, zjl_comment, zjl_time, zh_user_id, zh_time from cmc_performance
+        select performance_id, reporter, document, remark, report_time, report_dept, manager_user_id, manager_comment, manager_time, zjl_user_id, zjl_comment, zjl_time, zh_user_id, zh_time from cmc_performance
     </sql>
 
     <select id="selectCmcPerformanceList" parameterType="CmcPerformance" resultMap="CmcPerformanceResult">
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reporter != null "> and reporter = #{reporter}</if>
             <if test="document != null  and document != ''"> and document = #{document}</if>
             <if test="reportTime != null "> and report_time = #{reportTime}</if>
+            <if test="reportDept != null "> and report_dept = #{reportDept}</if>
             <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
             <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
             <if test="managerTime != null "> and manager_time = #{managerTime}</if>
@@ -54,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="document != null">document,</if>
             <if test="remark != null">remark,</if>
             <if test="reportTime != null">report_time,</if>
+            <if test="reportDept != null">report_dept,</if>
             <if test="managerUserId != null">manager_user_id,</if>
             <if test="managerComment != null">manager_comment,</if>
             <if test="managerTime != null">manager_time,</if>
@@ -69,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="document != null">#{document},</if>
             <if test="remark != null">#{remark},</if>
             <if test="reportTime != null">#{reportTime},</if>
+            <if test="reportDept != null">#{reportDept},</if>
             <if test="managerUserId != null">#{managerUserId},</if>
             <if test="managerComment != null">#{managerComment},</if>
             <if test="managerTime != null">#{managerTime},</if>
@@ -87,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="document != null">document = #{document},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="reportDept != null">report_dept = #{reportDept},</if>
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="managerComment != null">manager_comment = #{managerComment},</if>
             <if test="managerTime != null">manager_time = #{managerTime},</if>