From 399023401b33a02b97a7f26ce165d68aee9f18e4 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 23 Mar 2022 09:14:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?20220323=E6=B7=BB=E5=8A=A0=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E9=A1=B9=E7=9B=AESDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/ptccsens/service/TallService.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/main/java/com/ccsens/ptccsens/service/TallService.java b/src/main/java/com/ccsens/ptccsens/service/TallService.java index e659150..80f246b 100644 --- a/src/main/java/com/ccsens/ptccsens/service/TallService.java +++ b/src/main/java/com/ccsens/ptccsens/service/TallService.java @@ -9,8 +9,10 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.ccsens.ptccsens.bean.dto.FinanceDto; import com.ccsens.ptccsens.bean.po.ProRole; +import com.ccsens.ptccsens.bean.po.ProTaskDetail; import com.ccsens.ptccsens.bean.po.ProTaskSub; import com.ccsens.ptccsens.bean.po.ProUser; +import com.ccsens.ptccsens.bean.vo.ClockingInVo; import com.ccsens.ptccsens.bean.vo.DeliverVo; import com.ccsens.ptccsens.bean.vo.FinanceVo; import com.ccsens.ptccsens.persist.dao.*; @@ -80,6 +82,8 @@ public class TallService implements ITallService { private FinanceService financeService; @Resource private IExportService exportService; + @Resource + private PowerService powerService; @SneakyThrows @Override @@ -736,4 +740,31 @@ public class TallService implements ITallService { return queryTaskList; } + + @Override + public void deleteProject(String token, TallProjectDto.ProjectById params) { + //根据token获取用户信息 + TallTokenVo.UserIdByToken userByToken = TokenUtil.getUserByToken(new TallTokenDto.GetUserByToken(token, Constant.APP_ID, Constant.APP_SECRET)); + if(ObjectUtil.isNull(userByToken)){ + throw new BaseException(CodeEnum.NOT_LOGIN); + } + //通过手机号获取用户在服务内的userId + ProUser user = null; + if(ObjectUtil.isNotNull(userByToken) && StrUtil.isNotBlank(userByToken.getPhone())){ + user = userDao.getUserIdByPhone(userByToken.getPhone()); + } + if(ObjectUtil.isNull(user)){ + throw new BaseException(BasicsCodeError.NOT_USER_SERVER); + } + //判断用户是否是项目经理 + Integer power = powerService.queryUserPower(params.getProjectId(), user.getId()); + if (power < 1) { + throw new BaseException(BasicsCodeError.NO_POWER); + } + //TODO 删除项目 暂时只删除项目 + ProTaskDetail project = new ProTaskDetail(); + project.setId(params.getProjectId()); + project.setRecStatus((byte) 2); + taskDetailDao.updateByPrimaryKeySelective(project); + } } From 7c756d06aaf63619568e4b7f6a1bdf92e6c19edd Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 23 Mar 2022 15:09:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?20220323=E4=BF=AE=E6=94=B9=E5=AF=BC?= =?UTF-8?q?=E5=85=A5wbs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ccsens/ptccsens/service/ImportService.java | 4 ++-- src/main/java/com/ccsens/ptccsens/service/TallService.java | 4 +++- src/main/resources/mapper_dao/PluDeliverDao.xml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ccsens/ptccsens/service/ImportService.java b/src/main/java/com/ccsens/ptccsens/service/ImportService.java index 05d19f1..06cbe8c 100644 --- a/src/main/java/com/ccsens/ptccsens/service/ImportService.java +++ b/src/main/java/com/ccsens/ptccsens/service/ImportService.java @@ -782,7 +782,7 @@ public class ImportService implements IImportService { roleTask.setTaskId(taskDetail.getId()); roleTaskMapper.insertSelective(roleTask); }else { - throw new BaseException(BasicsCodeError.WBS_NOT_FIND_ROLE.addMsg(wbsSheet.getSheetName(),i+1,executorRole)); + throw new BaseException(BasicsCodeError.WBS_NOT_FIND_ROLE.addMsg(wbsSheet.getSheetName(),i+1,checkerRole)); } //处理时间、添加任务分解、添加任务标签 @@ -930,7 +930,7 @@ public class ImportService implements IImportService { // Long timeLabel = subLabelDao.getLabelByTypeAndLevel(0, 4); // saveLabelTask(taskDetailId,timeLabel); }catch (Exception e){ - Date startDate = new Date(project.getBeginTime()); + Date startDate = new Date(project.getBeginTime() - 1L); Date endDate = new Date(project.getEndTime()); try { List taskDateList = diff --git a/src/main/java/com/ccsens/ptccsens/service/TallService.java b/src/main/java/com/ccsens/ptccsens/service/TallService.java index 80f246b..53b90f9 100644 --- a/src/main/java/com/ccsens/ptccsens/service/TallService.java +++ b/src/main/java/com/ccsens/ptccsens/service/TallService.java @@ -759,12 +759,14 @@ public class TallService implements ITallService { //判断用户是否是项目经理 Integer power = powerService.queryUserPower(params.getProjectId(), user.getId()); if (power < 1) { - throw new BaseException(BasicsCodeError.NO_POWER); + throw new BaseException(BasicsCodeError.NO_POWER); } //TODO 删除项目 暂时只删除项目 ProTaskDetail project = new ProTaskDetail(); project.setId(params.getProjectId()); project.setRecStatus((byte) 2); taskDetailDao.updateByPrimaryKeySelective(project); + //删除任务 + //删除角色 } } diff --git a/src/main/resources/mapper_dao/PluDeliverDao.xml b/src/main/resources/mapper_dao/PluDeliverDao.xml index 58a2ee7..49e30d0 100644 --- a/src/main/resources/mapper_dao/PluDeliverDao.xml +++ b/src/main/resources/mapper_dao/PluDeliverDao.xml @@ -240,7 +240,7 @@ LEFT JOIN t_pro_member m on c.checker_id = m.id and m.rec_status = 0 WHERE c.deliver_record_id = #{deliverRecordId} - and c.rec_status = 0 + and cl.rec_status = 0 ORDER BY cl.time DESC \ No newline at end of file