add 根据乐团主管获取进行中乐团

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/InspectionItemPlanDao.java

@@ -10,15 +10,17 @@ import java.util.List;
 public interface InspectionItemPlanDao extends BaseDAO<Long, InspectionItemPlan> {
 
     /**
-     * 获取开始的巡查日程
+     * 获取当天的巡查计划
      *
-     * @param planStart
+     * @param startTime
+     * @param endTime
      * @return
      */
-    List<InspectionItemPlan> getStartPlan(@Param("planStart") Date planStart);
+    List<InspectionItemPlan> getStartPlan(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     /**
      * 更新推送状态
+     *
      * @param ids
      * @return
      */

mec-biz/src/main/java/com/ym/mec/biz/service/impl/InspectionItemPlanServiceImpl.java

@@ -149,12 +149,13 @@ public class InspectionItemPlanServiceImpl extends BaseServiceImpl<Long, Inspect
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<InspectionItemPlan> pushNotice() {
-        List<InspectionItemPlan> startPlans = inspectionItemPlanDao.getStartPlan(new Date());
+        Date nowDate = new Date();
+        Date startTime = DateUtil.getFirstDayOfMonth(nowDate);
+        Date endTime = DateUtil.getLastTimeWithDay(DateUtil.getLastDayOfMonth(nowDate));
+        List<InspectionItemPlan> startPlans = inspectionItemPlanDao.getStartPlan(startTime,endTime);
         Set<Integer> userIds = startPlans.stream().map(InspectionItemPlan::getUserId).collect(Collectors.toSet());
         List<Long> ids = startPlans.stream().map(InspectionItemPlan::getId).collect(Collectors.toList());
 
-        inspectionItemPlanDao.updatePushedStatus(ids);
-
         //发送推送信息
         Map<Integer, String> userMap = new HashMap<>();
         for (Integer userId : userIds) {

mec-biz/src/main/resources/config/mybatis/InspectionItemPlanMapper.xml

@@ -176,8 +176,8 @@
         <![CDATA[
         SELECT *
         FROM inspection_item_plan
-        WHERE plan_start_ <= #{planStart}
-          AND is_pushed_ = 0
+        WHERE plan_start_ >= #{startTime}
+        AND plan_start_ <= #{endTime}
         ]]></select>
 
     <update id="updatePushedStatus">

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -329,6 +329,7 @@ public class TaskController extends BaseController {
 		indexBaseMonthDataService.indexBaseDataTask(month);
 	}
 
+	//乐团巡查计划当日9:00
 	@GetMapping("/inspectionPlan")
 	public void inspectionPlan(){
 		inspectionItemPlanService.pushNotice();