排序订单

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassStudentController.java

@@ -139,7 +139,7 @@ public class ClassStudentController extends BaseController {
     }
 
     /**
-     * 查询学员商品学习记录
+     * 查询学员商品题库学习记录
      */
     @ApiOperation("查询学员商品题库学习记录")
     @PreAuthorize("@ss.hasPermi('grade:student:list')")
@@ -147,7 +147,18 @@ public class ClassStudentController extends BaseController {
     public TableDataInfo<ExamStudyRecordVo> listExam(UserQueryBo bo) {
         startPage();
         List<ExamStudyRecordVo> list = iUserStudyRecordService.querExamStudy(bo);
+        return getDataTable(list);
+    }
 
+    /**
+     * 查询学员商品学习记录
+     */
+    @ApiOperation("查询学员商品卷学习记录")
+    @PreAuthorize("@ss.hasPermi('grade:student:list')")
+    @GetMapping("/listExamSon")
+    public TableDataInfo<ExamSonStudyRecordVo> listExamSon(SubjectStudyRecordQueryBo bo) {
+        startPage();
+        List<ExamSonStudyRecordVo> list = iUserStudyRecordService.listExamSon(bo);
         return getDataTable(list);
     }
 }

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));
     }
 

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));
     }
 

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));
     }
 

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));
     }
 

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));
     }
 

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));
     }
 

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));
     }
 

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));
     }
 

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));
     }
 

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));
     }
 

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));
     }
 

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));
     }
 

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));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SubjectStudyRecordQueryBo.java

@@ -45,7 +45,7 @@ public class SubjectStudyRecordQueryBo extends BaseEntity {
 
     /** 商品ID */
     @ApiModelProperty("商品ID")
-    private Long goodId;
+    private Long goodsId;
 
     /** 科目名称 */
     @ApiModelProperty("科目名称")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordMapper.java

@@ -31,4 +31,6 @@ public interface UserStudyRecordMapper extends BaseMapper<UserStudyRecord> {
     List<Long> sectionType(@Param("courseId") Long courseId,@Param("sectionType") Long sectionType);
 
     List<ExamStudyRecordVo> querExamStudy(UserQueryBo bo);
+
+    List<ExamSonStudyRecordVo> listExamSon(SubjectStudyRecordQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserStudyRecordService.java

@@ -60,4 +60,6 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 	List<SectionStudyRecordVo> listSection(SubjectStudyRecordQueryBo bo);
 
     List<ExamStudyRecordVo> querExamStudy(UserQueryBo bo);
+
+    List<ExamSonStudyRecordVo> listExamSon(SubjectStudyRecordQueryBo bo);
 }

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));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -142,7 +142,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             Long studyLong = 0L;
 
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
-            subjectStudyRecordQueryBo.setGoodId(goodsStudyRecordVo.getGoodsId());
+            subjectStudyRecordQueryBo.setGoodsId(goodsStudyRecordVo.getGoodsId());
             subjectStudyRecordQueryBo.setUserId(goodsStudyRecordVo.getUserId());
             List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
@@ -197,4 +197,11 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
         return examStudyRecordVos;
     }
+
+    @Override
+    public List<ExamSonStudyRecordVo> listExamSon(SubjectStudyRecordQueryBo bo) {
+        List<ExamSonStudyRecordVo> examSonStudyRecordVos = baseMapper.listExamSon(bo);
+
+        return examSonStudyRecordVos;
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/ExamSonStudyRecordVo.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.user.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author change
+ * @date 2021-06-24
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class ExamSonStudyRecordVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 题卷ID */
+    @ApiModelProperty("题卷ID")
+    private Long questionId;
+
+
+    /** 题卷名 */
+    @ApiModelProperty("题卷名")
+    private String questionName;
+
+    /** 模块数 */
+    @ApiModelProperty("模块数")
+    private Long moduleNum;
+
+    /** 章数 */
+    @ApiModelProperty("章数")
+    private Long chapterNum;
+
+    /** 节数 */
+    @ApiModelProperty("试卷数")
+    private Long examNum;
+
+    /** 科目名 */
+    @ApiModelProperty("科目名")
+    private String subjectName;
+
+    /** 题目数 */
+    @ApiModelProperty("题目数")
+    private Long questionNum;
+
+
+    /** 试卷类型 */
+    @ApiModelProperty("试卷类型")
+    private String examType;
+
+    /** 已做试卷 */
+    @ApiModelProperty("已做试卷")
+    private Long recordNum;
+}

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>

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>

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>

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>

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>

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>

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

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

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>

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

@@ -69,6 +69,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"
@@ -104,5 +105,6 @@
         <if test="userId != null and userId != ''">
             and u.user_id= #{userId}
         </if>
+        order by u.update_time desc
     </select>
 </mapper>

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>

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>

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

@@ -110,5 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="businessId != null and businessId!=0 ">
             AND b.id = #{businessId}
         </if>
+        GROUP BY s.id
+        order by s.update_time
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -80,6 +80,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stuAllNum" column="stu_all_num"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.user.vo.ExamSonStudyRecordVo" id="ExamSonStudyRecordVoResult">
+        <result property="questionId" column="question_id"/>
+        <result property="questionName" column="question_name"/>
+        <result property="moduleNum" column="module_num"/>
+        <result property="chapterNum" column="chapter_num"/>
+        <result property="examNum" column="exam_num"/>
+        <result property="subjectName" column="subject_name"/>
+        <result property="questionNum" column="question_num"/>
+        <result property="examType" column="exam_type"/>
+        <result property="recordNum" column="record_num"/>
+    </resultMap>
+
     <select id="selectList" parameterType="com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo"  resultMap="UserStudyRecordResult">
         SELECT DISTINCT
         temp.course_id,
@@ -150,8 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         course r
         LEFT JOIN goods_course c ON c.course_id = r.course_id
         where 1=1
-        <if test="goodId != null and goodId !=''">
-            and c.goods_id =#{goodId}
+        <if test="goodsId != null and goodsId !=''">
+            and c.goods_id =#{goodsId}
         </if>
     </select>
 
@@ -315,4 +327,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND o.user_id = #{userId}
         </if>
     </select>
+
+    <select id="listExamSon" parameterType="com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo"  resultMap="ExamSonStudyRecordVoResult">
+        SELECT
+        a.id as question_id,
+        e.exam_name as question_name,
+        (SELECT s.subject_name FROM question_business b LEFT JOIN course_subject s on b.subject_id= s.id where b.type =2 and b.major_id =a.major_id) as subject_name,
+        0 as module_num,
+        0 as chapter_num,
+        1 as exam_num,
+        (select COUNT(q.id) FROM exam_question q where e.exam_id = q.exam_id) as question_num,
+        (SELECT COUNT(DISTINCT r.exam_id) FROM user_bank_record r where r.goods_id = a.goods_id and r.exam_id = e.exam_id  <if test="userId != null and userId !=''">
+        AND r.user_id = #{userId}
+    </if> ) as record_num
+        FROM
+        goods_attached a
+        LEFT JOIN exam e ON a.major_id = e.exam_id
+        WHERE
+        a.type =3
+        <if test="goodsId != null and goodsId !=''">
+            and a.goods_id =#{goodsId}
+        </if>
+        UNION
+        SELECT
+        a.id as question_id,
+        c.`name` as question_name,
+        (SELECT s.subject_name FROM question_business b LEFT JOIN course_subject s on b.subject_id= s.id where b.type =3 and b.major_id =a.major_id) as subject_name,
+        0 as module_num,
+        1 as chapter_num,
+        (SELECT COUNT(e.id) FROM question_chapter_exam e where c.chapter_exam_id=e.chapter_exam_id) as exam_num,
+        (select COUNT(q.id) FROM exam_question q LEFT JOIN question_chapter_exam m  on m.exam_id = q.exam_id where m.chapter_exam_id = a.major_id) as question_num,
+        (SELECT COUNT(DISTINCT r.exam_id) FROM user_bank_record r LEFT JOIN question_chapter_exam m on r.exam_id = m.exam_id  where r.goods_id = a.goods_id and m.chapter_exam_id=c.chapter_exam_id   <if test="userId != null and userId !=''">
+        AND r.user_id = #{userId}
+    </if> ) as record_num
+        FROM
+        goods_attached a
+        LEFT JOIN question_chapter c ON a.major_id = c.chapter_exam_id
+        WHERE
+        a.type =2
+        <if test="goodsId != null and goodsId !=''">
+            and a.goods_id =#{goodsId}
+        </if>
+        UNION
+        SELECT
+        a.id as question_id,
+        c.module_name as question_name,
+        (SELECT s.subject_name FROM question_business b LEFT JOIN course_subject s on b.subject_id= s.id where b.type =4 and b.major_id =a.major_id) as subject_name,
+        1 as module_num,
+        (SELECT COUNT(e.id) FROM question_module_chapter e where c.module_exam_id=e.module_exam_id) as chapter_num,
+        (SELECT COUNT(e.id) FROM question_chapter_exam e LEFT JOIN question_module_chapter r on e.chapter_exam_id = r.chapter_exam_id  where c.module_exam_id=r.module_exam_id) as exam_num,
+        (select COUNT(q.id) FROM exam_question q LEFT JOIN question_chapter_exam m on m.exam_id = q.exam_id LEFT JOIN question_module_chapter r on m.chapter_exam_id = r.chapter_exam_id where r.module_exam_id = a.major_id) as question_num,
+        (SELECT COUNT(DISTINCT r.exam_id) FROM user_bank_record r LEFT JOIN question_chapter_exam m on r.exam_id = m.exam_id LEFT JOIN question_module_chapter l on l.chapter_exam_id = m.chapter_exam_id where r.goods_id = a.goods_id and l.module_exam_id = a.major_id  <if test="userId != null and userId !=''">
+        AND r.user_id = #{userId}
+    </if> ) as record_num
+        FROM
+        goods_attached a
+        LEFT JOIN question_module c ON a.major_id = c.module_exam_id
+        WHERE
+        a.type =1
+        <if test="goodsId != null and goodsId !=''">
+            and a.goods_id =#{goodsId}
+        </if>
+
+    </select>
 </mapper>