From 389e6e3e18dc726a59e415d0233d32d2ad68cfb9 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Fri, 12 Dec 2025 14:26:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E5=85=BB=E6=8A=A4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95-=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MentencePlanController.java | 19 +-------- .../project/hsz/model/MentencePlan.java | 2 +- .../project/hsz/model/MentencePlanDetail.java | 2 +- .../hsz/service/MentencePlanService.java | 39 +++++++++++++------ .../hsz/service/MentenceTemplateService.java | 1 + 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java b/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java index 70f22a9..8f245ed 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java @@ -106,24 +106,7 @@ public class MentencePlanController extends AbstractCommonFileController { @Operation(summary = "审批") @PostMapping("/approving") public R approve(@Validated @RequestBody MentencePlan dto,HttpServletRequest request){ - SessionUser sessionUser = checkLogin(request); - if(sessionUser == null){ - throw new IllegalArgumentException("未登录"); - } - //TODO 暂时没有权限，先注释掉，需要了再放开 -// Long userId = sessionUser.getUserId(); -// if(!userId.toString().equals(dto.getApprovePersonId())){ -// throw new IllegalArgumentException("对不起，您没有审批的权限"); -// } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(MentencePlan::getId, dto.getId()); - MentencePlan one = mentencePlanService.getOne(queryWrapper); - if(Objects.isNull(one)){ - throw new RuntimeException("该计划不存在"); - } - dto.setApprovePersonId(sessionUser.getUserId() == null?"1":String.valueOf(sessionUser.getUserId())); - dto.setApprovePersonName(sessionUser.getUserName()); - mentencePlanService.updateById(dto); + mentencePlanService.approve(dto); return R.ok(true); } diff --git a/src/main/java/com/gunshi/project/hsz/model/MentencePlan.java b/src/main/java/com/gunshi/project/hsz/model/MentencePlan.java index c3034fe..57ad4fb 100644 --- a/src/main/java/com/gunshi/project/hsz/model/MentencePlan.java +++ b/src/main/java/com/gunshi/project/hsz/model/MentencePlan.java @@ -42,7 +42,7 @@ public class MentencePlan { @Schema(description = "创建者id") private String createId; - @TableField("create_name") + @TableField(exist = false) @Schema(description = "创建者名称") private String createName; diff --git a/src/main/java/com/gunshi/project/hsz/model/MentencePlanDetail.java b/src/main/java/com/gunshi/project/hsz/model/MentencePlanDetail.java index c7a63dd..4b9f971 100644 --- a/src/main/java/com/gunshi/project/hsz/model/MentencePlanDetail.java +++ b/src/main/java/com/gunshi/project/hsz/model/MentencePlanDetail.java @@ -53,7 +53,7 @@ public class MentencePlanDetail { @TableField("charge_person_id") private String chargePersonId; - @TableField("charge_person_name") + @TableField(exist = false) private String chargePersonName; diff --git a/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java b/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java index c30bb77..cd2ac82 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java @@ -51,10 +51,6 @@ public class MentencePlanService extends ServiceImpl{ detail.setId(IdWorker.getId()); detail.setMentencePlanId(dto.getId()); -// if(detail.getChargePersonId() != null){ -// SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(detail.getChargePersonId())); -// if(sysUser != null){ -// detail.setChargePersonName(sysUser.getNickName()); -// } -// } - }); if(details == null || details.isEmpty()){ throw new IllegalArgumentException("请添加维护内容"); @@ -125,9 +114,37 @@ public class MentencePlanService extends ServiceImpl records = mentencePlanPage.getRecords(); for (MentencePlan record : records) { Long id = record.getId(); + if(record.getCreateId() != null){ + SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(record.getApprovePersonId())); + if(sysUser != null){ + record.setApprovePersonName(sysUser.getNickName()); + } + } List details = mentencePlanDetailMapper.selectDetail(id); + for (MentencePlanDetail detail : details) { + if(detail.getChargePersonId() != null){ + SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(detail.getChargePersonId())); + if(sysUser != null){ + detail.setChargePersonName(sysUser.getNickName()); + } + } + } record.setDetails(details); } return mentencePlanPage; } + + public void approve(MentencePlan dto) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MentencePlan::getId, dto.getId()); + MentencePlan one = getOne(queryWrapper); + if(Objects.isNull(one)){ + throw new RuntimeException("该计划不存在"); + } + if(!one.getApprovePersonId().equals(dto.getApprovePersonId())){ + throw new IllegalArgumentException("对不起，您没有审批的权限"); + } + dto.setApprovePersonId(dto.getApprovePersonId()); + updateById(dto); + } } diff --git a/src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java b/src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java index f14b223..4afed96 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java @@ -62,6 +62,7 @@ public class MentenceTemplateService extends ServiceImpl mentenceTemplatePage = baseMapper.selectPage(pageSo.getPageSo().toPage(), wrapper); return mentenceTemplatePage; }