安全检查app列表增加当前时间是否在任务计划时间内字段

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -134,6 +134,11 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                 vo.setCompleted(convertToAppItemVo(v, i -> ObjectUtil.equal(i.getStatus(), SafetyCheckTaskStatus.Completed.getValue())));
                 vo.setUncompleted(convertToAppItemVo(v, i -> !ObjectUtil.equal(i.getStatus(), SafetyCheckTaskStatus.Completed.getValue())));
             }
+
+            Date date=DateUtil.beginOfDay(new Date());
+            Date planStartDate=DateUtil.beginOfDay(vo.getPlanStartTime());
+            Date planEndDate=DateUtil.beginOfDay(vo.getPlanEndTime());
+            vo.setInRegisterTime((planStartDate.before(date) && planEndDate.after(date) || date.getTime()==planStartDate.getTime())?1:0);
         });
 
         return TableDataInfo.success(page);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/AppPageVo.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.json.LongListSerializer;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -36,6 +37,9 @@ public class AppPageVo {
      */
     private Date planEndTime;
 
+    @ApiModelProperty(value = "为1时，表示可登记，其它值均表示不能登记")
+    private  Integer inRegisterTime;
+
 //    @JsonIgnore
 //    private Long batchId;