代码提交

ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueQueryCriteria.java

@@ -21,6 +21,9 @@ public class ClueQueryCriteria {
     @ApiModelProperty(value = "小组id")
     private Long organizeId;
 
+    @ApiModelProperty(value = "任务id")
+    private Long taskId;
+
     @ApiModelProperty(value = "所属组员id")
     private Long memberId;
 

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java

@@ -386,6 +386,7 @@ public class OrganizeServiceImpl implements OrganizeService {
         ClueQueryCriteria clueQueryCriteria = new ClueQueryCriteria();
         clueQueryCriteria.setOrganizeId(organizeId);
         clueQueryCriteria.setUserIds(userIds);
+        clueQueryCriteria.setTaskId(taskId);
         sourceClueClient.queryOrganizeIdList(clueQueryCriteria);
         //修改小组任务信息
         TaskOrganize updateTaskOrganize = taskOrganizeRepository.findByOrganizeIdAndTaskId(organizeId, taskId);

services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java

@@ -30,14 +30,6 @@ public interface ClueMiddleRepository extends JpaRepository<ClueMiddle, Long>, J
     @Query(value = " update tb_clue_middle set organize_id = ?2 where clue_id = ?1 ", nativeQuery = true)
     void updateOrganizeIdById(Long id, Long deptId);
 
-    /**
-     * 小组id查询
-     *
-     * @param organizeId
-     * @return
-     */
-    List<ClueMiddle> findByOrganizeId(Long organizeId);
-
     /**
      * 批量更新组员信息
      *

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -100,7 +100,7 @@ public class ClueServiceImpl implements ClueService {
         if (clueQueryCriteria.getMemberId() != null) {
             clueMiddleList = clueMiddleRepository.findByMemberId(clueQueryCriteria.getMemberId());
         } else {
-            clueMiddleList = clueMiddleRepository.findByOrganizeId(clueQueryCriteria.getOrganizeId());
+            clueMiddleList = clueMiddleRepository.findByTaskIdAndOrganizeId(clueQueryCriteria.getTaskId(),clueQueryCriteria.getOrganizeId());
         }
         if (clueMiddleList.size() > 0) {
             // 所有的资源id

services/ad-platform-source/src/main/resources/application-prod.yml

@@ -63,7 +63,7 @@ spring:
 storage:
   url: /usr/local/webapp/source/files/
   de_symbol: /
-  download-template: /usr/local/webapp/source/template/custom.xlsx
+  download-template: /api-source/download/custom.xlsx
 
 
 # 线程池配置

services/ad-platform-source/src/main/resources/application-test.yml

@@ -63,7 +63,7 @@ spring:
 storage:
   url: /usr/local/webapp/source/files/
   de_symbol: /
-  download-template: /usr/local/webapp/source/template/custom.xlsx
+  download-template: /api-source/download/custom.xlsx
 
 # 线程池配置
 save:
@@ -74,6 +74,8 @@ save:
       queueCapacity: 3
       ThreadNamePrefix: SaveFileTaskExecutor-
 
+
+
 ## IP 本地解析
 #ip:
 #  local-parsing: true