修改 sim_add_on_user 相关。

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/AddOnUserController.java

@@ -28,8 +28,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author tom
  * @date 2024-12-11
  */
-@RestController
-@RequestMapping("/sim/add_on_user")
+// @RestController
+// @RequestMapping("/sim/add_on_user")
 public class AddOnUserController extends BaseController {
     @Autowired
     private IAddOnUserService addOnUserService;

ruoyi-sim/src/main/java/com/ruoyi/sim/domain/AddOnUser.java

@@ -9,22 +9,16 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 用户附加对象 sim_add_on_user
  *
  * @author tom
- * @date 2024-12-11
+ * @date 2024-12-15
  */
 public class AddOnUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 用户ID
+     * 学员ID/教师ID/用户ID
      */
     private Long userId;
 
-    /**
-     * 专业ID
-     */
-    @Excel(name = "专业ID")
-    private Long majorId;
-
     public void setUserId(Long userId) {
         this.userId = userId;
     }
@@ -33,19 +27,10 @@ public class AddOnUser extends BaseEntity {
         return userId;
     }
 
-    public void setMajorId(Long majorId) {
-        this.majorId = majorId;
-    }
-
-    public Long getMajorId() {
-        return majorId;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("userId", getUserId())
-                .append("majorId", getMajorId())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

ruoyi-sim/src/main/java/com/ruoyi/sim/mapper/AddOnUserMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.sim.domain.AddOnUser;
  * 用户附加Mapper接口
  *
  * @author tom
- * @date 2024-12-11
+ * @date 2024-12-15
  */
 public interface AddOnUserMapper {
     /**

ruoyi-sim/src/main/java/com/ruoyi/sim/service/IAddOnUserService.java

@@ -8,7 +8,7 @@ import com.ruoyi.sim.domain.AddOnUser;
  * 用户附加Service接口
  *
  * @author tom
- * @date 2024-12-11
+ * @date 2024-12-15
  */
 public interface IAddOnUserService {
     /**

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/AddOnUserServiceImpl.java

@@ -3,7 +3,6 @@ package com.ruoyi.sim.service.impl;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.AddOnUserMapper;
@@ -14,11 +13,10 @@ import com.ruoyi.sim.service.IAddOnUserService;
  * 用户附加Service业务层处理
  *
  * @author tom
- * @date 2024-12-11
+ * @date 2024-12-15
  */
 @Service
 public class AddOnUserServiceImpl implements IAddOnUserService {
-
     @Autowired
     private AddOnUserMapper addOnUserMapper;
 

ruoyi-sim/src/main/resources/mapper/sim/AddOnUserMapper.xml

@@ -6,8 +6,7 @@
 
     <resultMap type="AddOnUser" id="AddOnUserResult">
         <result property="userId" column="user_id"/>
-        <result property="majorId" column="major_id"/>
-        <result property="createBy" column="createBy"/>
+        <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
@@ -15,15 +14,13 @@
     </resultMap>
 
     <sql id="selectAddOnUserVo">
-        select user_id, major_id, createBy, create_time, update_by, update_time, remark
+        select user_id, create_by, create_time, update_by, update_time, remark
         from sim_add_on_user
     </sql>
 
     <select id="selectAddOnUserList" parameterType="AddOnUser" resultMap="AddOnUserResult">
         <include refid="selectAddOnUserVo"/>
         <where>
-            <if test="majorId != null ">and major_id = #{majorId}</if>
-            <if test="createBy != null  and createBy != ''">and createBy = #{createBy}</if>
         </where>
     </select>
 
@@ -35,15 +32,13 @@
     <insert id="insertAddOnUser" parameterType="AddOnUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sim_add_on_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="majorId != null">major_id,</if>
-            <if test="createBy != null">createBy,</if>
+            <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="majorId != null">#{majorId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -55,8 +50,7 @@
     <update id="updateAddOnUser" parameterType="AddOnUser">
         update sim_add_on_user
         <trim prefix="SET" suffixOverrides=",">
-            <if test="majorId != null">major_id = #{majorId},</if>
-            <if test="createBy != null">createBy = #{createBy},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>