From eaacd488a8335552ac06f2ec16bd165ad8cc00e7 Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 19 Nov 2025 17:40:04 +0800 Subject: [PATCH] =?UTF-8?q?1.0.38=20=E6=8F=90=E4=BA=A4=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=B9=B6=E6=8F=90=E4=BA=A4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/domain/vo/ErpProjectPurchaseVo.java | 6 ++++ .../impl/ErpProjectInfoServiceImpl.java | 2 +- .../impl/ErpProjectPurchaseServiceImpl.java | 22 ++---------- .../oa/erp/ErpProjectPurchaseMapper.xml | 1 + .../erp/ErpProjectPurchaseMaterialMapper.xml | 35 ++++++++----------- 5 files changed, 26 insertions(+), 40 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseVo.java index 45843b51..6d2d437b 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseVo.java @@ -94,6 +94,12 @@ public class ErpProjectPurchaseVo implements Serializable { @ExcelProperty(value = "分管副总名称") private String deputyName; + /** + * 部门ID + */ + @ExcelProperty(value = "部门ID") + private Long deptId; + /** * 提报人 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java index 6c5e9299..86fcb05c 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java @@ -90,7 +90,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectInfo.class) .selectAll(ErpProjectInfo.class) .eq(StringUtils.isNotBlank(bo.getContractFlag()), ErpProjectInfo::getContractFlag, bo.getContractFlag()) - .eq(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectInfo::getProjectCode, bo.getProjectCode()) + .like(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectInfo::getProjectCode, bo.getProjectCode()) .like(StringUtils.isNotBlank(bo.getProjectName()), ErpProjectInfo::getProjectName, bo.getProjectName()) .eq(StringUtils.isNotBlank(bo.getBusinessDirection()), ErpProjectInfo::getBusinessDirection, bo.getBusinessDirection()) .eq(StringUtils.isNotBlank(bo.getProjectCategory()), ErpProjectInfo::getProjectCategory, bo.getProjectCategory()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java index ffffbf5c..ebd7b07f 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java @@ -155,25 +155,15 @@ public class ErpProjectPurchaseServiceImpl implements IErpProjectPurchaseService @Override @GlobalTransactional(rollbackFor = Exception.class) public ErpProjectPurchaseVo projectPurchaseSubmitAndFlowStart(ErpProjectPurchaseBo bo) { - ErpProjectPurchase entity = MapstructUtils.convert(bo, ErpProjectPurchase.class); - validEntityBeforeSave(entity); + ErpProjectPurchase add = MapstructUtils.convert(bo, ErpProjectPurchase.class); + validEntityBeforeSave(add); if (bo.getProjectPurchaseId() == null) { this.insertByBo(bo); } else { this.updateByBo(bo); } - if (bo.getVariables() == null) { - bo.setVariables(new HashMap<>()); - } bo.getVariables().put("ignore", true); - if (StringUtils.isBlank(bo.getFlowCode())) { - throw new ServiceException("流程编码不能为空"); - } RemoteFlowInstanceBizExt bizExt = bo.getBizExt(); - if (bizExt == null) { - bizExt = new RemoteFlowInstanceBizExt(); - bo.setBizExt(bizExt); - } RemoteStartProcess startProcess = new RemoteStartProcess(); startProcess.setBusinessId(String.valueOf(bo.getProjectPurchaseId())); startProcess.setFlowCode(bo.getFlowCode()); @@ -184,13 +174,7 @@ public class ErpProjectPurchaseServiceImpl implements IErpProjectPurchaseService if (!started) { throw new ServiceException("流程发起异常"); } - // 更新状态为审批中 - ErpProjectPurchase updateStatus = new ErpProjectPurchase(); - updateStatus.setProjectPurchaseId(bo.getProjectPurchaseId()); - updateStatus.setFlowStatus(BusinessStatusEnum.WAITING.getStatus()); - updateStatus.setProjectPurchaseStatus("2"); - baseMapper.updateById(updateStatus); - return queryById(bo.getProjectPurchaseId()); + return MapstructUtils.convert(add, ErpProjectPurchaseVo.class); } /** diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMapper.xml index ca156f1b..f2810543 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMapper.xml @@ -34,6 +34,7 @@ t.update_by, t.update_time, p.project_name, + p.dept_id, u1.nick_name as managerName, u2.nick_name as chargeName, u3.nick_name as deputyName, diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMaterialMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMaterialMapper.xml index 1e81efe1..c8b52e42 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMaterialMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMaterialMapper.xml @@ -72,28 +72,23 @@