64de006c by xiaojie

【数据资产】

1、认证变更跨平台审批
1 parent 5a240d38
...@@ -89,7 +89,7 @@ public interface EnterpriseService { ...@@ -89,7 +89,7 @@ public interface EnterpriseService {
89 89
90 List<ChangeInfoVO> getChange(String sourceGuid, Date createTime); 90 List<ChangeInfoVO> getChange(String sourceGuid, Date createTime);
91 91
92 List<ChangeInfoVO> beforeChangeList(Date createTime); 92 List<ChangeInfoVO> beforeChangeList(String approveGuid);
93 93
94 EnterpriseRSVO getEnterpriseDetailByName(String tenantName); 94 EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
95 95
......
...@@ -304,7 +304,7 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -304,7 +304,7 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
304 vo.setChangeList(enterpriseService.getChange(entity.getSourceGuid(), entity.getCreateTime())); 304 vo.setChangeList(enterpriseService.getChange(entity.getSourceGuid(), entity.getCreateTime()));
305 305
306 // 生成变更前的数据 306 // 生成变更前的数据
307 vo.setBeforeChangeList(enterpriseService.beforeChangeList(entity.getCreateTime())); 307 vo.setBeforeChangeList(enterpriseService.beforeChangeList(entity.getApproveGuid()));
308 return vo; 308 return vo;
309 } 309 }
310 310
......
...@@ -225,10 +225,11 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -225,10 +225,11 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
225 } 225 }
226 226
227 @Override 227 @Override
228 public List<ChangeInfoVO> beforeChangeList(Date createTime){ 228 public List<ChangeInfoVO> beforeChangeList(String approveGuid){
229 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 229 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
230 LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>(); 230 LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
231 queryWrapper.apply("DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') = '" + simpleDateFormat.format(createTime) + "'"); 231 queryWrapper.eq(MfEnterpriseChangeApprove::getApproveGuid, approveGuid);
232 // queryWrapper.apply("DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') = '" + simpleDateFormat.format(createTime) + "'");
232 queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime); 233 queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
233 List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper); 234 List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
234 if(CollectionUtils.isEmpty(approveList)){ 235 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!