【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -56,6 +57,7 @@ public class ChangeInfoUtil {
                 list.add(vo);
                 list.add(vo);
             }
             }
         }
         }
+        list = list.stream().sorted(Comparator.comparing(ChangeInfoVO::getDate).thenComparing(ChangeInfoVO::getNameEn)).collect(Collectors.toList());
         return list;
         return list;
     }
     }
 
 
@@ -71,7 +73,9 @@ public class ChangeInfoUtil {
         if(v == null){
         if(v == null){
             return "";
             return "";
         }
         }
-        return v.setScale(2, RoundingMode.HALF_DOWN).toString();
+        String s = v.setScale(2, RoundingMode.HALF_DOWN).toString();
+        s = s.split("\\.")[0] + s.split("\\.")[1].substring(0,2);
+        return s;
     }
     }
 
 
     public static void getVenueResult(EnterpriseServiceImpl.ChangeApproveBean item, List<CompareResult> diffList) {
     public static void getVenueResult(EnterpriseServiceImpl.ChangeApproveBean item, List<CompareResult> diffList) {