修复履职子计划显示机构简称

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

@@ -1,6 +1,8 @@
 package com.xunmei.core.resumption.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xunmei.common.core.utils.FormType;
@@ -26,42 +28,11 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @Builder
-
+@TableName("core_resumption")
 public class Resumption extends BaseEntity {
 
     private static Logger log = LoggerFactory.getLogger(Resumption.class);
 
-//    public static Resumption of(final Long orgId, final ResumptionType type, final FormType formType, final Ymd ymd) {
-//        // 判断时间是否过期, 如果过期就显示未提交
-//        final ResumptionStatus status = type.isExpire(ymd) ? ResumptionStatus.NOT : ResumptionStatus.WAIT;
-//
-//        //
-//        return Resumption.builder()
-////                         .id(type.toId(formType, ymd.getDate(), orgId))
-////                         .status(status)
-//                         .orgId(orgId)
-////                         .type(type)
-////                         .formType(formType)
-//                         .exceptionCount(0)
-//                         .ymd(ymd)
-//                         .build();
-//    }
-
-//    public static Resumption newof(final Long orgId, final ResumptionType type, final Ymd ymd, final Long appPlanid,final String id) {
-//        // 判断时间是否过期, 如果过期就显示未提交
-//        final ResumptionStatus status = type.isExpire(ymd) ? ResumptionStatus.NOT : ResumptionStatus.WAIT;
-//        return Resumption.builder()
-//                .id(id)
-////                .status(status)
-//                .orgId(orgId)
-//                .type(type)
-//                .exceptionCount(0)
-//                .ymd(ymd)
-//                .planId(appPlanid)
-//                .build()
-//               ;
-//    }
-
 
     /**
      * 编号
@@ -81,6 +52,7 @@ public class Resumption extends BaseEntity {
     /**
      * 年月日
      */
+    @TableField(exist = false)
     private Ymd ymd;
 
     /**