Merge remote-tracking branch 'origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

@@ -389,19 +389,14 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
     /**
      * @param param
      * @return
-     * @Description 抽取项目节点历时逻辑
+     * @Description 抽取项目节点历时逻辑   全量
      * @author wangc
      * @date 2020.09.17 14:05
      **/
     @Override
     public void extractProjectPeriodData(ExtractOriginFormDTO param) {
-        int trace = factOriginProjectOrgPeriodDailyDao.selectIfExisted(param.getCustomerId());
-        Boolean isFirst = trace <= NumConstant.ZERO;
-        if (StringUtils.isBlank(param.getDateId())) {
-            param.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
-        }
         List<ProjectOrgPeriodResultDTO> extractData =
-                projectProcessService.getProjectPeriodDirectly(isFirst, param.getCustomerId(), param.getDateId());
+                projectProcessService.getProjectPeriodDirectly(param.getCustomerId(), param.getDateId());
         List<FactOriginProjectOrgPeriodDailyEntity> formattingData = new LinkedList<>();
 		extractData.forEach(original -> {
 			FactOriginProjectOrgPeriodDailyEntity dest

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java

@@ -97,14 +97,13 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
 
     /**
      * @Description 直接从项目业务改造获取项目节点耗时信息
-     * @param isFirst
      * @param customerId
      * @param date
      * @return java.util.List<com.epmet.dto.project.result.ProjectOrgPeriodResultDTO>
      * @author wangc
      * @date 2020.10.23 09:10
     */
-    List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(Boolean isFirst,String customerId, String date);
+    List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(String customerId, String date);
 
     /**
      * 获取办结组织

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java

@@ -99,13 +99,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
      * @date 2020.10.23 09:10
      */
     @Override
-    public List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(Boolean isFirst, String customerId, String date) {
-        if(isFirst){
+    public List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly( String customerId, String date) {
      return baseDao.selectProjectOrgPeriodDirectly(customerId,null,null);
-        }else{
-            return baseDao.selectProjectOrgPeriodDirectly(customerId,null,date);
-        }
-
     }
 
     @Override

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageExtServiceImpl.java

@@ -51,9 +51,9 @@ public class WxmpMessageExtServiceImpl implements WxmpMessageExtService {
                     wxSubscribeMessageFormDTO.setClientType(ExtConstant.APP_RESI);
                 }
                 //2020.12.23 sun 数据库字段key值有work改成gov  外挂接口直接传的gov不用再转换
-                /*if (ExtConstant.APP_GOV.equals(dto.getApp())){
-                    wxSubscribeMessageFormDTO.setClientType(ExtConstant.APP_WORK);
-                }*/
+                if (ExtConstant.APP_GOV.equals(dto.getApp())){
+                    wxSubscribeMessageFormDTO.setClientType(ExtConstant.APP_GOV);
+                }
                 wxSubscribeMessageFormDTO.setBehaviorType(dto.getTitle());
                 wxSubscribeMessageFormDTO.setMessageTime(new Date());
                 wxmpMsgList.add(wxSubscribeMessageFormDTO);