合同评价导出修改

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

@@ -52,6 +52,8 @@ public class ExcelResource {
                 OilContractSumScoreVo OilContract1 = new OilContractSumScoreVo();
                 OilContract1.setSupplierName(entry.get("SupplierName").toString());
                 OilContract1.setScore(entry.get("Score").toString());
+                OilContract1.setConditionScore(entry.get("ConditionScore").toString());
+                OilContract1.setSumScore(entry.get("CountScore").toString());
                 OilContract1.setScore1(entry.get("Score1").toString());
                 OilContract1.setScore2(entry.get("Score2").toString());
                 OilContract1.setScore3(entry.get("Score3").toString());
@@ -77,6 +79,8 @@ public class ExcelResource {
                 OilContractSumScoreVo2 OilContract = new OilContractSumScoreVo2();
                 OilContract.setSupplierName(entry.get("SupplierName").toString());
                 OilContract.setScore(entry.get("Score").toString());
+                OilContract.setConditionScore(entry.get("ConditionScore").toString());
+                OilContract.setSumScore(entry.get("CountScore").toString());
                 OilContract.setScore1(entry.get("Score1").toString());
                 OilContract.setScore2(entry.get("Score2").toString());
                 OilContract.setScore3(entry.get("Score3").toString());

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

@@ -7,27 +7,31 @@ public class OilContractSumScoreVo {
     private String supplierName;
     // 评价得分
     @ExcelField(title = "评价得分", order = 2)
+    private String sumScore;
+    @ExcelField(title = "业绩评价结果", order = 3)
     private String score;
+    @ExcelField(title = "基本条件评价加结果", order = 4)
+    private String conditionScore;
     // 项目管理
-    @ExcelField(title = "项目管理", order = 3)
+    @ExcelField(title = "项目管理", order = 5)
     private String score1;
     // HSE管理
-    @ExcelField(title = "HSE管理", order = 4)
+    @ExcelField(title = "HSE管理", order = 6)
     private String score2;
     // 合同履行
-    @ExcelField(title = "合同履行", order = 5)
+    @ExcelField(title = "合同履行", order = 7)
     private String score3;
     // 企业诚信
-    @ExcelField(title = "企业诚信", order = 6)
+    @ExcelField(title = "企业诚信", order = 8)
     private String score4;
     // 优秀
-    @ExcelField(title = "优秀", order = 7)
+    @ExcelField(title = "优秀", order = 9)
     private String evaluate;
     // 合格
-    @ExcelField(title = "合格", order = 8)
+    @ExcelField(title = "合格", order = 10)
     private String evaluate2;
     // 不合格
-    @ExcelField(title = "不合格", order = 9)
+    @ExcelField(title = "不合格", order = 11)
     private String evaluate3;
 
     public String getSupplierName() {
@@ -45,6 +49,20 @@ public class OilContractSumScoreVo {
     public void setScore(String score) {
         this.score = score;
     }
+    public String getConditionScore() {
+        return conditionScore;
+    }
+
+    public void setConditionScore(String conditionScore) {
+        this.conditionScore = conditionScore;
+    }
+    public String getSumScore() {
+        return sumScore;
+    }
+
+    public void setSumScore(String sumScore) {
+        this.sumScore = sumScore;
+    }
 
     public String getScore1() {
         return score1;

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

@@ -6,30 +6,34 @@ public class OilContractSumScoreVo2 {
     private String supplierName;
     // 评价得分
     @ExcelField(title = "评价得分", order = 2)
+    private String sumScore;
+    @ExcelField(title = "业绩评价结果", order = 3)
     private String score;
+    @ExcelField(title = "基本条件评价加结果", order = 4)
+    private String conditionScore;
     // 产品质量
-    @ExcelField(title = "产品质量", order = 3)
+    @ExcelField(title = "产品质量", order = 5)
     private String score1;
     // 合同履约
-    @ExcelField(title = "合同履约", order = 4)
+    @ExcelField(title = "合同履约", order = 6)
     private String score2;
     // 售后服务
-    @ExcelField(title = "售后服务", order = 5)
+    @ExcelField(title = "售后服务", order = 7)
     private String score3;
     // 诚信经营
-    @ExcelField(title = "诚信经营", order = 6)
+    @ExcelField(title = "诚信经营", order = 8)
     private String score4;
     // 协同响应
-    @ExcelField(title = "协同响应", order = 7)
+    @ExcelField(title = "协同响应", order = 9)
     private String score5;
     // 优秀
-    @ExcelField(title = "优秀", order = 8)
+    @ExcelField(title = "优秀", order = 10)
     private String evaluate;
     // 合格
-    @ExcelField(title = "合格", order = 9)
+    @ExcelField(title = "合格", order = 11)
     private String evaluate2;
     // 不合格
-    @ExcelField(title = "不合格", order = 10)
+    @ExcelField(title = "不合格", order = 12)
     private String evaluate3;
 
     public String getSupplierName() {
@@ -48,6 +52,21 @@ public class OilContractSumScoreVo2 {
         this.score = score;
     }
 
+    public String getConditionScore() {
+        return conditionScore;
+    }
+
+    public void setConditionScore(String conditionScore) {
+        this.conditionScore = conditionScore;
+    }
+    public String getSumScore() {
+        return sumScore;
+    }
+
+    public void setSumScore(String sumScore) {
+        this.sumScore = sumScore;
+    }
+
     public String getScore1() {
         return score1;
     }