fix 通知

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserAddBo.java

@@ -25,7 +25,7 @@ public class InformUserAddBo {
     @ApiModelProperty("发送时间")
     private Long sendTime;
     /** 发送状态 1成功 0失败 */
-    @ApiModelProperty("发送状态 1成功 0失败")
+    @ApiModelProperty("发送状态 1成功 0失败 2草稿")
     private Integer sendStatus;
     /** 已读回执 1已读 0未读 */
     @ApiModelProperty("已读回执 1已读 0未读")

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformServiceImpl.java

@@ -162,6 +162,9 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
                 informUserAddBo.setSendTime(DateUtils.getNowTime());
                 informUserAddBo.setSendStatus(1);
             }
+            if (bo.getIssueStatus() == 2 && bo.getStatus().equals(1)){
+                informUserAddBo.setSendStatus(2);
+            }
             informUserAddBo.setCreateTime(DateUtils.getNowTime());
             informUserAddBo.setUpdateTime(DateUtils.getNowTime());
             iInformUserService.insertByAddBo(informUserAddBo);
@@ -220,6 +223,9 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
                     informUserAddBo.setSendTime(DateUtils.getNowTime());
                     informUserAddBo.setSendStatus(1);
                 }
+                if (bo.getIssueStatus() == 2 && bo.getStatus().equals(1)){
+                    informUserAddBo.setSendStatus(2);
+                }
                 informUserAddBo.setCreateTime(DateUtils.getNowTime());
                 informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                 iInformUserService.insertByAddBo(informUserAddBo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -572,6 +572,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         InformQueryBo informQueryBo = new InformQueryBo();
         informQueryBo.setIssue(1);
         informQueryBo.setIssueStatus(2);
+        informQueryBo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
         List<InformVo> informVos = informService.listInform(informQueryBo);
         for (InformVo informVo : informVos) {
             List<Integer> statusList = new ArrayList<>();
@@ -597,6 +598,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         Calendar rightNow = Calendar.getInstance();
         boolean status = false;
         for (UserPlanVo userPlanVo : userPlanVos) {
+            status = false;
             List<CalendarStudyVo> calendarStudyUp = userPlanVo.getCalendarStudyVo();
             for (CalendarStudyVo studyVo : calendarStudyUp) {
                 if (studyVo.getMonth().equals(Convert.toLong(rightNow.get(Calendar.MONTH) + 1)) && studyVo.getYear().equals(Convert.toLong(rightNow.get(Calendar.YEAR)))) {
@@ -670,7 +672,13 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                                     }
                                 }
 
-                                dayStudyVo.setPerform(0);
+                            //    dayStudyVo.setPerform(0);
+                                if (dayStudyVo.getDate() > c5.get(Calendar.DAY_OF_MONTH) && clCalendarStudyVo.getMonth() == (c5.get(Calendar.MONTH) + 1) && clCalendarStudyVo.getYear() == (c5.get(Calendar.YEAR))) {
+                                    if(Validator.isNotEmpty(dayStudyVo.getPerform())&&dayStudyVo.getPerform().equals(0)){
+                                        //过期且没完成
+                                        dayStudyVo.setPerform(2);
+                                    }
+                                }
                                 List<DaySectionVo> daySectionList = new ArrayList<>();
                                 if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(dayStudyVo.getDaySectionList())) {
                                     daySectionList = dayStudyVo.getDaySectionList();
@@ -683,11 +691,16 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                                     daySectionVo.setStudyGoodsKnob(Convert.toLong(Sec));
                                 }
 
-                                daySectionVo.setGoodsPerform(0);
+                            //    daySectionVo.setGoodsPerform(0);
+                                if (dayStudyVo.getDate() > c5.get(Calendar.DAY_OF_MONTH) && clCalendarStudyVo.getMonth() == (c5.get(Calendar.MONTH) + 1) && clCalendarStudyVo.getYear() == (c5.get(Calendar.YEAR))) {
+                                    if(Validator.isNotEmpty(daySectionVo.getGoodsPerform())&&daySectionVo.getGoodsPerform().equals(0)){
+                                        //过期且没完成
+                                        daySectionVo.setGoodsPerform(2);
+                                    }
+                                }
                                 daySectionList.add(daySectionVo);
                                 dayStudyVo.setDaySectionList(daySectionList);
                                 allNum -= Sec;
-
                             }
                         }
                     }