BUG

blade-service/blade-control/src/main/java/org/springblade/control/service/PlanInfoService.java

@@ -5,9 +5,7 @@ import org.springblade.control.dto.PlanInfoDTO;
 import org.springblade.control.entity.PlanInfo;
 import org.springblade.control.vo.PlanInfoVO;
 import org.springblade.core.mp.base.BaseService;
-import org.springframework.stereotype.Service;
 
-@Service
 public interface PlanInfoService extends BaseService<PlanInfo> {
 
     IPage<PlanInfoVO> planPage(IPage<PlanInfo> page, PlanInfoDTO dto);

blade-service/blade-control/src/main/java/org/springblade/control/service/TaskInfoService.java

@@ -6,11 +6,9 @@ import org.springblade.control.entity.TaskInfo;
 import org.springblade.control.vo.TaskPageVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.secure.BladeUser;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-@Service
 public interface TaskInfoService extends BaseService<TaskInfo> {
 
     boolean taskSubmit(TaskInfo obj);

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/PlanInfoServiceImpl.java

@@ -34,7 +34,6 @@ import java.util.stream.Collectors;
 public class PlanInfoServiceImpl extends BaseServiceImpl<PlanInfoMapper, PlanInfo> implements PlanInfoService {
 
     private final JdbcTemplate jdbcTemplate;
-    private final TaskInfoServiceImpl taskInfoServiceImpl;
 
     @Override
     public IPage<PlanInfoVO> planPage(IPage<PlanInfo> page, PlanInfoDTO dto) {
@@ -102,7 +101,7 @@ public class PlanInfoServiceImpl extends BaseServiceImpl<PlanInfoMapper, PlanInf
                 jdbcTemplate.execute("insert into c_control_plan_task_record(id,plan_id,task_id) values(" + SnowFlakeUtil.getId() + "," + dto.getId() + "," + taskId + ")");
             }
             //修改任务数据状态为提交或暂存（任务数据状态 1=提交数据 2=暂存数据）
-            taskInfoServiceImpl.update(Wrappers.<TaskInfo>lambdaUpdate().set(TaskInfo::getIsSubmitOrSuspend, dto.getTaskDataStatus()).in(TaskInfo::getId, taskIds));
+            jdbcTemplate.execute("update from c_control_task_info set is_submit_or_suspend = " + dto.getTaskDataStatus() + " where id in(" + StringUtils.join(taskIds, ",") + ")");
             return true;
         }
         return false;

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskInfoServiceImpl.java

@@ -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())) {