Showing
1 changed file
with
8 additions
and
35 deletions
| ... | ... | @@ -469,10 +469,8 @@ public class ProcurementWeighingTicketServiceImpl |
| 469 | 469 | } |
| 470 | 470 | |
| 471 | 471 | LambdaUpdateWrapper<ProcurementWeighingTicket> wrapper = Wrappers.lambdaUpdate(ProcurementWeighingTicket.class) |
| 472 | - .set(ProcurementWeighingTicket::getSignAttachmentFileIds, | |
| 473 | - appendFiles(entity.getSignAttachmentFileIds(), fileIds)) | |
| 474 | - .set(ProcurementWeighingTicket::getSignAttachmentFileNames, | |
| 475 | - appendFiles(entity.getSignAttachmentFileNames(), fileNames)) | |
| 472 | + .set(ProcurementWeighingTicket::getSignAttachmentFileIds, fileIds) | |
| 473 | + .set(ProcurementWeighingTicket::getSignAttachmentFileNames, fileNames) | |
| 476 | 474 | .set(ProcurementWeighingTicket::getDriver, driver) |
| 477 | 475 | .eq(ProcurementWeighingTicket::getId, id); |
| 478 | 476 | |
| ... | ... | @@ -509,11 +507,9 @@ public class ProcurementWeighingTicketServiceImpl |
| 509 | 507 | } |
| 510 | 508 | |
| 511 | 509 | this.update(Wrappers.lambdaUpdate(ProcurementWeighingTicket.class) |
| 512 | - .set(ProcurementWeighingTicket::getDelayAttachmentFileIds, | |
| 513 | - appendFiles(entity.getDelayAttachmentFileIds(), fileIds)) | |
| 514 | - .set(ProcurementWeighingTicket::getDelayAttachmentFileNames, | |
| 515 | - appendFiles(entity.getDelayAttachmentFileNames(), fileNames)) | |
| 516 | - .eq(ProcurementWeighingTicket::getId, id)); | |
| 510 | + .set(ProcurementWeighingTicket::getDelayAttachmentFileIds, fileIds) | |
| 511 | + .set(ProcurementWeighingTicket::getDelayAttachmentFileNames, fileNames) | |
| 512 | + .eq(ProcurementWeighingTicket::getId, id)); | |
| 517 | 513 | |
| 518 | 514 | OpLogUtil.setVariable("id", id); |
| 519 | 515 | OpLogUtil.setExtra(entity); |
| ... | ... | @@ -532,11 +528,9 @@ public class ProcurementWeighingTicketServiceImpl |
| 532 | 528 | assertValid(entity); |
| 533 | 529 | |
| 534 | 530 | this.update(Wrappers.lambdaUpdate(ProcurementWeighingTicket.class) |
| 535 | - .set(ProcurementWeighingTicket::getReweighAttachmentFileIds, | |
| 536 | - appendFiles(entity.getReweighAttachmentFileIds(), fileIds)) | |
| 537 | - .set(ProcurementWeighingTicket::getReweighAttachmentFileNames, | |
| 538 | - appendFiles(entity.getReweighAttachmentFileNames(), fileNames)) | |
| 539 | - .eq(ProcurementWeighingTicket::getId, id)); | |
| 531 | + .set(ProcurementWeighingTicket::getReweighAttachmentFileIds, fileIds) | |
| 532 | + .set(ProcurementWeighingTicket::getReweighAttachmentFileNames, fileNames) | |
| 533 | + .eq(ProcurementWeighingTicket::getId, id)); | |
| 540 | 534 | |
| 541 | 535 | OpLogUtil.setVariable("id", id); |
| 542 | 536 | OpLogUtil.setExtra(entity); |
| ... | ... | @@ -817,27 +811,6 @@ public class ProcurementWeighingTicketServiceImpl |
| 817 | 811 | } |
| 818 | 812 | |
| 819 | 813 | /** |
| 820 | - * 追加附件(多次上传累加,保持顺序去重) | |
| 821 | - */ | |
| 822 | - private String appendFiles(String oldValues, String newValues) { | |
| 823 | - Set<String> merged = new LinkedHashSet<>(); | |
| 824 | - splitToSet(oldValues, merged); | |
| 825 | - splitToSet(newValues, merged); | |
| 826 | - return merged.isEmpty() ? null : String.join(",", merged); | |
| 827 | - } | |
| 828 | - | |
| 829 | - private void splitToSet(String value, Set<String> target) { | |
| 830 | - if (StringUtil.isBlank(value)) { | |
| 831 | - return; | |
| 832 | - } | |
| 833 | - for (String item : value.split(",")) { | |
| 834 | - if (StringUtil.isNotBlank(item)) { | |
| 835 | - target.add(item.trim()); | |
| 836 | - } | |
| 837 | - } | |
| 838 | - } | |
| 839 | - | |
| 840 | - /** | |
| 841 | 814 | * 填充按钮展示标记(审核按钮按当前用户流程待办判断) |
| 842 | 815 | */ |
| 843 | 816 | private void fillOperateFlags(List<ProcurementWeighingTicket> datas) { | ... | ... |