yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

维护养护

master
yangzhe123 2025-09-05 16:11:41 +08:00
parent 76d9114129
commit e5704509f7
5 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java
View File

@ -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);
}

5
src/main/java/com/gunshi/project/hsz/model/MentencePlanDetail.java
View File

@ -53,4 +53,9 @@ public class MentencePlanDetail {
@TableField("charge_person_id")
private String chargePersonId;
@TableField("charge_person_name")
private String chargePersonName;
}

17
src/main/java/com/gunshi/project/hsz/service/MentenceFarmerRecordService.java
View File

@ -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<MentenceFarmerRecor
@Autowired
private HiddenInfoMapper hiddenInfoMapper;
@Autowired
private SysUserMapper sysUserMapper;
public boolean saveDate(MentenceFarmerRecord dto) {
LambdaQueryWrapper<MentenceFarmerRecord> query = new LambdaQueryWrapper<>();
query.eq(MentenceFarmerRecord::getMentenceStDetailId, dto.getMentenceStDetailId());
@ -52,6 +57,12 @@ public class MentenceFarmerRecordService extends ServiceImpl<MentenceFarmerRecor
}
dto.setFillTime(new Date());
dto.setId(IdWorker.getId());
if(dto.getMentencePersonId() != null){
SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(dto.getMentencePersonId()));
if(sysUser != null){
dto.setMentencePersonName(sysUser.getNickName());
}
}
save(dto);
List<HiddenInfo> details = dto.getDetails();
if(details.isEmpty()){
@ -72,6 +83,12 @@ public class MentenceFarmerRecordService extends ServiceImpl<MentenceFarmerRecor
if(Objects.isNull(mentenceFarmerRecord)){
throw new IllegalArgumentException("该日常养护记录不存在");
}
if(dto.getMentencePersonId() != null){
SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(dto.getMentencePersonId()));
if(sysUser != null){
dto.setMentencePersonName(sysUser.getNickName());
}
}
updateById(dto);
LambdaQueryWrapper<HiddenInfo> queryHiddenWrapper= new LambdaQueryWrapper<>();
queryHiddenWrapper.eq(HiddenInfo::getMentenceFarmerRecordId,dto.getId());

9
src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java
View File

@ -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<MentencePlanMapper, Menten
@Autowired
private MentencePlanDetailMapper mentencePlanDetailMapper;
@Autowired
private SysUserMapper sysUserMapper;
public boolean saveData(MentencePlan dto) {
String planName = dto.getPlanName();//计划名称
String planYear = dto.getPlanYear();//计划年份
@ -53,6 +58,10 @@ public class MentencePlanService extends ServiceImpl<MentencePlanMapper, Menten
details.stream().forEach(detail->{
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("请添加维护内容");

13
src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java
View File

@ -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<MentenceTemplateMapper, MentenceTemplate> {
@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;
}