导出调整

src/main/java/com/common/workflow/web/rest/ExcelResource.java

@@ -85,7 +85,6 @@ public class ExcelResource {
                 OilContract.setScore2(entry.get("Score2").toString());
                 OilContract.setScore3(entry.get("Score3").toString());
                 OilContract.setScore4(entry.get("Score4").toString());
-                OilContract.setScore5(entry.get("Score5").toString());
                 OilContract.setEvaluate(entry.get("Evaluate").toString().equals("1") ? "是" : "");
                 OilContract.setEvaluate2(entry.get("Evaluate").toString().equals("2") ? "是" : "");
                 OilContract.setEvaluate3(entry.get("Evaluate").toString().equals("3") ? "是" : "");

src/main/java/com/common/workflow/web/rest/vm/OilContractSumScoreVo.java

@@ -19,10 +19,10 @@ public class OilContractSumScoreVo {
     @ExcelField(title = "HSE管理", order = 6)
     private String score2;
     // 合同履行
-    @ExcelField(title = "合同履行", order = 7)
+    @ExcelField(title = "企业诚信", order = 7)
     private String score3;
     // 企业诚信
-    @ExcelField(title = "企业诚信", order = 8)
+    @ExcelField(title = "合同履行", order = 8)
     private String score4;
     // 优秀
     @ExcelField(title = "优秀", order = 9)

src/main/java/com/common/workflow/web/rest/vm/OilContractSumScoreVo2.java

@@ -15,25 +15,22 @@ public class OilContractSumScoreVo2 {
     @ExcelField(title = "产品质量", order = 5)
     private String score1;
     // 合同履约
-    @ExcelField(title = "合同履约", order = 6)
+    @ExcelField(title = "技术水平", order = 6)
     private String score2;
     // 售后服务
-    @ExcelField(title = "售后服务", order = 7)
+    @ExcelField(title = "服务能力", order = 7)
     private String score3;
     // 诚信经营
-    @ExcelField(title = "诚信经营", order = 8)
+    @ExcelField(title = "合同履约", order = 8)
     private String score4;
-    // 协同响应
-    @ExcelField(title = "协同响应", order = 9)
-    private String score5;
     // 优秀
-    @ExcelField(title = "优秀", order = 10)
+    @ExcelField(title = "优秀", order = 9)
     private String evaluate;
     // 合格
-    @ExcelField(title = "合格", order = 11)
+    @ExcelField(title = "合格", order = 10)
     private String evaluate2;
     // 不合格
-    @ExcelField(title = "不合格", order = 12)
+    @ExcelField(title = "不合格", order = 11)
     private String evaluate3;
 
     public String getSupplierName() {
@@ -122,12 +119,4 @@ public class OilContractSumScoreVo2 {
     public void setEvaluate3(String evaluate3) {
         this.evaluate3 = evaluate3;
     }
-
-    public String getScore5() {
-        return score5;
-    }
-
-    public void setScore5(String score5) {
-        this.score5 = score5;
-    }
 }