【DAOP-1.0】企业认证

【功能点】联调问题处理

@@ -79,6 +79,9 @@ public class EnterpriseRSVO {
     @Schema(description = "区")
     @Schema(description = "区")
     private String district;
     private String district;
 
 
+    @Schema(description = "注册地")
+    private String venue;
+    
     /**
     /**
      * 营业期限【1 长期有效；2 自定义】
      * 营业期限【1 长期有效；2 自定义】
      */
      */
@@ -99,6 +102,9 @@ public class EnterpriseRSVO {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date businessLicenseEndDate;
     private Date businessLicenseEndDate;
 
 
+    @Schema(description = "营业日期范围")
+    private String businessLicenseStartEnd;
+    
     /**
     /**
      * 营业执照
      * 营业执照
      */
      */

@@ -207,10 +207,14 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         //循环对比每组记录生来变更内容
         //循环对比每组记录生来变更内容
         for(ChangeApproveBean item : beanList){
         for(ChangeApproveBean item : beanList){
             List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
             List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
+            getVenueResult(item,diffList);
+            getStartEndResult(item,diffList);
             for(CompareResult diffItem : diffList){
             for(CompareResult diffItem : diffList){
                 if(diffItem.getFieldComment().contains("审批状态") || diffItem.getFieldComment().contains("营业执照")
                 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("营业结束日期")){
                     continue;
                     continue;
                 }
                 }
                 ChangeInfoVO vo = new ChangeInfoVO();
                 ChangeInfoVO vo = new ChangeInfoVO();
@@ -223,10 +227,52 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
                 list.add(vo);
                 list.add(vo);
             }
             }
         }
         }
-
         return list;
         return list;
     }
     }
 
 
+    private static void getVenueResult(ChangeApproveBean item, List<CompareResult> diffList) {
+        String oldVenue = getVenue(item.oldBean.getProvince(),item.oldBean.getCity(),item.oldBean.getDistrict());
+        String newVenue = getVenue(item.newBean.getProvince(),item.newBean.getCity(),item.newBean.getDistrict());
+        if(!oldVenue.equals(newVenue)){
+            CompareResult result = new CompareResult();
+            result.setFieldComment("注册地");
+            result.setFieldName("venue");
+            result.setOldValue(oldVenue);
+            result.setNewValue(newVenue);
+            diffList.add(result);
+        }
+    }
+
+    private static void getStartEndResult(ChangeApproveBean item, List<CompareResult> diffList) {
+        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)){
+            CompareResult result = new CompareResult();
+            result.setFieldComment("营业日期范围");
+            result.setFieldName("businessLicenseStartEnd");
+            result.setOldValue(oldValue);
+            result.setNewValue(newValue);
+            diffList.add(result);
+        }
+    }
+
+    private static String getVenue(String province, String city, String district) {
+        if(StringUtils.isBlank(district)){
+            return String.format("%s/%s",province,city);
+        }
+        else{
+            return String.format("%s/%s/%s",province,city,district);
+        }
+    }
+
+
+    private static String getStartEnd(String businessLicenseTerm,Date businessLicenseStartDate, Date businessLicenseEndDate) {
+        if("1".equals(businessLicenseTerm)){
+            return "长期有效";
+        }
+        return String.format("%s至%s",businessLicenseStartDate,businessLicenseEndDate);
+    }
+
 
 
     /**
     /**
      * 企业信息数据新增
      * 企业信息数据新增
@@ -660,9 +706,12 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         EnterpriseRSVO vo = csbrBeanUtil.convert(entity, EnterpriseRSVO.class);
         EnterpriseRSVO vo = csbrBeanUtil.convert(entity, EnterpriseRSVO.class);
         //流程数据处理
         //流程数据处理
         vo.setApproveVO(approvalFlowUtil.getApprovalCrossTenantInfo(entity.getGuid()));
         vo.setApproveVO(approvalFlowUtil.getApprovalCrossTenantInfo(entity.getGuid()));
+        vo.setVenue(getVenue(vo.getProvince(),vo.getCity(),vo.getDistrict()));
+        vo.setBusinessLicenseStartEnd(getStartEnd(vo.getBusinessLicenseTerm(),vo.getBusinessLicenseStartDate(),vo.getBusinessLicenseEndDate()));
         return vo;
         return vo;
     }
     }
 
 
+
     /**
     /**
      * 企业信息新增、修改和其他情况的参数转换为实体
      * 企业信息新增、修改和其他情况的参数转换为实体
      * @author xcq
      * @author xcq