luojun пре 2 година
родитељ
комит
43cbae647f

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

@@ -31,6 +31,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
     private static final long serialVersionUID = 1L;
     @TableField(exist = false)
     private Integer orgType;
+    private String distribute;
     /**
      * 主键
      */

+ 5 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -175,6 +175,11 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 appPlanToItemMapper.insert(item);
             }
         }
+        //修改下发标识
+        AppPlan plan = new AppPlan();
+        plan.setId(dto.getId());
+        plan.setDistribute("1");
+        baseMapper.updateById(plan);
     }
 
     /**

+ 2 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/ResumptionPlanPageVo.java

@@ -19,8 +19,9 @@ public class ResumptionPlanPageVo {
     @TableId(type = IdType.AUTO)
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
-
+    private String distribute;
     private Integer orgType;
+    private Integer planOfOrgType;
     /**
      * 主键
      */

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

@@ -13,6 +13,8 @@
     <resultMap id="appPlans" type="com.xunmei.core.resumption.vo.appPlan.ResumptionPlanPageVo">
         <id column="id" property="id"/>
         <result column="plan_name" property="planName"/>
+        <result column="distribute" property="distribute"/>
+        <result column="plan_of_org_type" property="planOfOrgType"/>
         <result column="plan_type" property="planType"/>
         <result column="plan_cycle" property="planCycle"/>
         <result column="plan_exec" property="planExec"/>
@@ -42,7 +44,8 @@
         b.orgNames,
         o.short_name as plan_of_org_name,
         g.short_name as plan_create_org_name,
-        g.type as createOrgType
+        g.type as createOrgType,
+               o.type as plan_of_org_type
         FROM
         core_resumption_plan a
         left join sys_user u2 on u2.id=a.modified_by