1330393f by xiaojie

【数据资产】

1、认证变更跨平台审批
1 parent 6d160a34
1 package com.csbr.qingcloud.portal.service; 1 package com.csbr.qingcloud.portal.service;
2 2
3 import com.csbr.cloud.workflow.domain.dto.appove.FlowQueryDTO; 3 import com.csbr.cloud.workflow.domain.dto.appove.FlowQueryDTO;
4 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
5 import com.csbr.qingcloud.portal.domain.vo.*; 4 import com.csbr.qingcloud.portal.domain.vo.*;
6 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise; 5 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
7 import csbr.cloud.entity.domain.base.vo.PageListVO; 6 import csbr.cloud.entity.domain.base.vo.PageListVO;
8 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 7 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
9 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO; 8 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
10 9
10 import java.util.Date;
11 import java.util.List; 11 import java.util.List;
12 12
13 /** 13 /**
...@@ -87,7 +87,7 @@ public interface EnterpriseService { ...@@ -87,7 +87,7 @@ public interface EnterpriseService {
87 87
88 Boolean check(EnterpriseRQVO vo); 88 Boolean check(EnterpriseRQVO vo);
89 89
90 List<ChangeInfoVO> getChange(String tenantName); 90 List<ChangeInfoVO> getChange(String sourceGuid, Date createTime);
91 91
92 EnterpriseRSVO getEnterpriseDetailByName(String tenantName); 92 EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
93 93
......
...@@ -195,17 +195,19 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -195,17 +195,19 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
195 } 195 }
196 EnterpriseRSVO vo = convertToVO(entity); 196 EnterpriseRSVO vo = convertToVO(entity);
197 //生成变更信息 197 //生成变更信息
198 vo.setChangeList(getChange(guid)); 198 vo.setChangeList(getChange(guid, entity.getCreateTime()));
199 return vo; 199 return vo;
200 } 200 }
201 201
202 /** 生成变更信息列表 */ 202 /** 生成变更信息列表 */
203 @Override 203 @Override
204 public List<ChangeInfoVO> getChange(String sourceGuid){ 204 public List<ChangeInfoVO> getChange(String sourceGuid, Date createTime){
205 LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>(); 205 LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
206 queryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid, sourceGuid); 206 queryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid, sourceGuid);
207 queryWrapper.eq(MfEnterpriseChangeApprove::getBizApproveState, ApprovalStateEnum.PASSED.getValue()); 207 queryWrapper.eq(MfEnterpriseChangeApprove::getBizApproveState, ApprovalStateEnum.PASSED.getValue());
208 queryWrapper.le(MfEnterpriseChangeApprove::getCreateTime, createTime);
208 queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime); 209 queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
210 queryWrapper.last(" limit 1 ");
209 List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper); 211 List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
210 if(CollectionUtils.isEmpty(approveList)){ 212 if(CollectionUtils.isEmpty(approveList)){
211 return new ArrayList<>(); 213 return new ArrayList<>();
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!