9f952eaf by xiaojie

【数据资产】

1、注释生成连接器标识
1 parent c72355dd
...@@ -155,11 +155,11 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements ...@@ -155,11 +155,11 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
155 beforeSave(rqVO); 155 beforeSave(rqVO);
156 MfTdsConnectorIdentity entity = convertToEntity(rqVO); 156 MfTdsConnectorIdentity entity = convertToEntity(rqVO);
157 rqVO.setGuid(entity.getGuid()); 157 rqVO.setGuid(entity.getGuid());
158 if(StringUtils.isBlank(rqVO.getSourceBizGuid()) 158 // if(StringUtils.isBlank(rqVO.getSourceBizGuid())
159 && StringUtils.isBlank(rqVO.getConnectorIdentity()) 159 // && StringUtils.isBlank(rqVO.getConnectorIdentity())
160 && flowBaseVO.getImmediateApprove()) { 160 // && flowBaseVO.getImmediateApprove()) {
161 entity.setConnectorIdentity(IdentificationCodeUtil.genConnectorCode(entity.getLegalSocialCreditCode(), IdentificationCodeUtil.medIndustry)); 161 // entity.setConnectorIdentity(IdentificationCodeUtil.genConnectorCode(entity.getLegalSocialCreditCode(), IdentificationCodeUtil.medIndustry));
162 } 162 // }
163 mfTdsConnectorIdentityService.csbrAddEntity(entity); 163 mfTdsConnectorIdentityService.csbrAddEntity(entity);
164 // 发起审批流程或保存草稿 164 // 发起审批流程或保存草稿
165 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity,rqVO); 165 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity,rqVO);
...@@ -221,10 +221,10 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements ...@@ -221,10 +221,10 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
221 MfTdsConnectorIdentity oldEntity = mfTdsConnectorIdentityService.getById(rqVO.getGuid()); 221 MfTdsConnectorIdentity oldEntity = mfTdsConnectorIdentityService.getById(rqVO.getGuid());
222 MfTdsConnectorIdentity entity = convertToEntity(rqVO); 222 MfTdsConnectorIdentity entity = convertToEntity(rqVO);
223 rqVO.setConnectorIdentity(oldEntity.getConnectorIdentity()); 223 rqVO.setConnectorIdentity(oldEntity.getConnectorIdentity());
224 if("N".equals(oldEntity.getIsChangeData()) && StringUtils.isBlank(oldEntity.getConnectorIdentity()) 224 // if("N".equals(oldEntity.getIsChangeData()) && StringUtils.isBlank(oldEntity.getConnectorIdentity())
225 && flowBaseVO.getImmediateApprove()) { 225 // && flowBaseVO.getImmediateApprove()) {
226 entity.setConnectorIdentity(IdentificationCodeUtil.genConnectorCode(entity.getLegalSocialCreditCode(), IdentificationCodeUtil.medIndustry)); 226 // entity.setConnectorIdentity(IdentificationCodeUtil.genConnectorCode(entity.getLegalSocialCreditCode(), IdentificationCodeUtil.medIndustry));
227 } 227 // }
228 mfTdsConnectorIdentityService.csbrUpdateEntity(entity); 228 mfTdsConnectorIdentityService.csbrUpdateEntity(entity);
229 // 发起审批流程或保存草稿 229 // 发起审批流程或保存草稿
230 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO); 230 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!