From 0927bb6259b510070d91be7ae1585cc0a5613cd3 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Tue, 9 Sep 2025 16:15:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=85=BB=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MentencePlanController.java | 25 ++++++++++--------- .../hsz/mapper/MentencePlanDetailMapper.java | 1 + .../project/hsz/model/MentencePlanDetail.java | 4 +-- .../project/hsz/model/MentenceStDetail.java | 2 +- .../hsz/service/MentencePlanService.java | 18 +++++++------ .../hsz/service/MentenceStService.java | 2 +- 6 files changed, 29 insertions(+), 23 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 2bba162..e707037 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java @@ -67,10 +67,10 @@ public class MentencePlanController extends AbstractCommonFileController { if(sessionUser == null){ throw new IllegalArgumentException("未登录"); } - Long userId = sessionUser.getUserId(); - if(!userId.equals(dto.getCreateId())){ - throw new IllegalArgumentException("对不起，您没有编辑的权限"); - } +// Long userId = sessionUser.getUserId(); +// if(!userId.equals(dto.getCreateId())){ +// throw new IllegalArgumentException("对不起，您没有编辑的权限"); +// } boolean flag = mentencePlanService.update(dto); if (flag) { fileService.saveFile(dto.getFiles(), getGroupId(), dto.getId().toString()); @@ -92,10 +92,10 @@ public class MentencePlanController extends AbstractCommonFileController { if(sessionUser == null){ throw new IllegalArgumentException("未登录"); } - Long userId = sessionUser.getUserId(); - if(!userId.equals(one.getCreateId())){ - throw new IllegalArgumentException("对不起，您没有编辑的权限"); - } +// Long userId = sessionUser.getUserId(); +// if(!userId.equals(one.getCreateId())){ +// throw new IllegalArgumentException("对不起，您没有编辑的权限"); +// } LambdaQueryWrapper queryWrapperDetail = new LambdaQueryWrapper<>(); queryWrapperDetail.eq(MentencePlanDetail::getMentencePlanId, id); //先删细节 @@ -114,10 +114,11 @@ public class MentencePlanController extends AbstractCommonFileController { if(sessionUser == null){ throw new IllegalArgumentException("未登录"); } - Long userId = sessionUser.getUserId(); - if(!userId.toString().equals(dto.getApprovePersonId())){ - 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); diff --git a/src/main/java/com/gunshi/project/hsz/mapper/MentencePlanDetailMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/MentencePlanDetailMapper.java index 8bfce38..62b20f1 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/MentencePlanDetailMapper.java +++ b/src/main/java/com/gunshi/project/hsz/mapper/MentencePlanDetailMapper.java @@ -18,6 +18,7 @@ public interface MentencePlanDetailMapper extends BaseMapper on t1.mentence_st_detail_id = t2.id and t2.is_enable = 0 left join mentence_st t3 on t2.mentence_st_id = t3.id + where t1.mentence_plan_id = #{id} """) List selectDetail(@Param("id") Long id); } 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 b9a3c4d..c7a63dd 100644 --- a/src/main/java/com/gunshi/project/hsz/model/MentencePlanDetail.java +++ b/src/main/java/com/gunshi/project/hsz/model/MentencePlanDetail.java @@ -43,11 +43,11 @@ public class MentencePlanDetail { private String mentenceStName; @TableField("plan_begin") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date planBegin; @TableField("plan_end") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date planEnd; @TableField("charge_person_id") diff --git a/src/main/java/com/gunshi/project/hsz/model/MentenceStDetail.java b/src/main/java/com/gunshi/project/hsz/model/MentenceStDetail.java index 307da74..0b15717 100644 --- a/src/main/java/com/gunshi/project/hsz/model/MentenceStDetail.java +++ b/src/main/java/com/gunshi/project/hsz/model/MentenceStDetail.java @@ -27,7 +27,7 @@ public class MentenceStDetail { @TableField("name") @Schema(description = "维护项目名称") - private String name; + private String stDetailName; @TableField("context") @Schema(description = "维护内容") 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 2e72d47..4102263 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java @@ -61,10 +61,13 @@ public class MentencePlanService extends ServiceImpl{ detail.setId(IdWorker.getId()); detail.setMentencePlanId(dto.getId()); - SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(detail.getChargePersonId())); - if(sysUser != null){ - detail.setChargePersonName(sysUser.getNickName()); - } +// 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("请添加维护内容"); @@ -88,14 +91,15 @@ public class MentencePlanService extends ServiceImpl queryWrapperDetail = new LambdaQueryWrapper<>(); queryWrapperDetail.eq(MentencePlanDetail::getMentencePlanId,mentencePlan.getId()); int delete = mentencePlanDetailMapper.delete(queryWrapperDetail); - //再插入 - details.stream().forEach(detail->{ - detail.setId(IdWorker.getId()); + details.forEach(o ->{ + o.setId(IdWorker.getId()); + o.setMentencePlanId(dto.getId()); }); mentencePlanDetailMapper.insert(details); return true; diff --git a/src/main/java/com/gunshi/project/hsz/service/MentenceStService.java b/src/main/java/com/gunshi/project/hsz/service/MentenceStService.java index 948b1d7..2a31340 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MentenceStService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MentenceStService.java @@ -56,7 +56,7 @@ public class MentenceStService extends ServiceImpl MentenceSt mentenceSt = iterator.next(); LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); if(!StringUtils.isBlank(dto.getStDetailName())){ - queryWrapper2.like(MentenceStDetail::getName, dto.getStDetailName()); + queryWrapper2.like(MentenceStDetail::getStDetailName, dto.getStDetailName()); } queryWrapper2.eq(MentenceStDetail::getMentenceStId,mentenceSt.getId()); queryWrapper2.eq(MentenceStDetail::getIsEnable,0);