Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/build/YangGuangApiQuoteResultsVoBuild.java

@@ -151,12 +151,7 @@ public final class YangGuangApiQuoteResultsVoBuild {
     }
     private static QuoteResultsVo.ScoreVo buildScoreVo(YangGuangAccuracyCalculateResponse.discount discount,YangGuangAccuracyCalculateResponse yangGuangAccuracyCalculateResponse) {
         QuoteResultsVo.ScoreVo scoreVo = new QuoteResultsVo.ScoreVo();
-//        scoreVo.setJqScore(discount.getMarkingnobcCI());
-//        scoreVo.setSyScore(discount.getMarkingnobcBI());
-//        scoreVo.setMergeCostRate(yangGuangAccuracyCalculateResponse.getVascostmarginbc());
-//        scoreVo.setXyhGrade(yangGuangAccuracyCalculateResponse.getXYHGrade() != null ? "1" : "0");
-//        scoreVo.setSeriesTypeActualName(yangGuangAccuracyCalculateResponse.getSeriesTypeActualName() != null ? yangGuangAccuracyCalculateResponse.getSeriesTypeActualName() : "");
-//
+
         scoreVo.setLossRation(discount.getFinalmarkingnobc());
         scoreVo.setJqLossRation(discount.getFinalmarkingnoCi());
         scoreVo.setSyLossRation(discount.getFinalmarkingnoBi());
@@ -175,7 +170,7 @@ public final class YangGuangApiQuoteResultsVoBuild {
         scoreArray.add(new JSONObject()
                 .fluentPut("scoreName","向阳花标识")
                 .fluentPut("scoreKey","XyhGrade")
-                .fluentPut("score",yangGuangAccuracyCalculateResponse.getXYHGrade() != null ? "1" : "0"));
+                .fluentPut("score",yangGuangAccuracyCalculateResponse.getXYHGrade() != null ? "是" : "否"));
 
         scoreArray.add(new JSONObject()
                 .fluentPut("scoreName","红黄蓝车系")