Browse Source

增加绩效上报部门字段

lamphua 10 months ago
parent
commit
71f7e83c6b

+ 14
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcPerformance.java View File

24
     @Excel(name = "上报人")
24
     @Excel(name = "上报人")
25
     private Long reporter;
25
     private Long reporter;
26
 
26
 
27
+    /** 上报部门 */
28
+    @Excel(name = "上报部门")
29
+    private Long reportDept;
30
+
27
     /** 附件 */
31
     /** 附件 */
28
     @Excel(name = "附件")
32
     @Excel(name = "附件")
29
     private String document;
33
     private String document;
86
     {
90
     {
87
         return reporter;
91
         return reporter;
88
     }
92
     }
93
+    public void setReportDept(Long reportDept)
94
+    {
95
+        this.reportDept = reportDept;
96
+    }
97
+
98
+    public Long getReportDept()
99
+    {
100
+        return reportDept;
101
+    }
89
     public void setDocument(String document)
102
     public void setDocument(String document)
90
     {
103
     {
91
         this.document = document;
104
         this.document = document;
185
                 .append("document", getDocument())
198
                 .append("document", getDocument())
186
                 .append("remark", getRemark())
199
                 .append("remark", getRemark())
187
                 .append("reportTime", getReportTime())
200
                 .append("reportTime", getReportTime())
201
+                .append("reportDept", getReportDept())
188
                 .append("managerUserId", getManagerUserId())
202
                 .append("managerUserId", getManagerUserId())
189
                 .append("managerComment", getManagerComment())
203
                 .append("managerComment", getManagerComment())
190
                 .append("managerTime", getManagerTime())
204
                 .append("managerTime", getManagerTime())

+ 6
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcPerformanceMapper.xml View File

10
         <result property="document"    column="document"    />
10
         <result property="document"    column="document"    />
11
         <result property="remark"    column="remark"    />
11
         <result property="remark"    column="remark"    />
12
         <result property="reportTime"    column="report_time"    />
12
         <result property="reportTime"    column="report_time"    />
13
+        <result property="reportDept"    column="report_dept"    />
13
         <result property="managerUserId"    column="manager_user_id"    />
14
         <result property="managerUserId"    column="manager_user_id"    />
14
         <result property="managerComment"    column="manager_comment"    />
15
         <result property="managerComment"    column="manager_comment"    />
15
         <result property="managerTime"    column="manager_time"    />
16
         <result property="managerTime"    column="manager_time"    />
21
     </resultMap>
22
     </resultMap>
22
 
23
 
23
     <sql id="selectCmcPerformanceVo">
24
     <sql id="selectCmcPerformanceVo">
24
-        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
25
+        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
25
     </sql>
26
     </sql>
26
 
27
 
27
     <select id="selectCmcPerformanceList" parameterType="CmcPerformance" resultMap="CmcPerformanceResult">
28
     <select id="selectCmcPerformanceList" parameterType="CmcPerformance" resultMap="CmcPerformanceResult">
30
             <if test="reporter != null "> and reporter = #{reporter}</if>
31
             <if test="reporter != null "> and reporter = #{reporter}</if>
31
             <if test="document != null  and document != ''"> and document = #{document}</if>
32
             <if test="document != null  and document != ''"> and document = #{document}</if>
32
             <if test="reportTime != null "> and report_time = #{reportTime}</if>
33
             <if test="reportTime != null "> and report_time = #{reportTime}</if>
34
+            <if test="reportDept != null "> and report_dept = #{reportDept}</if>
33
             <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
35
             <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
34
             <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
36
             <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
35
             <if test="managerTime != null "> and manager_time = #{managerTime}</if>
37
             <if test="managerTime != null "> and manager_time = #{managerTime}</if>
54
             <if test="document != null">document,</if>
56
             <if test="document != null">document,</if>
55
             <if test="remark != null">remark,</if>
57
             <if test="remark != null">remark,</if>
56
             <if test="reportTime != null">report_time,</if>
58
             <if test="reportTime != null">report_time,</if>
59
+            <if test="reportDept != null">report_dept,</if>
57
             <if test="managerUserId != null">manager_user_id,</if>
60
             <if test="managerUserId != null">manager_user_id,</if>
58
             <if test="managerComment != null">manager_comment,</if>
61
             <if test="managerComment != null">manager_comment,</if>
59
             <if test="managerTime != null">manager_time,</if>
62
             <if test="managerTime != null">manager_time,</if>
69
             <if test="document != null">#{document},</if>
72
             <if test="document != null">#{document},</if>
70
             <if test="remark != null">#{remark},</if>
73
             <if test="remark != null">#{remark},</if>
71
             <if test="reportTime != null">#{reportTime},</if>
74
             <if test="reportTime != null">#{reportTime},</if>
75
+            <if test="reportDept != null">#{reportDept},</if>
72
             <if test="managerUserId != null">#{managerUserId},</if>
76
             <if test="managerUserId != null">#{managerUserId},</if>
73
             <if test="managerComment != null">#{managerComment},</if>
77
             <if test="managerComment != null">#{managerComment},</if>
74
             <if test="managerTime != null">#{managerTime},</if>
78
             <if test="managerTime != null">#{managerTime},</if>
87
             <if test="document != null">document = #{document},</if>
91
             <if test="document != null">document = #{document},</if>
88
             <if test="remark != null">remark = #{remark},</if>
92
             <if test="remark != null">remark = #{remark},</if>
89
             <if test="reportTime != null">report_time = #{reportTime},</if>
93
             <if test="reportTime != null">report_time = #{reportTime},</if>
94
+            <if test="reportDept != null">report_dept = #{reportDept},</if>
90
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
95
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
91
             <if test="managerComment != null">manager_comment = #{managerComment},</if>
96
             <if test="managerComment != null">manager_comment = #{managerComment},</if>
92
             <if test="managerTime != null">manager_time = #{managerTime},</if>
97
             <if test="managerTime != null">manager_time = #{managerTime},</if>

Loading…
Cancel
Save