ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

4.299

recovery
hyy-alt 4 years ago
parent
ac25103eeb 586af9fe0d
commit
225c32b8c4
4 changed files with 88 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
  2. 146
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
  3. 1
      tall/src/main/resources/mapper_dao/ProMemberDao.xml
  4. 6
      tall/src/main/resources/mapper_dao/ProRoleDao.xml

4
tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
View File

@ -687,7 +687,7 @@ public class ProRoleService implements IProRoleService {
if ((isPm && power < WebConstant.ROLE_POWER.ADMIN_POWER.value) || (!isPm && power < WebConstant.ROLE_POWER.OPERATION_POWER.value)) { if ((isPm && power < WebConstant.ROLE_POWER.ADMIN_POWER.value) || (!isPm && power < WebConstant.ROLE_POWER.OPERATION_POWER.value)) {
throw new BaseException(CodeEnum.NOT_POWER); throw new BaseException(CodeEnum.NOT_POWER);
} }
if(CollectionUtil.isNotEmpty(saveMember.getMemberId())){ // if(CollectionUtil.isNotEmpty(saveMember.getMemberId())){
//删除以前关联的成员 //删除以前关联的成员
ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); ProMemberRoleExample memberRoleExample = new ProMemberRoleExample();
memberRoleExample.createCriteria().andRoleIdEqualTo(saveMember.getRoleId()); memberRoleExample.createCriteria().andRoleIdEqualTo(saveMember.getRoleId());
@ -707,7 +707,7 @@ public class ProRoleService implements IProRoleService {
proMemberRole.setMemberId(memberId); proMemberRole.setMemberId(memberId);
memberRoleDao.insertSelective(proMemberRole); memberRoleDao.insertSelective(proMemberRole);
}); });
} // }
// //检查成员是否为空 // //检查成员是否为空

146
tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
View File

@ -1397,10 +1397,13 @@ public class ProTaskDetailService implements IProTaskDetailService {
if (ObjectUtil.isNotNull(updateTaskInfo.getMilestone())) { if (ObjectUtil.isNotNull(updateTaskInfo.getMilestone())) {
taskDetail.setMilestone(updateTaskInfo.getMilestone()); taskDetail.setMilestone(updateTaskInfo.getMilestone());
} }
//父任务id
if(null != updateTaskInfo.getParentId()){
taskDetail.setParentId(updateTaskInfo.getParentId()); // //父任务id
} // if(null != updateTaskInfo.getParentId()){
// taskDetail.setParentId(updateTaskInfo.getParentId());
// }
//时间 //时间
if (ObjectUtil.isNotNull(updateTaskInfo.getBeginTime()) || if (ObjectUtil.isNotNull(updateTaskInfo.getBeginTime()) ||
ObjectUtil.isNotNull(updateTaskInfo.getEndTime()) || ObjectUtil.isNotNull(updateTaskInfo.getEndTime()) ||
@ -1494,34 +1497,48 @@ public class ProTaskDetailService implements IProTaskDetailService {
} }
}); });
} }
//修改项目信息 当前的项目
if(ObjectUtil.isNotNull(updateTaskInfo.getId())){ //修改任务所属的项目
if(ObjectUtil.isNotNull(updateTaskInfo.getProjectId())){ if (ObjectUtil.isNotNull(updateTaskInfo.getProjectId())) {
if(ObjectUtil.isNotNull(updateTaskInfo.getParentId())){ if (ObjectUtil.isNotNull(updateTaskInfo.getParentId())) {
//检查父任务在不在移动后的项目下，不在的话提示错误信息 该任务不在该项目下，在的话则修改项目信息 //检查父任务在不在移动后的项目下，不在的话提示错误信息 该任务不在该项目下，在的话则修改项目信息
//B项目updateTaskInfo.getProjectId() 父任务updateTaskInfo.getParentId() //B项目updateTaskInfo.getProjectId() 父任务updateTaskInfo.getParentId()
ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample(); ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
proTaskDetailExample.createCriteria().andIdEqualTo(updateTaskInfo.getParentId()).andProjectIdEqualTo(updateTaskInfo.getProjectId()); proTaskDetailExample.createCriteria().andIdEqualTo(updateTaskInfo.getParentId()).andProjectIdEqualTo(updateTaskInfo.getProjectId());
long l = taskDetailDao.countByExample(proTaskDetailExample); long l = taskDetailDao.countByExample(proTaskDetailExample);
if(l > 0 ){ if (l > 0) {
throw new BaseException(CodeEnum.NOT_TASK); // throw new BaseException(CodeEnum.NOT_TASK);
}else { //在的话则修改项目信息 taskDetail.setProjectId(updateTaskInfo.getProjectId());
taskDetail.setId(updateTaskInfo.getId()); taskDetail.setParentId(updateTaskInfo.getParentId());
taskDetail.setParentId(updateTaskInfo.getParentId()); } else { //在的话则修改项目信息
taskDetail.setProjectId(updateTaskInfo.getProjectId()); throw new BaseException(CodeEnum.PARENT_PROJECT_NOT_MATCHING);
taskDetailDao.updateByPrimaryKeySelective(taskDetail);
}
}
//把这个任务当作父任务，如果原来任务下的父任务有值 设置为0，修改项目信息
//taskDetail = taskDetailDao.selectByPrimaryKey(updateTaskInfo.getId()); //任务详情
if(ObjectUtil.isNotNull(taskDetail.getParentId())){
taskDetail.setParentId(0L);
taskDetailDao.updateByPrimaryKeySelective(taskDetail);
} }
taskDetail.setId(updateTaskInfo.getId()); } else {
taskDetail.setParentId(0L);
taskDetail.setProjectId(updateTaskInfo.getProjectId()); taskDetail.setProjectId(updateTaskInfo.getProjectId());
taskDetailDao.updateByPrimaryKeySelective(taskDetail);
} }
//将此任务以前的子任务的父id改成0
ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
proTaskDetailExample.createCriteria().andParentIdEqualTo(taskDetail.getId());
List<ProTaskDetail> proTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample);
if(CollectionUtil.isNotEmpty(proTaskDetailList)){
proTaskDetailList.forEach(proTaskDetail -> {
proTaskDetail.setParentId(0L);
taskDetailDao.updateByPrimaryKeySelective(proTaskDetail);
});
}
} else {
//父任务id
if (null != updateTaskInfo.getParentId()) {
ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
proTaskDetailExample.createCriteria().andIdEqualTo(updateTaskInfo.getParentId()).andProjectIdEqualTo(taskDetail.getProjectId());
long l = taskDetailDao.countByExample(proTaskDetailExample);
if (l <= 0) {
throw new BaseException(CodeEnum.PARENT_PROJECT_NOT_MATCHING);
}
taskDetail.setParentId(updateTaskInfo.getParentId());
}
} }
//修改数据 //修改数据
@ -1758,44 +1775,47 @@ public class ProTaskDetailService implements IProTaskDetailService {
* 新增和修改交付物 * 新增和修改交付物
* @param jiaoFuWu * @param jiaoFuWu
*/ */
@Override
public void addAndUpdateJiaoFuWu(TaskDto.JiaoFuWu jiaoFuWu) {
ProTaskDeliverExample proTaskDeliverExample=new ProTaskDeliverExample();
ProTaskDeliver proTaskDeliver=new ProTaskDeliver();
if(jiaoFuWu.getId()!=null && StringUtils.isNotBlank(jiaoFuWu.getNames())){
//修改
proTaskDeliver.setId(jiaoFuWu.getId());
proTaskDeliver.setName(jiaoFuWu.getNames());
proTaskDeliverExample.createCriteria().andIdEqualTo(jiaoFuWu.getId()).andRecStatusEqualTo((byte) 0);
proTaskDeliverMapper.updateByExampleSelective(proTaskDeliver,proTaskDeliverExample);
}else if(jiaoFuWu.getId()==null && StringUtils.isNotBlank(jiaoFuWu.getNames())) {
//新增
proTaskDeliver.setId(snowflake.nextId());
proTaskDeliver.setName(jiaoFuWu.getNames());
proTaskDeliverMapper.insertSelective(proTaskDeliver);
}
} // @Override
// public void addAndUpdateJiaoFuWu(TaskDto.JiaoFuWu jiaoFuWu) {
// ProTaskDeliverExample proTaskDeliverExample=new ProTaskDeliverExample();
// ProTaskDeliver proTaskDeliver=new ProTaskDeliver();
// if(jiaoFuWu.getId()!=null && StringUtils.isNotBlank(jiaoFuWu.getNames())){
// //修改
// proTaskDeliver.setId(jiaoFuWu.getId());
// proTaskDeliver.setName(jiaoFuWu.getNames());
// proTaskDeliverExample.createCriteria().andIdEqualTo(jiaoFuWu.getId()).andRecStatusEqualTo((byte) 0);
// proTaskDeliverMapper.updateByExampleSelective(proTaskDeliver,proTaskDeliverExample);
// }else if(jiaoFuWu.getId()==null && StringUtils.isNotBlank(jiaoFuWu.getNames())) {
// //新增
// proTaskDeliver.setId(snowflake.nextId());
// proTaskDeliver.setName(jiaoFuWu.getNames());
// proTaskDeliverMapper.insertSelective(proTaskDeliver);
// }
//
// }
/** /**
* 新增和修改输入文档 * 新增和修改输入文档
* @param jiaoFuWu * @param jiaoFuWu
*/ */
@Override
public void addAndUpdateShuWuWenDang(TaskDto.JiaoFuWu jiaoFuWu) { // @Override
ProTaskInputDocExample proTaskDeliverExample=new ProTaskInputDocExample(); // public void addAndUpdateShuWuWenDang(TaskDto.JiaoFuWu jiaoFuWu) {
ProTaskInputDoc proTaskDeliver=new ProTaskInputDoc(); // ProTaskInputDocExample proTaskDeliverExample=new ProTaskInputDocExample();
if(jiaoFuWu.getId()!=null && StringUtils.isNotBlank(jiaoFuWu.getNames())){ // ProTaskInputDoc proTaskDeliver=new ProTaskInputDoc();
//修改 // if(jiaoFuWu.getId()!=null && StringUtils.isNotBlank(jiaoFuWu.getNames())){
proTaskDeliver.setId(jiaoFuWu.getId()); // //修改
proTaskDeliver.setName(jiaoFuWu.getNames()); // proTaskDeliver.setId(jiaoFuWu.getId());
proTaskDeliverExample.createCriteria().andIdEqualTo(jiaoFuWu.getId()).andRecStatusEqualTo((byte) 0); // proTaskDeliver.setName(jiaoFuWu.getNames());
proTaskInputDocDao.updateByExampleSelective(proTaskDeliver,proTaskDeliverExample); // proTaskDeliverExample.createCriteria().andIdEqualTo(jiaoFuWu.getId()).andRecStatusEqualTo((byte) 0);
}else if(jiaoFuWu.getId()==null && StringUtils.isNotBlank(jiaoFuWu.getNames())) { // proTaskInputDocDao.updateByExampleSelective(proTaskDeliver,proTaskDeliverExample);
//新增 // }else if(jiaoFuWu.getId()==null && StringUtils.isNotBlank(jiaoFuWu.getNames())) {
proTaskDeliver.setId(snowflake.nextId()); // //新增
proTaskDeliver.setName(jiaoFuWu.getNames()); // proTaskDeliver.setId(snowflake.nextId());
proTaskInputDocDao.insertSelective(proTaskDeliver); // proTaskDeliver.setName(jiaoFuWu.getNames());
} // proTaskInputDocDao.insertSelective(proTaskDeliver);
} // }
// }
} }

1
tall/src/main/resources/mapper_dao/ProMemberDao.xml
View File

@ -198,6 +198,7 @@
(r.rec_status = 0 or r.rec_status is null) (r.rec_status = 0 or r.rec_status is null)
and and
m.project_id = #{projectId} m.project_id = #{projectId}
and mr.rec_status = 0
</select> </select>
<select id="getMemberInfoByMemberId" parameterType="java.util.Map" resultMap="memberInfos"> <select id="getMemberInfoByMemberId" parameterType="java.util.Map" resultMap="memberInfos">

6
tall/src/main/resources/mapper_dao/ProRoleDao.xml
View File

@ -82,8 +82,8 @@
pr.relevance_project_id as relevanceProjectId, pr.relevance_project_id as relevanceProjectId,
(SELECT `name` FROM t_sys_project WHERE id = pr.relevance_project_id) as relevanceProjectName (SELECT `name` FROM t_sys_project WHERE id = pr.relevance_project_id) as relevanceProjectName
from t_pro_role pr from t_pro_role pr
LEFT JOIN t_pro_member_role mr ON mr.role_id = pr.id LEFT JOIN t_pro_member_role mr ON mr.role_id = pr.id AND mr.rec_status = 0
LEFT JOIN t_pro_member m ON mr.member_id = m.id LEFT JOIN t_pro_member m ON mr.member_id = m.id AND m.rec_status = 0
where where
pr.project_id = #{projectId} pr.project_id = #{projectId}
and and
@ -92,8 +92,6 @@
pr.name not IN ('全体成员','观众','MVP') pr.name not IN ('全体成员','观众','MVP')
AND AND
pr.rec_status = 0 pr.rec_status = 0
AND (mr.rec_status = 0 or mr.rec_status is null)
AND (m.rec_status = 0 or m.rec_status is null)
</select> </select>
<select id="selectSecondRolesShowByProjectId" parameterType="java.util.Map" <select id="selectSecondRolesShowByProjectId" parameterType="java.util.Map"
resultMap="resultMap_ProRoleInfo"> resultMap="resultMap_ProRoleInfo">

Write Preview
Loading…
Cancel
Save