【DAOP-1.0】企业认证

【功能点】变更功能开发

 package com.csbr.qingcloud.portal.controller;
 
 import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.qingcloud.portal.domain.vo.ChangeApproveVO;
+import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService;
 import csbr.cloud.entity.annotation.SystemLog;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
@@ -13,8 +15,8 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 /**
@@ -30,6 +32,9 @@ public class EnterpriseController {
     
     @Resource
     private EnterpriseService enterpriseService;
+
+    @Resource
+    private EnterpriseChangeApproveService enterpriseChangeApproveService;
     
     //region 基本操作
 
@@ -67,11 +72,8 @@ public class EnterpriseController {
      
     @GetMapping("/detail")
     @SystemLog(value = "企业信息-详情")
-    @Operation(
-            summary = "企业信息-详情",
-            parameters = {
-                    @Parameter(name = "guid", description = "企业信息唯一标识", required = true)}
-    )
+    @Operation(summary = "企业信息-详情",
+            parameters = {@Parameter(name = "guid", description = "企业信息唯一标识", required = true)} )
     public CommonRes<EnterpriseRSVO> getEnterpriseDetail(@RequestParam String guid) {
         EnterpriseRSVO vo = enterpriseService.getEnterpriseDetail(guid);
         return CommonRes.success(vo);
@@ -86,5 +88,44 @@ public class EnterpriseController {
     }
     
     //endregion
+
+    //region 变更申请
+
+    /**
+     * 前置校验
+     */
+    @PostMapping("/check")
+    @SystemLog(value = "前置校验")
+    @Operation(summary = "前置校验")
+    public CommonRes<Boolean> check(@Validated @RequestBody EnterpriseRQVO vo) {
+        Boolean result = enterpriseService.check(vo);
+        return CommonRes.success(result);
+    }
+
+    @PostMapping("/change/update")
+    @SystemLog(value = "变更审批-最终更新")
+    @Operation( summary = "变更审批-最终更新" )
+    public CommonRes<Boolean> changeUpdate(@RequestBody BizCallbackDTO dto) {
+        enterpriseChangeApproveService.changeUpdate(dto);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/change/save")
+    @SystemLog(value = "变更申请-保存数据")
+    @Operation(summary = "变更申请-保存数据")
+    public CommonRes<Boolean> changeSave(@Validated @RequestBody ChangeApproveVO vo) {
+        enterpriseChangeApproveService.changeSave(vo);
+        return CommonRes.success(true);
+    }
+
+
+    @GetMapping("/change/detail")
+    @SystemLog(value = "变更申请-查询详情")
+    @Operation(summary = "变更申请-详情",parameters = {  @Parameter(name = "guid", description = "申请唯一标识", required = true)})
+    public CommonRes<ChangeApproveVO> changeDetail(@RequestParam String guid) {
+        return CommonRes.success(enterpriseChangeApproveService.changeDetail(guid));
+    }
+
+    //endregion
     
 }

+package com.csbr.qingcloud.portal.domain.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @program: ms-hc-workflow-service
+ * @description: 通用变更审批对象
+ * @author: XiaoCQ
+ * @create: 2024-01-20
+ **/
+@Data
+@Schema(name = "通用变更审批对象")
+public class ChangeApproveVO {
+
+    /**
+     * 各变更业务唯一标识
+     */
+    @Schema(description = "各变更业务唯一标识")
+    private String guid;
+
+    /**
+     * 审批流唯一标识
+     */
+    @Schema(description = "审批流唯一标识")
+    private String approveGuid;
+
+    @Schema(description = "业务审批状态")
+    private String bizApproveState;
+
+    @Schema(description = "原审批流唯一标识")
+    private String sourceApproveGuid;
+
+    /**
+     * 源数据GUID
+     */
+    @Schema(description = "源数据GUID")
+    private String sourceGuid;
+
+    /**
+     * 业务数据
+     */
+    @Schema(description = "业务数据")
+    private String bizDataJson;
+
+    @Schema(description = "业务数据明细")
+    private String bizDataDetailJson;
+
+    /**
+     * 原业务数据
+     */
+    @Schema(description = "原业务数据")
+    private String oldBizDataJson;
+
+    @Schema(description = "原业务数据明细")
+    private String oldBizDataDetailJson;
+
+}
\ No newline at end of file

@@ -22,7 +22,7 @@ public class EnterpriseQueryVO extends FlowBizGuidQueryDTO {
     /**
      * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃】
      */
-    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃】")
+    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中；】")
     private String bizApproveState;
 
     /******** 自定义扩展 *****/

@@ -167,7 +167,7 @@ public class EnterpriseRQVO extends FlowRQBaseVO {
     /**
      * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
      */
-    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】")
+    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中； 默认 N】")
     private String bizApproveState;
     
     /******** 库表存储属性 需处理 *****/

@@ -173,7 +173,7 @@ public class EnterpriseRSVO {
     /**
      * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
      */
-    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】")
+    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中； 默认 N】")
     private String bizApproveState;
     
     /******** 库表存储属性 需处理 *****/

+package com.csbr.qingcloud.portal.domain.vo;
+
+import csbr.cloud.entity.domain.base.vo.CsbrBaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+* 企业表 视图对象类
+*
+* @author xiaocq
+* @date 2023-12-19
+*/
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@Schema(name = "企业表")
+public class TenantRQVO extends CsbrBaseVO {
+
+    @Schema(description = "上级企业GUID")
+    private String parentGuid;
+
+    /**
+    * 公司编号
+    */
+    @Schema(description = "公司编号")
+    private String tenantCode;
+
+    /**
+    * 公司名称
+    */
+    @Schema(description = "公司名称")
+    private String tenantName;
+
+    /**
+    * 公司简称
+    */
+    @Schema(description = "公司简称")
+    private String abbreviation;
+
+    @Schema(description = "企业类型")
+    private String tenantType;
+
+    /**
+    * 公司法人
+    */
+    @Schema(description = "公司法人")
+    private String personIncharge;
+
+    /**
+    * 注册日期
+    */
+    @Schema(description = "注册日期")
+    private LocalDateTime registrationDate;
+
+    /**
+    * 注册资本
+    */
+    @Schema(description = "注册资本")
+    private BigDecimal registeredCapital;
+
+    /**
+    * 税号
+    */
+    @Schema(description = "税号")
+    private String bankTaxNo;
+
+    /**
+    * 单位地址
+    */
+    @Schema(description = "单位地址")
+    private String companyAddress;
+
+    /**
+    * 状态
+    */
+    @Schema(description = "状态 N草稿 Y正常 S停用")
+    private String bizState;
+
+    /**
+    * 营业执照经营范围
+    */
+    @Schema(description = "营业执照经营范围")
+    private String businessLicenseScope;
+
+    /**
+    * 联系人
+    */
+    @Schema(description = "联系人")
+    private String contacts;
+
+    /**
+    * 联系人电话
+    */
+    @Schema(description = "联系人电话")
+    private String contactTel;
+
+    /**
+    * 公司电话
+    */
+    @Schema(description = "公司电话")
+    private String enterprisePhone;
+
+    /**
+    * 省
+    */
+    @Schema(description = "省")
+    private String province;
+
+    /**
+    * 市
+    */
+    @Schema(description = "市")
+    private String city;
+
+    /**
+    * 区
+    */
+    @Schema(description = "区")
+    private String district;
+
+    /**
+    * 地址
+    */
+    @Schema(description = "地址")
+    private String venue;
+
+    /**
+    * 详细地址
+    */
+    @Schema(description = "详细地址")
+    private String address;
+
+    /**
+    * 登录账号
+    */
+    @Schema(description = "登录账号")
+    private String logonUser;
+
+    @Schema(description = "会员状态 来自字典")
+    private String memberStatus;
+
+    @Schema(description = "持股类型 来自字典")
+    private String holdType;
+
+
+    /********非库表存储属性*****/
+
+    @Schema(description = "token后台赋值")
+    private String token;
+
+    /********字典类*****/
+
+    /********实体类、用户单选、组织机构单选*****/
+
+    /********范围查询*****/
+
+    /********自定义扩展*****/
+
+    /********子对象*****/
+
+    @Schema(hidden = true,description = "分库标识")
+    private String shardingFlag;
+}

+package com.csbr.qingcloud.portal.feign;
+
+import com.csbr.cloud.common.config.FastCallFeignConfiguration;
+import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.qingcloud.portal.domain.vo.TenantRQVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import java.util.Map;
+
+/**
+ * @author Xiaocq
+ */
+@FeignClient(value = "ms-daop-personel-service", configuration = FastCallFeignConfiguration.class)
+public interface PersonelFeign {
+
+    @PostMapping(value = "/tenant/auth", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Boolean> authTenant(@RequestBody TenantRQVO vo);
+
+    @PostMapping(value = "/tenant/update", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Boolean> updateTenant(@RequestBody TenantRQVO vo);
+
+    @GetMapping(value = "/tenant/get-all-tenant-guid-name-map", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Map<String, String>> getAllTenantGuidNameMap();
+
+}

@@ -172,7 +172,7 @@ public class MfEnterprise extends BaseDO {
     /**
     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
     */
-    @Name("业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】")
+    @Name("业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中 默认 N】")
     private String bizApproveState;
 
 }

+package com.csbr.qingcloud.portal.mybatis.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import csbr.cloud.entity.domain.base.dao.BaseDO;
+import jdk.jfr.Name;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息变更审批实体
+ * @author: xcq
+ * @create: 2024-12-27 15:10
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@Name("企业信息变更审批")
+public class MfEnterpriseChangeApprove extends BaseDO {
+    
+    /**
+    * 公司名称
+    */
+    @Name("公司名称")
+    private String tenantName;
+    
+    /**
+    * 统一社会信用代码
+    */
+    @Name("统一社会信用代码")
+    private String socialCreditCode;
+    
+    /**
+    * 企业类型【选择平台字典【公司类型】的选项】
+    */
+    @Name("企业类型【选择平台字典【公司类型】的选项】")
+    private String tenantType;
+    
+    /**
+    * 注册日期
+    */
+    @Name("注册日期")
+    private Date registrationDate;
+    
+    /**
+    * 注册资本【(万元)】
+    */
+    @Name("注册资本【(万元)】")
+    private BigDecimal registeredCapital;
+    
+    /**
+    * 税号
+    */
+    @Name("税号")
+    private String bankTaxNo;
+    
+    /**
+    * 省
+    */
+    @Name("省")
+    private String province;
+    
+    /**
+    * 市
+    */
+    @Name("市")
+    private String city;
+    
+    /**
+    * 区
+    */
+    @Name("区")
+    private String district;
+    
+    /**
+    * 营业期限【1 长期有效；2 自定义】
+    */
+    @Name("营业期限【1 长期有效；2 自定义】")
+    private String businessLicenseTerm;
+    
+    /**
+    * 营业开始日期
+    */
+    @Name("营业开始日期")
+    private Date businessLicenseStartDate;
+    
+    /**
+    * 营业结束日期
+    */
+    @Name("营业结束日期")
+    private Date businessLicenseEndDate;
+    
+    /**
+    * 营业执照
+    */
+    @Name("营业执照")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String businessLicenseJson;
+    
+    /**
+    * 营业执照经营范围
+    */
+    @Name("营业执照经营范围")
+    private String businessLicenseScope;
+    
+    /**
+    * 公司法人
+    */
+    @Name("公司法人")
+    private String juridicalPerson;
+    
+    /**
+    * 法人证件类型
+    */
+    @Name("法人证件类型")
+    private String juridicalPersonIdType;
+    
+    /**
+    * 法人证件号
+    */
+    @Name("法人证件号")
+    private String juridicalPersonId;
+    
+    /**
+    * 法人证件照
+    */
+    @Name("法人证件照")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String juridicalPersonIdPhotoJson;
+    
+    /**
+    * 登录账号
+    */
+    @Name("登录账号")
+    private String logonUser;
+    
+    /**
+    * 联系人
+    */
+    @Name("联系人")
+    private String contacts;
+    
+    /**
+    * 联系人电话
+    */
+    @Name("联系人电话")
+    private String contactTel;
+    
+    /**
+    * 管理员证件号
+    */
+    @Name("管理员证件号")
+    private String managerPersonId;
+    
+    /**
+    * 管理员证件照
+    */
+    @Name("管理员证件照")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String managerPersonIdPhotoJson;
+    
+    /**
+    * 授权委托书
+    */
+    @Name("授权委托书")
+    private String authorizationLetter;
+    
+    /**
+    * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+    */
+    @Name("业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】")
+    private String bizApproveState;
+    
+    /**
+    * 审批流唯一标识
+    */
+    @Name("审批流唯一标识")
+    private String approveGuid;
+    
+    /**
+    * 原数据唯一标识
+    */
+    @Name("原数据唯一标识")
+    private String sourceGuid;
+    
+    /**
+    * 数据类型【数据类型 1原数据 2新数据】
+    */
+    @Name("数据类型【数据类型 1原数据 2新数据】")
+    private String dataType;
+
+}

+package com.csbr.qingcloud.portal.mybatis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息变更审批 Mapper 接口
+ * @author: xcq
+ * @create: 2024-12-27 15:10
+ **/
+@Mapper
+public interface MfEnterpriseChangeApproveMapper extends BaseMapper<MfEnterpriseChangeApprove> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service;
+
+import com.csbr.cloud.base.service.CsbrService;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息变更审批逻辑层接口
+ * @author: xcq
+ * @create: 2024-12-27 15:10
+ **/
+public interface MfEnterpriseChangeApproveService extends CsbrService<MfEnterpriseChangeApprove> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service.impl;
+
+import com.csbr.cloud.mybatis.service.impl.CsbrServiceImpl;
+import com.csbr.qingcloud.portal.mybatis.mapper.MfEnterpriseChangeApproveMapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
+import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息变更审批逻辑层接口实现
+ * @author: xcq
+ * @create: 2024-12-27 15:10
+ **/
+@Service
+public class MfEnterpriseChangeApproveServiceImpl extends CsbrServiceImpl<MfEnterpriseChangeApproveMapper, MfEnterpriseChangeApprove> implements MfEnterpriseChangeApproveService {
+
+    @Resource
+    private MfEnterpriseChangeApproveMapper mfEnterpriseChangeApproveMapper;
+    
+}

+package com.csbr.qingcloud.portal.service;
+
+import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
+import com.csbr.qingcloud.portal.domain.vo.ChangeApproveVO;
+
+/**
+ * @description: 供应商商品变更
+ * @author: XiaoCQ
+ * @create: 2024-12-27
+ **/
+public interface EnterpriseChangeApproveService {
+    void changeSave(ChangeApproveVO vo);
+
+    ChangeApproveVO changeDetail(String guid);
+
+    void changeUpdate(BizCallbackDTO dto);
+}

 package com.csbr.qingcloud.portal.service;
 
+import com.csbr.qingcloud.portal.domain.vo.EnterpriseRQVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
@@ -69,5 +70,6 @@ public interface EnterpriseService {
      * @return void
      */
     void flowCallBack(BizCallbackDTO dto);
-    
+
+    Boolean check(EnterpriseRQVO vo);
 }

+package com.csbr.qingcloud.portal.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.csbr.cloud.common.enums.SystemError;
+import com.csbr.cloud.common.exception.CsbrSystemException;
+import com.csbr.cloud.common.util.CommonUtil;
+import com.csbr.cloud.common.util.CsbrBeanUtil;
+import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
+import com.csbr.qingcloud.portal.domain.vo.ChangeApproveVO;
+import com.csbr.qingcloud.portal.domain.vo.EnterpriseRQVO;
+import com.csbr.qingcloud.portal.domain.vo.EnterpriseRSVO;
+import com.csbr.qingcloud.portal.domain.vo.TenantRQVO;
+import com.csbr.qingcloud.portal.feign.PersonelFeign;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
+import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService;
+import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
+import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService;
+import com.csbr.qingcloud.portal.service.EnterpriseService;
+import csbr.cloud.entity.enums.ApprovalStateEnum;
+import jakarta.annotation.Resource;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Component;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @program: ms-hc-customer-service
+ * @description: 供应商商品变更
+ * @author: XiaoCQ
+ * @create: 2024-08-05
+ **/
+@Component
+public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeApproveService {
+
+    @Resource
+    private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService;
+
+    @Resource
+    private CsbrBeanUtil csbrBeanUtil;
+
+    @Resource
+    private MfEnterpriseService mfEnterpriseService;
+
+    @Resource
+    private EnterpriseService enterpriseService;
+
+    @Resource
+    private PersonelFeign personelFeign;
+
+
+    /** 保存变更数据 */
+    @Override
+    public void changeSave(ChangeApproveVO vo) {
+        //对重新发起的原审批源数据进行废弃
+        if(StringUtils.isNotBlank(vo.getSourceApproveGuid())){
+            LambdaUpdateWrapper<MfEnterpriseChangeApprove> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(MfEnterpriseChangeApprove::getApproveGuid,vo.getSourceApproveGuid());
+            updateWrapper.set(MfEnterpriseChangeApprove::getBizApproveState,"D");
+            mfEnterpriseChangeApproveService.update(updateWrapper);
+        }
+
+        //保存新数据
+        EnterpriseRQVO beanVO = JSON.parseObject(vo.getBizDataJson(), EnterpriseRQVO.class);
+        MfEnterpriseChangeApprove entity = csbrBeanUtil.convert(beanVO, MfEnterpriseChangeApprove.class);
+        setEntity(entity,beanVO,vo);
+        entity.setDataType("2");
+        entity.setGuid(vo.getGuid());
+        mfEnterpriseChangeApproveService.save(entity);
+
+        //保存原数据
+        beanVO = JSON.parseObject(vo.getOldBizDataJson(),EnterpriseRQVO.class);
+        entity = csbrBeanUtil.convert(beanVO,MfEnterpriseChangeApprove.class);
+        setEntity(entity,beanVO,vo);
+        entity.setDataType("1");
+        entity.setGuid(CommonUtil.newGuid());
+        mfEnterpriseChangeApproveService.save(entity);
+
+        MfEnterprise bean = mfEnterpriseService.getById(entity.getSourceGuid());
+        bean.setBizApproveState("B");
+        mfEnterpriseService.updateById(bean);
+    }
+
+    private void setEntity(MfEnterpriseChangeApprove entity,EnterpriseRQVO customerVO,ChangeApproveVO vo){
+        entity.setApproveGuid(vo.getApproveGuid());
+        entity.setSourceGuid(vo.getSourceGuid());
+    }
+
+    /** 变更数据详细接口 */
+    @Override
+    public ChangeApproveVO changeDetail(String guid) {
+        //取新数据
+        LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MfEnterpriseChangeApprove::getApproveGuid,guid);
+        queryWrapper.eq(MfEnterpriseChangeApprove::getDataType,"2");
+        List<MfEnterpriseChangeApprove> tempList = mfEnterpriseChangeApproveService.list(queryWrapper);
+        if(CollectionUtils.isEmpty(tempList)){
+            throw new CsbrSystemException(SystemError.DATA_INPUT_ERROR, "未找到对应的变更数据，审批流GUID:" + guid);
+        }
+        MfEnterpriseChangeApprove bean = tempList.get(0);
+        ChangeApproveVO vo = new ChangeApproveVO();
+        vo.setGuid(bean.getGuid());
+        vo.setApproveGuid(bean.getApproveGuid());
+        vo.setSourceGuid(bean.getSourceGuid());
+        vo.setBizDataJson(convertToVO(bean));
+
+        //取原数据
+        queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MfEnterpriseChangeApprove::getApproveGuid,bean.getApproveGuid());
+        queryWrapper.eq(MfEnterpriseChangeApprove::getDataType,"1");
+        tempList = mfEnterpriseChangeApproveService.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(tempList)){
+            vo.setOldBizDataJson(convertToVO(tempList.get(0)));
+        }
+
+        return vo;
+    }
+
+    /** 执行最终的变更 */
+    @Override
+    public void changeUpdate(BizCallbackDTO dto) {
+        MfEnterpriseChangeApprove entity = mfEnterpriseChangeApproveService.getById(dto.getBizGuid());
+        //审批不通过则将状态恢复到以前的Y
+        if(!dto.getApprovalState().equals(ApprovalStateEnum.PASSED.getValue())){
+            MfEnterprise bean = mfEnterpriseService.getById(entity.getSourceGuid());
+            bean.setBizApproveState("Y");
+            mfEnterpriseService.updateById(bean);
+            return;
+        }
+        //审批通过则执行更新
+        EnterpriseRQVO vo = csbrBeanUtil.convert(entity,EnterpriseRQVO.class);
+        vo.setGuid(entity.getSourceGuid());
+        vo.setBizApproveState("Y");
+        enterpriseService.updateEnterprise(vo);
+
+        //同步更新会员表
+        TenantRQVO tenantVO = csbrBeanUtil.convert(vo,TenantRQVO.class);
+        tenantVO.setGuid(getTenantGuid(vo.getTenantName()));
+        tenantVO.setPersonIncharge(vo.getJuridicalPerson());
+        personelFeign.updateTenant(tenantVO);
+    }
+
+    private String getTenantGuid(String name){
+        Map<String,String> map = personelFeign.getAllTenantGuidNameMap().getData();
+        for(String guid : map.keySet()){
+            if(map.get(guid).equals(name)){
+                return guid;
+            }
+        }
+        return null;
+    }
+
+    /** 转换数据 */
+    private String convertToVO(MfEnterpriseChangeApprove entity){
+        EnterpriseRSVO vo = csbrBeanUtil.convert(entity, EnterpriseRSVO.class);
+        return JSON.toJSONString(vo);
+    }
+
+}

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
+import com.csbr.qingcloud.portal.domain.vo.TenantRQVO;
+import com.csbr.qingcloud.portal.feign.PersonelFeign;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
 import com.csbr.cloud.common.exception.CsbrSystemException;
 import com.csbr.cloud.common.util.CommonUtil;
@@ -30,7 +32,6 @@ import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -60,6 +61,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     @Resource
     private MessageSourceUtil messageSourceUtil;
 
+    @Resource
+    private PersonelFeign personelFeign;
+
     /**
      * 企业信息分页查询
      * @author xcq
@@ -231,7 +235,10 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
             throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(FUNCTION_NAME));
         }
         if (ApprovalStateEnum.PASSED.getValue().equals(dto.getApprovalState())) {
-            // todo
+            //删除原帐号并新增正式会员
+            TenantRQVO vo = csbrBeanUtil.convert(entity,TenantRQVO.class);
+            vo.setPersonIncharge(entity.getJuridicalPerson());
+            personelFeign.authTenant(vo);
         }
         // 同步更新审批状态
         LambdaUpdateWrapper<MfEnterprise> updateWrapper = mfEnterpriseService.csbrUpdateWrapper(MfEnterprise.class);
@@ -242,7 +249,12 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
             throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, messageSourceUtil.updateMessage(String.format("%s的业务审批状态", FUNCTION_NAME)));
         }
     }
-    
+
+    @Override
+    public Boolean check(EnterpriseRQVO vo) {
+        return true;
+    }
+
     /**
      * 获取发起流程参数
      * @author xcq