f179ef52 by xiaojie

【数据资产】

1、认证变更跨平台审批
1 parent c8a6ee8d
......@@ -84,7 +84,7 @@ public class EnterpriseController {
@Operation(summary = "企业信息-详情",
parameters = {@Parameter(name = "guid", description = "企业信息唯一标识", required = true)} )
public CommonRes<EnterpriseRSVO> getEnterpriseDetail(@RequestParam String guid) {
EnterpriseRSVO vo = enterpriseService.getEnterpriseDetail(guid);
EnterpriseRSVO vo = enterpriseChangeApproveService.getEnterpriseChangeDetail(guid);
return CommonRes.success(vo);
}
......
......@@ -200,7 +200,7 @@ public class MfEnterpriseChangeApprove extends BaseDO {
private String crossPlatformApproveState;
/**
* 数据类型【数据类型 1原数据 2新数据】
* 数据类型【数据类型 1原数据 2新数据 0认证表数据
*/
@Name("数据类型")
private String dataType;
......
......@@ -3,6 +3,8 @@ package com.csbr.qingcloud.portal.service;
import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
import com.csbr.qingcloud.portal.domain.vo.ChangeApproveVO;
import com.csbr.qingcloud.portal.domain.vo.ChangeInfoVO;
import com.csbr.qingcloud.portal.domain.vo.EnterpriseRSVO;
import java.util.List;
/**
......@@ -22,4 +24,6 @@ public interface EnterpriseChangeApproveService {
void crossFlowCallBack(BizCallbackDTO dto);
void crossRemoveByBizGuid(List<String> zqBizGuids);
EnterpriseRSVO getEnterpriseChangeDetail(String guid);
}
......
......@@ -15,6 +15,7 @@ import com.csbr.cloud.workflow.util.ApprovalFlowUtil;
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.feign.ConfigureFeign;
import com.csbr.qingcloud.portal.feign.PersonelFeign;
import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
......@@ -22,6 +23,7 @@ import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveServic
import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService;
import com.csbr.qingcloud.portal.service.EnterpriseService;
import com.csbr.qingcloud.portal.util.ChangeInfoUtil;
import com.csbr.qingcloud.portal.util.InvokeUtil;
import com.csbr.qingcloud.portal.util.ZQConfig;
import csbr.cloud.entity.enums.ApprovalStateEnum;
......@@ -82,6 +84,9 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
@Resource
private PersonelFeign personelFeign;
@Resource
private ConfigureFeign configureFeign;
/** 保存变更数据 */
@Override
public void changeSave(ChangeApproveVO vo) {
......@@ -274,6 +279,33 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
approvalFlowUtil.removeApproveByBizGuids(Collections.singletonList(enterpriseChangeApprove.getGuid()));
}
@Override
public EnterpriseRSVO getEnterpriseChangeDetail(String guid) {
if (StringUtils.isBlank(guid)) {
// W00012 = {0}:参数[{1}]不能为空!
throw new CsbrSystemException(SystemError.DATA_INPUT_ERROR, messageSourceUtil.getMessage("W00010",
String.format("获取%s详情数据", FUNCTION_NAME), "数据唯一标识"));
}
MfEnterpriseChangeApprove entity = mfEnterpriseChangeApproveService.getById(guid);
if (entity == null) {
throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(String.format("获取%s详情数据", FUNCTION_NAME)));
}
EnterpriseRSVO vo = csbrBeanUtil.convert(entity, EnterpriseRSVO.class);
//流程数据处理
vo.setApproveVO(approvalFlowUtil.getApprovalCrossTenantInfo(entity.getGuid()));
if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){
ChangeInfoUtil.areaList = configureFeign.getBoroughCodeName().getData();
}
vo.setVenue(ChangeInfoUtil.getVenue(vo.getProvince(),vo.getCity(),vo.getDistrict()));
vo.setBusinessLicenseStartEnd(ChangeInfoUtil.getStartEnd(vo.getBusinessLicenseTerm(),vo.getBusinessLicenseStartDate(),vo.getBusinessLicenseEndDate()));
//生成变更信息
vo.setChangeList(enterpriseService.getChange(guid, entity.getCreateTime()));
return vo;
}
/**
* 企业信息删除前置处理
* @author xcq
......
......@@ -207,7 +207,6 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
queryWrapper.eq(MfEnterpriseChangeApprove::getBizApproveState, ApprovalStateEnum.PASSED.getValue());
queryWrapper.le(MfEnterpriseChangeApprove::getCreateTime, createTime);
queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
queryWrapper.last(" limit 2 ");
List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
if(CollectionUtils.isEmpty(approveList)){
return new ArrayList<>();
......@@ -695,13 +694,12 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
* @param rqVO
* @return void
*/
private void afterSave(MfEnterprise entity, EnterpriseRQVO rqVO) {
//region 1.输出特殊转换
//region 1.1.输出过滤与补充处理
//endregion 1.1.输出过滤与补充处理
//endregion 1.输出特殊转换
public void afterSave(MfEnterprise entity, EnterpriseRQVO rqVO) {
// 保存认证数据
MfEnterpriseChangeApprove enterpriseChangeApprove = csbrBeanUtil.convert(entity, MfEnterpriseChangeApprove.class);
enterpriseChangeApprove.setSourceGuid(entity.getGuid());
enterpriseChangeApprove.setDataType("0");
mfEnterpriseChangeApproveService.save(enterpriseChangeApprove);
}
/**
......@@ -766,13 +764,12 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
* @param rqVO
* @return void
*/
protected void afterUpdate(MfEnterprise entity, EnterpriseRQVO rqVO) {
//region 1.输出特殊转换
//region 1.1.输出过滤与补充处理
//endregion 1.1.输出过滤与补充处理
//endregion 1.输出特殊转换
public void afterUpdate(MfEnterprise entity, EnterpriseRQVO rqVO) {
// 修改认证记录
MfEnterpriseChangeApprove enterpriseChangeApprove = csbrBeanUtil.convert(entity, MfEnterpriseChangeApprove.class);
enterpriseChangeApprove.setSourceGuid(entity.getGuid());
enterpriseChangeApprove.setDataType("0");
mfEnterpriseChangeApproveService.updateById(enterpriseChangeApprove);
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!