Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
f13afe9d by xiaojie
Options

【数据资产】 

企业认证修改领域和附件信息
1 parent 4e555e65
Inline Side-by-side
Showing 4 changed files with 100 additions and 18 deletions
src/main/java/com/csbr/qingcloud/portal/service/EnterpriseAttachmentService.java
...@@ -89,10 +89,11 @@ public interface EnterpriseAttachmentService { ...@@ -89,10 +89,11 @@ public interface EnterpriseAttachmentService {
89 /** 89 /**
90 * 批量新增开发主体附件信息 90 * 批量新增开发主体附件信息
91 * @param attachmentRQVOS 91 * @param attachmentRQVOS
92 * @param enterprise 92 * @param guid
93 * @param tenantGuid
93 * @param isRequired 94 * @param isRequired
94 */ 95 */
95 void batchSave(List<EnterpriseAttachmentRQVO> attachmentRQVOS, MfEnterprise enterprise, Boolean isRequired); 96 void batchSave(List<EnterpriseAttachmentRQVO> attachmentRQVOS, String guid, String tenantGuid, Boolean isRequired);
96 97
97 /** 98 /**
98 * 删除开发主体附件信息 99 * 删除开发主体附件信息
...@@ -103,10 +104,11 @@ public interface EnterpriseAttachmentService { ...@@ -103,10 +104,11 @@ public interface EnterpriseAttachmentService {
103 /** 104 /**
104 * 批量修改开发主体附件信息 105 * 批量修改开发主体附件信息
105 * @param attachmentRQVOS 106 * @param attachmentRQVOS
106 * @param enterprise 107 * @param guid
108 * @param tenantGuid
107 * @param isRequired 109 * @param isRequired
108 */ 110 */
109 void batchUpdate(List<EnterpriseAttachmentRQVO> attachmentRQVOS, MfEnterprise enterprise, Boolean isRequired); 111 void batchUpdate(List<EnterpriseAttachmentRQVO> attachmentRQVOS, String guid, String tenantGuid, Boolean isRequired);
110 112
111 /** 113 /**
112 * 根据企业认证guid查询附件信息 114 * 根据企业认证guid查询附件信息
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseAttachmentServiceImpl.java
...@@ -280,12 +280,12 @@ public class EnterpriseAttachmentServiceImpl implements EnterpriseAttachmentServ ...@@ -280,12 +280,12 @@ public class EnterpriseAttachmentServiceImpl implements EnterpriseAttachmentServ
280 280
281 @Override 281 @Override
282 @Transactional 282 @Transactional
283 public void batchSave(List<EnterpriseAttachmentRQVO> attachmentRQVOS, MfEnterprise enterprise, Boolean isRequired) { 283 public void batchSave(List<EnterpriseAttachmentRQVO> attachmentRQVOS, String guid, String tenantGuid, Boolean isRequired) {
284 if (ObjectUtils.isNotEmpty(attachmentRQVOS)) { 284 if (ObjectUtils.isNotEmpty(attachmentRQVOS)) {
285 List<MfEnterpriseAttachment> attachmentList = new ArrayList<>(); 285 List<MfEnterpriseAttachment> attachmentList = new ArrayList<>();
286 for (EnterpriseAttachmentRQVO attachmentRQVO : attachmentRQVOS) { 286 for (EnterpriseAttachmentRQVO attachmentRQVO : attachmentRQVOS) {
287 attachmentRQVO.setEnterpriseGuid(enterprise.getGuid()); 287 attachmentRQVO.setEnterpriseGuid(guid);
288 attachmentRQVO.setTenantGuid(enterprise.getTenantGuid()); 288 attachmentRQVO.setTenantGuid(tenantGuid);
289 // 获取文件大小 289 // 获取文件大小
290 // 下载文件流 290 // 下载文件流
291 String fileUrl = attachmentRQVO.getFileUrl(); 291 String fileUrl = attachmentRQVO.getFileUrl();
...@@ -324,12 +324,12 @@ public class EnterpriseAttachmentServiceImpl implements EnterpriseAttachmentServ ...@@ -324,12 +324,12 @@ public class EnterpriseAttachmentServiceImpl implements EnterpriseAttachmentServ
324 324
325 @Override 325 @Override
326 @Transactional 326 @Transactional
327 public void batchUpdate(List<EnterpriseAttachmentRQVO> attachmentRQVOS, MfEnterprise enterprise, Boolean isRequired) { 327 public void batchUpdate(List<EnterpriseAttachmentRQVO> attachmentRQVOS, String guid, String tenantGuid, Boolean isRequired) {
328 // 删除开发主体附件信息 328 // 删除开发主体附件信息
329 removeByEnterpriseGuids(Collections.singletonList(enterprise.getGuid())); 329 removeByEnterpriseGuids(Collections.singletonList(guid));
330 330
331 // 批量新增开发主体附件信息 331 // 批量新增开发主体附件信息
332 batchSave(attachmentRQVOS, enterprise, isRequired); 332 batchSave(attachmentRQVOS, guid, tenantGuid, isRequired);
333 } 333 }
334 334
335 @Override 335 @Override
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseChangeApproveServiceImpl.java
...@@ -34,6 +34,7 @@ import org.apache.commons.collections.CollectionUtils; ...@@ -34,6 +34,7 @@ import org.apache.commons.collections.CollectionUtils;
34 import org.apache.commons.lang.StringUtils; 34 import org.apache.commons.lang.StringUtils;
35 import org.apache.commons.lang3.ObjectUtils; 35 import org.apache.commons.lang3.ObjectUtils;
36 import org.springframework.beans.factory.annotation.Autowired; 36 import org.springframework.beans.factory.annotation.Autowired;
37 import org.springframework.beans.factory.annotation.Value;
37 import org.springframework.stereotype.Component; 38 import org.springframework.stereotype.Component;
38 39
39 import java.util.*; 40 import java.util.*;
...@@ -61,6 +62,9 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -61,6 +62,9 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
61 @Autowired 62 @Autowired
62 private InvokeUtil invokeUtil; 63 private InvokeUtil invokeUtil;
63 64
65 @Value("${enterpriseAttachment.isRequired:true}")
66 private Boolean isRequired;
67
64 @Resource 68 @Resource
65 private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService; 69 private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService;
66 70
...@@ -113,6 +117,12 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -113,6 +117,12 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
113 entity.setGuid(vo.getGuid()); 117 entity.setGuid(vo.getGuid());
114 mfEnterpriseChangeApproveService.save(entity); 118 mfEnterpriseChangeApproveService.save(entity);
115 119
120 // 保存新数据的附件和领域数据
121 List<EnterpriseAttachmentRQVO> attachmentRQVOS = beanVO.getAttachmentRQVOS();
122 enterpriseAttachmentService.batchSave(attachmentRQVOS, entity.getGuid(), entity.getTenantGuid(), isRequired);
123 List<EnterpriseDomainRQVO> domainRQVOS = beanVO.getDomainRQVOS();
124 enterpriseDomainService.batchSave(domainRQVOS, entity.getGuid());
125
116 //保存原数据 126 //保存原数据
117 beanVO = JSON.parseObject(vo.getOldBizDataJson(),EnterpriseRQVO.class); 127 beanVO = JSON.parseObject(vo.getOldBizDataJson(),EnterpriseRQVO.class);
118 entity = csbrBeanUtil.convert(beanVO,MfEnterpriseChangeApprove.class); 128 entity = csbrBeanUtil.convert(beanVO,MfEnterpriseChangeApprove.class);
...@@ -122,6 +132,12 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -122,6 +132,12 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
122 entity.setTenantGuid(tenantGuid); 132 entity.setTenantGuid(tenantGuid);
123 mfEnterpriseChangeApproveService.save(entity); 133 mfEnterpriseChangeApproveService.save(entity);
124 134
135 // 保存旧数据的附件和领域数据
136 List<EnterpriseAttachmentRQVO> attachmentRQVOSOld = beanVO.getAttachmentRQVOS();
137 enterpriseAttachmentService.batchSave(attachmentRQVOSOld, entity.getGuid(), entity.getTenantGuid(), isRequired);
138 List<EnterpriseDomainRQVO> domainRQVOSOld = beanVO.getDomainRQVOS();
139 enterpriseDomainService.batchSave(domainRQVOSOld, entity.getGuid());
140
125 log.info("========entity, {}", entity); 141 log.info("========entity, {}", entity);
126 MfEnterprise bean = mfEnterpriseService.getById(entity.getSourceGuid()); 142 MfEnterprise bean = mfEnterpriseService.getById(entity.getSourceGuid());
127 bean.setBizApproveState("B"); 143 bean.setBizApproveState("B");
...@@ -151,7 +167,21 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -151,7 +167,21 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
151 vo.setGuid(bean.getGuid()); 167 vo.setGuid(bean.getGuid());
152 vo.setApproveGuid(bean.getApproveGuid()); 168 vo.setApproveGuid(bean.getApproveGuid());
153 vo.setSourceGuid(bean.getSourceGuid()); 169 vo.setSourceGuid(bean.getSourceGuid());
154 vo.setBizDataJson(convertToVO(bean)); 170 if (ObjectUtils.isNotEmpty(bean)) {
171 EnterpriseRSVO enterpriseRSVO = csbrBeanUtil.convert(bean, EnterpriseRSVO.class);
172 // 查询附件信息
173 Map<String, List<EnterpriseAttachmentRSVO>> attachmentByEnterpriseGuids = enterpriseAttachmentService.getMapByEnterpriseGuids(Collections.singletonList(enterpriseRSVO.getGuid()));
174 if (ObjectUtils.isNotEmpty(attachmentByEnterpriseGuids) && attachmentByEnterpriseGuids.containsKey(enterpriseRSVO.getGuid())) {
175 enterpriseRSVO.setAttachmentRSVOS(attachmentByEnterpriseGuids.get(enterpriseRSVO.getGuid()));
176 }
177
178 // 查询领域信息
179 Map<String, List<EnterpriseDomainRSVO>> domainByEnterpriseGuids = enterpriseDomainService.getMapByEnterpriseGuids(Collections.singletonList(enterpriseRSVO.getGuid()));
180 if (ObjectUtils.isNotEmpty(domainByEnterpriseGuids) && domainByEnterpriseGuids.containsKey(enterpriseRSVO.getGuid())) {
181 enterpriseRSVO.setDomainRSVOS(domainByEnterpriseGuids.get(enterpriseRSVO.getGuid()));
182 }
183 vo.setBizDataJson(JSON.toJSONString(enterpriseRSVO));
184 }
155 185
156 //取原数据 186 //取原数据
157 queryWrapper = new LambdaQueryWrapper<>(); 187 queryWrapper = new LambdaQueryWrapper<>();
...@@ -159,7 +189,19 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -159,7 +189,19 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
159 queryWrapper.eq(MfEnterpriseChangeApprove::getDataType,"1"); 189 queryWrapper.eq(MfEnterpriseChangeApprove::getDataType,"1");
160 tempList = mfEnterpriseChangeApproveService.list(queryWrapper); 190 tempList = mfEnterpriseChangeApproveService.list(queryWrapper);
161 if(CollectionUtils.isNotEmpty(tempList)){ 191 if(CollectionUtils.isNotEmpty(tempList)){
162 vo.setOldBizDataJson(convertToVO(tempList.get(0))); 192 EnterpriseRSVO enterpriseRSVO = csbrBeanUtil.convert(tempList.get(0), EnterpriseRSVO.class);
193 // 查询附件信息
194 Map<String, List<EnterpriseAttachmentRSVO>> attachmentByEnterpriseGuids = enterpriseAttachmentService.getMapByEnterpriseGuids(Collections.singletonList(enterpriseRSVO.getGuid()));
195 if (ObjectUtils.isNotEmpty(attachmentByEnterpriseGuids) && attachmentByEnterpriseGuids.containsKey(enterpriseRSVO.getGuid())) {
196 enterpriseRSVO.setAttachmentRSVOS(attachmentByEnterpriseGuids.get(enterpriseRSVO.getGuid()));
197 }
198
199 // 查询领域信息
200 Map<String, List<EnterpriseDomainRSVO>> domainByEnterpriseGuids = enterpriseDomainService.getMapByEnterpriseGuids(Collections.singletonList(enterpriseRSVO.getGuid()));
201 if (ObjectUtils.isNotEmpty(domainByEnterpriseGuids) && domainByEnterpriseGuids.containsKey(enterpriseRSVO.getGuid())) {
202 enterpriseRSVO.setDomainRSVOS(domainByEnterpriseGuids.get(enterpriseRSVO.getGuid()));
203 }
204 vo.setOldBizDataJson(JSON.toJSONString(enterpriseRSVO));
163 } 205 }
164 206
165 return vo; 207 return vo;
...@@ -189,6 +231,21 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -189,6 +231,21 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
189 vo.setBizApproveState("Y"); 231 vo.setBizApproveState("Y");
190 mfEnterpriseService.updateById(vo); 232 mfEnterpriseService.updateById(vo);
191 233
234 // 修改附件和领域数据
235 Map<String, List<EnterpriseAttachmentRSVO>> attachmentByEnterpriseGuids = enterpriseAttachmentService.getMapByEnterpriseGuids(Collections.singletonList(entity.getGuid()));
236 if (ObjectUtils.isNotEmpty(attachmentByEnterpriseGuids) && attachmentByEnterpriseGuids.containsKey(entity.getGuid())) {
237 List<EnterpriseAttachmentRSVO> attachmentRSVOS = attachmentByEnterpriseGuids.get(entity.getGuid());
238 List<EnterpriseAttachmentRQVO> attachmentRQVOS = csbrBeanUtil.convert(attachmentRSVOS, EnterpriseAttachmentRQVO.class);
239 enterpriseAttachmentService.batchUpdate(attachmentRQVOS, entity.getSourceGuid(), entity.getTenantGuid(), isRequired);
240 }
241
242 Map<String, List<EnterpriseDomainRSVO>> domainByEnterpriseGuids = enterpriseDomainService.getMapByEnterpriseGuids(Collections.singletonList(entity.getGuid()));
243 if (ObjectUtils.isNotEmpty(domainByEnterpriseGuids) && domainByEnterpriseGuids.containsKey(entity.getGuid())) {
244 List<EnterpriseDomainRSVO> domainRSVOS = domainByEnterpriseGuids.get(entity.getGuid());
245 List<EnterpriseDomainRQVO> domainRQVOS = csbrBeanUtil.convert(domainRSVOS, EnterpriseDomainRQVO.class);
246 enterpriseDomainService.batchUpdate(domainRQVOS, entity.getSourceGuid());
247 }
248
192 //同步更新会员表 249 //同步更新会员表
193 enterpriseService.updateTenant(vo); 250 enterpriseService.updateTenant(vo);
194 } 251 }
...@@ -214,6 +271,10 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -214,6 +271,10 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
214 } 271 }
215 mfEnterpriseChangeApproveService.removeById(guid); 272 mfEnterpriseChangeApproveService.removeById(guid);
216 273
274 // 删除领域和附件信息
275 enterpriseAttachmentService.removeByEnterpriseGuids(Collections.singletonList(entity.getGuid()));
276 enterpriseDomainService.removeByEnterpriseGuids(Collections.singletonList(entity.getGuid()));
277
217 // 修改企业认证审批状态 278 // 修改企业认证审批状态
218 LambdaQueryWrapper<MfEnterpriseChangeApprove> lambdaQueryWrapper = Wrappers.lambdaQuery(MfEnterpriseChangeApprove.class); 279 LambdaQueryWrapper<MfEnterpriseChangeApprove> lambdaQueryWrapper = Wrappers.lambdaQuery(MfEnterpriseChangeApprove.class);
219 lambdaQueryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid, entity.getSourceGuid()); 280 lambdaQueryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid, entity.getSourceGuid());
...@@ -269,6 +330,21 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -269,6 +330,21 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
269 vo.setCrossPlatformApproveState("Y"); 330 vo.setCrossPlatformApproveState("Y");
270 mfEnterpriseService.updateById(vo); 331 mfEnterpriseService.updateById(vo);
271 332
333 // 修改附件和领域数据
334 Map<String, List<EnterpriseAttachmentRSVO>> attachmentByEnterpriseGuids = enterpriseAttachmentService.getMapByEnterpriseGuids(Collections.singletonList(entity.getGuid()));
335 if (ObjectUtils.isNotEmpty(attachmentByEnterpriseGuids) && attachmentByEnterpriseGuids.containsKey(entity.getGuid())) {
336 List<EnterpriseAttachmentRSVO> attachmentRSVOS = attachmentByEnterpriseGuids.get(entity.getGuid());
337 List<EnterpriseAttachmentRQVO> attachmentRQVOS = csbrBeanUtil.convert(attachmentRSVOS, EnterpriseAttachmentRQVO.class);
338 enterpriseAttachmentService.batchUpdate(attachmentRQVOS, entity.getSourceGuid(), entity.getTenantGuid(), isRequired);
339 }
340
341 Map<String, List<EnterpriseDomainRSVO>> domainByEnterpriseGuids = enterpriseDomainService.getMapByEnterpriseGuids(Collections.singletonList(entity.getGuid()));
342 if (ObjectUtils.isNotEmpty(domainByEnterpriseGuids) && domainByEnterpriseGuids.containsKey(entity.getGuid())) {
343 List<EnterpriseDomainRSVO> domainRSVOS = domainByEnterpriseGuids.get(entity.getGuid());
344 List<EnterpriseDomainRQVO> domainRQVOS = csbrBeanUtil.convert(domainRSVOS, EnterpriseDomainRQVO.class);
345 enterpriseDomainService.batchUpdate(domainRQVOS, entity.getSourceGuid());
346 }
347
272 //同步更新会员表 348 //同步更新会员表
273 enterpriseService.updateTenant(vo); 349 enterpriseService.updateTenant(vo);
274 } 350 }
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
...@@ -641,11 +641,15 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -641,11 +641,15 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
641 enterpriseRSVO = csbrBeanUtil.convert(mfEnterpriseChangeApprove, EnterpriseRSVO.class); 641 enterpriseRSVO = csbrBeanUtil.convert(mfEnterpriseChangeApprove, EnterpriseRSVO.class);
642 enterpriseRSVO.setBizApproveState(mfEnterprise.getBizApproveState()); 642 enterpriseRSVO.setBizApproveState(mfEnterprise.getBizApproveState());
643 643
644 if (ObjectUtils.isNotEmpty(attachmentByEnterpriseGuids) && attachmentByEnterpriseGuids.containsKey(mfEnterpriseChangeApprove.getSourceGuid())) { 644 attachmentByEnterpriseGuids = enterpriseAttachmentService.getMapByEnterpriseGuids(Collections.singletonList(mfEnterpriseChangeApprove.getGuid()));
645 enterpriseRSVO.setAttachmentRSVOS(attachmentByEnterpriseGuids.get(mfEnterpriseChangeApprove.getSourceGuid())); 645
646 // 查询领域信息
647 domainByEnterpriseGuids = enterpriseDomainService.getMapByEnterpriseGuids(Collections.singletonList(mfEnterpriseChangeApprove.getGuid()));
648 if (ObjectUtils.isNotEmpty(attachmentByEnterpriseGuids) && attachmentByEnterpriseGuids.containsKey(mfEnterpriseChangeApprove.getGuid())) {
649 enterpriseRSVO.setAttachmentRSVOS(attachmentByEnterpriseGuids.get(mfEnterpriseChangeApprove.getGuid()));
646 } 650 }
647 if (ObjectUtils.isNotEmpty(domainByEnterpriseGuids) && domainByEnterpriseGuids.containsKey(mfEnterpriseChangeApprove.getSourceGuid())) { 651 if (ObjectUtils.isNotEmpty(domainByEnterpriseGuids) && domainByEnterpriseGuids.containsKey(mfEnterpriseChangeApprove.getGuid())) {
648 enterpriseRSVO.setDomainRSVOS(domainByEnterpriseGuids.get(mfEnterpriseChangeApprove.getSourceGuid())); 652 enterpriseRSVO.setDomainRSVOS(domainByEnterpriseGuids.get(mfEnterpriseChangeApprove.getGuid()));
649 } 653 }
650 } 654 }
651 } 655 }
...@@ -889,7 +893,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -889,7 +893,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
889 893
890 // 新增附件信息 894 // 新增附件信息
891 List<EnterpriseAttachmentRQVO> attachmentRQVOS = rqVO.getAttachmentRQVOS(); 895 List<EnterpriseAttachmentRQVO> attachmentRQVOS = rqVO.getAttachmentRQVOS();
892 enterpriseAttachmentService.batchSave(attachmentRQVOS, entity, isRequired); 896 enterpriseAttachmentService.batchSave(attachmentRQVOS, entity.getGuid(), entity.getTenantGuid(), isRequired);
893 897
894 // 新增领域信息 898 // 新增领域信息
895 List<EnterpriseDomainRQVO> domainRQVOS = rqVO.getDomainRQVOS(); 899 List<EnterpriseDomainRQVO> domainRQVOS = rqVO.getDomainRQVOS();
...@@ -967,7 +971,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -967,7 +971,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
967 971
968 // 新增附件信息 972 // 新增附件信息
969 List<EnterpriseAttachmentRQVO> attachmentRQVOS = rqVO.getAttachmentRQVOS(); 973 List<EnterpriseAttachmentRQVO> attachmentRQVOS = rqVO.getAttachmentRQVOS();
970 enterpriseAttachmentService.batchUpdate(attachmentRQVOS, entity, isRequired); 974 enterpriseAttachmentService.batchUpdate(attachmentRQVOS, entity.getGuid(), entity.getTenantGuid(), isRequired);
971 975
972 // 新增领域信息 976 // 新增领域信息
973 List<EnterpriseDomainRQVO> domainRQVOS = rqVO.getDomainRQVOS(); 977 List<EnterpriseDomainRQVO> domainRQVOS = rqVO.getDomainRQVOS();
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!