Explorar el Código

生成酒店项目报告自测bug修复

lixing hace 3 años
padre
commit
9b4b0ce3ad

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/manualfilling/service/IManualFilliingService.java

@@ -6,13 +6,13 @@ public interface IManualFilliingService {
 
     /**
      *
-     * @param pjId 项目id
+     * @param pjLocalId 项目本地编码
      * @param indicatorId 指标id
      * @param timeType 查询时间类型(1-日,2-月,3-年,4-无周期(无周期数据跟时间没有关系))
      * @param startDate 开始时间
      * @param endDate 结束时间
      * @return
      */
-    String getIndicatorFillingData(String pjId, String indicatorId, Integer timeType, Date startDate, Date endDate);
+    String getIndicatorFillingData(String pjLocalId, String indicatorId, Integer timeType, Date startDate, Date endDate);
 
 }

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/manualfilling/service/impl/IManualFilliingServiceImpl.java

@@ -21,11 +21,11 @@ public class IManualFilliingServiceImpl implements IManualFilliingService {
     ManualFillingWebClient ManualFillingWebClient;
 
     @Override
-    public String getIndicatorFillingData(String pjId, String indicatorId, Integer timeType, Date reportDate, Date endDate) {
+    public String getIndicatorFillingData(String pjLocalId, String indicatorId, Integer timeType, Date reportDate, Date endDate) {
         String result = "";
         try {
             QueryIndicatorFillingDataDTO queryIndicatorFillingDataDTO = new QueryIndicatorFillingDataDTO();
-            queryIndicatorFillingDataDTO.setProjectId(pjId);
+            queryIndicatorFillingDataDTO.setProjectId(pjLocalId);
             queryIndicatorFillingDataDTO.setIndicatorId(indicatorId);
             queryIndicatorFillingDataDTO.setTimeType(timeType);
             queryIndicatorFillingDataDTO.setStartDate(DateUtils.date2Str(reportDate, DateUtils.SDF_SECOND));