f9eef92c by xiaojie

【数据资产】

1、认证变更跨平台审批
1 parent a6ba6f0f
...@@ -302,7 +302,7 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -302,7 +302,7 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
302 vo.setBusinessLicenseStartEnd(ChangeInfoUtil.getStartEnd(vo.getBusinessLicenseTerm(),vo.getBusinessLicenseStartDate(),vo.getBusinessLicenseEndDate())); 302 vo.setBusinessLicenseStartEnd(ChangeInfoUtil.getStartEnd(vo.getBusinessLicenseTerm(),vo.getBusinessLicenseStartDate(),vo.getBusinessLicenseEndDate()));
303 303
304 //生成变更信息 304 //生成变更信息
305 vo.setChangeList(enterpriseService.getChange(entity.getSourceGuid(), ObjectUtils.isEmpty(entity.getUpdateTime()) ? entity.getCreateTime() : entity.getUpdateTime())); 305 vo.setChangeList(enterpriseService.getChange(entity.getSourceGuid(), entity.getCreateTime()));
306 return vo; 306 return vo;
307 } 307 }
308 308
......
...@@ -205,7 +205,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -205,7 +205,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
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.lt(MfEnterpriseChangeApprove::getCreateTime, createTime);
209 queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime); 209 queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
210 List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper); 210 List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
211 if(CollectionUtils.isEmpty(approveList)){ 211 if(CollectionUtils.isEmpty(approveList)){
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!