Merge remote-tracking branch 'origin/dev_pyscreen' into dev

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@@ -26,6 +26,7 @@ public interface NumConstant {
     int TEN = 10;
     int ELEVEN = 11;
     int TWELVE = 12;
+    int THIRTEEN = 13;
     int SEVENTEEN = 17;
     int FIFTEEN = 15;
     int FOURTEEN=14;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -143,6 +143,8 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         if(StringUtils.isBlank(dateId)){
             log.warn("selectLatestDateId dateId is null customerIds" + JSON.toJSONString(customerIds));
         }
+        log.info("=============dateId:"+dateId);
+        dateId= com.epmet.commons.tools.utils.DateUtils.getBeforeNDay(NumConstant.ONE);
         WorkRecordRankResultDTO returnDto = new WorkRecordRankResultDTO();
         AgencyInfoDTO agencyInfoDTO = agencyService.getAgencyInfoDTO(formDTO.getAreaCode(), formDTO.getAgencyId());
         // log.info("agencyInfoDTO:  "+JSON.toJSONString(agencyInfoDTO));
@@ -210,8 +212,8 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         //3-1.查询当前组织及所有下级过去12个月份某项数据所有资源的统计数据
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMM");
         LocalDate today = LocalDate.now();
-        formDTO.setStartMonth(today.minusMonths(NumConstant.TWELVE).format(fmt));
+        formDTO.setStartMonth(today.minusMonths(NumConstant.THIRTEEN).format(fmt));
-        formDTO.setEndMonth(today.minusMonths(NumConstant.ZERO).format(fmt));
+        formDTO.setEndMonth(today.minusMonths(NumConstant.ONE).format(fmt));
         List<WorkRecordTrendResultDTO.SeriesResultDTO> list = screenWorkRecordOrgMonthlyDao.selectMonthList(formDTO);
 
         //3-2.遍历封装数据并返回
@@ -299,4 +301,10 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         return resultDTO;
     }
 
+    public static void main(String[] args) {
+        LocalDate today = LocalDate.now();
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMM");
+        System.out.println(today.minusMonths(NumConstant.THIRTEEN).format(fmt));
+        System.out.println(today.minusMonths(NumConstant.ONE).format(fmt));
+    }
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml

@@ -6,7 +6,7 @@
     <select id="selectMonthList" resultType="com.epmet.plugins.result.WorkRecordTrendResultDTO$SeriesResultDTO">
         SELECT
             sw.MONTH_ID AS monthId,
-            (select resource_label from screen_customer_work_record_dict where resource_code = sw.type_code and customer_id = #{customerId})`name`
+            (select resource_label from screen_customer_work_record_dict where resource_code = sw.meeting_code and customer_id = #{customerId})`name`
         <if test="type != null and type.trim() != ''">
             <if test="type == 'organize' ">
                 ,SUM(sw.organize_total) as `value`
@@ -24,13 +24,12 @@
         WHERE
             sw.del_flag = '0'
         AND sca.del_flag = '0'
-        AND sw.customer_id = #{customerId}
         AND sca.area_code LIKE CONCAT('%',(select area_code from screen_customer_agency where agency_id = #{agencyId}),'%')
-        AND sw.month_id > #{startMonth}
+        AND sw.month_id &gt;= #{startMonth}
         AND sw.month_id <![CDATA[ <= ]]> #{endMonth}
         AND wrd.data_type = #{dataType}
         GROUP BY
-            sw.month_id,sw.type_code
+            sw.month_id,sw.meeting_code
         ORDER BY
             sw.month_id ASC
     </select>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/WorkRecordColController.java

@@ -49,6 +49,7 @@ public class WorkRecordColController {
 			log.error("com.epmet.controller.plugins.WorkRecordColController.resourceDict,param:{}", JSON.toJSONString(data));
 			throw new ValidateException("客户Id、上传数据列表、日期Id不可为空");
 		}
+		// log.info("【工作日志】客户资源字典信息上传"+JSON.toJSONString(data,true));
 		dictService.collect(customerId,data);
 		return new Result();
 	}
@@ -68,6 +69,7 @@ public class WorkRecordColController {
 			log.error("com.epmet.controller.plugins.WorkRecordColController.collectOrg,param:{}", JSON.toJSONString(data));
 			throw new ValidateException("客户Id、上传数据列表、月份Id不可为空");
 		}
+		// log.info("【工作日志】组织按月统计"+JSON.toJSONString(data,true));
 		screenWorkRecordOrgMonthlyService.collect(customerId,data);
 		return new Result();
 	}
@@ -87,6 +89,7 @@ public class WorkRecordColController {
 			log.error("com.epmet.controller.plugins.WorkRecordColController.collectOrgDaily,param:{}", JSON.toJSONString(data));
 			throw new ValidateException("客户Id、上传数据列表、日期Id不可为空");
 		}
+		// log.info("【工作日志】组织按日统计  累计值"+JSON.toJSONString(data,true));
 		screenWorkRecordOrgDailyService.collectOrgDaily(customerId,data);
 		return new Result();
 	}