Merge remote-tracking branch 'origin/master'

pricing/src/main/java/com/hotent/pricing/manager/impl/FapPricingItemManagerImpl.java

@@ -1007,6 +1007,13 @@ public class FapPricingItemManagerImpl extends BaseManagerImpl<FapPricingItemDao
         String currentUserOrgId = AuthenticationUtil.getCurrentUserMainOrgId();
 
         PageHelper.startPage(pageNum, pageSize);
+        PageHelper.startPage(pageNum, pageSize);
+        if (StringUtil.isNotEmpty(startTime)) {
+            startTime=startTime+" 00:00:00";
+        }
+        if (StringUtil.isNotEmpty(endTime)) {
+            endTime=endTime+" 23:59:59";
+        }
         // 使用XML SQL查询
         List<FapPricingItem> list = baseMapper.queryTrackingList(startTime, endTime, itemType, itemName, orgName, status, itemScope, regionOrgIds, currentUserOrgId, currentUserId, contentId);
 

pricing/src/main/java/com/hotent/pricing/manager/impl/FapTaskNodeManagerImpl.java

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo;
 import com.hotent.base.manager.impl.BaseManagerImpl;
 import com.hotent.base.query.PageList;
 import com.hotent.base.util.AuthenticationUtil;
+import com.hotent.base.util.StringUtil;
 import com.hotent.pricing.dao.FapTaskNodeDao;
 import com.hotent.pricing.model.enums.SchedulingStatusEnum;
 import com.hotent.pricing.manager.FapTaskNodeManager;
@@ -46,6 +47,12 @@ public class FapTaskNodeManagerImpl extends BaseManagerImpl<FapTaskNodeDao, FapT
 
         // 使用 PageHelper 进行分页
         PageHelper.startPage(pageNum, pageSize);
+        if (StringUtil.isNotEmpty(startTime)) {
+            startTime=startTime+" 00:00:00";
+        }
+        if (StringUtil.isNotEmpty(endTime)) {
+            endTime=endTime+" 23:59:59";
+        }
         List<FapTaskNode> list = this.baseMapper.queryTaskList(taskName, taskStatus, regionPath, startTime, endTime, parentId, currentUserOrgId, currentUserId, regionLevel);
         PageInfo<FapTaskNode> pageInfo = new PageInfo<>(list);