diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java index b1b5167d..0a595f2b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java @@ -2,6 +2,9 @@ package com.bonus.material.purchase.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + +import com.bonus.material.basic.domain.BmFileInfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; @@ -138,4 +141,8 @@ public class PurchaseCheckDetails extends BaseEntity { @ApiModelProperty(value = "是否是固定资产编号(0 否,1 是)") private String fixCode; + /** 验收附件列表 */ + @Excel(name = "验收附件列表") + @ApiModelProperty(value = "验收附件列表") + private List bmFileInfos; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index a9480ee6..f19a4943 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -12,6 +12,8 @@ import java.util.stream.Collectors; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.basic.domain.BmFileInfo; +import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.purchase.config.PurchaseTaskEnum; import com.bonus.material.purchase.domain.PurchaseCheckDetails; import com.bonus.material.purchase.domain.dto.PurchaseCheckDto; @@ -54,6 +56,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { @Resource private TmTaskMapper tmTaskMapper; + @Resource + BmFileInfoMapper bmFileInfoMapper; + /** * 查询新购验收任务 * @@ -188,6 +193,15 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { }); // 批量插入详情数据 boolean purchaseCheckDetailsListAddResult = purchaseCheckDetailsMapper.insertPurchaseCheckDetailsList(purchaseCheckInfo.getPurchaseCheckDetailsList()) > 0; + + // 批量插入附件列表 + List purchaseCheckDetailsList = purchaseCheckInfo.getPurchaseCheckDetailsList(); + for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { + List bmFileInfos = purchaseCheckDetails.getBmFileInfos(); + bmFileInfos.stream().forEach(o -> o.setTaskId(taskId)); + bmFileInfoMapper.insertBmFileInfos(bmFileInfos); + } + if (purchaseCheckDetailsListAddResult) { transactionManager.commit(transactionStatus); return AjaxResult.success("新增任务成功");