完善安全检查登记簿

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/CheckDataVo.java

@@ -0,0 +1,31 @@
+package com.xunmei.system.api.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class CheckDataVo {
+    private Long pointId;
+
+    private Long itemId;
+
+    private String pointName;
+
+    private int pointNum;
+
+    private String itemName;
+
+    private Boolean checkStatus;
+
+//    private List<RemarkVo> remarkList;
+
+    private String resRemark;
+
+    private String orderNum;
+}
+

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SafeCheckTaskRegisterBookVo.java

@@ -0,0 +1,46 @@
+package com.xunmei.system.api.domain;
+
+import com.xunmei.system.api.domain.CheckDataVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ *
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class SafeCheckTaskRegisterBookVo {
+
+  @ApiModelProperty("任务名称")
+  private String taskTitle;
+
+  @ApiModelProperty("检查机构Id")
+  private Long checkOrgId;
+
+  @ApiModelProperty("检查机构名称")
+  private String checkOrgName;
+
+  @ApiModelProperty("受检机构Id")
+  private Long orgId;
+
+  @ApiModelProperty("受检机构名称")
+  private String orgName;
+
+  @ApiModelProperty("受检日期 eg: 2000年1月2日")
+  private String dateStr;
+
+  @ApiModelProperty("检查人员信息 eg: 张三（一级支行行长）")
+  private String checkUserInfo;
+
+  private List<CheckDataVo> checkDatas;
+  private String dest;
+
+
+}

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

@@ -0,0 +1,46 @@
+package com.xunmei.core.safetyCheck.vo;
+
+import com.xunmei.core.safetyCheck.domain.CoreSafetyTaskDataRemarkimg;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 安全检查项表问题描述表(t_app_safety_task_data_remark)实体类
+ *
+ * @author oygj
+ * @since 2022-06-28 15:11:42
+ * @description 由 Mybatisplus Code Generator 创建
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+
+@Builder
+public class AppSafetyTaskDataRemarkDto {
+
+    /**
+     * id
+     */
+	private Long id;
+    /**
+     * 检查项id
+     */
+    private Long taskDataId;
+    /**
+     * 检查任务id
+     */
+    private String taskId;
+    /**
+     * 问题描述
+     */
+    private String remark;
+
+    List<CoreSafetyTaskDataRemarkimg> imgList;
+
+}

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

@@ -0,0 +1,35 @@
+package com.xunmei.core.safetyCheck.vo;
+
+import com.xunmei.core.safetyCheck.domain.CoreSafetyTaskDataNfc;
+import com.xunmei.core.safetyCheck.domain.CoreSafetyTaskDataRemarkimg;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class PointDto {
+    private Long pointId;
+    private int resValue;
+    private Long itemId;
+    private Long areaId;
+    private Long planId;
+    private String pointName;
+    private Long pointDataId;
+    private int resStatus;
+    private int timeType;
+    private String resTime;
+    private int pointnum;
+    private String itemName;
+    private String areaName;
+    private List<CoreSafetyTaskDataNfc> pointNfcList;
+    private List<CoreSafetyTaskDataRemarkimg> remarkList;
+
+
+}
+