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