数据拉取定时任务、逻辑补充

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/DataCollectTask.java

@@ -57,6 +57,9 @@ public class DataCollectTask {
     @Resource
     private ReportMapper reportMapper;
 
+    @Resource
+    private FmwDetailMapper fmwDetailMapper;
+
 
     private static HikariDataSource sqlServerDataSource;
 
@@ -74,6 +77,8 @@ public class DataCollectTask {
         SimpleDateFormat sdfYmd = new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date();
         String dateStr = sdfYmd.format(date);
+        //TODO fmwDetail修改，不从report里取
+//        List<TisTimeVO> timeVOList = fmwDetailMapper.getTisTimeByDate(specialCompanyId,dateStr);
         List<TisTimeVO> timeVOList =  reportMapper.getTisTimeByDate(specialCompanyId,dateStr);
         for (TisTimeVO tisTimeVO : timeVOList) {
             String sqlQuery = "select top 1 iRealCOID from ca_batchmap where cMOCode = ? and iMOSubSN = ? ";

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/BustripProjectMapper.xml

@@ -22,8 +22,8 @@
         from bustrip_project bp
         left join business_trip bt on bp.bustrip_id = bt.id
         where bt.owner_id = #{userId}
-        and bp.start_date < str_to_date(#{date},'%Y-%m-%d')
-        and bp.end_date > str_to_date(#{date},'%Y-%m-%d')
+        and bp.start_date <= str_to_date(#{date},'%Y-%m-%d')
+        and bp.end_date >= str_to_date(#{date},'%Y-%m-%d')
     </select>
 
 </mapper>