合同评价导出

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

@@ -58,7 +58,9 @@ public class ExcelResource {
                 OilContract1.setScore2(entry.get("Score2").toString());
                 OilContract1.setScore3(entry.get("Score3").toString());
                 OilContract1.setScore4(entry.get("Score4").toString());
-                OilContract1.setEvaluate(entry.get("Evaluate").toString().equals("1") ? "是" : "");
+                OilContract1.setScore5(entry.get("Score5").toString());
+                OilContract1.setScore6(entry.get("Score6").toString());
+                OilContract1.setEvaluate(entry.get("Evaluate").toString().equals("1") && !entry.get("Score").toString().equals("") ? "是" : "");
                 OilContract1.setEvaluate2(entry.get("Evaluate").toString().equals("2") ? "是" : "");
                 OilContract1.setEvaluate3(entry.get("Evaluate").toString().equals("3") ? "是" : "");
                 reportList.add(OilContract1);
@@ -85,7 +87,7 @@ public class ExcelResource {
                 OilContract.setScore2(entry.get("Score2").toString());
                 OilContract.setScore3(entry.get("Score3").toString());
                 OilContract.setScore4(entry.get("Score4").toString());
-                OilContract.setEvaluate(entry.get("Evaluate").toString().equals("1") ? "是" : "");
+                OilContract.setEvaluate(entry.get("Evaluate").toString().equals("1") && !entry.get("Score").toString().equals("") ? "是" : "");
                 OilContract.setEvaluate2(entry.get("Evaluate").toString().equals("2") ? "是" : "");
                 OilContract.setEvaluate3(entry.get("Evaluate").toString().equals("3") ? "是" : "");
                 reportList.add(OilContract);

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

@@ -13,25 +13,29 @@ public class OilContractSumScoreVo {
     @ExcelField(title = "基本条件评价加结果", order = 4)
     private String conditionScore;
     // 项目管理
-    @ExcelField(title = "项目管理", order = 5)
+    @ExcelField(title = "项目组织及资源管理", order = 5)
     private String score1;
     // HSE管理
-    @ExcelField(title = "HSE管理", 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)
+    private String score6;
     // 优秀
-    @ExcelField(title = "优秀", order = 9)
+    @ExcelField(title = "优秀", order = 11)
     private String evaluate;
     // 合格
-    @ExcelField(title = "合格", order = 10)
+    @ExcelField(title = "合格", order = 12)
     private String evaluate2;
     // 不合格
-    @ExcelField(title = "不合格", order = 11)
+    @ExcelField(title = "不合格", order = 13)
     private String evaluate3;
 
     public String getSupplierName() {
@@ -96,6 +100,22 @@ public class OilContractSumScoreVo {
         this.score4 = score4;
     }
 
+    public String getScore5() {
+        return score5;
+    }
+
+    public void setScore5(String score5) {
+        this.score5 = score5;
+    }
+
+    public String getScore6() {
+        return score6;
+    }
+
+    public void setScore6(String score6) {
+        this.score6 = score6;
+    }
+
     public String getEvaluate() {
         return evaluate;
     }

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

@@ -15,13 +15,13 @@ 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)