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

日常养护记录-计划管理

master
yangzhe123 2025-12-12 14:26:56 +08:00
parent eab482d8c3
commit 389e6e3e18
5 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,24 +106,7 @@ public class MentencePlanController extends AbstractCommonFileController {
@Operation(summary = "审批")
@PostMapping("/approving")
public R<Boolean> 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<MentencePlan> 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);
}

2
src/main/java/com/gunshi/project/hsz/model/MentencePlan.java
View File

@ -42,7 +42,7 @@ public class MentencePlan {
@Schema(description = "创建者id")
private String createId;
@TableField("create_name")
@TableField(exist = false)
@Schema(description = "创建者名称")
private String createName;

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

@ -53,7 +53,7 @@ public class MentencePlanDetail {
@TableField("charge_person_id")
private String chargePersonId;
@TableField("charge_person_name")
@TableField(exist = false)
private String chargePersonName;

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

@ -51,10 +51,6 @@ public class MentencePlanService extends ServiceImpl<MentencePlanMapper, Menten
}
dto.setId(IdWorker.getId());
dto.setCreateDate(new Date());
SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(dto.getCreateId()));
if(sysUser != null){
dto.setCreateName(sysUser.getNickName());
}
dto.setPlanStatus(0);
save(dto);
//保存细节
@ -65,13 +61,6 @@ public class MentencePlanService extends ServiceImpl<MentencePlanMapper, Menten
details.stream().forEach(detail->{
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<MentencePlanMapper, Menten
List<MentencePlan> 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<MentencePlanDetail> 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<MentencePlan> 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);
}
}

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

@ -62,6 +62,7 @@ public class MentenceTemplateService extends ServiceImpl<MentenceTemplateMapper,
if(pageSo.getType() != null){
wrapper.eq(MentenceTemplate::getType,pageSo.getType());
}
wrapper.orderByDesc(MentenceTemplate::getCreateTime);
Page<MentenceTemplate> mentenceTemplatePage = baseMapper.selectPage(pageSo.getPageSo().toPage(), wrapper);
return mentenceTemplatePage;
}