浏览代码

判断重复

change 3 年之前
父节点
当前提交
78f8a68de4

+ 5 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -58,10 +58,15 @@ public class UserController extends BaseController {
     public AjaxResult infoAttached() {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         Map<String,Object> map = new HashMap<>();
+        //计划数量
         Long planSum = iUserService.planSum(loginUser.getUser().getUserId());
+        //学时数量
         Long periodSum = iUserService.periodSum(loginUser.getUser().getUserId());
+        //预约考试数量
         Long subscribeSum = iUserService.subscribeSum(loginUser.getUser().getUserId());
+        //通知数量
         Long informSum = iUserService.informSum(loginUser.getUser().getUserId());
+        //订单数量
         Long orderSum = iUserService.orderSum(loginUser.getUser().getUserId());
         map.put("planSum",planSum);
         map.put("periodSum",periodSum);

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserBankRecordServiceImpl.java

@@ -197,6 +197,7 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
         }
 
         if (userStudyRecordMapper.selectStudyExamRecordOr(userBankRecordVo) > 0 && add.getReportStatus().equals(1)){
+            //修改之前的记录,新增一条当前记录
             UserPeriodStatus userPeriodStatus = userStudyRecordMapper.selectStudyExamRecordCount(userBankRecordVo);
             userPeriodStatus.setPeriodStatus(0);
             iUserPeriodStatusService.updateById(userPeriodStatus);

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserNoteServiceImpl.java

@@ -108,6 +108,7 @@ public class UserNoteServiceImpl extends ServiceImpl<UserNoteMapper, UserNote> i
     @Override
     public List<UserDateNoteVo> listDate(UserNoteQueryBo bo) {
         List<UserDateNoteVo> userDateVos = baseMapper.listDate(bo);
+        //查询时间范围内的笔记
         for (UserDateNoteVo userDateVo : userDateVos) {
             bo.setNoteDate(userDateVo.getDateNote());
             List<UserNoteVo> userNoteVos = baseMapper.listDateSon(bo);

+ 5 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserPlanServiceImpl.java

@@ -396,6 +396,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
                         }
                         DaySectionVo daySectionVo = new DaySectionVo();
                         daySectionVo.setGoodsId(aLong);
+                        //小于学习节数,直接加上剩余学习节数
                         if (allNum < Sec) {
                             daySectionVo.setStudyGoodsKnob(Convert.toLong(allNum));
                         } else{
@@ -489,7 +490,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         c1.set(Calendar.DAY_OF_MONTH, c1.getActualMaximum(Calendar.DAY_OF_MONTH));
         System.out.println(c.getTimeInMillis());
         System.out.println(c1.getTimeInMillis());
-
+        //获得学习范围的日历
         List<CalendarStudyVo> clCalendarStudyVos = findDates(c.getTimeInMillis()/1000,c1.getTimeInMillis()/1000);
         Long secAll = 0L;
         for (Long aLong : bo.getGoodsId()) {
@@ -500,6 +501,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             if (dutyDays < 1){
                 throw new IllegalArgumentException("没有学习天数,请认真填写开始结束时间");
             }
+            //查询商品每个课程得总节数
             List<Long> seLongs = baseMapper.selectGoods(aLong);
             Long allNum = 0L;
             for (Long seLong : seLongs) {
@@ -515,6 +517,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
                             break;
                         }
                         Calendar c5 = Calendar.getInstance();
+                        //给大于等于今天的天数赋值学习节数,小于直接跳出循环
                         if (dayStudyVo.getDate() < c5.get(Calendar.DAY_OF_MONTH) && clCalendarStudyVo.getMonth() == (c5.get(Calendar.MONTH) + 1) && clCalendarStudyVo.getYear() == (c5.get(Calendar.YEAR))){
                             continue;
                         }
@@ -540,6 +543,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
                         }
                         DaySectionVo daySectionVo = new DaySectionVo();
                         daySectionVo.setGoodsId(aLong);
+                        //小于学习节数,直接加上剩余的学习节数
                         if (allNum < Sec) {
                             daySectionVo.setStudyGoodsKnob(Convert.toLong(allNum));
                         } else{