【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -31,18 +31,27 @@ public class ChangeInfoUtil {
         //循环对比每组记录生来变更内容
         for(EnterpriseServiceImpl.ChangeApproveBean item : beanList){
             List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
-            getVenueResult(item,diffList);
-            getStartEndResult(item,diffList);
-            getRegistrationDateResult(item,diffList);
-            getRegisteredCapitalResult(item,diffList);
+            getVenueResult(item,list);
+            getStartEndResult(item,list);
+            getRegistrationDateResult(item,list);
+            getRegisteredCapitalResult(item,list);
             for(CompareResult diffItem : diffList){
                 if(diffItem.getFieldComment().contains("审批状态") || diffItem.getFieldComment().contains("营业执照")
                         || diffItem.getFieldComment().contains("法人证件照") || diffItem.getFieldComment().contains("管理员证件照")
                         || diffItem.getFieldComment().contains("授权委托书") || diffItem.getFieldComment().contains("省")
                         || diffItem.getFieldComment().contains("市") || diffItem.getFieldComment().contains("区")
-                        || diffItem.getFieldComment().contains("营业开始日期") || diffItem.getFieldComment().contains("营业结束日期")){
+                        || diffItem.getFieldComment().contains("营业开始日期") || diffItem.getFieldComment().contains("营业结束日期")
+                        || diffItem.getFieldComment().contains("注册日期") || diffItem.getFieldComment().contains("注册资本")){
                     continue;
                 }
+                list.add(getChangeInfoVO(item,diffItem));
+            }
+        }
+        list = list.stream().sorted(Comparator.comparing(ChangeInfoVO::getNameEn).thenComparing(ChangeInfoVO::getDate).reversed()).collect(Collectors.toList());
+        return list;
+    }
+
+    private static ChangeInfoVO getChangeInfoVO(EnterpriseServiceImpl.ChangeApproveBean item,CompareResult diffItem){
         ChangeInfoVO vo = new ChangeInfoVO();
         vo.setNameEn(diffItem.getFieldName());
         vo.setName(diffItem.getFieldComment());
@@ -50,18 +59,14 @@ public class ChangeInfoUtil {
         vo.setBefore(diffItem.getOldValue().toString());
         vo.setAfter(diffItem.getNewValue().toString());
         vo.setGuid(CommonUtil.newGuid());
-                list.add(vo);
-            }
-        }
-        list = list.stream().sorted(Comparator.comparing(ChangeInfoVO::getNameEn).thenComparing(ChangeInfoVO::getDate).reversed()).collect(Collectors.toList());
-        return list;
+        return vo;
     }
 
-    private static void getRegisteredCapitalResult(EnterpriseServiceImpl.ChangeApproveBean item, List<CompareResult> diffList) {
+    private static void getRegisteredCapitalResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
         String oldValue = getRegisteredCapital(item.oldBean.getRegisteredCapital());
         String newValue = getRegisteredCapital(item.newBean.getRegisteredCapital());
         if(!oldValue.equals(newValue)){
-            diffList.add(getCompareResult("注册资本","registeredCapital",oldValue,newValue));
+            list.add(getChangeInfoVO(item,getCompareResult("注册资本","registeredCapital",oldValue,newValue)));
         }
     }
 
@@ -72,19 +77,19 @@ public class ChangeInfoUtil {
         return v.setScale(2, RoundingMode.HALF_DOWN).toString();
     }
 
-    public static void getVenueResult(EnterpriseServiceImpl.ChangeApproveBean item, List<CompareResult> diffList) {
+    public static void getVenueResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
         String oldValue = getVenue(item.oldBean.getProvince(),item.oldBean.getCity(),item.oldBean.getDistrict());
         String newValue = getVenue(item.newBean.getProvince(),item.newBean.getCity(),item.newBean.getDistrict());
         if(!oldValue.equals(newValue)){
-            diffList.add(getCompareResult("注册地","venue",oldValue,newValue));
+            list.add(getChangeInfoVO(item,getCompareResult("注册地","venue",oldValue,newValue)));
         }
     }
 
-    public static void getRegistrationDateResult(EnterpriseServiceImpl.ChangeApproveBean item, List<CompareResult> diffList) {
+    public static void getRegistrationDateResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
         String oldValue = getRegistrationDate(item.oldBean.getRegistrationDate());
         String newValue = getRegistrationDate(item.newBean.getRegistrationDate());
         if(!oldValue.equals(newValue)){
-            diffList.add(getCompareResult("注册日期","registrationDate",oldValue,newValue));
+            list.add(getChangeInfoVO(item,getCompareResult("注册日期","registrationDate",oldValue,newValue)));
         }
     }
 
@@ -101,11 +106,11 @@ public class ChangeInfoUtil {
         return result;
     }
 
-    public static void getStartEndResult(EnterpriseServiceImpl.ChangeApproveBean item, List<CompareResult> diffList) {
+    public static void getStartEndResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
         String oldValue = getStartEnd(item.oldBean.getBusinessLicenseTerm(),item.oldBean.getBusinessLicenseStartDate(),item.oldBean.getBusinessLicenseEndDate());
         String newValue = getStartEnd(item.newBean.getBusinessLicenseTerm(),item.newBean.getBusinessLicenseStartDate(),item.newBean.getBusinessLicenseEndDate());
         if(!oldValue.equals(newValue)){
-            diffList.add(getCompareResult("营业期限","businessLicenseStartEnd",oldValue,newValue));
+            list.add(getChangeInfoVO(item,getCompareResult("营业期限","businessLicenseStartEnd",oldValue,newValue)));
         }
     }