履职任务下发

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlan.java

@@ -83,6 +83,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
     /**
      * 计划创建机构名称
      */
+    @TableField(exist = false)
     private String planCreateOrgName;
     /**
      * 计划创建机构id
@@ -91,6 +92,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
     /**
      * 计划所属机构名称
      */
+    @TableField(exist = false)
     private String planOfOrgName;
     /**
      * 计划所属机构id

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanMapper.xml

@@ -36,7 +36,9 @@
         a.*,
         d.roleNames,
         b.orgId,
-        b.orgNames
+        b.orgNames,
+        o.name as plan_of_org_name,
+        g.name as plan_create_org_name
         FROM
         core_resumption_plan a
         LEFT JOIN (
@@ -47,6 +49,7 @@
         FROM
         core_resumption_plan_to_exec_org m
         LEFT JOIN sys_org n ON m.org_id = n.id
+
         GROUP BY
         m.plan_id
         ) b ON a.id = b.plan_id
@@ -60,6 +63,8 @@
         GROUP BY
         r.plan_id
         ) d ON a.id = d.plan_id
+        LEFT JOIN sys_org o ON a.plan_of_org_id = o.id
+        LEFT JOIN sys_org g ON a.plan_create_org_id = g.id
         <where>
             1=1
             <if test="info.planName != '' and info.planName != null">