禅道bug修改。

This commit is contained in:
wangzhijiang
2023-03-24 11:23:22 +08:00
parent 3ffed9356c
commit b3230842fd
4 changed files with 11 additions and 3 deletions
@@ -18,7 +18,7 @@ public enum ProjectRoleEnum {
INTERFACE_PERSON1("工程接口人","30","Interface person"),
PERSON_LIABLE1("责任人","31","Person liable"),
// 项目库-认证清单使用。
INTERFACE_PERSON("接口人","20","Interface person"),
INTERFACE_PERSON("工程接口人","20","Interface person"),
PERSON_LIABLE("责任人","21","Person liable"),
;
@@ -105,6 +105,7 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl<AuthDummyIn
Date now = new Date();
authDummyInventoryBaseEO.setCreateTime(now);
authDummyInventoryBaseEO.setUpdateTime(now);
authDummyInventoryBaseEO.setState(InventoryStateEnum.DRAFT.getValue());
save(authDummyInventoryBaseEO);
}
@@ -132,6 +132,7 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
private String sort;
//置顶标识(flag为空的时候为置顶, flag为1的时候取消置顶)
// flag为1时置顶 空时不置顶。
private String flag;
@TableField(exist = false)
@@ -374,8 +374,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)){
projectCertificationInventoryEOS = projectCertificationInventoryEOS.stream().filter(certificationInventory -> {
boolean flag = false;
if(!projectCertificationInventoryEO.getEndTime().equals(certificationInventory.getEndTime())){
flag = true;
if(projectCertificationInventoryEO.getEndTime() != null && certificationInventory.getEndTime() != null){
if(!projectCertificationInventoryEO.getEndTime().equals(certificationInventory.getEndTime())){
flag = true;
}
}
return flag;
}).collect(Collectors.toList());
@@ -412,6 +414,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
projectUserPermissionService.saveBatch(adds);
}
}catch (Exception ex){
ex.printStackTrace();
log.error("批量设置失败:" + ex.getMessage());
throw new JeroBootException("批量设置失败!");
}
return Result.OK("批量设置成功!");
@@ -929,6 +933,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
// 接口人
QueryWrapper<ProjectCertificationInventoryEO> querySdtCountWrap = new QueryWrapper<>();
querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt,loginUser.getId());
querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
Integer sdtCount = this.baseMapper.selectCount(querySdtCountWrap);
if(sdtCount > 0){
SysRole sysRole = new SysRole();
@@ -944,6 +949,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
// 责任人
QueryWrapper<ProjectCertificationInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>();
queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson,loginUser.getId());
queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap);
if(dutyPersonCount > 0){
SysRole sysRole = new SysRole();