【数据资产】

企业认证修改

@@ -227,6 +227,10 @@ public class EnterpriseRSVO {
     @Schema(description = "认证方式")
     @Schema(description = "认证方式")
     private String authenticationMethod;
     private String authenticationMethod;
 
 
+    @Schema(description = "认证方式名称")
+    @SystemParamsDict(dictTypeName = "认证方式", codeFieldName = "authenticationMethod")
+    private String authenticationMethodName;
+
     @Schema(description = "认证状态")
     @Schema(description = "认证状态")
     private String authenticationState;
     private String authenticationState;
 
 
@@ -237,12 +241,24 @@ public class EnterpriseRSVO {
     @Schema(description = "认证等级")
     @Schema(description = "认证等级")
     private String authenticationLevel;
     private String authenticationLevel;
 
 
+    @Schema(description = "认证等级名称")
+    @SystemParamsDict(dictTypeName = "认证等级", codeFieldName = "authenticationLevel")
+    private String authenticationLevelName;
+
     @Schema(description = "身份状态")
     @Schema(description = "身份状态")
     private String identityState;
     private String identityState;
 
 
+    @Schema(description = "身份状态名称")
+    @SystemParamsDict(dictTypeName = "身份状态", codeFieldName = "identityState")
+    private String identityStateName;
+
     @Schema(description = "授权方式")
     @Schema(description = "授权方式")
     private String authorizationMethod;
     private String authorizationMethod;
 
 
+    @Schema(description = "授权方式名称")
+    @SystemParamsDict(dictTypeName = "授权方式", codeFieldName = "authorizationMethod")
+    private String authorizationMethodName;
+
     @Schema(description = "经办人证件类型")
     @Schema(description = "经办人证件类型")
     private String handlePersonIdType;
     private String handlePersonIdType;
 
 

@@ -306,7 +306,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
      * @param flowBaseVO
      * @param flowBaseVO
      * @return void
      * @return void
      */
      */
-//    @GlobalTransactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public void saveEnterprise(FlowRQBaseVO flowBaseVO) {
     public void saveEnterprise(FlowRQBaseVO flowBaseVO) {
@@ -332,7 +332,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
      * @param flowBaseVO
      * @param flowBaseVO
      * @return void
      * @return void
      */
      */
-//    @GlobalTransactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public void updateEnterprise(FlowRQBaseVO flowBaseVO) {
     public void updateEnterprise(FlowRQBaseVO flowBaseVO) {

 package com.csbr.qingcloud.portal.util;
 package com.csbr.qingcloud.portal.util;
 
 
 import com.csbr.cloud.common.util.CommonUtil;
 import com.csbr.cloud.common.util.CommonUtil;
-import com.csbr.cloud.common.util.CsbrBeanUtil;
 import com.csbr.qingcloud.portal.domain.vo.BoroughPOJO;
 import com.csbr.qingcloud.portal.domain.vo.BoroughPOJO;
 import com.csbr.qingcloud.portal.domain.vo.ChangeInfoVO;
 import com.csbr.qingcloud.portal.domain.vo.ChangeInfoVO;
 import com.csbr.qingcloud.portal.domain.vo.CompareResult;
 import com.csbr.qingcloud.portal.domain.vo.CompareResult;
-import com.csbr.qingcloud.portal.feign.ConfigureFeign;
 import com.csbr.qingcloud.portal.service.impl.EnterpriseServiceImpl;
 import com.csbr.qingcloud.portal.service.impl.EnterpriseServiceImpl;
-import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
@@ -35,6 +33,7 @@ public class ChangeInfoUtil {
             }
             }
             List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
             List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
             getVenueResult(item,list);
             getVenueResult(item,list);
+            getStartTimeResult(item,list);
             getStartEndResult(item,list);
             getStartEndResult(item,list);
             getRegistrationDateResult(item,list);
             getRegistrationDateResult(item,list);
             getRegisteredCapitalResult(item,list);
             getRegisteredCapitalResult(item,list);
@@ -109,9 +108,17 @@ public class ChangeInfoUtil {
         return result;
         return result;
     }
     }
 
 
+    public static void getStartTimeResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
+        String oldValue = DateUtil.getShortDateToString(item.oldBean.getBusinessLicenseStartDate());
+        String newValue = DateUtil.getShortDateToString(item.newBean.getBusinessLicenseStartDate());
+        if(!oldValue.equals(newValue)){
+            list.add(getChangeInfoVO(item,getCompareResult("营业开始日期","businessLicenseStartDate",oldValue,newValue)));
+        }
+    }
+
     public static void getStartEndResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
     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());
+        String oldValue = getDurationOrEnd(item.oldBean.getBusinessLicenseTerm(),item.oldBean.getBusinessLicenseStartDate(),item.oldBean.getBusinessLicenseEndDate());
+        String newValue = getDurationOrEnd(item.newBean.getBusinessLicenseTerm(),item.newBean.getBusinessLicenseStartDate(),item.newBean.getBusinessLicenseEndDate());
         if(!oldValue.equals(newValue)){
         if(!oldValue.equals(newValue)){
             list.add(getChangeInfoVO(item,getCompareResult("营业期限","businessLicenseStartEnd",oldValue,newValue)));
             list.add(getChangeInfoVO(item,getCompareResult("营业期限","businessLicenseStartEnd",oldValue,newValue)));
         }
         }
@@ -142,4 +149,14 @@ public class ChangeInfoUtil {
         return String.format("%s至%s",DateUtil.getShortDateToString(businessLicenseStartDate),DateUtil.getShortDateToString(businessLicenseEndDate));
         return String.format("%s至%s",DateUtil.getShortDateToString(businessLicenseStartDate),DateUtil.getShortDateToString(businessLicenseEndDate));
     }
     }
 
 
+    public static String getDurationOrEnd(String businessLicenseTerm, Date businessLicenseStartDate, Date businessLicenseEndDate) {
+        if("1".equals(businessLicenseTerm)){
+            return "长期有效";
+        }
+        if(ObjectUtils.isNotEmpty(businessLicenseEndDate)){
+            return DateUtil.getShortDateToString(businessLicenseEndDate);
+        }
+        return String.format("%s至%s",DateUtil.getShortDateToString(businessLicenseStartDate),DateUtil.getShortDateToString(businessLicenseEndDate));
+    }
+
 }
 }