【数据资产】

1、认证变更跨平台审批

@@ -153,6 +153,14 @@ public class EnterpriseController {
         return CommonRes.success(true);
         return CommonRes.success(true);
     }
     }
 
 
+    @PostMapping("/change/cross-flow-call-back")
+    @SystemLog(value = "变更审批-最终更新(跨平台)")
+    @Operation( summary = "变更审批-最终更新(跨平台)" )
+    public CommonRes<Boolean> changeCrossFlowCallBack(@RequestBody BizCallbackDTO dto) {
+        enterpriseChangeApproveService.crossFlowCallBack(dto);
+        return CommonRes.success(true);
+    }
+
     @PostMapping("/change/save")
     @PostMapping("/change/save")
     @SystemLog(value = "变更申请-保存数据")
     @SystemLog(value = "变更申请-保存数据")
     @Operation(summary = "变更申请-保存数据")
     @Operation(summary = "变更申请-保存数据")

@@ -18,4 +18,6 @@ public interface EnterpriseChangeApproveService {
     void changeUpdate(BizCallbackDTO dto);
     void changeUpdate(BizCallbackDTO dto);
 
 
     void removeByGuids(List<String> guids);
     void removeByGuids(List<String> guids);
+
+    void crossFlowCallBack(BizCallbackDTO dto);
 }
 }

@@ -165,14 +165,16 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
             mfEnterpriseService.updateById(bean);
             mfEnterpriseService.updateById(bean);
             return;
             return;
         }
         }
-        //审批通过则执行更新
-        MfEnterprise vo = csbrBeanUtil.convert(entity,MfEnterprise.class);
-        vo.setGuid(entity.getSourceGuid());
-        vo.setBizApproveState("Y");
-        mfEnterpriseService.updateById(vo);
-
-        //同步更新会员表
-        enterpriseService.updateTenant(vo);
+        if (!dto.getIsZqPlatformApprove() && StringUtils.isEmpty(entity.getZqName())) {
+            //审批通过则执行更新
+            MfEnterprise vo = csbrBeanUtil.convert(entity,MfEnterprise.class);
+            vo.setGuid(entity.getSourceGuid());
+            vo.setBizApproveState("Y");
+            mfEnterpriseService.updateById(vo);
+
+            //同步更新会员表
+            enterpriseService.updateTenant(vo);
+        }
     }
     }
 
 
     @Override
     @Override
@@ -208,6 +210,33 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
         approvalFlowUtil.removeApproveByBizGuids(guids);
         approvalFlowUtil.removeApproveByBizGuids(guids);
     }
     }
 
 
+    @Override
+    public void crossFlowCallBack(BizCallbackDTO dto) {
+        MfEnterpriseChangeApprove entity = mfEnterpriseChangeApproveService.getById(dto.getBizGuid());
+
+        LambdaUpdateWrapper<MfEnterpriseChangeApprove> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(MfEnterpriseChangeApprove::getApproveGuid,entity.getApproveGuid());
+        updateWrapper.set(MfEnterpriseChangeApprove::getBizApproveState, dto.getApprovalState());
+        updateWrapper.set(MfEnterpriseChangeApprove::getCrossPlatformApproveState, dto.getApprovalState());
+        mfEnterpriseChangeApproveService.update(updateWrapper);
+
+        //审批不通过则将状态恢复到以前的Y
+        if(!dto.getApprovalState().equals(ApprovalStateEnum.PASSED.getValue())){
+            MfEnterprise bean = mfEnterpriseService.getById(entity.getSourceGuid());
+            bean.setBizApproveState("Y");
+            mfEnterpriseService.updateById(bean);
+            return;
+        }
+        //审批通过则执行更新
+        MfEnterprise vo = csbrBeanUtil.convert(entity,MfEnterprise.class);
+        vo.setGuid(entity.getSourceGuid());
+        vo.setBizApproveState("Y");
+        mfEnterpriseService.updateById(vo);
+
+        //同步更新会员表
+        enterpriseService.updateTenant(vo);
+    }
+
     /**
     /**
      * 企业信息删除前置处理
      * 企业信息删除前置处理
      * @author xcq
      * @author xcq