From 17d99d0cee380b78f5e80a775cbd6407c79ac4bb Mon Sep 17 00:00:00 2001 From: aikai Date: Wed, 25 Sep 2024 14:44:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=AE=B6=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E4=B8=AD=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=8F=E5=88=86=E9=85=8D=E5=88=B0?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=B8=AD=20-=20=E9=81=BF=E5=85=8D=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=95=BF=E4=BC=A0=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=B0=E8=B4=A7=E5=87=AD=E8=AF=81=E5=AF=BC=E8=87=B4=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E5=88=86=E9=85=8D=E5=88=B0=E8=B5=84=E4=BA=A7=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BpmOASupplierProcurementPlanPageReqVO.java | 3 +++ .../BpmOASupplierProcurementPlanReqVO.java | 3 +++ .../BpmOASupplierProcurementPlanRespVO.java | 3 +++ .../BpmOASupplierProcurementPlanSaveReqVO.java | 3 +++ .../dal/dataobject/oa/BpmOASupplierProcurementPlanDO.java | 4 ++++ .../service/oa/BpmOASupplierProcurementPlanServiceImpl.java | 5 +++-- 6 files changed, 19 insertions(+), 2 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanPageReqVO.java index f435c36f..527e0919 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanPageReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanPageReqVO.java @@ -48,6 +48,9 @@ public class BpmOASupplierProcurementPlanPageReqVO extends PageParam { @Schema(description = "是否上传凭证 0否 1是") private Integer certificateFlag; + @Schema(description = "是否已分配到资产中 0否 1是", example = "5984") + private Integer assignedFlag; + @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanReqVO.java index 16c7fcca..5a03073a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanReqVO.java @@ -17,6 +17,9 @@ public class BpmOASupplierProcurementPlanReqVO { @Schema(description = "供应商id", example = "123") private Long supplierId; + @Schema(description = "是否已分配到资产中 0否 1是", example = "5984") + private Integer assignedFlag; + @Schema(description = "流程实例的编号", example = "5984") private String processInstanceId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanRespVO.java index 5aa316a5..37a1f4c8 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanRespVO.java @@ -41,6 +41,9 @@ public class BpmOASupplierProcurementPlanRespVO { @Schema(description = "备注") private String remark; + @Schema(description = "是否已分配到资产中 0否 1是", example = "5984") + private Integer assignedFlag; + @Schema(description = "流程实例的编号", example = "5984") private String processInstanceId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanSaveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanSaveReqVO.java index ff3ffe2e..4b8ddeea 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanSaveReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanSaveReqVO.java @@ -42,6 +42,9 @@ public class BpmOASupplierProcurementPlanSaveReqVO { @Schema(description = "备注") private String remark; + @Schema(description = "是否已分配到资产中 0否 1是", example = "5984") + private Integer assignedFlag; + @Schema(description = "流程实例的编号", example = "5984") private String processInstanceId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierProcurementPlanDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierProcurementPlanDO.java index 4140eeb5..e0c6a569 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierProcurementPlanDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierProcurementPlanDO.java @@ -70,6 +70,10 @@ public class BpmOASupplierProcurementPlanDO extends BaseDO { * 备注 */ private String remark; + /** + * 是否已分配到资产中 0否 1是 + */ + private Integer assignedFlag; /** * 流程实例的编号 */ diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierProcurementPlanServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierProcurementPlanServiceImpl.java index 1affb7f2..7b29c774 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierProcurementPlanServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierProcurementPlanServiceImpl.java @@ -165,10 +165,11 @@ public class BpmOASupplierProcurementPlanServiceImpl extends BpmOABaseService im public void uploadDeliveryReceipt(TheArrivalFileItemsVO vo) { BpmOASupplierProcurementPlanDO supplierProcurementPlanDO = oaSupplierProcurementPlanMapper.selectById(vo.getId()); //判断是否需要更新到资产 - Boolean updateAssetFlag = false; - if (CollectionUtil.isEmpty(supplierProcurementPlanDO.getTheArrivalFileItems())) { + boolean updateAssetFlag = false; + if (supplierProcurementPlanDO.getAssignedFlag() == 0) { updateAssetFlag = true; } + supplierProcurementPlanDO.setAssignedFlag(1); supplierProcurementPlanDO.setTheArrivalFileItems(vo.getTheArrivalFileItems()); oaSupplierProcurementPlanMapper.updateById(supplierProcurementPlanDO); // ----- 如果需要更新到资产 - From 89db6f8fe7216ee4e874d89788b7b6137d99e008 Mon Sep 17 00:00:00 2001 From: aikai Date: Wed, 25 Sep 2024 17:46:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E9=99=84=E4=BB=B6=E5=BA=94?= =?UTF-8?q?=E4=BD=BF=E7=94=A8mybatisPlus=E6=9F=A5=E8=AF=A2=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E4=B8=8D=E8=83=BD=E8=87=AA=E5=8A=A8=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E6=88=90list=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/BpmOASupplierProcurementPlanController.java | 8 ++++++++ .../BpmOASupplierPurchasePaymentSaveReqVO.java | 1 - .../oa/BpmOASupplierPurchasePaymentServiceImpl.java | 11 ++++++++--- .../yudao/module/system/api/supplier/SupplierApi.java | 9 ++++++++- .../module/system/api/supplier/SupplierApiImpl.java | 7 +++++++ .../system/controller/admin/user/dto/UserPageDTO.java | 2 ++ .../main/resources/mapper/user/AdminUserMapper.xml | 3 +++ 7 files changed, 36 insertions(+), 5 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASupplierProcurementPlanController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASupplierProcurementPlanController.java index a59bf6f3..69ef4a46 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASupplierProcurementPlanController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASupplierProcurementPlanController.java @@ -78,6 +78,14 @@ public class BpmOASupplierProcurementPlanController { return success(BeanUtils.toBean(pageResult, BpmOASupplierProcurementPlanRespVO.class)); } + @GetMapping("/getPlanItem") + @Operation(summary = "获得供应商采购计划商品列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult> getPlanItem(@RequestParam("id") Long id) { + List items = oaSupplierProcurementPlanItemService.getByProcurementPlanId(id); + List itemVos = BeanUtils.toBean(items, BpmOASupplierProcurementPlanItemRespVO.class); + return success(itemVos); + } @GetMapping("/getListBySupplierId") @Operation(summary = "根据供应商id获取采购计划列表") diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierpurchasepayment/BpmOASupplierPurchasePaymentSaveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierpurchasepayment/BpmOASupplierPurchasePaymentSaveReqVO.java index 5eee9148..1c75da61 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierpurchasepayment/BpmOASupplierPurchasePaymentSaveReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierpurchasepayment/BpmOASupplierPurchasePaymentSaveReqVO.java @@ -18,7 +18,6 @@ public class BpmOASupplierPurchasePaymentSaveReqVO { private Long id; @Schema(description = "申请人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "14357") - @NotNull(message = "申请人的用户编号不能为空") private Long userId; @Schema(description = "供应商id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13580") diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierPurchasePaymentServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierPurchasePaymentServiceImpl.java index 3d32538b..aede1898 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierPurchasePaymentServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierPurchasePaymentServiceImpl.java @@ -22,6 +22,7 @@ import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import cn.iocoder.yudao.module.bpm.service.financialpayment.FinancialPaymentService; import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService; import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; +import cn.iocoder.yudao.module.system.api.supplier.SupplierApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -66,7 +67,8 @@ public class BpmOASupplierPurchasePaymentServiceImpl extends BpmOABaseService im private BpmOASupplierProcurementPlanMapper supplierProcurementPlanMapper; @Resource private BpmOASupplierProcurementPlanItemMapper supplierProcurementPlanItemMapper; - + @Resource + private SupplierApi supplierApi; /** * 供应商采购支付 @@ -76,9 +78,9 @@ public class BpmOASupplierPurchasePaymentServiceImpl extends BpmOABaseService im @Override public Long createOASupplierPurchasePayment(BpmOASupplierPurchasePaymentSaveReqVO createReqVO) { // 插入 + Long userId = WebFrameworkUtils.getLoginUserId(); BpmOASupplierPurchasePaymentDO supplierPurchasePaymentDO = BeanUtils.toBean(createReqVO, BpmOASupplierPurchasePaymentDO.class); supplierPurchasePaymentMapper.insert(supplierPurchasePaymentDO); - Long userId = WebFrameworkUtils.getLoginUserId(); // 发起 BPM 流程 Map processInstanceVariables = new HashMap<>(); @@ -118,7 +120,10 @@ public class BpmOASupplierPurchasePaymentServiceImpl extends BpmOABaseService im @Override public BpmOASupplierPurchasePaymentDO getOASupplierPurchasePayment(Long id) { - BpmOASupplierPurchasePaymentDO supplierPurchasePaymentDO = supplierPurchasePaymentMapper.getById(id); + BpmOASupplierPurchasePaymentDO supplierPurchasePaymentDO = supplierPurchasePaymentMapper.selectById(id); + // 根据supplierId 供应商id查询供应商 + CommonResult result = supplierApi.getNameById(supplierPurchasePaymentDO.getSupplierId()); + supplierPurchasePaymentDO.setSupplierName(result.getData()); List supplierProcurementPlanIds = Arrays.stream(supplierPurchasePaymentDO.getSupplierProcurementPlanIds().split(",")).map(Long::valueOf).collect(Collectors.toList()); List planDOS = supplierProcurementPlanMapper.selectList(new LambdaQueryWrapper().in(BpmOASupplierProcurementPlanDO::getId, supplierProcurementPlanIds)); List planItemDOS = supplierProcurementPlanItemMapper.selectList(new LambdaQueryWrapper().in(BpmOASupplierProcurementPlanItemDO::getProcurementPlanId, supplierProcurementPlanIds)); diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApi.java index 11a54b57..2d307596 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApi.java @@ -1,14 +1,16 @@ package cn.iocoder.yudao.module.system.api.supplier; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.subscribe.dto.SubscribeMessageReqDTO; import cn.iocoder.yudao.module.system.api.supplier.dto.SupplierRpcDTO; import cn.iocoder.yudao.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; @FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = @Tag(name = "RPC 服务 - 供应商新增编辑") @@ -20,4 +22,9 @@ public interface SupplierApi { @Operation(summary = "新增编辑供应商") CommonResult saveOrEdit(@RequestBody SupplierRpcDTO supplier); + + @GetMapping(PREFIX + "/getNameById") + @Operation(summary = "获取供应商名称") + @Parameter(name = "id", description = "供应商id", example = "1", required = true) + CommonResult getNameById(@RequestParam("id") Long id); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApiImpl.java index aaec46de..d3268598 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApiImpl.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.api.supplier; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.system.api.supplier.dto.SupplierRpcDTO; +import cn.iocoder.yudao.module.system.dal.dataobject.supplier.SupplierDO; import cn.iocoder.yudao.module.system.service.supplier.SupplierService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -23,4 +24,10 @@ public class SupplierApiImpl implements SupplierApi { supplierService.saveOrEdit(supplier); return success(true); } + + @Override + public CommonResult getNameById(Long id) { + SupplierDO supplier = supplierService.getSupplier(id); + return success(supplier == null ? "其他" : supplier.getSupplierName()); + } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/dto/UserPageDTO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/dto/UserPageDTO.java index 206bea70..9ec18627 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/dto/UserPageDTO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/dto/UserPageDTO.java @@ -14,4 +14,6 @@ public class UserPageDTO extends PageParam { private String name; @Schema(description = "状态（0正常 1停用）不传则全部", example = "1") private Integer status; + @Schema(description = "部门id", example = "1") + private Long deptId; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml index 2f4cf71b..ffb0e44e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml @@ -73,6 +73,9 @@ #{groupId} + + and a.dept_id = #{dto.deptId} + and a.nickname like concat('%', #{dto.name}, '%')