|
|
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
|
|
|
public class TaskInfoServiceImpl extends BaseServiceImpl<TaskInfoMapper, TaskInfo> implements TaskInfoService {
|
|
|
|
|
|
private final JdbcTemplate jdbcTemplate;
|
|
|
- private final PlanInfoServiceImpl planInfoServiceImpl;
|
|
|
+ //private final PlanInfoServiceImpl planInfoServiceImpl;
|
|
|
|
|
|
@Override
|
|
|
public boolean taskSubmit(TaskInfo obj) {
|
|
|
@@ -74,12 +74,12 @@ public class TaskInfoServiceImpl extends BaseServiceImpl<TaskInfoMapper, TaskInf
|
|
|
if (("1").equals(dto.getType()) || ("3").equals(dto.getType())) {
|
|
|
//我的任务、全部任务
|
|
|
List<Long> taskIds = null;
|
|
|
- if (ObjectUtil.isNotEmpty(dto.getPlanDept())) {
|
|
|
+ /*if (ObjectUtil.isNotEmpty(dto.getPlanDept())) {
|
|
|
//获取对应部门计划任务信息
|
|
|
List<PlanInfo> planInfos = planInfoServiceImpl.getBaseMapper().selectList(Wrappers.<PlanInfo>lambdaQuery().eq(PlanInfo::getPlanDept, dto.getPlanDept()));
|
|
|
List<Long> planIds = planInfos.stream().map(PlanInfo::getId).collect(Collectors.toList());
|
|
|
taskIds = jdbcTemplate.queryForList("select task_id from c_control_plan_task_record where plan_id in(" + StringUtils.join(planIds, ",") + ")", Long.class);
|
|
|
- }
|
|
|
+ }*/
|
|
|
QueryWrapper<TaskInfo> queryWrapper = Condition.getQueryWrapper(dto);
|
|
|
if (("1").equals(dto.getType())) {
|
|
|
if (ObjectUtil.isEmpty(SecureUtil.getUserId())) {
|
liuyc