From e5704509f72fa69f78f9e17834778ede07f60bc2 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Fri, 5 Sep 2025 16:11:41 +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 --- .../hsz/controller/MentencePlanController.java | 1 + .../project/hsz/model/MentencePlanDetail.java | 5 +++++ .../service/MentenceFarmerRecordService.java | 17 +++++++++++++++++ .../hsz/service/MentencePlanService.java | 9 +++++++++ .../hsz/service/MentenceTemplateService.java | 13 +++++++++++++ 5 files changed, 45 insertions(+) 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 7b30693..2bba162 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java @@ -124,6 +124,7 @@ public class MentencePlanController extends AbstractCommonFileController { if(Objects.isNull(one)){ throw new RuntimeException("该计划不存在"); } + dto.setApprovePersonName(sessionUser.getUserName()); mentencePlanService.updateById(dto); return R.ok(true); } 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 45005fc..b9a3c4d 100644 --- a/src/main/java/com/gunshi/project/hsz/model/MentencePlanDetail.java +++ b/src/main/java/com/gunshi/project/hsz/model/MentencePlanDetail.java @@ -53,4 +53,9 @@ public class MentencePlanDetail { @TableField("charge_person_id") private String chargePersonId; + @TableField("charge_person_name") + private String chargePersonName; + + + } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/hsz/service/MentenceFarmerRecordService.java b/src/main/java/com/gunshi/project/hsz/service/MentenceFarmerRecordService.java index 7e9a744..2f134ea 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MentenceFarmerRecordService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MentenceFarmerRecordService.java @@ -15,6 +15,8 @@ import com.gunshi.project.hsz.mapper.HiddenInfoMapper; import com.gunshi.project.hsz.mapper.MentenceFarmerRecordMapper; import com.gunshi.project.hsz.model.HiddenInfo; import com.gunshi.project.hsz.model.MentenceFarmerRecord; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.mapper.SysUserMapper; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.*; @@ -43,6 +45,9 @@ public class MentenceFarmerRecordService extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(MentenceFarmerRecord::getMentenceStDetailId, dto.getMentenceStDetailId()); @@ -52,6 +57,12 @@ public class MentenceFarmerRecordService extends ServiceImpl details = dto.getDetails(); if(details.isEmpty()){ @@ -72,6 +83,12 @@ public class MentenceFarmerRecordService extends ServiceImpl queryHiddenWrapper= new LambdaQueryWrapper<>(); queryHiddenWrapper.eq(HiddenInfo::getMentenceFarmerRecordId,dto.getId()); 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 7f6b862..99e92c0 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java @@ -16,6 +16,8 @@ import com.gunshi.project.hsz.model.MentencePlan; import com.gunshi.project.hsz.model.MentencePlanDetail; import com.gunshi.project.hsz.model.MentenceSt; import com.gunshi.session.util.SessionUtil; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.mapper.SysUserMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,6 +36,9 @@ 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(details == null || details.isEmpty()){ throw new IllegalArgumentException("请添加维护内容"); 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 3b8a588..d8d8e1a 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java @@ -12,7 +12,10 @@ import com.gunshi.project.hsz.mapper.MentenceTemplateMapper; import com.gunshi.project.hsz.model.MentencePlan; import com.gunshi.project.hsz.model.MentenceSt; import com.gunshi.project.hsz.model.MentenceTemplate; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.mapper.SysUserMapper; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,9 +26,19 @@ import java.util.Objects; @Slf4j @Transactional(rollbackFor = Exception.class) public class MentenceTemplateService extends ServiceImpl { + + @Autowired + private SysUserMapper sysUserMapper; + public boolean saveDate(MentenceTemplate dto) { dto.setId(IdWorker.getId()); dto.setCreateTime(new Date()); + if(dto.getCreateId() != null){ + SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(dto.getCreateId())); + if(sysUser != null){ + dto.setCreateName(sysUser.getUserName()); + } + } save(dto); return true; }