From 0d2536234f2a7298a0b7fc9cdefc745a6652b4ee Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 10:16:24 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=96=B0=E8=B4=AD=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 00e588e8b3550c2e4f245cc664e2c8dc5c327ffc. --- .../basic/controller/BmFileInfoController.java | 11 ----------- .../material/basic/mapper/BmFileInfoMapper.java | 3 --- .../basic/service/IBmFileInfoService.java | 2 -- .../service/impl/BmFileInfoServiceImpl.java | 9 --------- .../purchase/domain/PurchaseCheckDetails.java | 7 ------- .../impl/PurchaseCheckInfoServiceImpl.java | 14 -------------- .../mapper/material/basic/BmFileInfoMapper.xml | 17 ----------------- 7 files changed, 63 deletions(-) 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 3e424c53..b3655c5d 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,17 +95,6 @@ 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 0d3f6f64..75d56c9f 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,7 +2,6 @@ package com.bonus.material.basic.mapper; import java.util.List; import com.bonus.material.basic.domain.BmFileInfo; -import org.apache.ibatis.annotations.Param; /** * 附件Mapper接口 @@ -33,8 +32,6 @@ 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 d36d2d35..0e3ecefe 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,8 +44,6 @@ 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 1aecf747..9fb79cb3 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,8 +1,6 @@ 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; @@ -68,13 +66,6 @@ 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 0a595f2b..b1b5167d 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,9 +2,6 @@ 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; @@ -141,8 +138,4 @@ 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 f19a4943..a9480ee6 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,8 +12,6 @@ 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; @@ -56,9 +54,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { @Resource private TmTaskMapper tmTaskMapper; - @Resource - BmFileInfoMapper bmFileInfoMapper; - /** * 查询新购验收任务 * @@ -193,15 +188,6 @@ 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 ee21a5e1..e112a2d1 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,23 +61,6 @@ 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