From 707b5af9ed7c12d18cba597e3f2f76671891034b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期二, 12 十二月 2023 17:27:21 +0800 Subject: [PATCH] 技术状态鉴定 批量点检驳回 审批 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java index b2218d8..b93032f 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java @@ -129,6 +129,7 @@ public Result<String> add(@RequestBody DailyInspectionStandard dailyInspectionStandard) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); dailyInspectionStandard.setWritePerson(sysUser.getRealname()); + dailyInspectionStandard.setAssignMode("1"); dailyInspectionStandardService.save(dailyInspectionStandard); List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist(); DailyInspectionStandardDetail isd = null; @@ -557,4 +558,41 @@ return Result.error("瀹℃牳澶辫触!"); } } + + + /** + * 鎵归噺 绛惧娴佺▼ + * qsw 2023-12-12 + */ + @RequestMapping(value = "/auditApprovalBatch", method = {RequestMethod.PUT,RequestMethod.POST}) + @Transactional(rollbackFor = { Exception.class }) + public Result<String> auditApprovalBatch(@RequestBody DailyInspectionStandard dailyInspectionStandard) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + List<DailyInspectionStandard> dailyInspectionStandardlist = dailyInspectionStandard.getDailyInspectionStandardlist(); + for (DailyInspectionStandard inspectionStandard : dailyInspectionStandardlist) { + String approvalStatus = inspectionStandard.getApprovalStatus(); + if("5".equals(approvalStatus)){//瀹℃牳閫氳繃鍚庯紝鐗堟湰鐢熸晥 + List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery() + .eq(DailyInspectionStandard::getNum, inspectionStandard.getNum()) + .eq(DailyInspectionStandard::getVersionStatus, "2").list(); + for (DailyInspectionStandard standard : dailyInspectionStandards) { + standard.setVersionStatus("3"); + standard.setLoseEfficacyTime(new Date()); + standard.setLoseEfficacyPerson(sysUser.getRealname()); + dailyInspectionStandardService.updateById(standard); + } + inspectionStandard.setApprovalPerson(sysUser.getRealname()); + inspectionStandard.setVersionStatus("2"); + inspectionStandard.setTakeEffectTime(new Date()); + }else if("3".equals(approvalStatus)){ + inspectionStandard.setAuditPerson(sysUser.getRealname()); + } + boolean b = dailyInspectionStandardService.updateById(inspectionStandard); + if (!b){ + return Result.error("瀹℃牳澶辫触!"); + } + } + return Result.OK("瀹℃牳鎴愬姛!"); + } } -- Gitblit v1.9.3