From e3fa19c89162e23491aae8ef05061dcbe281b57c Mon Sep 17 00:00:00 2001 From: yqy Date: Thu, 20 Jan 2022 09:49:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/baiye/model/dto/ClueQueryCriteria.java | 3 +++ .../modules/system/service/impl/OrganizeServiceImpl.java | 1 + .../java/com/baiye/module/dao/ClueMiddleRepository.java | 8 -------- .../com/baiye/module/service/impl/ClueServiceImpl.java | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 4 +++- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueQueryCriteria.java b/ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueQueryCriteria.java index 34f0cb33..d88a0bc9 100644 --- a/ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueQueryCriteria.java +++ b/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; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java index ebfb7829..c817540d 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java +++ b/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); diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java b/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java index c8982896..08b9a15b 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java +++ b/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java @@ -30,14 +30,6 @@ public interface ClueMiddleRepository extends JpaRepository, 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 findByOrganizeId(Long organizeId); - /** * 批量更新组员信息 * diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index 254d7d20..a91b099b 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/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 diff --git a/services/ad-platform-source/src/main/resources/application-prod.yml b/services/ad-platform-source/src/main/resources/application-prod.yml index abe82415..ca3d7f8b 100644 --- a/services/ad-platform-source/src/main/resources/application-prod.yml +++ b/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 # 线程池配置 diff --git a/services/ad-platform-source/src/main/resources/application-test.yml b/services/ad-platform-source/src/main/resources/application-test.yml index 5293ea0a..f00a1d20 100644 --- a/services/ad-platform-source/src/main/resources/application-test.yml +++ b/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