From eb2037ba6cb27ad5e4613de33e48e3ee12eb0214 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 19 Jul 2021 11:12:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=B8=8A=E6=8A=A5=20sql?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenGridManagerDao.xml | 2 +- .../elink/esua/epdc/service/impl/PartyGroupServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml index 8a0f2d96..e1f70de1 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml @@ -165,7 +165,7 @@ 'W', WEEK(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y-%m-%d'))) weekId, DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y') AS yearId, - CONCAT(DATE_FORMAScreenBaseReportDataFormDTOT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y'), + CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y'), 'Q', QUARTER(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y-%m-%d'))) quarterId, diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java index 5d328bfb..ea72cd50 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java @@ -8,6 +8,7 @@ import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.PartyGroupFeignClient; import com.elink.esua.epdc.service.PartyGroupService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,6 +20,7 @@ import java.util.List; * @create 2020-06-03 */ @Service +@Slf4j public class PartyGroupServiceImpl implements PartyGroupService { @Autowired @@ -70,6 +72,9 @@ public class PartyGroupServiceImpl implements PartyGroupService { } //获取所有上级机构名称和ID拼接 Result dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId()); + + log.info("话题提交，用户ID: " + userDetail.getGridId()); + ParentAndAllDeptDTO deptDTO = dtoResult.getData(); // 父所有部门 formDto.setParentDeptIds(deptDTO.getParentDeptIds());