天津-智科电子 1.协同办公-协同审批：采购及销售审批进入销售流程后也可预览在台账上传的附件

gaoluyang

7 小时以前 bd643b964b84a0be22437c04f0eee375a9623de8

天津-智科电子
1.协同办公-协同审批：采购及销售审批进入销售流程后也可预览在台账上传的附件

 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java

@@ -14,6 +14,7 @@
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.ApprovalInstanceService;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.basic.enums.ApplicationTypeEnum;
import com.ruoyi.basic.enums.RecordTypeEnum;
import com.ruoyi.basic.mapper.OilDepotMapper;
@@ -942,8 +943,8 @@
        if (!products.isEmpty()) {
            resultDto.setHasChildren(true);
            resultDto.setProductData(products);
            resultDto.setStorageBlobVOS(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum.FILE, RecordTypeEnum.PURCHASE_LEDGER, purchaseLedger.getId()));
        }
        resultDto.setStorageBlobVOS(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum.FILE, RecordTypeEnum.PURCHASE_LEDGER, purchaseLedger.getId()));
        return resultDto;
    }

@@ -1178,6 +1179,10 @@
            }
        }

        // 附件按台账 id 实查，审批人预览时始终是最新上传的附件
        List<StorageBlobVO> attachments = fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(
                ApplicationTypeEnum.FILE, RecordTypeEnum.PURCHASE_LEDGER, purchaseLedger.getId());

        // 3. 查询当前采购单对应的审批快照
        if (approvalSnapshotInstance == null) {
            approvalSnapshotInstance = approvalInstanceService.getOne(new LambdaQueryWrapper<ApprovalInstance>()
@@ -1228,6 +1233,7 @@
                    }
                    snapshot.setProductData(snapshot.getProductData() == null ? Collections.emptyList() : snapshot.getProductData());
                    snapshot.setHasChildren(CollectionUtils.isNotEmpty(snapshot.getProductData()));
                    snapshot.setStorageBlobVOS(attachments);
                    return snapshot;
                }
            } catch (Exception e) {
@@ -1248,6 +1254,7 @@
            resultDto.setHasChildren(true);
            resultDto.setProductData(products);
        }
        resultDto.setStorageBlobVOS(attachments);
        return resultDto;
    }