From d5c8fefe790d2e1f4f496c3d088aed14cdfc5359 Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Fri, 23 Jan 2026 10:43:32 +0800 Subject: [PATCH] =?UTF-8?q?jsk=20=20=E9=85=8D=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E9=85=8D=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=BA=93=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../part/domain/PartTypeQueryDto.java | 2 ++ .../part/mapper/PartArrivedMapper.java | 2 +- .../service/impl/PartArrivedServiceImpl.java | 19 +++++++++++++++---- .../material/part/PartArrivedMapper.xml | 6 ++++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartTypeQueryDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartTypeQueryDto.java index 4a5d0858..ce2254f4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartTypeQueryDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartTypeQueryDto.java @@ -88,4 +88,6 @@ public class PartTypeQueryDto { */ @ApiModelProperty(value = "子任务状态列表") private List statusList; + + private Long companyId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartArrivedMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartArrivedMapper.java index db714a75..cfdf84ea 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartArrivedMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartArrivedMapper.java @@ -25,7 +25,7 @@ public interface PartArrivedMapper * @param partName 查询配件类型三级树 * @return 查询配件类型三级树 */ - List getTypeTree(String partName); + List getTypeTree(@Param("partName") String partName,@Param("companyId")Long companyId); /** * 查询当年当月最大任务序号，用于生成任务编号 by 分类型查询 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java index 44086ced..454aa0d0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java @@ -13,6 +13,7 @@ import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.countersign.domain.SignProcessVo; import com.bonus.material.countersign.mapper.SignProcessMapper; +import com.bonus.material.ma.service.ITypeService; import com.bonus.material.part.domain.*; import com.bonus.material.part.mapper.PartArrivedMapper; import com.bonus.material.part.service.IPartArrivedService; @@ -49,6 +50,9 @@ public class PartArrivedServiceImpl implements IPartArrivedService @Resource private SignProcessMapper signProcessMapper; + @Resource + private ITypeService iTypeService; + // 引入新购任务阶段常量 private static final int PURCHASE_TASK_STAGE_MANAGE = 1; private static final int PURCHASE_TASK_STAGE_CHECK = 2; @@ -61,7 +65,8 @@ public class PartArrivedServiceImpl implements IPartArrivedService */ @Override public List getTypeTree(Long partId, String partName) { - List maTypes = partArrivedMapper.getTypeTree(""); + Long companyId=iTypeService.getUserDeptId(); + List maTypes = partArrivedMapper.getTypeTree("",companyId); List list = new ArrayList<>(); for (PartTypeDto maType : maTypes) { if (maType.getParentId() == 0) { @@ -117,9 +122,11 @@ public class PartArrivedServiceImpl implements IPartArrivedService partArrivedMapper.insertTmTask(tmTask); Long taskId = tmTask.getTaskId(); partTypeCheckDto.getPartTypeCheckInfo().setTaskId(taskId); + Long companyId=iTypeService.getUserDeptId(); + partTypeCheckDto.getPartTypeCheckInfo().setCompanyId(companyId); final int count = partArrivedMapper.insertPartTypeCheckInfo(partTypeCheckDto.getPartTypeCheckInfo()); if (0 < count) { - return insertPartTypeCheckDetails(partTypeCheckDto.getPartTypeCheckDetailsList(), taskId); + return insertPartTypeCheckDetails(partTypeCheckDto.getPartTypeCheckDetailsList(), taskId,companyId); } else { return AjaxResult.error("新增任务失败,purchase_part_info表插入0条"); } @@ -130,12 +137,13 @@ public class PartArrivedServiceImpl implements IPartArrivedService } } - private AjaxResult insertPartTypeCheckDetails(List partTypeCheckDetailsList, Long taskId) { + private AjaxResult insertPartTypeCheckDetails(List partTypeCheckDetailsList, Long taskId,Long companyId) { if (!CollectionUtils.isEmpty(partTypeCheckDetailsList)) { for (PartTypeCheckDetails details : partTypeCheckDetailsList) { details.setTaskId(taskId); details.setStatus(1); details.setInputStatus("0"); + details.setCompanyId(companyId); final List bmFileInfos = details.getBmFileInfos(); if (!CollectionUtils.isEmpty(bmFileInfos)) { bmFileInfos.forEach(o -> o.setTaskId(taskId)); @@ -176,6 +184,8 @@ public class PartArrivedServiceImpl implements IPartArrivedService */ @Override public List selectPartTypeCheckInfoList(PartTypeQueryDto partTypeQueryDto) { + Long companyId=iTypeService.getUserDeptId(); + partTypeQueryDto.setCompanyId(companyId); List partTypeCheckInfos = partArrivedMapper.selectPartTypeCheckInfoJoinList(partTypeQueryDto); List purchaseCheckInfoResult = new ArrayList<>(); for (int i = 0; i < partTypeCheckInfos.size(); i++) { @@ -408,7 +418,8 @@ public class PartArrivedServiceImpl implements IPartArrivedService if (res == 0) { throw new ServiceException("修改失败"); } - insertPartTypeCheckDetails(partTypeCheckDto.getPartTypeCheckDetailsList(), partTypeCheckDto.getPartTypeCheckInfo().getTaskId()); + Long companyId=iTypeService.getUserDeptId(); + insertPartTypeCheckDetails(partTypeCheckDto.getPartTypeCheckDetailsList(), partTypeCheckDto.getPartTypeCheckInfo().getTaskId(),companyId); } return true; } catch (final Exception e) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml index 9e8110ef..e6362abb 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml @@ -36,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ma_part_type m where m.del_flag = '0' + + and m.company_id = #{companyId} +