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

维护养护

master
yangzhe123 2025-09-09 16:15:40 +08:00
parent dd83c6f662
commit 0927bb6259
6 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<MentencePlanDetail> 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<MentencePlan> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MentencePlan::getId, dto.getId());
MentencePlan one = mentencePlanService.getOne(queryWrapper);

1
src/main/java/com/gunshi/project/hsz/mapper/MentencePlanDetailMapper.java
View File

@ -18,6 +18,7 @@ public interface MentencePlanDetailMapper extends BaseMapper<MentencePlanDetail>
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<MentencePlanDetail> selectDetail(@Param("id") Long id);
}

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

@ -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")

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

@ -27,7 +27,7 @@ public class MentenceStDetail {
@TableField("name")
@Schema(description = "维护项目名称")
private String name;
private String stDetailName;
@TableField("context")
@Schema(description = "维护内容")

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

@ -61,10 +61,13 @@ 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(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<MentencePlanMapper, Menten
if(details == null || details.isEmpty()){
throw new IllegalArgumentException("至少需要一条维护内容");
}
//先删除细节
LambdaQueryWrapper<MentencePlanDetail> 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;

2
src/main/java/com/gunshi/project/hsz/service/MentenceStService.java
View File

@ -56,7 +56,7 @@ public class MentenceStService extends ServiceImpl<MentenceStMapper, MentenceSt>
MentenceSt mentenceSt = iterator.next();
LambdaQueryWrapper<MentenceStDetail> 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);