网格上报 sql错误修改

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,

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<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId());
+
+        log.info("话题提交，用户ID: " + userDetail.getGridId());
+
         ParentAndAllDeptDTO deptDTO = dtoResult.getData();
         // 父所有部门
         formDto.setParentDeptIds(deptDTO.getParentDeptIds());