add 业务层次排序

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessAddBo.java

@@ -69,4 +69,7 @@ public class CourseBusinessAddBo {
     /** 退款确认审核用户ID拼接 */
     @ApiModelProperty("退款确认审核用户ID拼接")
     private String refundConfirmUserIds;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessEditBo.java

@@ -81,4 +81,7 @@ public class CourseBusinessEditBo {
     /** 退款确认审核用户ID拼接 */
     @ApiModelProperty("退款确认审核用户ID拼接")
     private String refundConfirmUserIds;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessQueryBo.java

@@ -74,5 +74,7 @@ public class CourseBusinessQueryBo extends BaseEntity {
 	/** 学时确认审核用户ID拼接 */
 	@ApiModelProperty("学时确认审核用户ID拼接")
 	private String periodConfirmUserIds;
-
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEducationTypeAddBo.java

@@ -41,4 +41,7 @@ public class CourseEducationTypeAddBo {
     @Excel(name = "1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
     @ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
     private String tireStatus;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEducationTypeEditBo.java

@@ -45,5 +45,7 @@ public class CourseEducationTypeEditBo {
     @Excel(name = "1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
     @ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
     private String tireStatus;
-
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEducationTypeQueryBo.java

@@ -52,4 +52,8 @@ public class CourseEducationTypeQueryBo extends BaseEntity {
 	@Excel(name = "1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
 	@ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
 	private String tireStatus;
+
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseProjectTypeAddBo.java

@@ -39,4 +39,7 @@ public class CourseProjectTypeAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseProjectTypeEditBo.java

@@ -44,5 +44,7 @@ public class CourseProjectTypeEditBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
-
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseProjectTypeQueryBo.java

@@ -52,4 +52,8 @@ public class CourseProjectTypeQueryBo extends BaseEntity {
 	/**  状态 1正常 0关闭 */
 	@ApiModelProperty(" 状态 1正常 0关闭")
 	private List<Integer> status;
+
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectAddBo.java

@@ -40,4 +40,7 @@ public class CourseSubjectAddBo {
     /** 科目名称 */
     @ApiModelProperty("科目名称")
     private Long[] courseSubjectProjects;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectEditBo.java

@@ -44,5 +44,7 @@ public class CourseSubjectEditBo {
     /** 科目名称 */
     @ApiModelProperty("科目名称")
     private Long[] courseSubjectProjects;
-
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectQueryBo.java

@@ -67,4 +67,7 @@ public class CourseSubjectQueryBo extends BaseEntity {
 	/** yes */
 	@ApiModelProperty("yes")
 	private Long wrong;
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorAddBo.java

@@ -46,4 +46,8 @@ public class MajorAddBo {
     /** 绑定项目id集合 */
     @ApiModelProperty("绑定项目id集合")
     private Long[] majorProjects;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorEditBo.java

@@ -54,5 +54,7 @@ public class MajorEditBo {
     /** 绑定项目id集合 */
     @ApiModelProperty("绑定项目id集合")
     private Long[] majorProjects;
-
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorQueryBo.java

@@ -68,4 +68,8 @@ public class MajorQueryBo extends BaseEntity {
 	/** 业务层次id */
 	@ApiModelProperty("业务层次id")
 	private Long businessId;
+
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseBusiness.java

@@ -62,4 +62,6 @@ private static final long serialVersionUID=1L;
     private String refundUserIds;
     /** 退款确认审核用户ID拼接 */
     private String refundConfirmUserIds;
+    /** 排序 */
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseEducationType.java

@@ -41,4 +41,6 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+    /** 排序 */
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseProjectType.java

@@ -42,4 +42,6 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+    /** 排序 */
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSubject.java

@@ -40,4 +40,6 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** 科目名称 */
     private String subjectName;
+    /** 排序 */
+    private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Major.java

@@ -44,4 +44,6 @@ private static final long serialVersionUID=1L;
     private Integer status;
     /** 编码ZY */
     private String encoder;
+    /** 排序 */
+    private Integer sort;
 }

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

@@ -53,7 +53,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);
+        lqw.orderByAsc(CourseEducationType::getSort);
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseBusinessVo.java

@@ -112,4 +112,8 @@ public class CourseBusinessVo {
 	@Excel(name = "退款确认审核用户ID拼接")
 	@ApiModelProperty("退款确认审核用户ID拼接")
 	private String refundConfirmUserIds;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseEducationTypeVo.java

@@ -44,4 +44,8 @@ public class CourseEducationTypeVo {
 	@Excel(name = "1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
 	@ApiModelProperty("1,2,3,4 逗号隔开 代表层次1项目类型，2业务类型，3院校，4专业")
 	private String tireStatus;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseProjectTypeVo.java

@@ -48,4 +48,8 @@ public class CourseProjectTypeVo {
 	@Excel(name = "0 未启用 1启用")
 	@ApiModelProperty("0 未启用 1启用")
 	private Integer status;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseSubjectVo.java

@@ -45,4 +45,8 @@ public class CourseSubjectVo {
 	@Excel(name = "绑定项目类型")
 	@ApiModelProperty("绑定项目类型")
 	private List<CourseProjectTypeVo> courseProjectTypes;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/MajorVo.java

@@ -63,4 +63,8 @@ public class MajorVo {
 	@Excel(name = "专业项目")
 	@ApiModelProperty("专业项目")
 	private List<CourseProjectTypeVo> courseProjectTypeVo;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

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

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="periodConfirmUserIds" column="period_confirm_user_ids"/>
         <result property="refundUserIds" column="refund_user_ids"/>
         <result property="refundConfirmUserIds" column="refund_confirm_user_ids"/>
+        <result property="sort" column="sort"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseBusinessVo" id="CourseBusinessVoResult">
@@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="periodConfirmUserIds" column="period_confirm_user_ids"/>
         <result property="refundUserIds" column="refund_user_ids"/>
         <result property="refundConfirmUserIds" column="refund_confirm_user_ids"/>
+        <result property="sort" column="sort"/>
     </resultMap>
 
 
@@ -79,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null and id != ''">
             AND b.id = #{id}
         </if>
-        order by b.create_time desc
+        order by b.sort
     </select>
 
 

zhongzheng-system/src/main/resources/mapper/modules/course/CourseEducationTypeMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="sort" column="sort"/>
     </resultMap>
 
 

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

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="sort" column="sort"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseProjectTypeVo" id="CourseProjectTypeVoResult">
@@ -23,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="educationId" column="education_id"/>
         <result property="educationName" column="education_name"/>
         <result property="status" column="status"/>
+        <result property="sort" column="sort"/>
     </resultMap>
 
     <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo"  resultMap="CourseProjectTypeVoResult">
@@ -51,6 +53,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
+        order by p.sort
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseSubjectMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="subjectName" column="subject_name"/>
+        <result property="sort" column="sort"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseProjectTypeVo" id="CourseProjectTypeVoResult">
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
         <result property="status" column="status"/>
         <result property="subjectName" column="subject_name"/>
+        <result property="sort" column="sort"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseProjectTypeVo" id="CourseProjectTypeVoTwoResult">
@@ -93,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null and id!='' ">
             and s.id = #{id}
         </if>
-        order by s.update_time desc
+        order by s.sort
     </select>
 
     <select id="queryProject" parameterType="map"  resultMap="CourseProjectTypeVoResult">

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

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="labelId" column="label_id"/>
         <result property="status" column="status"/>
         <result property="encoder" column="encoder"/>
+        <result property="sort" column="sort"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseProjectTypeVo" id="CourseProjectTypeVoResult">
@@ -80,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND b.id = #{businessId}
         </if>
         group by m.id
-        order by m.update_time desc
+        order by m.sort
     </select>
 
 </mapper>