Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/FormalParentsStudentServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.CourseChange;
+import org.dromara.system.domain.xiake.XiakeConfig;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.FormalParentsStudentBo;
 import org.dromara.system.domain.vo.FormalParentsStudentVo;
@@ -80,6 +81,7 @@ public class FormalParentsStudentServiceImpl implements IFormalParentsStudentSer
         lqw.eq(StringUtils.isNotBlank(bo.getStudentNumber()), FormalParentsStudent::getStudentNumber, bo.getStudentNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getIsDel()), FormalParentsStudent::getIsDel, bo.getIsDel());
         lqw.in((bo.getClassIds()!=null && bo.getClassIds().size()>0), FormalParentsStudent::getClassId,bo.getClassIds());
+        lqw.orderByDesc(FormalParentsStudent::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/FormalTeacherClassServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.FormalParentsStudent;
 import org.dromara.system.domain.vo.FormalParentsStudentVo;
 import org.dromara.system.domain.vo.FormalTeacherClassListVo;
 import org.springframework.stereotype.Service;
@@ -75,6 +76,7 @@ public class FormalTeacherClassServiceImpl implements IFormalTeacherClassService
         lqw.like(StringUtils.isNotBlank(bo.getClassName()), FormalTeacherClass::getClassName, bo.getClassName());
         lqw.eq(StringUtils.isNotBlank(bo.getDiscipline()), FormalTeacherClass::getDiscipline, bo.getDiscipline());
         lqw.like(StringUtils.isNotBlank(bo.getTeacherName()), FormalTeacherClass::getTeacherName, bo.getTeacherName());
+        lqw.orderByDesc(FormalTeacherClass::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/OrientationInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.FormalTeacherClass;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.OrientationInfoBo;
 import org.dromara.system.domain.vo.OrientationInfoVo;
@@ -69,6 +70,7 @@ public class OrientationInfoServiceImpl implements IOrientationInfoService {
         lqw.eq(StringUtils.isNotBlank(bo.getAddress()), OrientationInfo::getAddress, bo.getAddress());
         lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), OrientationInfo::getLongitude, bo.getLongitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), OrientationInfo::getLatitude, bo.getLatitude());
+        lqw.orderByDesc(OrientationInfo::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterParentsServiceImpl.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.OrientationInfo;
 import org.dromara.system.domain.RegisterParentsStudent;
 import org.dromara.system.domain.bo.RegisterParentsStudentBo;
 import org.dromara.system.domain.bo.RegisterTeacherClassBo;
@@ -82,6 +83,7 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService {
         lqw.like(StringUtils.isNotBlank(bo.getUserName()), RegisterParents::getUserName, bo.getUserName());
         lqw.eq(StringUtils.isNotBlank(bo.getUserPhone()), RegisterParents::getUserPhone, bo.getUserPhone());
         lqw.eq(StringUtils.isNotBlank(bo.getIsPass()), RegisterParents::getIsPass, bo.getIsPass());
+        lqw.orderByDesc(RegisterParents::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StudentInfoOldServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.RegisterParents;
 import org.dromara.system.domain.bo.StudentLiveOldBo;
 import org.dromara.system.domain.vo.StudentLiveOldVo;
 import org.dromara.system.mapper.StudentLiveOldMapper;
@@ -103,6 +104,7 @@ public class StudentInfoOldServiceImpl implements IStudentInfoOldService {
         lqw.eq(StringUtils.isNotBlank(bo.getIsPoverty()), StudentInfoOld::getIsPoverty, bo.getIsPoverty());
         lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContact()), StudentInfoOld::getEmergencyContact, bo.getEmergencyContact());
         lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactTelephone()), StudentInfoOld::getEmergencyContactTelephone, bo.getEmergencyContactTelephone());
+        lqw.orderByDesc(StudentInfoOld::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StudentLiveOldServiceImpl.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.StudentInfo;
+import org.dromara.system.domain.StudentInfoOld;
 import org.dromara.system.domain.vo.StudentInfoVo;
 import org.dromara.system.mapper.StudentInfoMapper;
 import org.springframework.stereotype.Service;
@@ -83,6 +84,7 @@ public class StudentLiveOldServiceImpl implements IStudentLiveOldService {
         lqw.eq(StringUtils.isNotBlank(bo.getHeight()), StudentLiveOld::getHeight, bo.getHeight());
         lqw.eq(StringUtils.isNotBlank(bo.getWeight()), StudentLiveOld::getWeight, bo.getWeight());
         lqw.eq(StringUtils.isNotBlank(bo.getCreateType()), StudentLiveOld::getCreateType, bo.getCreateType());
+        lqw.orderByDesc(StudentLiveOld::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ZhxyShyjServiceImpl.java

@@ -114,6 +114,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
         lqw.eq(StringUtils.isNotBlank(bo.getShjg()), ZhxyShyj::getShjg, bo.getShjg());
         lqw.eq(StringUtils.isNotBlank(bo.getShyj()), ZhxyShyj::getShyj, bo.getShyj());
         lqw.eq(bo.getShsj() != null, ZhxyShyj::getShsj, bo.getShsj());
+        lqw.orderByDesc(ZhxyShyj::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/info/XiaoyuanInfoServiceImpl.java

@@ -134,6 +134,7 @@ public class XiaoyuanInfoServiceImpl implements IXiaoyuanInfoService {
         lqw.eq(bo.getInfoDianZanId() != null, XiaoyuanInfo::getInfoDianZanId, bo.getInfoDianZanId());
         lqw.eq(StringUtils.isNotBlank(bo.getInfoZhuanFa()), XiaoyuanInfo::getInfoZhuanFa, bo.getInfoZhuanFa());
         lqw.eq(bo.getInfoPingLunId() != null, XiaoyuanInfo::getInfoPingLunId, bo.getInfoPingLunId());
+        lqw.orderByDesc(XiaoyuanInfo::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/notice/XiaoyuanNoticeServiceImpl.java

@@ -167,6 +167,7 @@ public class XiaoyuanNoticeServiceImpl implements IXiaoyuanNoticeService {
         lqw.eq(StringUtils.isNotBlank(bo.getComment()), XiaoyuanNotice::getComment, bo.getComment());
         lqw.eq(StringUtils.isNotBlank(bo.getPrised()), XiaoyuanNotice::getPrised, bo.getPrised());
         lqw.eq(StringUtils.isNotBlank(bo.getCollect()), XiaoyuanNotice::getCollect, bo.getCollect());
+        lqw.orderByDesc(XiaoyuanNotice::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/opinion/XiaoyuanOpinionServiceImpl.java

@@ -8,6 +8,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.notice.XiaoyuanNotice;
 import org.dromara.system.domain.opinion.XiaoyuanOpinion;
 import org.dromara.system.domain.opinion.bo.XiaoyuanOpinionBo;
 import org.dromara.system.domain.opinion.vo.XiaoyuanOpinionVo;
@@ -64,6 +65,7 @@ public class XiaoyuanOpinionServiceImpl implements IXiaoyuanOpinionService {
         lqw.eq(StringUtils.isNotBlank(bo.getOpinionReply()), XiaoyuanOpinion::getOpinionReply, bo.getOpinionReply());
         lqw.eq(StringUtils.isNotBlank(bo.getOpinionType()), XiaoyuanOpinion::getOpinionType, bo.getOpinionType());
         lqw.eq(StringUtils.isNotBlank(bo.getOpinionPhoto()), XiaoyuanOpinion::getOpinionPhoto, bo.getOpinionPhoto());
+        lqw.orderByDesc(XiaoyuanOpinion::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/record/RecordLeaveServiceImpl.java

@@ -14,6 +14,7 @@ import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.FormalParentsStudent;
 import org.dromara.system.domain.FormalTeacherClass;
 import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.opinion.XiaoyuanOpinion;
 import org.dromara.system.domain.record.RecordLeave;
 import org.dromara.system.domain.record.bo.RecordLeaveBo;
 import org.dromara.system.domain.record.vo.RecordLeaveVo;
@@ -132,6 +133,7 @@ public class RecordLeaveServiceImpl implements IRecordLeaveService {
         lqw.eq(StringUtils.isNotBlank(bo.getIsPass()), RecordLeave::getIsPass, bo.getIsPass());
         lqw.eq(StringUtils.isNotBlank(bo.getPhoto()), RecordLeave::getPhoto, bo.getPhoto());
         lqw.eq(bo.getSubmitTime() != null, RecordLeave::getSubmitTime, bo.getSubmitTime());
+        lqw.orderByDesc(RecordLeave::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/reservat/XiaoyuanReservatConfigServiceImpl.java

@@ -10,6 +10,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.record.RecordLeave;
 import org.dromara.system.domain.reservat.XiaoyuanReservatConfig;
 import org.dromara.system.domain.reservat.bo.XiaoyuanReservatConfigBo;
 import org.dromara.system.domain.reservat.vo.XiaoyuanReservatConfigVo;
@@ -74,6 +75,7 @@ public class XiaoyuanReservatConfigServiceImpl implements IXiaoyuanReservatConfi
         lqw.eq(bo.getReservatConfigTimePmBegin() != null, XiaoyuanReservatConfig::getReservatConfigTimePmBegin, bo.getReservatConfigTimePmBegin());
         lqw.eq(bo.getReservatConfigTimePmEnd() != null, XiaoyuanReservatConfig::getReservatConfigTimePmEnd, bo.getReservatConfigTimePmEnd());
         lqw.eq(bo.getReservatConfigNum() != null, XiaoyuanReservatConfig::getReservatConfigNum, bo.getReservatConfigNum());
+        lqw.orderByDesc(XiaoyuanReservatConfig::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/reservat/XiaoyuanReservatServiceImpl.java

@@ -264,10 +264,15 @@ public class XiaoyuanReservatServiceImpl implements IXiaoyuanReservatService {
             return R.fail("无当前学校预约，核销失败");
         }
         int i = 0;
+        //获取当前时间
+        String date = DateUtils.getDate();
         for (XiaoyuanReservatVo xiaoyuanReservatVo : reservatVoList) {
             if("2".equals(xiaoyuanReservatVo.getVisitStatus())){
                 return R.ok("核销失败");
             }
+            if(!date.equals(xiaoyuanReservatVo.getVisitDate())){
+                return R.fail("请核对预约时间，核销失败");
+            }
             XiaoyuanReservat update = new XiaoyuanReservat();
             update.setReservatId(xiaoyuanReservatVo.getReservatId());
             update.setVisitStatus("2");

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/score/ScoreDataDetailServiceImpl.java

@@ -8,6 +8,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.reservat.XiaoyuanReservatConfig;
 import org.dromara.system.domain.score.ScoreDataDetail;
 import org.dromara.system.domain.score.bo.ScoreDataDetailBo;
 import org.dromara.system.domain.score.vo.ScoreDataDetailVo;
@@ -66,6 +67,7 @@ public class ScoreDataDetailServiceImpl implements IScoreDataDetailService {
         lqw.eq(StringUtils.isNotBlank(bo.getXueke()), ScoreDataDetail::getXueke, bo.getXueke());
         lqw.eq(bo.getScore() != null, ScoreDataDetail::getScore, bo.getScore());
         lqw.eq(bo.getManfen() != null, ScoreDataDetail::getManfen, bo.getManfen());
+        lqw.orderByDesc(ScoreDataDetail::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/score/ScoreDataMfServiceImpl.java

@@ -8,6 +8,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.score.ScoreDataDetail;
 import org.dromara.system.domain.score.ScoreDataMf;
 import org.dromara.system.domain.score.bo.ScoreDataMfBo;
 import org.dromara.system.domain.score.vo.ScoreDataMfVo;
@@ -65,6 +66,7 @@ public class ScoreDataMfServiceImpl implements IScoreDataMfService {
         lqw.eq(StringUtils.isNotBlank(bo.getXueke()), ScoreDataMf::getXueke, bo.getXueke());
         lqw.eq(StringUtils.isNotBlank(bo.getManfen()), ScoreDataMf::getManfen, bo.getManfen());
         lqw.eq(StringUtils.isNotBlank(bo.getAvg()), ScoreDataMf::getAvg, bo.getAvg());
+        lqw.orderByDesc(ScoreDataMf::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/score/ScoreDataStudentServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.score.ScoreDataMf;
 import org.dromara.system.domain.score.ScoreDataStudent;
 import org.dromara.system.domain.score.bo.ScoreDataStudentBo;
 import org.dromara.system.domain.score.vo.ScoreDataStudentVo;
@@ -67,6 +68,7 @@ public class ScoreDataStudentServiceImpl implements IScoreDataStudentService {
         lqw.eq(bo.getZongfen() != null, ScoreDataStudent::getZongfen, bo.getZongfen());
         lqw.eq(StringUtils.isNotBlank(bo.getAvg()), ScoreDataStudent::getAvg, bo.getAvg());
         lqw.eq(StringUtils.isNotBlank(bo.getDetailsType()), ScoreDataStudent::getDetailsType, bo.getDetailsType());
+        lqw.orderByDesc(ScoreDataStudent::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/xiake/XiakeConfigServiceImpl.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.sms4j.api.universal.RedisUtil;
+import org.dromara.system.domain.score.ScoreDataStudent;
 import org.dromara.system.domain.xiake.XiakeConfig;
 import org.dromara.system.domain.xiake.bo.XiakeConfigBo;
 import org.dromara.system.domain.xiake.vo.XiakeConfigVo;
@@ -143,6 +144,7 @@ public class XiakeConfigServiceImpl implements IXiakeConfigService {
         lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), XiakeConfig::getConfigKey, bo.getConfigKey());
         lqw.eq(StringUtils.isNotBlank(bo.getConfigValue()), XiakeConfig::getConfigValue, bo.getConfigValue());
         lqw.eq(StringUtils.isNotBlank(bo.getConfigType()), XiakeConfig::getConfigType, bo.getConfigType());
+        lqw.orderByDesc(XiakeConfig::getCreateTime);
         return lqw;
     }