2022年8月16日17点40分

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -815,7 +815,8 @@ public class ProjectController {
 			.le(StringUtils.isNotBlank(beginEndTime), ServiceProjectItem::getBeginTime, beginEndTime)
 			.ge(StringUtils.isNotBlank(actualDateStart), ServiceProjectItem::getActualDate, actualDateStart)
 			.le(StringUtils.isNotBlank(actualDateEnd), ServiceProjectItem::getActualDate, actualDateEnd)
-			.like(StringUtils.isNotBlank(sysNo), ServiceProjectItem::getSysNo, sysNo);
+			.like(StringUtils.isNotBlank(sysNo), ServiceProjectItem::getSysNo, sysNo)
+			.orderByDesc(ServiceProjectItem::getCreateTime);
 
 
 		LambdaQueryWrapper<ServiceProject> lambdaQueryWrapper = new LambdaQueryWrapper<>();

blade-service/blade-project/src/main/java/org/springblade/project/handler/LocateJobHandler.java → blade-service/blade-project/src/main/java/org/springblade/project/handler/TaskCompleteJobHandler.java

@@ -23,7 +23,7 @@ import java.util.concurrent.*;
 
 @Component
 @AllArgsConstructor
-public class LocateJobHandler {
+public class TaskCompleteJobHandler {
 
 	@Autowired
 	private ServiceProjectItemService serviceProjectItemService;
@@ -31,7 +31,7 @@ public class LocateJobHandler {
 	private final IMessageClient iMessageClient;
 
 	@XxlJob("taskCompleteJobHandler")
-	public ReturnT<String> locateJobHandler(String param) throws Exception {
+	public ReturnT<String> taskCompleteJobHandler(String param) throws Exception {
 		// 创建线程池
 		ExecutorService pool = new ThreadPoolExecutor(5, 200, 0L,
 			TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(1024),

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/HandoverServiceImpl.java

@@ -266,6 +266,7 @@ public class HandoverServiceImpl extends ServiceImpl<HandoverMapper, Handover> i
 			throw new SecurityException("审批失败");
 		}
 		handover.setStatus(0);
+		handover.setConfirmStatus(0);
 		baseMapper.updateById(handover);
 		editItemStatus(id, 0);
 	}