Prechádzať zdrojové kódy

Merge branch 'dev/20220105_2.2.0_通用版_申诉驳回' into test

songxinlu 3 rokov pred
rodič
commit
a67ce611c7

+ 2 - 2
src/main/java/com/diagbot/dto/ExportGetAppealReviewDTO.java

@@ -38,7 +38,7 @@ public class ExportGetAppealReviewDTO {
     private String name;
 
     @Excel(name = "申诉模块", needMerge = true)
-    private String casesName;
+    private String modeName;
 
     @Excel(name = "缺陷详情", needMerge = true)
     private String qcresultDetailMsg;
@@ -49,7 +49,7 @@ public class ExportGetAppealReviewDTO {
     @Excel(name = "审核时间", needMerge = true, exportFormat = "yyyy-MM-dd HH:mm:ss")
     private Date checkGmtCreate;
 
-    @Excel(name = "操作类型", needMerge = true, replace = {"删改_0","新增已有_1","新增缺失_2","恢复条目_3"})
+    @Excel(name = "操作类型", needMerge = true, replace = {"删改条目_0","新增已有条目_1","新增缺失条目_2","恢复条目_3"})
     private String appealOperationType;
 
     @Excel(name = "状态", needMerge = true, replace = {"待审核_0","已驳回_1","审核通过_2"})

+ 2 - 2
src/main/java/com/diagbot/dto/ExportGetComplaintRecordDTO.java

@@ -38,7 +38,7 @@ public class ExportGetComplaintRecordDTO {
     private String name;
 
     @Excel(name = "申诉模块", needMerge = true)
-    private String casesName;
+    private String modeName;
 
     @Excel(name = "缺陷详情", needMerge = true)
     private String qcresultDetailMsg;
@@ -49,7 +49,7 @@ public class ExportGetComplaintRecordDTO {
     @Excel(name = "审核时间", needMerge = true, exportFormat = "yyyy-MM-dd HH:mm:ss")
     private Date checkGmtCreate;
 
-    @Excel(name = "操作类型", needMerge = true, replace = {"删改_0","新增已有_1","新增缺失_2","恢复条目_3"})
+    @Excel(name = "操作类型", needMerge = true, replace = {"删改条目_0","新增已有条目_1","新增缺失条目_2","恢复条目_3"})
     private String appealOperationType;
 
     @Excel(name = "状态", needMerge = true, replace = {"待审核_0","已驳回_1","审核通过_2"})