Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
803e665b by 肖初晴
Options

【DAOP-1.0】企业认证 

【功能点】测试问题处理
1 parent 5b171143
Inline Side-by-side
Showing 1 changed file with 23 additions and 18 deletions
src/main/java/com/csbr/qingcloud/portal/util/ChangeInfoUtil.java
...@@ -31,18 +31,27 @@ public class ChangeInfoUtil { ...@@ -31,18 +31,27 @@ public class ChangeInfoUtil {
31 //循环对比每组记录生来变更内容 31 //循环对比每组记录生来变更内容
32 for(EnterpriseServiceImpl.ChangeApproveBean item : beanList){ 32 for(EnterpriseServiceImpl.ChangeApproveBean item : beanList){
33 List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean); 33 List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
34 getVenueResult(item,diffList); 34 getVenueResult(item,list);
35 getStartEndResult(item,diffList); 35 getStartEndResult(item,list);
36 getRegistrationDateResult(item,diffList); 36 getRegistrationDateResult(item,list);
37 getRegisteredCapitalResult(item,diffList); 37 getRegisteredCapitalResult(item,list);
38 for(CompareResult diffItem : diffList){ 38 for(CompareResult diffItem : diffList){
39 if(diffItem.getFieldComment().contains("审批状态") || diffItem.getFieldComment().contains("营业执照") 39 if(diffItem.getFieldComment().contains("审批状态") || diffItem.getFieldComment().contains("营业执照")
40 || diffItem.getFieldComment().contains("法人证件照") || diffItem.getFieldComment().contains("管理员证件照") 40 || diffItem.getFieldComment().contains("法人证件照") || diffItem.getFieldComment().contains("管理员证件照")
41 || diffItem.getFieldComment().contains("授权委托书") || diffItem.getFieldComment().contains("省") 41 || diffItem.getFieldComment().contains("授权委托书") || diffItem.getFieldComment().contains("省")
42 || diffItem.getFieldComment().contains("市") || diffItem.getFieldComment().contains("区") 42 || diffItem.getFieldComment().contains("市") || diffItem.getFieldComment().contains("区")
43 || diffItem.getFieldComment().contains("营业开始日期") || diffItem.getFieldComment().contains("营业结束日期")){ 43 || diffItem.getFieldComment().contains("营业开始日期") || diffItem.getFieldComment().contains("营业结束日期")
44 || diffItem.getFieldComment().contains("注册日期") || diffItem.getFieldComment().contains("注册资本")){
44 continue; 45 continue;
45 } 46 }
47 list.add(getChangeInfoVO(item,diffItem));
48 }
49 }
50 list = list.stream().sorted(Comparator.comparing(ChangeInfoVO::getNameEn).thenComparing(ChangeInfoVO::getDate).reversed()).collect(Collectors.toList());
51 return list;
52 }
53
54 private static ChangeInfoVO getChangeInfoVO(EnterpriseServiceImpl.ChangeApproveBean item,CompareResult diffItem){
46 ChangeInfoVO vo = new ChangeInfoVO(); 55 ChangeInfoVO vo = new ChangeInfoVO();
47 vo.setNameEn(diffItem.getFieldName()); 56 vo.setNameEn(diffItem.getFieldName());
48 vo.setName(diffItem.getFieldComment()); 57 vo.setName(diffItem.getFieldComment());
...@@ -50,18 +59,14 @@ public class ChangeInfoUtil { ...@@ -50,18 +59,14 @@ public class ChangeInfoUtil {
50 vo.setBefore(diffItem.getOldValue().toString()); 59 vo.setBefore(diffItem.getOldValue().toString());
51 vo.setAfter(diffItem.getNewValue().toString()); 60 vo.setAfter(diffItem.getNewValue().toString());
52 vo.setGuid(CommonUtil.newGuid()); 61 vo.setGuid(CommonUtil.newGuid());
53 list.add(vo); 62 return vo;
54 }
55 }
56 list = list.stream().sorted(Comparator.comparing(ChangeInfoVO::getNameEn).thenComparing(ChangeInfoVO::getDate).reversed()).collect(Collectors.toList());
57 return list;
58 } 63 }
59 64
60 private static void getRegisteredCapitalResult(EnterpriseServiceImpl.ChangeApproveBean item, List<CompareResult> diffList) { 65 private static void getRegisteredCapitalResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
61 String oldValue = getRegisteredCapital(item.oldBean.getRegisteredCapital()); 66 String oldValue = getRegisteredCapital(item.oldBean.getRegisteredCapital());
62 String newValue = getRegisteredCapital(item.newBean.getRegisteredCapital()); 67 String newValue = getRegisteredCapital(item.newBean.getRegisteredCapital());
63 if(!oldValue.equals(newValue)){ 68 if(!oldValue.equals(newValue)){
64 diffList.add(getCompareResult("注册资本","registeredCapital",oldValue,newValue)); 69 list.add(getChangeInfoVO(item,getCompareResult("注册资本","registeredCapital",oldValue,newValue)));
65 } 70 }
66 } 71 }
67 72
...@@ -72,19 +77,19 @@ public class ChangeInfoUtil { ...@@ -72,19 +77,19 @@ public class ChangeInfoUtil {
72 return v.setScale(2, RoundingMode.HALF_DOWN).toString(); 77 return v.setScale(2, RoundingMode.HALF_DOWN).toString();
73 } 78 }
74 79
75 public static void getVenueResult(EnterpriseServiceImpl.ChangeApproveBean item, List<CompareResult> diffList) { 80 public static void getVenueResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
76 String oldValue = getVenue(item.oldBean.getProvince(),item.oldBean.getCity(),item.oldBean.getDistrict()); 81 String oldValue = getVenue(item.oldBean.getProvince(),item.oldBean.getCity(),item.oldBean.getDistrict());
77 String newValue = getVenue(item.newBean.getProvince(),item.newBean.getCity(),item.newBean.getDistrict()); 82 String newValue = getVenue(item.newBean.getProvince(),item.newBean.getCity(),item.newBean.getDistrict());
78 if(!oldValue.equals(newValue)){ 83 if(!oldValue.equals(newValue)){
79 diffList.add(getCompareResult("注册地","venue",oldValue,newValue)); 84 list.add(getChangeInfoVO(item,getCompareResult("注册地","venue",oldValue,newValue)));
80 } 85 }
81 } 86 }
82 87
83 public static void getRegistrationDateResult(EnterpriseServiceImpl.ChangeApproveBean item, List<CompareResult> diffList) { 88 public static void getRegistrationDateResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
84 String oldValue = getRegistrationDate(item.oldBean.getRegistrationDate()); 89 String oldValue = getRegistrationDate(item.oldBean.getRegistrationDate());
85 String newValue = getRegistrationDate(item.newBean.getRegistrationDate()); 90 String newValue = getRegistrationDate(item.newBean.getRegistrationDate());
86 if(!oldValue.equals(newValue)){ 91 if(!oldValue.equals(newValue)){
87 diffList.add(getCompareResult("注册日期","registrationDate",oldValue,newValue)); 92 list.add(getChangeInfoVO(item,getCompareResult("注册日期","registrationDate",oldValue,newValue)));
88 } 93 }
89 } 94 }
90 95
...@@ -101,11 +106,11 @@ public class ChangeInfoUtil { ...@@ -101,11 +106,11 @@ public class ChangeInfoUtil {
101 return result; 106 return result;
102 } 107 }
103 108
104 public static void getStartEndResult(EnterpriseServiceImpl.ChangeApproveBean item, List<CompareResult> diffList) { 109 public static void getStartEndResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
105 String oldValue = getStartEnd(item.oldBean.getBusinessLicenseTerm(),item.oldBean.getBusinessLicenseStartDate(),item.oldBean.getBusinessLicenseEndDate()); 110 String oldValue = getStartEnd(item.oldBean.getBusinessLicenseTerm(),item.oldBean.getBusinessLicenseStartDate(),item.oldBean.getBusinessLicenseEndDate());
106 String newValue = getStartEnd(item.newBean.getBusinessLicenseTerm(),item.newBean.getBusinessLicenseStartDate(),item.newBean.getBusinessLicenseEndDate()); 111 String newValue = getStartEnd(item.newBean.getBusinessLicenseTerm(),item.newBean.getBusinessLicenseStartDate(),item.newBean.getBusinessLicenseEndDate());
107 if(!oldValue.equals(newValue)){ 112 if(!oldValue.equals(newValue)){
108 diffList.add(getCompareResult("营业期限","businessLicenseStartEnd",oldValue,newValue)); 113 list.add(getChangeInfoVO(item,getCompareResult("营业期限","businessLicenseStartEnd",oldValue,newValue)));
109 } 114 }
110 } 115 }
111 116
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!