Explorar el Código

更正申诉审核导出字段

songxinlu hace 3 años
padre
commit
1b64412a21

+ 8 - 9
src/main/java/com/diagbot/dto/ExportGetAppealReviewDTO.java

@@ -19,34 +19,33 @@ import java.util.Date;
 @Setter
 public class ExportGetAppealReviewDTO {
 
-    @Excel(name = "申述id", needMerge = true)
-    private Long id;
+//    @Excel(name = "申述id", needMerge = true)
+//    private Long id;
 
-    @Excel(name = "申人", needMerge = true)
+    @Excel(name = "申人", needMerge = true)
     private String claimantName;
 
     @Excel(name = "所属科室", needMerge = true)
     private String behDeptName;
 
+    @Excel(name = "申诉时间", needMerge = true, exportFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date claimantGmtCreate;
+
     @Excel(name = "病人住院序号", needMerge = true)
     private String behospitalCode;
 
     @Excel(name = "患者姓名", needMerge = true)
     private String name;
 
-    @Excel(name = "申模块", needMerge = true)
+    @Excel(name = "申模块", needMerge = true)
     private String casesName;
 
     @Excel(name = "缺陷详情", needMerge = true)
     private String qcresultDetailMsg;
 
-    @ApiModelProperty(value = "审核人")
-    @Excel(name = "缺陷详情", needMerge = true)
+    @Excel(name = "审核人", needMerge = true)
     private String checkName;
 
-    @Excel(name = "申述申诉时间", needMerge = true, exportFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date claimantGmtCreate;
-
     @Excel(name = "审核时间", needMerge = true, exportFormat = "yyyy-MM-dd HH:mm:ss")
     private Date checkGmtCreate;
 

+ 8 - 9
src/main/java/com/diagbot/dto/ExportGetComplaintRecordDTO.java

@@ -19,34 +19,33 @@ import java.util.Date;
 @Setter
 public class ExportGetComplaintRecordDTO {
 
-    @Excel(name = "申述id", needMerge = true)
-    private Long id;
+//    @Excel(name = "申述id", needMerge = true)
+//    private Long id;
 
-    @Excel(name = "申人", needMerge = true)
+    @Excel(name = "申人", needMerge = true)
     private String claimantName;
 
     @Excel(name = "所属科室", needMerge = true)
     private String behDeptName;
 
+    @Excel(name = "申诉时间", needMerge = true, exportFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date claimantGmtCreate;
+
     @Excel(name = "病人住院序号", needMerge = true)
     private String behospitalCode;
 
     @Excel(name = "患者姓名", needMerge = true)
     private String name;
 
-    @Excel(name = "申模块", needMerge = true)
+    @Excel(name = "申模块", needMerge = true)
     private String casesName;
 
     @Excel(name = "缺陷详情", needMerge = true)
     private String qcresultDetailMsg;
 
-    @ApiModelProperty(value = "审核人")
-    @Excel(name = "缺陷详情", needMerge = true)
+    @Excel(name = "审核人", needMerge = true)
     private String checkName;
 
-    @Excel(name = "申述申诉时间", needMerge = true, exportFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date claimantGmtCreate;
-
     @Excel(name = "审核时间", needMerge = true, exportFormat = "yyyy-MM-dd HH:mm:ss")
     private Date checkGmtCreate;