paper

src/main/java/club/joylink/rtss/entity/paper/PaperComposition.java

@@ -28,7 +28,7 @@ public class PaperComposition implements Serializable {
     /**
      * 组织id
      */
-    private String companyId;
+    private Long orgId;
 
     /**
      * 启用起始时间

src/main/java/club/joylink/rtss/entity/paper/PaperCompositionExample.java

@@ -325,73 +325,63 @@ public class PaperCompositionExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIsNull() {
+        public Criteria andOrgIdIsNull() {
-            addCriterion("company_id is null");
+            addCriterion("org_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIsNotNull() {
+        public Criteria andOrgIdIsNotNull() {
-            addCriterion("company_id is not null");
+            addCriterion("org_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdEqualTo(String value) {
+        public Criteria andOrgIdEqualTo(Long value) {
-            addCriterion("company_id =", value, "companyId");
+            addCriterion("org_id =", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotEqualTo(String value) {
+        public Criteria andOrgIdNotEqualTo(Long value) {
-            addCriterion("company_id <>", value, "companyId");
+            addCriterion("org_id <>", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdGreaterThan(String value) {
+        public Criteria andOrgIdGreaterThan(Long value) {
-            addCriterion("company_id >", value, "companyId");
+            addCriterion("org_id >", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+        public Criteria andOrgIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("company_id >=", value, "companyId");
+            addCriterion("org_id >=", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLessThan(String value) {
+        public Criteria andOrgIdLessThan(Long value) {
-            addCriterion("company_id <", value, "companyId");
+            addCriterion("org_id <", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+        public Criteria andOrgIdLessThanOrEqualTo(Long value) {
-            addCriterion("company_id <=", value, "companyId");
+            addCriterion("org_id <=", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLike(String value) {
+        public Criteria andOrgIdIn(List<Long> values) {
-            addCriterion("company_id like", value, "companyId");
+            addCriterion("org_id in", values, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotLike(String value) {
+        public Criteria andOrgIdNotIn(List<Long> values) {
-            addCriterion("company_id not like", value, "companyId");
+            addCriterion("org_id not in", values, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIn(List<String> values) {
+        public Criteria andOrgIdBetween(Long value1, Long value2) {
-            addCriterion("company_id in", values, "companyId");
+            addCriterion("org_id between", value1, value2, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotIn(List<String> values) {
+        public Criteria andOrgIdNotBetween(Long value1, Long value2) {
-            addCriterion("company_id not in", values, "companyId");
+            addCriterion("org_id not between", value1, value2, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdBetween(String value1, String value2) {
-            addCriterion("company_id between", value1, value2, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdNotBetween(String value1, String value2) {
-            addCriterion("company_id not between", value1, value2, "companyId");
             return (Criteria) this;
         }
 

src/main/java/club/joylink/rtss/entity/paper/PaperRule.java

@@ -37,7 +37,7 @@ public class PaperRule implements Serializable {
     /**
      * 该类型题目数量
      */
-    private Integer sum;
+    private Integer amount;
 
     /**
      * 每题分值

src/main/java/club/joylink/rtss/entity/paper/PaperRuleExample.java

@@ -434,63 +434,63 @@ public class PaperRuleExample {
             return (Criteria) this;
         }
 
-        public Criteria andSumIsNull() {
+        public Criteria andAmountIsNull() {
-            addCriterion("`sum` is null");
+            addCriterion("amount is null");
             return (Criteria) this;
         }
 
-        public Criteria andSumIsNotNull() {
+        public Criteria andAmountIsNotNull() {
-            addCriterion("`sum` is not null");
+            addCriterion("amount is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSumEqualTo(Integer value) {
+        public Criteria andAmountEqualTo(Integer value) {
-            addCriterion("`sum` =", value, "sum");
+            addCriterion("amount =", value, "amount");
             return (Criteria) this;
         }
 
-        public Criteria andSumNotEqualTo(Integer value) {
+        public Criteria andAmountNotEqualTo(Integer value) {
-            addCriterion("`sum` <>", value, "sum");
+            addCriterion("amount <>", value, "amount");
             return (Criteria) this;
         }
 
-        public Criteria andSumGreaterThan(Integer value) {
+        public Criteria andAmountGreaterThan(Integer value) {
-            addCriterion("`sum` >", value, "sum");
+            addCriterion("amount >", value, "amount");
             return (Criteria) this;
         }
 
-        public Criteria andSumGreaterThanOrEqualTo(Integer value) {
+        public Criteria andAmountGreaterThanOrEqualTo(Integer value) {
-            addCriterion("`sum` >=", value, "sum");
+            addCriterion("amount >=", value, "amount");
             return (Criteria) this;
         }
 
-        public Criteria andSumLessThan(Integer value) {
+        public Criteria andAmountLessThan(Integer value) {
-            addCriterion("`sum` <", value, "sum");
+            addCriterion("amount <", value, "amount");
             return (Criteria) this;
         }
 
-        public Criteria andSumLessThanOrEqualTo(Integer value) {
+        public Criteria andAmountLessThanOrEqualTo(Integer value) {
-            addCriterion("`sum` <=", value, "sum");
+            addCriterion("amount <=", value, "amount");
             return (Criteria) this;
         }
 
-        public Criteria andSumIn(List<Integer> values) {
+        public Criteria andAmountIn(List<Integer> values) {
-            addCriterion("`sum` in", values, "sum");
+            addCriterion("amount in", values, "amount");
             return (Criteria) this;
         }
 
-        public Criteria andSumNotIn(List<Integer> values) {
+        public Criteria andAmountNotIn(List<Integer> values) {
-            addCriterion("`sum` not in", values, "sum");
+            addCriterion("amount not in", values, "amount");
             return (Criteria) this;
         }
 
-        public Criteria andSumBetween(Integer value1, Integer value2) {
+        public Criteria andAmountBetween(Integer value1, Integer value2) {
-            addCriterion("`sum` between", value1, value2, "sum");
+            addCriterion("amount between", value1, value2, "amount");
             return (Criteria) this;
         }
 
-        public Criteria andSumNotBetween(Integer value1, Integer value2) {
+        public Criteria andAmountNotBetween(Integer value1, Integer value2) {
-            addCriterion("`sum` not between", value1, value2, "sum");
+            addCriterion("amount not between", value1, value2, "amount");
             return (Criteria) this;
         }
 

src/main/java/club/joylink/rtss/entity/paper/PaperUser.java

@@ -28,7 +28,7 @@ public class PaperUser implements Serializable {
     /**
      * 组织id
      */
-    private String companyId;
+    private Long orgId;
 
     /**
      * 用户最终得分

src/main/java/club/joylink/rtss/entity/paper/PaperUserExample.java

@@ -305,73 +305,63 @@ public class PaperUserExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIsNull() {
+        public Criteria andOrgIdIsNull() {
-            addCriterion("company_id is null");
+            addCriterion("org_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIsNotNull() {
+        public Criteria andOrgIdIsNotNull() {
-            addCriterion("company_id is not null");
+            addCriterion("org_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdEqualTo(String value) {
+        public Criteria andOrgIdEqualTo(Long value) {
-            addCriterion("company_id =", value, "companyId");
+            addCriterion("org_id =", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotEqualTo(String value) {
+        public Criteria andOrgIdNotEqualTo(Long value) {
-            addCriterion("company_id <>", value, "companyId");
+            addCriterion("org_id <>", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdGreaterThan(String value) {
+        public Criteria andOrgIdGreaterThan(Long value) {
-            addCriterion("company_id >", value, "companyId");
+            addCriterion("org_id >", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+        public Criteria andOrgIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("company_id >=", value, "companyId");
+            addCriterion("org_id >=", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLessThan(String value) {
+        public Criteria andOrgIdLessThan(Long value) {
-            addCriterion("company_id <", value, "companyId");
+            addCriterion("org_id <", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+        public Criteria andOrgIdLessThanOrEqualTo(Long value) {
-            addCriterion("company_id <=", value, "companyId");
+            addCriterion("org_id <=", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLike(String value) {
+        public Criteria andOrgIdIn(List<Long> values) {
-            addCriterion("company_id like", value, "companyId");
+            addCriterion("org_id in", values, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotLike(String value) {
+        public Criteria andOrgIdNotIn(List<Long> values) {
-            addCriterion("company_id not like", value, "companyId");
+            addCriterion("org_id not in", values, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIn(List<String> values) {
+        public Criteria andOrgIdBetween(Long value1, Long value2) {
-            addCriterion("company_id in", values, "companyId");
+            addCriterion("org_id between", value1, value2, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotIn(List<String> values) {
+        public Criteria andOrgIdNotBetween(Long value1, Long value2) {
-            addCriterion("company_id not in", values, "companyId");
+            addCriterion("org_id not between", value1, value2, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdBetween(String value1, String value2) {
-            addCriterion("company_id between", value1, value2, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdNotBetween(String value1, String value2) {
-            addCriterion("company_id not between", value1, value2, "companyId");
             return (Criteria) this;
         }
 

src/main/java/club/joylink/rtss/entity/paper/PaperUserQuestion.java

@@ -22,7 +22,7 @@ public class PaperUserQuestion implements Serializable {
     /**
      * 组织id
      */
-    private String companyId;
+    private Long orgId;
 
     /**
      * 试题类型：1-理论题，2-实训题

src/main/java/club/joylink/rtss/entity/paper/PaperUserQuestionExample.java

@@ -244,73 +244,63 @@ public class PaperUserQuestionExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIsNull() {
+        public Criteria andOrgIdIsNull() {
-            addCriterion("company_id is null");
+            addCriterion("org_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIsNotNull() {
+        public Criteria andOrgIdIsNotNull() {
-            addCriterion("company_id is not null");
+            addCriterion("org_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdEqualTo(String value) {
+        public Criteria andOrgIdEqualTo(Long value) {
-            addCriterion("company_id =", value, "companyId");
+            addCriterion("org_id =", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotEqualTo(String value) {
+        public Criteria andOrgIdNotEqualTo(Long value) {
-            addCriterion("company_id <>", value, "companyId");
+            addCriterion("org_id <>", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdGreaterThan(String value) {
+        public Criteria andOrgIdGreaterThan(Long value) {
-            addCriterion("company_id >", value, "companyId");
+            addCriterion("org_id >", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+        public Criteria andOrgIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("company_id >=", value, "companyId");
+            addCriterion("org_id >=", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLessThan(String value) {
+        public Criteria andOrgIdLessThan(Long value) {
-            addCriterion("company_id <", value, "companyId");
+            addCriterion("org_id <", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+        public Criteria andOrgIdLessThanOrEqualTo(Long value) {
-            addCriterion("company_id <=", value, "companyId");
+            addCriterion("org_id <=", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLike(String value) {
+        public Criteria andOrgIdIn(List<Long> values) {
-            addCriterion("company_id like", value, "companyId");
+            addCriterion("org_id in", values, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotLike(String value) {
+        public Criteria andOrgIdNotIn(List<Long> values) {
-            addCriterion("company_id not like", value, "companyId");
+            addCriterion("org_id not in", values, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIn(List<String> values) {
+        public Criteria andOrgIdBetween(Long value1, Long value2) {
-            addCriterion("company_id in", values, "companyId");
+            addCriterion("org_id between", value1, value2, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotIn(List<String> values) {
+        public Criteria andOrgIdNotBetween(Long value1, Long value2) {
-            addCriterion("company_id not in", values, "companyId");
+            addCriterion("org_id not between", value1, value2, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdBetween(String value1, String value2) {
-            addCriterion("company_id between", value1, value2, "companyId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyIdNotBetween(String value1, String value2) {
-            addCriterion("company_id not between", value1, value2, "companyId");
             return (Criteria) this;
         }
 

src/main/resources/mybatis/mapper/PaperCompositionDAO.xml

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="profile" jdbcType="VARCHAR" property="profile" />
-    <result column="company_id" jdbcType="VARCHAR" property="companyId" />
+    <result column="org_id" jdbcType="BIGINT" property="orgId" />
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
     <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
     <result column="valid_duration" jdbcType="INTEGER" property="validDuration" />
@@ -74,8 +74,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, profile, company_id, start_time, end_time, valid_duration, pass_score, 
+    id, `name`, profile, org_id, start_time, end_time, valid_duration, pass_score, creator_id, 
-    creator_id, create_time, update_time, `state`
+    create_time, update_time, `state`
   </sql>
   <select id="selectByExample" parameterType="club.joylink.rtss.entity.paper.PaperCompositionExample" resultMap="BaseResultMap">
     select
@@ -117,12 +117,12 @@
   </delete>
   <insert id="insert" parameterType="club.joylink.rtss.entity.paper.PaperComposition">
     insert into paper_composition (id, `name`, profile, 
-      company_id, start_time, end_time, 
+      org_id, start_time, end_time, 
       valid_duration, pass_score, creator_id, 
       create_time, update_time, `state`
       )
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{profile,jdbcType=VARCHAR}, 
-      #{companyId,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, 
+      #{orgId,jdbcType=BIGINT}, #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, 
       #{validDuration,jdbcType=INTEGER}, #{passScore,jdbcType=INTEGER}, #{creatorId,jdbcType=BIGINT}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER}
       )
@@ -139,8 +139,8 @@
       <if test="profile != null">
         profile,
       </if>
-      <if test="companyId != null">
+      <if test="orgId != null">
-        company_id,
+        org_id,
       </if>
       <if test="startTime != null">
         start_time,
@@ -177,8 +177,8 @@
       <if test="profile != null">
         #{profile,jdbcType=VARCHAR},
       </if>
-      <if test="companyId != null">
+      <if test="orgId != null">
-        #{companyId,jdbcType=VARCHAR},
+        #{orgId,jdbcType=BIGINT},
       </if>
       <if test="startTime != null">
         #{startTime,jdbcType=TIMESTAMP},
@@ -224,8 +224,8 @@
       <if test="record.profile != null">
         profile = #{record.profile,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyId != null">
+      <if test="record.orgId != null">
-        company_id = #{record.companyId,jdbcType=VARCHAR},
+        org_id = #{record.orgId,jdbcType=BIGINT},
       </if>
       <if test="record.startTime != null">
         start_time = #{record.startTime,jdbcType=TIMESTAMP},
@@ -261,7 +261,7 @@
     set id = #{record.id,jdbcType=BIGINT},
       `name` = #{record.name,jdbcType=VARCHAR},
       profile = #{record.profile,jdbcType=VARCHAR},
-      company_id = #{record.companyId,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=BIGINT},
       start_time = #{record.startTime,jdbcType=TIMESTAMP},
       end_time = #{record.endTime,jdbcType=TIMESTAMP},
       valid_duration = #{record.validDuration,jdbcType=INTEGER},
@@ -283,8 +283,8 @@
       <if test="profile != null">
         profile = #{profile,jdbcType=VARCHAR},
       </if>
-      <if test="companyId != null">
+      <if test="orgId != null">
-        company_id = #{companyId,jdbcType=VARCHAR},
+        org_id = #{orgId,jdbcType=BIGINT},
       </if>
       <if test="startTime != null">
         start_time = #{startTime,jdbcType=TIMESTAMP},
@@ -317,7 +317,7 @@
     update paper_composition
     set `name` = #{name,jdbcType=VARCHAR},
       profile = #{profile,jdbcType=VARCHAR},
-      company_id = #{companyId,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=BIGINT},
       start_time = #{startTime,jdbcType=TIMESTAMP},
       end_time = #{endTime,jdbcType=TIMESTAMP},
       valid_duration = #{validDuration,jdbcType=INTEGER},

src/main/resources/mybatis/mapper/PaperRuleDAO.xml

@@ -7,7 +7,7 @@
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="subType" jdbcType="INTEGER" property="subtype" />
     <result column="tags" jdbcType="VARCHAR" property="tags" />
-    <result column="sum" jdbcType="INTEGER" property="sum" />
+    <result column="amount" jdbcType="INTEGER" property="amount" />
     <result column="score" jdbcType="INTEGER" property="score" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -69,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, pc_id, `type`, subType, tags, `sum`, score
+    id, pc_id, `type`, subType, tags, amount, score
   </sql>
   <select id="selectByExample" parameterType="club.joylink.rtss.entity.paper.PaperRuleExample" resultMap="BaseResultMap">
     select
@@ -111,10 +111,10 @@
   </delete>
   <insert id="insert" parameterType="club.joylink.rtss.entity.paper.PaperRule">
     insert into paper_rule (id, pc_id, `type`, 
-      subType, tags, `sum`, 
+      subType, tags, amount, 
       score)
     values (#{id,jdbcType=BIGINT}, #{pcId,jdbcType=BIGINT}, #{type,jdbcType=INTEGER}, 
-      #{subtype,jdbcType=INTEGER}, #{tags,jdbcType=VARCHAR}, #{sum,jdbcType=INTEGER}, 
+      #{subtype,jdbcType=INTEGER}, #{tags,jdbcType=VARCHAR}, #{amount,jdbcType=INTEGER}, 
       #{score,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="club.joylink.rtss.entity.paper.PaperRule">
@@ -135,8 +135,8 @@
       <if test="tags != null">
         tags,
       </if>
-      <if test="sum != null">
+      <if test="amount != null">
-        `sum`,
+        amount,
       </if>
       <if test="score != null">
         score,
@@ -158,8 +158,8 @@
       <if test="tags != null">
         #{tags,jdbcType=VARCHAR},
       </if>
-      <if test="sum != null">
+      <if test="amount != null">
-        #{sum,jdbcType=INTEGER},
+        #{amount,jdbcType=INTEGER},
       </if>
       <if test="score != null">
         #{score,jdbcType=INTEGER},
@@ -190,8 +190,8 @@
       <if test="record.tags != null">
         tags = #{record.tags,jdbcType=VARCHAR},
       </if>
-      <if test="record.sum != null">
+      <if test="record.amount != null">
-        `sum` = #{record.sum,jdbcType=INTEGER},
+        amount = #{record.amount,jdbcType=INTEGER},
       </if>
       <if test="record.score != null">
         score = #{record.score,jdbcType=INTEGER},
@@ -208,7 +208,7 @@
       `type` = #{record.type,jdbcType=INTEGER},
       subType = #{record.subtype,jdbcType=INTEGER},
       tags = #{record.tags,jdbcType=VARCHAR},
-      `sum` = #{record.sum,jdbcType=INTEGER},
+      amount = #{record.amount,jdbcType=INTEGER},
       score = #{record.score,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -229,8 +229,8 @@
       <if test="tags != null">
         tags = #{tags,jdbcType=VARCHAR},
       </if>
-      <if test="sum != null">
+      <if test="amount != null">
-        `sum` = #{sum,jdbcType=INTEGER},
+        amount = #{amount,jdbcType=INTEGER},
       </if>
       <if test="score != null">
         score = #{score,jdbcType=INTEGER},
@@ -244,7 +244,7 @@
       `type` = #{type,jdbcType=INTEGER},
       subType = #{subtype,jdbcType=INTEGER},
       tags = #{tags,jdbcType=VARCHAR},
-      `sum` = #{sum,jdbcType=INTEGER},
+      amount = #{amount,jdbcType=INTEGER},
       score = #{score,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>

src/main/resources/mybatis/mapper/PaperUserDAO.xml

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="pc_id" jdbcType="BIGINT" property="pcId" />
-    <result column="company_id" jdbcType="VARCHAR" property="companyId" />
+    <result column="org_id" jdbcType="BIGINT" property="orgId" />
     <result column="score" jdbcType="INTEGER" property="score" />
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
     <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
@@ -71,7 +71,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, user_id, pc_id, company_id, score, start_time, end_time, cause, create_time
+    id, user_id, pc_id, org_id, score, start_time, end_time, cause, create_time
   </sql>
   <select id="selectByExample" parameterType="club.joylink.rtss.entity.paper.PaperUserExample" resultMap="BaseResultMap">
     select
@@ -113,11 +113,11 @@
   </delete>
   <insert id="insert" parameterType="club.joylink.rtss.entity.paper.PaperUser">
     insert into paper_user (id, user_id, pc_id, 
-      company_id, score, start_time, 
+      org_id, score, start_time, 
       end_time, cause, create_time
       )
     values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{pcId,jdbcType=BIGINT}, 
-      #{companyId,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{orgId,jdbcType=BIGINT}, #{score,jdbcType=INTEGER}, #{startTime,jdbcType=TIMESTAMP}, 
       #{endTime,jdbcType=TIMESTAMP}, #{cause,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -133,8 +133,8 @@
       <if test="pcId != null">
         pc_id,
       </if>
-      <if test="companyId != null">
+      <if test="orgId != null">
-        company_id,
+        org_id,
       </if>
       <if test="score != null">
         score,
@@ -162,8 +162,8 @@
       <if test="pcId != null">
         #{pcId,jdbcType=BIGINT},
       </if>
-      <if test="companyId != null">
+      <if test="orgId != null">
-        #{companyId,jdbcType=VARCHAR},
+        #{orgId,jdbcType=BIGINT},
       </if>
       <if test="score != null">
         #{score,jdbcType=INTEGER},
@@ -200,8 +200,8 @@
       <if test="record.pcId != null">
         pc_id = #{record.pcId,jdbcType=BIGINT},
       </if>
-      <if test="record.companyId != null">
+      <if test="record.orgId != null">
-        company_id = #{record.companyId,jdbcType=VARCHAR},
+        org_id = #{record.orgId,jdbcType=BIGINT},
       </if>
       <if test="record.score != null">
         score = #{record.score,jdbcType=INTEGER},
@@ -228,7 +228,7 @@
     set id = #{record.id,jdbcType=BIGINT},
       user_id = #{record.userId,jdbcType=BIGINT},
       pc_id = #{record.pcId,jdbcType=BIGINT},
-      company_id = #{record.companyId,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=BIGINT},
       score = #{record.score,jdbcType=INTEGER},
       start_time = #{record.startTime,jdbcType=TIMESTAMP},
       end_time = #{record.endTime,jdbcType=TIMESTAMP},
@@ -247,8 +247,8 @@
       <if test="pcId != null">
         pc_id = #{pcId,jdbcType=BIGINT},
       </if>
-      <if test="companyId != null">
+      <if test="orgId != null">
-        company_id = #{companyId,jdbcType=VARCHAR},
+        org_id = #{orgId,jdbcType=BIGINT},
       </if>
       <if test="score != null">
         score = #{score,jdbcType=INTEGER},
@@ -272,7 +272,7 @@
     update paper_user
     set user_id = #{userId,jdbcType=BIGINT},
       pc_id = #{pcId,jdbcType=BIGINT},
-      company_id = #{companyId,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=BIGINT},
       score = #{score,jdbcType=INTEGER},
       start_time = #{startTime,jdbcType=TIMESTAMP},
       end_time = #{endTime,jdbcType=TIMESTAMP},

src/main/resources/mybatis/mapper/PaperUserQuestionDAO.xml

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="club.joylink.rtss.entity.paper.PaperUserQuestion">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="pu_id" jdbcType="BIGINT" property="puId" />
-    <result column="company_id" jdbcType="VARCHAR" property="companyId" />
+    <result column="org_id" jdbcType="BIGINT" property="orgId" />
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="question_id" jdbcType="BIGINT" property="questionId" />
     <result column="state" jdbcType="INTEGER" property="state" />
@@ -68,7 +68,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, pu_id, company_id, `type`, question_id, `state`
+    id, pu_id, org_id, `type`, question_id, `state`
   </sql>
   <select id="selectByExample" parameterType="club.joylink.rtss.entity.paper.PaperUserQuestionExample" resultMap="BaseResultMap">
     select
@@ -109,10 +109,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="club.joylink.rtss.entity.paper.PaperUserQuestion">
-    insert into paper_user_question (id, pu_id, company_id, 
+    insert into paper_user_question (id, pu_id, org_id, 
       `type`, question_id, `state`
       )
-    values (#{id,jdbcType=BIGINT}, #{puId,jdbcType=BIGINT}, #{companyId,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=BIGINT}, #{puId,jdbcType=BIGINT}, #{orgId,jdbcType=BIGINT}, 
       #{type,jdbcType=INTEGER}, #{questionId,jdbcType=BIGINT}, #{state,jdbcType=INTEGER}
       )
   </insert>
@@ -125,8 +125,8 @@
       <if test="puId != null">
         pu_id,
       </if>
-      <if test="companyId != null">
+      <if test="orgId != null">
-        company_id,
+        org_id,
       </if>
       <if test="type != null">
         `type`,
@@ -145,8 +145,8 @@
       <if test="puId != null">
         #{puId,jdbcType=BIGINT},
       </if>
-      <if test="companyId != null">
+      <if test="orgId != null">
-        #{companyId,jdbcType=VARCHAR},
+        #{orgId,jdbcType=BIGINT},
       </if>
       <if test="type != null">
         #{type,jdbcType=INTEGER},
@@ -174,8 +174,8 @@
       <if test="record.puId != null">
         pu_id = #{record.puId,jdbcType=BIGINT},
       </if>
-      <if test="record.companyId != null">
+      <if test="record.orgId != null">
-        company_id = #{record.companyId,jdbcType=VARCHAR},
+        org_id = #{record.orgId,jdbcType=BIGINT},
       </if>
       <if test="record.type != null">
         `type` = #{record.type,jdbcType=INTEGER},
@@ -195,7 +195,7 @@
     update paper_user_question
     set id = #{record.id,jdbcType=BIGINT},
       pu_id = #{record.puId,jdbcType=BIGINT},
-      company_id = #{record.companyId,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=BIGINT},
       `type` = #{record.type,jdbcType=INTEGER},
       question_id = #{record.questionId,jdbcType=BIGINT},
       `state` = #{record.state,jdbcType=INTEGER}
@@ -209,8 +209,8 @@
       <if test="puId != null">
         pu_id = #{puId,jdbcType=BIGINT},
       </if>
-      <if test="companyId != null">
+      <if test="orgId != null">
-        company_id = #{companyId,jdbcType=VARCHAR},
+        org_id = #{orgId,jdbcType=BIGINT},
       </if>
       <if test="type != null">
         `type` = #{type,jdbcType=INTEGER},
@@ -227,7 +227,7 @@
   <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.paper.PaperUserQuestion">
     update paper_user_question
     set pu_id = #{puId,jdbcType=BIGINT},
-      company_id = #{companyId,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=BIGINT},
       `type` = #{type,jdbcType=INTEGER},
       question_id = #{questionId,jdbcType=BIGINT},
       `state` = #{state,jdbcType=INTEGER}