change 3 жил өмнө
parent
commit
fc15aa5df6
26 өөрчлөгдсөн 40 нэмэгдсэн , 2 устгасан
  1. 1 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseEducationTypeServiceImpl.java
  2. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseHandoutsBusinessServiceImpl.java
  3. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectProjectServiceImpl.java
  4. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorCategoryServiceImpl.java
  5. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorProjectServiceImpl.java
  6. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeInterfaceServiceImpl.java
  7. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayAisleServiceImpl.java
  8. 1 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayCostServiceImpl.java
  9. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayNatureServiceImpl.java
  10. 1 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayPayeeServiceImpl.java
  11. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayServeServiceImpl.java
  12. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PaySourceServiceImpl.java
  13. 1 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayVisitServiceImpl.java
  14. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/SchoolProjectServiceImpl.java
  15. 1 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseBusinessMapper.xml
  16. 1 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseHandoutsMapper.xml
  17. 1 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseProjectTypeMapper.xml
  18. 1 1
      zhongzheng-system/src/main/resources/mapper/modules/course/MajorExamineMapper.xml
  19. 2 1
      zhongzheng-system/src/main/resources/mapper/modules/course/MajorLabelMapper.xml
  20. 3 0
      zhongzheng-system/src/main/resources/mapper/modules/course/MajorMapper.xml
  21. 1 0
      zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml
  22. 1 0
      zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeSysMapper.xml
  23. 2 0
      zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml
  24. 1 0
      zhongzheng-system/src/main/resources/mapper/modules/pay/PayPayeeAisleMapper.xml
  25. 1 0
      zhongzheng-system/src/main/resources/mapper/modules/pay/PaySupplyMapper.xml
  26. 1 0
      zhongzheng-system/src/main/resources/mapper/modules/user/SchoolMapper.xml

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseEducationTypeServiceImpl.java

@@ -54,6 +54,7 @@ public class CourseEducationTypeServiceImpl extends ServiceImpl<CourseEducationT
         lqw.like(StrUtil.isNotBlank(bo.getEducationName()), CourseEducationType::getEducationName, bo.getEducationName());
         lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), CourseEducationType::getEncoder, bo.getEncoder());
         lqw.in(bo.getStatus() != null, CourseEducationType::getStatus, bo.getStatus());
+        lqw.orderByDesc(CourseEducationType::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseHandoutsBusinessServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.domain.CourseEducationType;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -42,6 +43,7 @@ public class CourseHandoutsBusinessServiceImpl extends ServiceImpl<CourseHandout
         lqw.eq(bo.getEducationId() != null, CourseHandoutsBusiness::getEducationId, bo.getEducationId());
         lqw.eq(bo.getBusinessId() != null, CourseHandoutsBusiness::getBusinessId, bo.getBusinessId());
         lqw.eq(bo.getHandoutsId() != null, CourseHandoutsBusiness::getHandoutsId, bo.getHandoutsId());
+        lqw.orderByDesc(CourseHandoutsBusiness::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectProjectServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.domain.CourseHandoutsBusiness;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -41,6 +42,7 @@ public class CourseSubjectProjectServiceImpl extends ServiceImpl<CourseSubjectPr
         LambdaQueryWrapper<CourseSubjectProject> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getProjectId() != null, CourseSubjectProject::getProjectId, bo.getProjectId());
         lqw.eq(bo.getSubjectId() != null, CourseSubjectProject::getSubjectId, bo.getSubjectId());
+        lqw.orderByDesc(CourseSubjectProject::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorCategoryServiceImpl.java

@@ -10,6 +10,7 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.bo.MajorCategoryAddBo;
 import com.zhongzheng.modules.course.bo.MajorCategoryEditBo;
 import com.zhongzheng.modules.course.bo.MajorCategoryQueryBo;
+import com.zhongzheng.modules.course.domain.CourseSubjectProject;
 import com.zhongzheng.modules.course.domain.MajorCategory;
 import com.zhongzheng.modules.course.mapper.MajorCategoryMapper;
 import com.zhongzheng.modules.course.service.IMajorCategoryService;
@@ -47,6 +48,7 @@ public class MajorCategoryServiceImpl extends ServiceImpl<MajorCategoryMapper, M
         lqw.eq(bo.getSort() != null, MajorCategory::getSort, bo.getSort());
         lqw.in(bo.getStatus() != null, MajorCategory::getStatus, bo.getStatus());
         lqw.like(StrUtil.isNotBlank(bo.getCategoryName()), MajorCategory::getCategoryName, bo.getCategoryName());
+        lqw.orderByDesc(MajorCategory::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorProjectServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.domain.MajorCategory;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -41,6 +42,7 @@ public class MajorProjectServiceImpl extends ServiceImpl<MajorProjectMapper, Maj
         LambdaQueryWrapper<MajorProject> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getProjectId() != null, MajorProject::getProjectId, bo.getProjectId());
         lqw.eq(bo.getMajorId() != null, MajorProject::getMajorId, bo.getMajorId());
+        lqw.orderByDesc(MajorProject::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeInterfaceServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.grade.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.domain.MajorProject;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -42,6 +43,7 @@ public class ClassGradeInterfaceServiceImpl extends ServiceImpl<ClassGradeInterf
         lqw.eq(bo.getType() != null, ClassGradeInterface::getType, bo.getType());
         lqw.like(StrUtil.isNotBlank(bo.getName()), ClassGradeInterface::getName, bo.getName());
         lqw.in(bo.getStatus() != null, ClassGradeInterface::getStatus, bo.getStatus());
+        lqw.orderByDesc(ClassGradeInterface::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayAisleServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.domain.CourseEducationType;
+import com.zhongzheng.modules.user.domain.SchoolProject;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -42,6 +43,7 @@ public class PayAisleServiceImpl extends ServiceImpl<PayAisleMapper, PayAisle> i
         LambdaQueryWrapper<PayAisle> lqw = Wrappers.lambdaQuery();
         lqw.eq(StrUtil.isNotBlank(bo.getPayWay()), PayAisle::getPayWay, bo.getPayWay());
         lqw.in(bo.getStatus() != null, PayAisle::getStatus, bo.getStatus());
+        lqw.orderByDesc(PayAisle::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayCostServiceImpl.java

@@ -42,6 +42,7 @@ public class PayCostServiceImpl extends ServiceImpl<PayCostMapper, PayCost> impl
         LambdaQueryWrapper<PayCost> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getCostName()), PayCost::getCostName, bo.getCostName());
         lqw.in(bo.getStatus() != null, PayCost::getStatus, bo.getStatus());
+        lqw.orderByDesc(PayCost::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayNatureServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.pay.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.pay.domain.PayAisle;
 import com.zhongzheng.modules.pay.domain.PayCost;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -42,6 +43,7 @@ public class PayNatureServiceImpl extends ServiceImpl<PayNatureMapper, PayNature
         LambdaQueryWrapper<PayNature> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getNatureName()), PayNature::getNatureName, bo.getNatureName());
         lqw.in(bo.getStatus() != null, PayNature::getStatus, bo.getStatus());
+        lqw.orderByDesc(PayNature::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayPayeeServiceImpl.java

@@ -42,6 +42,7 @@ public class PayPayeeServiceImpl extends ServiceImpl<PayPayeeMapper, PayPayee> i
         LambdaQueryWrapper<PayPayee> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getPayeeName()), PayPayee::getPayeeName, bo.getPayeeName());
         lqw.in(bo.getStatus() != null, PayPayee::getStatus, bo.getStatus());
+        lqw.orderByDesc(PayPayee::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayServeServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.pay.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.pay.domain.PayAisle;
 import com.zhongzheng.modules.pay.domain.PayPayee;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -42,6 +43,7 @@ public class PayServeServiceImpl extends ServiceImpl<PayServeMapper, PayServe> i
         LambdaQueryWrapper<PayServe> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getServeName()), PayServe::getServeName, bo.getServeName());
         lqw.in(bo.getStatus() != null, PayServe::getStatus, bo.getStatus());
+        lqw.orderByDesc(PayServe::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PaySourceServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.pay.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.pay.domain.PayAisle;
 import com.zhongzheng.modules.pay.domain.PayServe;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -42,6 +43,7 @@ public class PaySourceServiceImpl extends ServiceImpl<PaySourceMapper, PaySource
         LambdaQueryWrapper<PaySource> lqw = Wrappers.lambdaQuery();
         lqw.in(bo.getStatus() != null, PaySource::getStatus, bo.getStatus());
         lqw.like(StrUtil.isNotBlank(bo.getSourceName()), PaySource::getSourceName, bo.getSourceName());
+        lqw.orderByDesc(PaySource::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayVisitServiceImpl.java

@@ -42,6 +42,7 @@ public class PayVisitServiceImpl extends ServiceImpl<PayVisitMapper, PayVisit> i
         LambdaQueryWrapper<PayVisit> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getVisitName()), PayVisit::getVisitName, bo.getVisitName());
         lqw.in(bo.getStatus() != null, PayVisit::getStatus, bo.getStatus());
+        lqw.orderByDesc(PayVisit::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/SchoolProjectServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.user.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.grade.domain.ClassGradeInterface;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -41,6 +42,7 @@ public class SchoolProjectServiceImpl extends ServiceImpl<SchoolProjectMapper, S
         LambdaQueryWrapper<SchoolProject> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getProjectId() != null, SchoolProject::getProjectId, bo.getProjectId());
         lqw.eq(bo.getSchoolId() != null, SchoolProject::getSchoolId, bo.getSchoolId());
+        lqw.orderByDesc(SchoolProject::getUpdateTime);
         return entity2Vo(this.list(lqw));
     }
 

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseBusinessMapper.xml

@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null and id != ''">
             AND b.id = #{id}
         </if>
+        order by b.update_time desc
     </select>
 
 </mapper>

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseHandoutsMapper.xml

@@ -88,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND s.handouts_name like (concat('%', #{handoutsName}, '%'))
         </if>
         GROUP BY s.handouts_id
+        ORDER BY s.update_time
     </select>
 
 </mapper>

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseProjectTypeMapper.xml

@@ -51,5 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null and id != ''">
             AND p.id = #{id}
         </if>
+        order by p.update_time desc
     </select>
 </mapper>

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/course/MajorExamineMapper.xml

@@ -50,6 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
-
+        order by b.update_time desc
     </select>
 </mapper>

+ 2 - 1
zhongzheng-system/src/main/resources/mapper/modules/course/MajorLabelMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="labelName != null and labelName != ''">
             AND l.label_name = #{labelName}
         </if>
-
+        order by l.update_time desc
     </select>
 
     <select id="listMajor" parameterType="com.zhongzheng.modules.course.bo.MajorLabelQueryBo"  resultMap="MajorLabelVoResult">
@@ -73,5 +73,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null and id != ''">
             AND l.id = #{id}
         </if>
+        order by l.update_time desc
     </select>
 </mapper>

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/MajorMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null and id!=0 ">
             AND j.major_id = #{id}
         </if>
+        order by j.update_time desc
     </select>
 
     <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.MajorQueryBo"  resultMap="MajorResult">
@@ -75,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="businessId != null and businessId!=0 ">
             AND b.id = #{businessId}
         </if>
+        group by m.id
+        order by m.update_time
     </select>
 
 </mapper>

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -178,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND d.major_id =#{majorId}
             ) >0
         </if>
+        order by s.update_time desc
     </select>
 
     <select id="queryGoodsList" parameterType="Long" resultMap="GoodsResultVo">

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeSysMapper.xml

@@ -49,5 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="gradeId != null and gradeId != ''">
             AND s.grade_id = #{gradeId}
         </if>
+        order by s.update_time desc
     </select>
 </mapper>

+ 2 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -67,6 +67,7 @@
         <if test="gradeId != null and gradeId != ''">
             AND g.grade_id = #{gradeId}
         </if>
+        order by g.update_time desc
     </select>
 
     <select id="listUser" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
@@ -102,5 +103,6 @@
         <if test="userId != null and userId != ''">
             and u.user_id= #{userId}
         </if>
+        order by u.update_time desc
     </select>
 </mapper>

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/pay/PayPayeeAisleMapper.xml

@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="payeeName != null and payeeName != ''">
             AND y.payee_name  like concat('%', #{payeeName}, '%')
         </if>
+        order by p.update_time desc
     </select>
 
 </mapper>

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/pay/PaySupplyMapper.xml

@@ -40,5 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="supplyId != null and supplyId != ''">
             AND p.supply_id = #{supplyId}
         </if>
+        order by s.update_time desc
     </select>
 </mapper>

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/SchoolMapper.xml

@@ -111,5 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND b.id = #{businessId}
         </if>
         GROUP BY s.id
+        order by s.update_time
     </select>
 </mapper>