diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/homepage/HomepageSummaryMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/homepage/HomepageSummaryMapper.java index 6f98416..9c6fd7f 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/homepage/HomepageSummaryMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/homepage/HomepageSummaryMapper.java @@ -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 { * @param userId * @Return com.baomidou.mybatisplus.core.metadata.IPage */ - IPage queryPendingTaskDetails(IPage page, @Param("roleIds") List roleIds, @Param("userId") Long userId, @Param("deptId") Long deptId); + IPage queryPendingTaskDetails(IPage page, @Param("roleIds") List roleIds, @Param("userId") Long userId, @Param("deptId") Long deptId, @Param("currentDate") LocalDateTime currentDate); /** * @Author wangqian diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java index d32794b..1efdce3 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java @@ -114,7 +114,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{ //待办 Long deptId = SecurityFrameworkUtils.getDeptId(); List 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()); } diff --git a/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml b/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml index a781b5b..6cdf8c8 100644 --- a/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml @@ -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 <= NOW() - AND c.end_time >= NOW() + and c.begin_time <= #{currentDate} + AND c.end_time >= #{currentDate} and a.dept_id = #{deptId} AND b.role_id IN @@ -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 <= NOW() - AND c.end_time >= NOW() + and c.begin_time <= #{currentDate} + AND c.end_time >= #{currentDate} and a.dept_id = #{deptId} AND b.role_id IN