|
|
|
@ -189,7 +189,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
detailEntity.setCreateTime(new Date()); |
|
|
|
|
detailEntity.setTenantId(user.getTenantId()); |
|
|
|
|
detailEntity.setCreateUser(user.getUserId()); |
|
|
|
|
detailEntity.setCreateDept(Long.valueOf(user.getDeptId())); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Long deptId =getDeptByMaxDept(user.getDeptId()); |
|
|
|
|
detailEntity.setCreateDept(deptId); |
|
|
|
|
detailEntity.setIsDeleted(0); |
|
|
|
|
detailEntity.setStatus(1); |
|
|
|
|
detailEntity.setQuestId(taskQuest); |
|
|
|
@ -330,6 +333,22 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 获取用户部门最大的部门ID |
|
|
|
|
* @param deptId |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
private Long getDeptByMaxDept(String deptId) { |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
String[] split = deptId.split(","); |
|
|
|
|
return Long.parseLong(split[0]); |
|
|
|
|
}catch (Exception e){ |
|
|
|
|
throw new CustomerException("最大部门获取失败"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 生成Id |
|
|
|
|
* @return |
|
|
|
@ -354,7 +373,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
detailEntity.setCreateTime(new Date()); |
|
|
|
|
detailEntity.setTenantId(user.getTenantId()); |
|
|
|
|
detailEntity.setCreateUser(user.getUserId()); |
|
|
|
|
detailEntity.setCreateDept(Long.valueOf(user.getDeptId())); |
|
|
|
|
detailEntity.setCreateDept(getDeptByMaxDept(user.getDeptId())); |
|
|
|
|
detailEntity.setIsDeleted(0); |
|
|
|
|
detailEntity.setStatus(1); |
|
|
|
|
detailEntity.setQuestId(taskQuest); |
|
|
|
@ -435,7 +454,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
detailEntity.setCreateTime(new Date()); |
|
|
|
|
detailEntity.setTenantId(user.getTenantId()); |
|
|
|
|
detailEntity.setCreateUser(user.getUserId()); |
|
|
|
|
detailEntity.setCreateDept(Long.valueOf(user.getDeptId())); |
|
|
|
|
detailEntity.setCreateDept(getDeptByMaxDept(user.getDeptId())); |
|
|
|
|
detailEntity.setIsDeleted(0); |
|
|
|
|
detailEntity.setStatus(1); |
|
|
|
|
detailEntity.setQuestId(taskQuest); |
|
|
|
@ -783,7 +802,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
QuestDetailEntity questDetail = new QuestDetailEntity(); |
|
|
|
|
BeanUtil.copyProperties(i,questDetail); |
|
|
|
|
questDetail.setTenantId(user.getTenantId()); |
|
|
|
|
questDetail.setCreateDept(Long.valueOf(user.getDeptId())); |
|
|
|
|
questDetail.setCreateDept(getDeptByMaxDept(user.getDeptId())); |
|
|
|
|
questDetail.setCreateTime(new Date()); |
|
|
|
|
questDetail.setIsDeleted(0); |
|
|
|
|
questDetail.setStatus(1); |
|
|
|
@ -2874,7 +2893,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
questDetailChildEntity = new QuestDetailChildEntity(); |
|
|
|
|
questDetailChildEntity.setTenantId(user.getTenantId()); |
|
|
|
|
questDetailChildEntity.setCreateUser(user.getUserId()); |
|
|
|
|
questDetailChildEntity.setCreateDept(Long.valueOf(user.getDeptId())); |
|
|
|
|
questDetailChildEntity.setCreateDept(getDeptByMaxDept(user.getDeptId())); |
|
|
|
|
questDetailChildEntity.setCreateTime(new Date()); |
|
|
|
|
questDetailChildEntity.setIsDeleted(0); |
|
|
|
|
questDetailChildEntity.setStatus(1); |
|
|
|
|