朱园亮 / xingyun-erp · Commits

Commit 561cf653c17dfb78fa5c8ab61239b61624295cad

Authored by yeqianyong
2 parents 2b867b84 e01fb95d

Merge remote-tracking branch 'origin/master_0929' into master_0929

Inline Side-by-side
Showing 2 changed files with 78 additions and 78 deletions
... ... @@ -120,7 +120,7 @@ public class CustomerCreditController extends DefaultBaseController {
120 120 * 修改
121 121 */
122 122 @ApiOperation("修改")
123   - @HasPermission({"customer-credit-manage:customer-credit-plan:modify"})
  123 + @HasPermission({"customer-credit-manage:customer-credit-plan:modify","customer-credit-manage:customer-credit-plan:change"})
124 124 @PutMapping("/update")
125 125 public InvokeResult<Void> update(@Valid @RequestBody UpdateCustomerCreditVo vo) {
126 126
... ...
... ... @@ -545,87 +545,87 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
545 545
546 546 getBaseMapper().update(updateWrapper);
547 547 //更新核心人员
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   -// }
  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 + }
624 624 OpLogUtil.setVariable("id", data.getId());
625 625 OpLogUtil.setExtra(vo);
626 626
627 627 //开启审核
628   -// flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
  628 + flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
629 629 }
630 630
631 631 @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"})
... ...