diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java index b3655c5d..3e424c53 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java @@ -95,6 +95,17 @@ public class BmFileInfoController extends BaseController return toAjax(bmFileInfoService.insertBmFileInfo(bmFileInfo)); } + @ApiOperation(value = "批量新增附件") + @PreventRepeatSubmit + @RequiresPermissions("basic:info:add") + @SysLog(title = "附件", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->批量新增附件") + @PostMapping + public AjaxResult add(@RequestBody List bmFileInfos) + { + return toAjax(bmFileInfoService.insertBmFileInfos(bmFileInfos)); + } + + /** * 修改附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java index 75d56c9f..0d3f6f64 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java @@ -2,6 +2,7 @@ package com.bonus.material.basic.mapper; import java.util.List; import com.bonus.material.basic.domain.BmFileInfo; +import org.apache.ibatis.annotations.Param; /** * 附件Mapper接口 @@ -32,6 +33,8 @@ public interface BmFileInfoMapper { */ int insertBmFileInfo(BmFileInfo bmFileInfo); + int insertBmFileInfos(@Param("list") List bmFileInfos); + /** * 修改附件 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java index 0e3ecefe..d36d2d35 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java @@ -44,6 +44,8 @@ public interface IBmFileInfoService */ public int insertBmFileInfo(BmFileInfo bmFileInfo); + public int insertBmFileInfos(List bmFileInfos); + /** * 修改附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java index 9fb79cb3..1aecf747 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.bonus.material.basic.service.impl; import java.util.List; +import java.util.stream.Collectors; + import com.bonus.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -66,6 +68,13 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService return bmFileInfoMapper.insertBmFileInfo(bmFileInfo); } + @Override + public int insertBmFileInfos(List bmFileInfos) + { + bmFileInfos.stream().forEach(o -> o.setCreateTime(DateUtils.getNowDate())); + return bmFileInfoMapper.insertBmFileInfos(bmFileInfos); + } + /** * 修改附件 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("新增任务成功"); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml index e112a2d1..ee21a5e1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml @@ -61,6 +61,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into bm_file_info (task_type,type_id,model_id,name,url,file_type,create_by,create_time) + values + + ( + #{item.taskType}, + #{item.taskId}, + #{item.modelId}, + #{item.name}, + #{item.url}, + #{item.fileType}, + #{item.createBy}, + #{item.createTime} + ) + + + update bm_file_info