安全检查详情格式调整

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

@@ -42,7 +42,7 @@ public class AppTaskRegisterPointVo {
     private Integer isAdd;
 
     @ApiModelProperty(value = "是否正常，0：正常，1：异常")
-    private Integer status=0;
+    private Integer status;
 
     @ApiModelProperty(value = "情况描述")
     private String remark;

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

@@ -28,7 +28,7 @@ public class TaskRegisterPointVo {
     private Integer isAdd;
 
     @ApiModelProperty(value = "是否正常，0：正常，1：异常")
-    private Integer status=0;
+    private Integer status;
 
     @ApiModelProperty(value = "情况描述")
     private String remark;

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

@@ -41,6 +41,9 @@ public class TaskRegisterVo<T> {
     @ApiModelProperty(value = "计划结束时间")
     private Date planEndTime;
 
+    @ApiModelProperty(value = "检查时间")
+    private Date submitTime;
+
     @ApiModelProperty(value = "检查机构id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long checkOrgId;
@@ -72,9 +75,15 @@ public class TaskRegisterVo<T> {
     @ApiModelProperty(value = "任务状态")
     private Integer status;
 
+    @ApiModelProperty(value = "异常数")
+    private Integer exceptionCount;
+
     @ApiModelProperty(value = "授权目标用户id")
     private Long grantUserId;
 
+    @ApiModelProperty
+    private String submitBy;
+
     @ApiModelProperty(value = "检查列表")
     private List<T> checkList;
 
@@ -86,6 +95,7 @@ public class TaskRegisterVo<T> {
         vo.setStatus(task.getStatus());
         vo.setPlanStartTime(task.getPlanStartTime());
         vo.setPlanEndTime(task.getPlanEndTime());
+        vo.setSubmitTime(task.getSubmitTime());
         vo.setCheckOrgId(task.getCheckOrgId());
         vo.setCheckOrgName(task.getCheckOrgName());
         vo.setBeCheckedOrgId(task.getOrgId());
@@ -95,7 +105,8 @@ public class TaskRegisterVo<T> {
         vo.setCheckRoles(checkRoles);
         vo.setYmdDate(task.getYmdDate());
         vo.setGrantUserId(task.getGrantUserId());
-
+        vo.setExceptionCount(task.getExceptionCount().intValue());
+        vo.setSubmitBy(task.getSubmitBy());
         return vo;
     }
 }

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -655,8 +655,8 @@
         a.name as pointName,
         b.required as mustCheck,
         if(rd.is_add is null, 0, rd.is_add) as isAdd,
-        if(rd.value is null, 0, rd.value) as status,
-        if(rd.remark is null, null, rd.remark) as remark,
+        rd.value as status,
+        rd.remark as remark,
         rd.rectification_deadline as rectificationDeadline,
         rd.submit_by,
         rd.submit_time