liuchengqian/xkrs_work
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改了成员的加入和退出的功能模块

Browse Source
This commit is contained in:
DESKTOP-G8BCEP0\HP
2021-08-25 11:07:43 +08:00
parent 166d34bcd2
commit a875905347
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/xkrs/service/impl/MemberProjectServiceImpl.java
View File

@@ -69,19 +69,6 @@ public class MemberProjectServiceImpl implements MemberProjectService {
memberProject.setMemberProjectNumber(projectNumber);
memberProject.setMemberId(sysUserEntity.getId());
memberProject.setJoinTime(DateTimeUtil.dateTimeToString(LocalDateTime.now()));
if("QT".equals(projectNumber.substring(0,2))){
memberProject.setApplicationType("1");
memberProjectDao.save(memberProject);
WorkHourRecord workHourRecord = new WorkHourRecord();
workHourRecord.setWorkContent("优化");
workHourRecord.setWorkHour(0);
workHourRecord.setUserId(sysUserEntity.getId());
workHourRecord.setProjectNumber(projectNumber);
workHourRecord.setColor("1");
workHourRecord.setSubmitTime(DateTimeUtil.dateTimeToString(LocalDateTime.now()));
workHourRecordDao.save(workHourRecord);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,"加入成功",locale);
}
memberProject.setApplicationType("1");
memberProjectDao.save(memberProject);
WorkHourRecord workHourRecord = new WorkHourRecord();
@@ -119,7 +106,7 @@ public class MemberProjectServiceImpl implements MemberProjectService {
}
ResponsibleProject projectNumber1 = responsibleProjectDao.findByPrincipalIdAndResponsibleProjectNumber(sysUserEntity.getId(), projectNumber);
if(projectNumber1 != null){
return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL,"您已是负责人，请先移交权限再退出",locale);
return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL,"您已是负责人，请联系管理员退出",locale);
}
memberProjectDao.deleteByMemberIdAndMemberProjectNumber(sysUserEntity.getId(),projectNumber);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,"退出成功",locale);

5
src/main/java/com/xkrs/service/impl/ResponsibleProjectServiceImpl.java
View File

@@ -135,6 +135,7 @@ public class ResponsibleProjectServiceImpl implements ResponsibleProjectService
/**
* 管理员把项目授权给加入该项目的某个成员
* @param projectNumber
@@ -178,6 +179,9 @@ public class ResponsibleProjectServiceImpl implements ResponsibleProjectService
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,"撤销授权成功",locale);
}
//--------------------------------------------------------------------------------------*
/**
* 负责人移除成员
* @param memberId
@@ -222,4 +226,5 @@ public class ResponsibleProjectServiceImpl implements ResponsibleProjectService
public List<String> selectProjectNumberByPrincipalIds(Integer userId) {
return responsibleProjectDao.selectProjectNumberByPrincipalId(userId,"0");
}
// --------------------------------------------------------------------*
}