From 033019224bd0b90bebc1d6bc0d2a9ad25d3071d1 Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Thu, 8 Jan 2026 16:51:57 +0800 Subject: [PATCH] =?UTF-8?q?jsk=20=20=E6=96=B0=E8=B4=AD=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/report/PurChaseReportInfo.java | 2 + .../service/impl/BmReportServiceImpl.java | 9 +++++ .../purchase/domain/dto/PurchaseQueryDto.java | 3 ++ .../service/impl/PurchaseBindServiceImpl.java | 9 ++++- .../impl/PurchaseCheckDetailsServiceImpl.java | 8 ++++ .../impl/PurchaseCheckInfoServiceImpl.java | 38 ++++++++++++++++++- .../mapper/material/basic/BmReportMapper.xml | 3 ++ .../purchase/PurchaseCheckInfoMapper.xml | 3 +- 8 files changed, 71 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportInfo.java index 6219713a..c4085d17 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportInfo.java @@ -107,6 +107,8 @@ public class PurChaseReportInfo { private Long userId; + private Long companyId; + @ApiModelProperty(value = "状态（已验收1，未入库2）") private String status; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java index 26f683f2..c14bc38f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java @@ -9,6 +9,7 @@ import com.bonus.material.basic.domain.report.*; import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.basic.mapper.BmReportMapper; import com.bonus.material.basic.service.BmReportService; +import com.bonus.material.ma.service.ITypeService; import org.hibernate.validator.internal.util.StringHelper; import org.springframework.stereotype.Service; @@ -32,6 +33,9 @@ public class BmReportServiceImpl implements BmReportService { @Resource private BmFileInfoMapper fileInfoMapper; + + @Resource + private ITypeService iTypeService; /** * 新购入库报表查询 * @param bean @@ -40,6 +44,11 @@ public class BmReportServiceImpl implements BmReportService { @Override public List getPurChaseReportList(PurChaseReportInfo bean) { bean.setUserId(SecurityUtils.getLoginUser().getUserid()); + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + bean.setCompanyId(companyId); BigDecimal totalPurchaseNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); BigDecimal totalPassNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); BigDecimal totalInputNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java index 6467c86b..a951e757 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java @@ -29,6 +29,9 @@ public class PurchaseQueryDto { @ApiModelProperty(value = "登录用户id") private Long userId; + @ApiModelProperty(value = "所属公司") + private Long companyId; + @ApiModelProperty(value = "任务单号") private String code; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index 8565adff..3420cf00 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -18,6 +18,7 @@ import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.basic.service.IBmConfigService; import com.bonus.material.codeCollection.domain.WsMaInfo; import com.bonus.material.codeCollection.mapper.WsMaInfoMapper; +import com.bonus.material.ma.service.ITypeService; import com.bonus.material.purchase.config.RemoteConfig; import com.bonus.common.biz.domain.purchase.PurchaseDto; import com.bonus.material.purchase.domain.PurchaseCheckDetails; @@ -86,6 +87,8 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { @Resource private BmFileInfoMapper bmFileInfoMapper; + @Resource + private ITypeService iTypeService; // 引入新购任务阶段常量 private static final int PURCHASE_TASK_STAGE_MANAGE = 1; private static final int PURCHASE_TASK_STAGE_CHECK = 2; @@ -607,7 +610,11 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { @Override public List selectPurchaseCheckInfoList(PurchaseQueryDto purchaseQueryDto) { log.info("=== MaterialLeaseInfoServiceImpl.selectPurchaseCheckInfoList开始执行，purchaseQueryDto: {}", purchaseQueryDto); - + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + purchaseQueryDto.setCompanyId(companyId); final List purchaseCheckInfos = purchaseCheckInfoMapper.selectPurchaseCheckInfoJoinList(purchaseQueryDto); if (org.springframework.util.CollectionUtils.isEmpty(purchaseCheckInfos)) { return Collections.emptyList(); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java index a7b6e4d8..437319e3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -5,6 +5,7 @@ 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.common.security.utils.SecurityUtils; +import com.bonus.material.ma.service.ITypeService; import com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto; import com.bonus.material.purchase.mapper.PurchaseCheckFileMapper; import org.springframework.stereotype.Service; @@ -29,6 +30,8 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer @Resource private PurchaseCheckFileMapper purchaseCheckFileMapper; + @Resource + private ITypeService iTypeService; /** * 查询新购验收任务详细 * @@ -108,6 +111,11 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer public int updatePurchaseCheckDetails(PurchaseCheckDetails purchaseCheckDetails) { purchaseCheckDetails.setUpdateTime(DateUtils.getNowDate()); try { + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + purchaseCheckDetails.setCompanyId(companyId); return purchaseCheckDetailsMapper.updatePurchaseCheckDetails(purchaseCheckDetails); } catch (Exception e) { throw new ServiceException("错误信息描述"); 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 f4fe4f5d..2fdd4732 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 @@ -26,6 +26,7 @@ import com.bonus.material.countersign.domain.SignProcessVo; import com.bonus.material.countersign.mapper.SignProcessMapper; import com.bonus.material.ma.domain.Type; import com.bonus.material.ma.mapper.TypeMapper; +import com.bonus.material.ma.service.ITypeService; import com.bonus.material.purchase.domain.PurchaseCheckDetails; import com.bonus.material.purchase.domain.PurchaseSignRecord; import com.bonus.material.purchase.domain.dto.PurchaseCheckDto; @@ -36,6 +37,7 @@ import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo; import com.bonus.material.purchase.mapper.PurchaseMacodeInfoMapper; import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.mapper.TmTaskMapper; +import com.bonus.system.api.domain.SysUser; import com.bonus.system.api.model.LoginUser; import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; @@ -84,6 +86,11 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { @Resource private SignProcessMapper signProcessMapper; + /** + * jsk + */ + @Resource + private ITypeService iTypeService; // 引入新购任务阶段常量 private static final int PURCHASE_TASK_STAGE_MANAGE = 1; private static final int PURCHASE_TASK_STAGE_CHECK = 2; @@ -198,7 +205,11 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { @Override public List selectPurchaseCheckInfoList(PurchaseQueryDto purchaseQueryDto) { log.info("=== MaterialLeaseInfoServiceImpl.selectPurchaseCheckInfoList开始执行，purchaseQueryDto: {}", purchaseQueryDto); - + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + purchaseQueryDto.setCompanyId(companyId); final List purchaseCheckInfos = purchaseCheckInfoMapper.selectPurchaseCheckInfoJoinList(purchaseQueryDto); if (CollectionUtils.isEmpty(purchaseCheckInfos)) { return Collections.emptyList(); @@ -682,6 +693,11 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { tmTaskMapper.insertTmTask(tmTask); Long taskId = tmTask.getTaskId(); purchaseCheckInfo.getPurchaseCheckInfo().setTaskId(taskId); + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + purchaseCheckInfo.getPurchaseCheckInfo().setCompanyId(companyId); final int count = purchaseCheckInfoMapper.insertPurchaseCheckInfo(purchaseCheckInfo.getPurchaseCheckInfo()); if (0 < count) { return insertPurchaseCheckDetails(purchaseCheckInfo.getPurchaseCheckDetailsList(), taskId); @@ -703,8 +719,13 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { */ private AjaxResult insertPurchaseCheckDetails(List purchaseCheckDetailsList, Long taskId) { if (!CollectionUtils.isEmpty(purchaseCheckDetailsList)) { + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); for (PurchaseCheckDetails details : purchaseCheckDetailsList) { details.setTaskId(taskId); + details.setCompanyId(companyId); details.setStatus(Objects.equals(PurchaseTaskStatusEnum.TO_CHECK_AFTER_REJECT.getStatus(), details.getStatus()) ? PurchaseTaskStatusEnum.TO_CHECK.getStatus() : PurchaseTaskStatusEnum.TO_NOTICE.getStatus()); @@ -1093,6 +1114,11 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { final Long[] ids = {purchaseCheckDto.getPurchaseCheckInfo().getId()}; purchaseCheckDetailsMapper.deletePurchaseCheckDetailsByParentIds(ids); insertPurchaseCheckDetails(purchaseCheckDto.getPurchaseCheckDetailsList(), purchaseCheckDto.getPurchaseCheckInfo().getTaskId()); + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + purchaseCheckDto.getPurchaseCheckInfo().setCompanyId(companyId); purchaseCheckInfoMapper.updatePurchaseCheckInfo(purchaseCheckDto.getPurchaseCheckInfo()); return true; } catch (final Exception e) { @@ -1180,9 +1206,14 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { bmFileInfoMapper.deleteBmFileList(purchaseCheckDto.getPurchaseCheckInfo().getTaskId()); } try { + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); final Long[] ids = {purchaseCheckDto.getPurchaseCheckInfo().getId()}; purchaseCheckDetailsMapper.deleteDetails(ids); insertPurchaseCheckDetailsInfo(purchaseCheckDto.getPurchaseCheckDetailsList(), purchaseCheckDto.getPurchaseCheckInfo().getTaskId()); + purchaseCheckDto.getPurchaseCheckInfo().setCompanyId(companyId); return purchaseCheckInfoMapper.updatePurchaseCheckInfo(purchaseCheckDto.getPurchaseCheckInfo()); } catch (final Exception e) { throw new ServiceException("错误信息描述"); @@ -1198,8 +1229,13 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { private int insertPurchaseCheckDetailsInfo(List purchaseCheckDetailsList, Long taskId) { int count = 0; if (!CollectionUtils.isEmpty(purchaseCheckDetailsList)) { + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); for (PurchaseCheckDetails details : purchaseCheckDetailsList) { details.setTaskId(taskId); + details.setCompanyId(companyId); details.setStatus(Objects.equals(PurchaseTaskStatusEnum.TO_CHECK_AFTER_REJECT.getStatus(), details.getStatus()) ? PurchaseTaskStatusEnum.TO_CHECK.getStatus() : PurchaseTaskStatusEnum.TO_NOTICE.getStatus()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml index be37682c..b6a0bed1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml @@ -47,6 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mtm.user_id = #{userId} + + and pcd.company_id=#{companyId} + AND ( mt2.type_name LIKE CONCAT('%', #{keyWord}, '%') diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml index 9c344521..b77fccce 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml @@ -149,8 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pci.supplier_id = #{supplierId} and pci.tax_rate = #{taxRate} and t.task_status = #{taskStatus} - - + and pci.company_id = #{companyId} order by pci.create_time desc