履职登记缺少整改期限

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

@@ -70,5 +70,8 @@ public class AppResumptionData extends Model<AppResumptionData> implements Seria
      */
     private Long areaId;
     private String resRemark;
-
+    /**
+     * 整改期限
+     */
+    private String rectificationDeadline;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/AppResumptionDataDto.java

@@ -67,6 +67,7 @@ public class AppResumptionDataDto {
     private Long areaId;
     private String resRemark;
 
+    private String rectificationDeadline;
     //private List<AppResumptionDataImg> imgData;
 
     private List<ResumptionDataProtectionVo> protectionVo;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/ResumptionBusiness.java

@@ -651,6 +651,7 @@ public class ResumptionBusiness {
             data.setResValue(appResumptionDataDto.getResValue());
             data.setResRemark(appResumptionDataDto.getResRemark());
             data.setResTime(appResumptionDataDto.getResTime());
+            data.setRectificationDeadline(appResumptionDataDto.getRectificationDeadline());
 //            if (ObjectUtil.isNotNull() StringUtils.isNotEmpty(appResumptionDataDto.getResTime())) {
 //                data.setResTime(sdf.parse(appResumptionDataDto.getResTime()));
 //            }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/ProtectionVo.java

@@ -1,13 +0,0 @@
-package com.xunmei.core.resumption.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ProtectionVo {
-    private Long id;
-    private String name;
-    private String status;
-    private Date time;
-}

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

@@ -213,7 +213,8 @@
             rd.res_status,
             rd.res_remark,
             rd.submit_by,
-            if(rd.id is null,null,rd.id) as pointdataid
+            if(rd.id is null,null,rd.id) as pointdataid,
+            rd.rectification_deadline as rectificationDeadline
         FROM
              core_resumption_plan_to_point b
                 LEFT JOIN core_resumption_rule_point a ON a.id = b.point_id