From a875905347bb0bfb0e97710af460ef61c6000db8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G8BCEP0\\HP" <2037158277@qq.com> Date: Wed, 25 Aug 2021 11:07:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=88=90=E5=91=98?= =?UTF-8?q?=E7=9A=84=E5=8A=A0=E5=85=A5=E5=92=8C=E9=80=80=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MemberProjectServiceImpl.java | 15 +-------------- .../impl/ResponsibleProjectServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/xkrs/service/impl/MemberProjectServiceImpl.java b/src/main/java/com/xkrs/service/impl/MemberProjectServiceImpl.java index 46e12a9..cacd048 100644 --- a/src/main/java/com/xkrs/service/impl/MemberProjectServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/MemberProjectServiceImpl.java @@ -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); diff --git a/src/main/java/com/xkrs/service/impl/ResponsibleProjectServiceImpl.java b/src/main/java/com/xkrs/service/impl/ResponsibleProjectServiceImpl.java index 946c06a..aacab8c 100644 --- a/src/main/java/com/xkrs/service/impl/ResponsibleProjectServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/ResponsibleProjectServiceImpl.java @@ -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 selectProjectNumberByPrincipalIds(Integer userId) { return responsibleProjectDao.selectProjectNumberByPrincipalId(userId,"0"); } + // --------------------------------------------------------------------* }