Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/MetaTaskNew.java

@@ -47,10 +47,6 @@ public class MetaTaskNew extends BaseEntity {
     @ExcelProperty("频道id")
     private Long channelId;
 
-    @ApiModelProperty("是否结束")
-    @ExcelProperty("是否结束")
-    private boolean finish;
-
     @Transient
     private List<MetaTaskBind> metaNodeTask;
 

src/main/java/com/izouma/nineth/repo/MetaTaskNewRepo.java

@@ -17,9 +17,9 @@ public interface MetaTaskNewRepo extends JpaRepository<MetaTaskNew, Long>, JpaSp
 
     MetaTaskNew findByIdAndDel(Long id, boolean del);
 
-    List<MetaTaskNew> findAllByDel(boolean del);
+    List<MetaTaskNew> findAllByAutoReceiveAndDel(boolean autoReceive, boolean del);
 
-    List<MetaTaskNew> findAllByPublishAndFinishAndDel(boolean publish, boolean finish, boolean del);
+    List<MetaTaskNew> findAllByPublishAndDel(boolean publish, boolean del);
 
     @Query(value = "select * from meta_task_new where finish = false and del = false and publish = true and channel_id = ?2 and id not in (select task_id from meta_task_to_user where user_id = ?1)", nativeQuery = true)
     List<MetaTaskNew> canGet(Long userId, Long channelId);

src/main/java/com/izouma/nineth/service/MetaTaskToUserNewService.java

@@ -51,7 +51,7 @@ public class MetaTaskToUserNewService {
     @Transactional
     public MetaRestResult<Void> autoReceiveTask() {
         Long userId = SecurityUtils.getAuthenticatedUser().getId();
-        List<MetaTaskNew> metaTaskNews = metaTaskNewRepo.findAllByDel(false);
+        List<MetaTaskNew> metaTaskNews = metaTaskNewRepo.findAllByAutoReceiveAndDel(true, false);
         AtomicBoolean exist = new AtomicBoolean(false);
         metaTaskNews.forEach(metaTaskNew -> {
             MetaTaskToUserNew metaTaskToUserNew = metaTaskToUserNewRepo.findByUserIdAndTaskIdAndDel(userId, metaTaskNew.getId(), false);
@@ -259,9 +259,6 @@ public class MetaTaskToUserNewService {
         if (!metaTaskNew.isPublish()) {
             return MetaServiceResult.returnError("status error : task has not been published");
         }
-        if (metaTaskNew.isFinish()) {
-            return MetaServiceResult.returnError("status error : task has been finished");
-        }
         if (StringUtils.isBlank(metaTaskNew.getName())) {
             return MetaServiceResult.returnError(String.format("任务[%S]缺少任务名称", metaTaskNew.getId()));
         }

src/main/java/com/izouma/nineth/web/MetaTaskNewController.java

@@ -54,7 +54,7 @@ public class MetaTaskNewController extends BaseController {
 
     @GetMapping("/findAll")
     public MetaRestResult<List<MetaTaskNew>> findAll() {
-        List<MetaTaskNew> metaTaskNews = metaTaskNewRepo.findAllByPublishAndFinishAndDel(true, false, false);
+        List<MetaTaskNew> metaTaskNews = metaTaskNewRepo.findAllByPublishAndDel(true, false);
         return MetaRestResult.returnSuccess(metaTaskNews);
     }