app首页统计修改

wangqian
1 parent a1b32268
Showing 3 changed files with 8 additions and 7 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/homepage/HomepageSummaryMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
@@ -13,6 +13,7 @@ import com.zteits.urbanops.module.garden.dal.dataobject.departmentcost.Departmen
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
  
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
  
@@ -137,7 +138,7 @@ public interface HomepageSummaryMapper  extends BaseMapperX&lt;DepartmentCostDO&gt; {
      * @param userId
      * @Return com.baomidou.mybatisplus.core.metadata.IPage<com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo>
      */
-    IPage<TaskDetailsRspVo> queryPendingTaskDetails(IPage<TaskDetailsRspVo> page, @Param("roleIds") List<Long> roleIds, @Param("userId") Long userId, @Param("deptId") Long deptId);
+    IPage<TaskDetailsRspVo> queryPendingTaskDetails(IPage<TaskDetailsRspVo> page, @Param("roleIds") List<Long> roleIds, @Param("userId") Long userId, @Param("deptId") Long deptId,  @Param("currentDate") LocalDateTime currentDate);
  
     /**
      * @Author wangqian
@@ -114,7 +114,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
             //待办
             Long deptId = SecurityFrameworkUtils.getDeptId();
             List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
-            mpPage = homepageSummaryMapper.queryPendingTaskDetails(mpPage, roleIds, userId, deptId);
+            mpPage = homepageSummaryMapper.queryPendingTaskDetails(mpPage, roleIds, userId, deptId, LocalDateTime.now());
         }
         return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
     }
@@ -422,8 +422,8 @@
              inner join garden_inspection_plan_detail c on a.batch_no=c.batch_no
              where a.deleted = b.deleted and a.deleted = 0
                 and c.finish_state = 1
-                and c.begin_time &lt;=  NOW()
-                AND c.end_time  >=  NOW()
+                and c.begin_time &lt;=  #{currentDate}
+                AND c.end_time  >=  #{currentDate}
                 and a.dept_id = #{deptId}
                 AND b.role_id IN
                 <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
@@ -433,14 +433,14 @@
             union all
  
             SELECT
-                a.plan_name as taskName,a.begin_time as busiDateTime, null as pressingType
+                a.plan_name as taskName,c.begin_time as busiDateTime, null as pressingType
             from garden_maintain_plan a
             INNER JOIN garden_maintain_plan_role b  on a.batch_no=b.batch_no
             inner join garden_maintain_plan_detail c on a.batch_no=c.batch_no
             where a.deleted=b.deleted and a.deleted = 0
                 and c.finish_state = 1
-                and c.begin_time  &lt;=  NOW()
-                AND c.end_time  >=  NOW()
+                and c.begin_time  &lt;=  #{currentDate}
+                AND c.end_time  >=  #{currentDate}
                 and a.dept_id = #{deptId}
                 AND b.role_id IN
                 <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>