init

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewMonitorCo.java

@@ -1,9 +1,13 @@
 package org.qinan.safetyeval.client.review.response;
 
+import com.alibaba.cola.dto.ClientObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
+
 /**
  * 资质现场核查监管端Co
  *
@@ -12,9 +16,65 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class QualOnSiteReviewMonitorCo extends QualOnSiteReviewCo {
+public class QualOnSiteReviewMonitorCo extends ClientObject {
     private static final long serialVersionUID = 1L;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+    /**
+     * 资质类型:add 新增 ，change:变更
+     */
+    @ApiModelProperty(value = "资质类型:add 新增 ，change:变更")
+    private String bizType;
+    /**
+     * 业务id
+     */
+    @ApiModelProperty(value = "业务id")
+    private Long bizId;
+    /**
+     * 现场审查开始时间
+     */
+    @ApiModelProperty(value = "现场审查开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime reviewDateStart;
+    /**
+     * 审查地点
+     */
+    @ApiModelProperty(value = "审查地点")
+    private String reviewLocation;
+    /**
+     * 审查组成员名单
+     */
+    @ApiModelProperty(value = "审查组成员名单")
+    private String reviewMembers;
+    /**
+     * 材料准备要求
+     */
+    @ApiModelProperty(value = "材料准备要求")
+    private String materialRequirements;
+    /**
+     * 监管联系人姓名
+     */
+    @ApiModelProperty(value = "监管联系人姓名")
+    private String supervisorContact;
+    /**
+     * 监管联系电话
+     */
+    @ApiModelProperty(value = "监管联系电话")
+    private String contactPhone;
+    /**
+     * 现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过)
+     */
+    @ApiModelProperty(value = "现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过)")
+    private Long status;
+    /**
+     * 环境
+     */
+    @ApiModelProperty(value = "环境")
+    private String env;
+    @ApiModelProperty(value = "version")
+    private Integer version;
+
     /**
      * 机构名称
      */

safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml

@@ -55,12 +55,8 @@
         from qual_on_site_review
     </sql>
 
-    <!-- 监管端分页查询结果映射（直接映射为Co对象） -->
-    <resultMap id="QualOnSiteReviewMonitorCoResult"
-               type="org.qinan.safetyeval.client.review.response.QualOnSiteReviewMonitorCo"
-               autoMapping="true"/>
 
-    <select id="monitorPage" resultMap="QualOnSiteReviewMonitorCoResult">
+    <select id="monitorPage"  resultType="org.qinan.safetyeval.client.review.response.QualOnSiteReviewMonitorCo" >
         select info.unit_name , review.*
         from qual_on_site_review review
             left join org_info info on info.id = review.org_id