朱园亮 / xingyun-erp · Commits

Commit 36ecc9265dd081c76e567bd5034192b894457802

Authored by 房远帅
1 parent 76386365

楚江ERP:资信上传工商信息、股东信息

Inline Side-by-side
Showing 5 changed files with 157 additions and 77 deletions
@@ -377,6 +377,30 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> { @@ -377,6 +377,30 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> {
377 private String status; 377 private String status;
378 378
379 /** 379 /**
  380 + * 工商信息文件名
  381 + */
  382 + @ApiModelProperty(value = "工商信息文件名")
  383 + private String businessFileName;
  384 +
  385 + /**
  386 + * 工商信息文件ID
  387 + */
  388 + @ApiModelProperty(value = "工商信息文件ID")
  389 + private String businessFileId;
  390 +
  391 + /**
  392 + * 股东信息文件名
  393 + */
  394 + @ApiModelProperty(value = "股东信息文件名")
  395 + private String shareholderFileName;
  396 +
  397 + /**
  398 + * 股东信息文件ID
  399 + */
  400 + @ApiModelProperty(value = "股东信息文件ID")
  401 + private String shareholderFileId;
  402 +
  403 + /**
380 * 核心人员 404 * 核心人员
381 */ 405 */
382 @ApiModelProperty("核心人员") 406 @ApiModelProperty("核心人员")
@@ -297,6 +297,26 @@ public class CustomerCredit extends BaseEntity implements BaseDto { @@ -297,6 +297,26 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
297 private String status; 297 private String status;
298 298
299 /** 299 /**
  300 + * 工商信息文件名
  301 + */
  302 + private String businessFileName;
  303 +
  304 + /**
  305 + * 工商信息文件ID
  306 + */
  307 + private String businessFileId;
  308 +
  309 + /**
  310 + * 股东信息文件名
  311 + */
  312 + private String shareholderFileName;
  313 +
  314 + /**
  315 + * 股东信息文件ID
  316 + */
  317 + private String shareholderFileId;
  318 +
  319 + /**
300 * 创建人ID 320 * 创建人ID
301 */ 321 */
302 @TableField(fill = FieldFill.INSERT) 322 @TableField(fill = FieldFill.INSERT)
@@ -537,91 +537,95 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM @@ -537,91 +537,95 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
537 .set(CustomerCredit::getCompanyMaterialSupplyPlan, StringUtil.isBlank(vo.getCompanyMaterialSupplyPlan()) ? null : vo.getCompanyMaterialSupplyPlan()) 537 .set(CustomerCredit::getCompanyMaterialSupplyPlan, StringUtil.isBlank(vo.getCompanyMaterialSupplyPlan()) ? null : vo.getCompanyMaterialSupplyPlan())
538 .set(CustomerCredit::getCompanySuggestedCategory, vo.getCompanySuggestedCategory()) 538 .set(CustomerCredit::getCompanySuggestedCategory, vo.getCompanySuggestedCategory())
539 .set(CustomerCredit::getStatus, "AUDIT") 539 .set(CustomerCredit::getStatus, "AUDIT")
  540 + .set(CustomerCredit::getBusinessFileName, StringUtil.isBlank(vo.getBusinessFileName()) ? null : vo.getBusinessFileName())
  541 + .set(CustomerCredit::getBusinessFileId, StringUtil.isBlank(vo.getBusinessFileId()) ? null : vo.getBusinessFileId())
  542 + .set(CustomerCredit::getShareholderFileName, StringUtil.isBlank(vo.getShareholderFileName()) ? null : vo.getShareholderFileName())
  543 + .set(CustomerCredit::getShareholderFileId, StringUtil.isBlank(vo.getShareholderFileId()) ? null : vo.getShareholderFileId())
540 .eq(CustomerCredit::getId, vo.getId()); 544 .eq(CustomerCredit::getId, vo.getId());
541 545
542 getBaseMapper().update(updateWrapper); 546 getBaseMapper().update(updateWrapper);
543 //更新核心人员 547 //更新核心人员
544 - List<UpdateCorePersonnelVo> corePersonnelListNew = vo.getCorePersonnelList();  
545 - if (CollectionUtils.isNotEmpty(corePersonnelListNew)) {  
546 - Set<String> oldIds = corePersonnelList.stream().map(CorePersonnel::getId).collect(Collectors.toSet());  
547 - Set<String> newIds = corePersonnelListNew.stream().map(UpdateCorePersonnelVo::getId).collect(Collectors.toSet());  
548 - // 计算差异  
549 - Set<String> addedIds = new HashSet<>(newIds);  
550 - addedIds.removeAll(oldIds); // 新增：new 有，old 没有  
551 -  
552 - Set<String> removedIds = new HashSet<>(oldIds);  
553 - removedIds.removeAll(newIds); // 删除：old 有，new 没有  
554 -  
555 - Set<String> unchangedIds = new HashSet<>(oldIds);  
556 - unchangedIds.retainAll(newIds); // 不变：交集  
557 -  
558 - // 如果需要获取对应的实体对象（注意：id 唯一）  
559 - Map<String, CorePersonnel> oldMap = corePersonnelList.stream().collect(Collectors.toMap(CorePersonnel::getId, e -> e));  
560 - Map<String, UpdateCorePersonnelVo> newMap = corePersonnelListNew.stream().collect(Collectors.toMap(UpdateCorePersonnelVo::getId, e -> e));  
561 -  
562 - List<UpdateCorePersonnelVo> added = addedIds.stream().map(newMap::get).collect(Collectors.toList());  
563 - List<CorePersonnel> removed = removedIds.stream().map(oldMap::get).collect(Collectors.toList());  
564 - List<UpdateCorePersonnelVo> updated = unchangedIds.stream().map(newMap::get).collect(Collectors.toList());  
565 - // 输出结果  
566 - System.out.println("新增: " + added);  
567 - System.out.println("删除: " + removed);  
568 - System.out.println("修改: " + updated);  
569 - //新增  
570 - for (UpdateCorePersonnelVo updateCorePersonnelVo : added) {  
571 - CreateCorePersonnelVo createCorePersonnelVo = new CreateCorePersonnelVo();  
572 - createCorePersonnelVo.setCreditId(vo.getId());  
573 - if (!StringUtil.isBlank(updateCorePersonnelVo.getPersonId())) {  
574 - createCorePersonnelVo.setPersonId(updateCorePersonnelVo.getPersonId());  
575 - }  
576 - if (!StringUtil.isBlank(updateCorePersonnelVo.getName())) {  
577 - createCorePersonnelVo.setName(updateCorePersonnelVo.getName());  
578 - }  
579 - if (!StringUtil.isBlank(updateCorePersonnelVo.getSex())) {  
580 - createCorePersonnelVo.setSex(updateCorePersonnelVo.getSex());  
581 - }  
582 - if (!StringUtil.isBlank(updateCorePersonnelVo.getNativePlace())) {  
583 - createCorePersonnelVo.setNativePlace(updateCorePersonnelVo.getNativePlace());  
584 - }  
585 - if (!StringUtil.isBlank(updateCorePersonnelVo.getAge())) {  
586 - createCorePersonnelVo.setAge(updateCorePersonnelVo.getAge());  
587 - }  
588 - if (!StringUtil.isBlank(updateCorePersonnelVo.getPosition())) {  
589 - createCorePersonnelVo.setPosition(updateCorePersonnelVo.getPosition());  
590 - }  
591 - if (!StringUtil.isBlank(updateCorePersonnelVo.getMobile())) {  
592 - createCorePersonnelVo.setMobile(updateCorePersonnelVo.getMobile());  
593 - }  
594 - if (!StringUtil.isBlank(updateCorePersonnelVo.getPhone())) {  
595 - createCorePersonnelVo.setPhone(updateCorePersonnelVo.getPhone());  
596 - }  
597 - if (!StringUtil.isBlank(updateCorePersonnelVo.getEmail())) {  
598 - createCorePersonnelVo.setEmail(updateCorePersonnelVo.getEmail());  
599 - }  
600 - if (!StringUtil.isBlank(updateCorePersonnelVo.getAddress())) {  
601 - createCorePersonnelVo.setAddress(updateCorePersonnelVo.getAddress());  
602 - }  
603 - corePersonnelService.create(createCorePersonnelVo);  
604 - }  
605 - //删除  
606 - for (CorePersonnel corePersonnel : removed) {  
607 - corePersonnelService.deleteById(corePersonnel.getId());  
608 - }  
609 - //修改  
610 - for (UpdateCorePersonnelVo updateCorePersonnelVo : updated) {  
611 - corePersonnelService.update(updateCorePersonnelVo);  
612 - }  
613 - } else {  
614 - if (CollectionUtils.isNotEmpty(corePersonnelList)) {  
615 - for (CorePersonnel corePersonnel : corePersonnelList) {  
616 - corePersonnelService.deleteById(corePersonnel.getId());  
617 - }  
618 - }  
619 - } 548 +// List<UpdateCorePersonnelVo> corePersonnelListNew = vo.getCorePersonnelList();
  549 +// if (CollectionUtils.isNotEmpty(corePersonnelListNew)) {
  550 +// Set<String> oldIds = corePersonnelList.stream().map(CorePersonnel::getId).collect(Collectors.toSet());
  551 +// Set<String> newIds = corePersonnelListNew.stream().map(UpdateCorePersonnelVo::getId).collect(Collectors.toSet());
  552 +// // 计算差异
  553 +// Set<String> addedIds = new HashSet<>(newIds);
  554 +// addedIds.removeAll(oldIds); // 新增：new 有，old 没有
  555 +//
  556 +// Set<String> removedIds = new HashSet<>(oldIds);
  557 +// removedIds.removeAll(newIds); // 删除：old 有，new 没有
  558 +//
  559 +// Set<String> unchangedIds = new HashSet<>(oldIds);
  560 +// unchangedIds.retainAll(newIds); // 不变：交集
  561 +//
  562 +// // 如果需要获取对应的实体对象（注意：id 唯一）
  563 +// Map<String, CorePersonnel> oldMap = corePersonnelList.stream().collect(Collectors.toMap(CorePersonnel::getId, e -> e));
  564 +// Map<String, UpdateCorePersonnelVo> newMap = corePersonnelListNew.stream().collect(Collectors.toMap(UpdateCorePersonnelVo::getId, e -> e));
  565 +//
  566 +// List<UpdateCorePersonnelVo> added = addedIds.stream().map(newMap::get).collect(Collectors.toList());
  567 +// List<CorePersonnel> removed = removedIds.stream().map(oldMap::get).collect(Collectors.toList());
  568 +// List<UpdateCorePersonnelVo> updated = unchangedIds.stream().map(newMap::get).collect(Collectors.toList());
  569 +// // 输出结果
  570 +// System.out.println("新增: " + added);
  571 +// System.out.println("删除: " + removed);
  572 +// System.out.println("修改: " + updated);
  573 +// //新增
  574 +// for (UpdateCorePersonnelVo updateCorePersonnelVo : added) {
  575 +// CreateCorePersonnelVo createCorePersonnelVo = new CreateCorePersonnelVo();
  576 +// createCorePersonnelVo.setCreditId(vo.getId());
  577 +// if (!StringUtil.isBlank(updateCorePersonnelVo.getPersonId())) {
  578 +// createCorePersonnelVo.setPersonId(updateCorePersonnelVo.getPersonId());
  579 +// }
  580 +// if (!StringUtil.isBlank(updateCorePersonnelVo.getName())) {
  581 +// createCorePersonnelVo.setName(updateCorePersonnelVo.getName());
  582 +// }
  583 +// if (!StringUtil.isBlank(updateCorePersonnelVo.getSex())) {
  584 +// createCorePersonnelVo.setSex(updateCorePersonnelVo.getSex());
  585 +// }
  586 +// if (!StringUtil.isBlank(updateCorePersonnelVo.getNativePlace())) {
  587 +// createCorePersonnelVo.setNativePlace(updateCorePersonnelVo.getNativePlace());
  588 +// }
  589 +// if (!StringUtil.isBlank(updateCorePersonnelVo.getAge())) {
  590 +// createCorePersonnelVo.setAge(updateCorePersonnelVo.getAge());
  591 +// }
  592 +// if (!StringUtil.isBlank(updateCorePersonnelVo.getPosition())) {
  593 +// createCorePersonnelVo.setPosition(updateCorePersonnelVo.getPosition());
  594 +// }
  595 +// if (!StringUtil.isBlank(updateCorePersonnelVo.getMobile())) {
  596 +// createCorePersonnelVo.setMobile(updateCorePersonnelVo.getMobile());
  597 +// }
  598 +// if (!StringUtil.isBlank(updateCorePersonnelVo.getPhone())) {
  599 +// createCorePersonnelVo.setPhone(updateCorePersonnelVo.getPhone());
  600 +// }
  601 +// if (!StringUtil.isBlank(updateCorePersonnelVo.getEmail())) {
  602 +// createCorePersonnelVo.setEmail(updateCorePersonnelVo.getEmail());
  603 +// }
  604 +// if (!StringUtil.isBlank(updateCorePersonnelVo.getAddress())) {
  605 +// createCorePersonnelVo.setAddress(updateCorePersonnelVo.getAddress());
  606 +// }
  607 +// corePersonnelService.create(createCorePersonnelVo);
  608 +// }
  609 +// //删除
  610 +// for (CorePersonnel corePersonnel : removed) {
  611 +// corePersonnelService.deleteById(corePersonnel.getId());
  612 +// }
  613 +// //修改
  614 +// for (UpdateCorePersonnelVo updateCorePersonnelVo : updated) {
  615 +// corePersonnelService.update(updateCorePersonnelVo);
  616 +// }
  617 +// } else {
  618 +// if (CollectionUtils.isNotEmpty(corePersonnelList)) {
  619 +// for (CorePersonnel corePersonnel : corePersonnelList) {
  620 +// corePersonnelService.deleteById(corePersonnel.getId());
  621 +// }
  622 +// }
  623 +// }
620 OpLogUtil.setVariable("id", data.getId()); 624 OpLogUtil.setVariable("id", data.getId());
621 OpLogUtil.setExtra(vo); 625 OpLogUtil.setExtra(vo);
622 626
623 //开启审核 627 //开启审核
624 - flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo); 628 +// flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
625 } 629 }
626 630
627 @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"}) 631 @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"})
@@ -396,4 +396,28 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable { @@ -396,4 +396,28 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
396 @ApiModelProperty(value = "操作类型") 396 @ApiModelProperty(value = "操作类型")
397 private String type; 397 private String type;
398 398
  399 + /**
  400 + * 工商信息文件名
  401 + */
  402 + @ApiModelProperty(value = "工商信息文件名")
  403 + private String businessFileName;
  404 +
  405 + /**
  406 + * 工商信息文件ID
  407 + */
  408 + @ApiModelProperty(value = "工商信息文件ID")
  409 + private String businessFileId;
  410 +
  411 + /**
  412 + * 股东信息文件名
  413 + */
  414 + @ApiModelProperty(value = "股东信息文件名")
  415 + private String shareholderFileName;
  416 +
  417 + /**
  418 + * 股东信息文件ID
  419 + */
  420 + @ApiModelProperty(value = "股东信息文件ID")
  421 + private String shareholderFileId;
  422 +
399 } 423 }
@@ -56,6 +56,10 @@ @@ -56,6 +56,10 @@
56 <result column="company_credit_limit" property="companyCreditLimit"/> 56 <result column="company_credit_limit" property="companyCreditLimit"/>
57 <result column="company_material_supply_plan" property="companyMaterialSupplyPlan"/> 57 <result column="company_material_supply_plan" property="companyMaterialSupplyPlan"/>
58 <result column="company_suggested_category" property="companySuggestedCategory"/> 58 <result column="company_suggested_category" property="companySuggestedCategory"/>
  59 + <result column="business_file_name" property="businessFileName"/>
  60 + <result column="business_file_id" property="businessFileId"/>
  61 + <result column="shareholder_file_name" property="shareholderFileName"/>
  62 + <result column="shareholder_file_id" property="shareholderFileId"/>
59 <result column="status" property="status"/> 63 <result column="status" property="status"/>
60 <result column="create_by_id" property="createById"/> 64 <result column="create_by_id" property="createById"/>
61 <result column="create_by" property="createBy"/> 65 <result column="create_by" property="createBy"/>
@@ -121,6 +125,10 @@ @@ -121,6 +125,10 @@
121 tb.company_material_supply_plan, 125 tb.company_material_supply_plan,
122 tb.company_suggested_category, 126 tb.company_suggested_category,
123 tb.status, 127 tb.status,
  128 + tb.business_file_name,
  129 + tb.business_file_id,
  130 + tb.shareholder_file_name,
  131 + tb.shareholder_file_id,
124 tb.create_by_id, 132 tb.create_by_id,
125 tb.create_by, 133 tb.create_by,
126 tb.update_by_id, 134 tb.update_by_id,