账户管理增加字段 区分来自问卷或账户申请

src/main/java/com/ccsens/carbasics/bean/po/AccountManage.java

@@ -26,6 +26,8 @@ public class AccountManage implements Serializable {
 
     private Byte auditStatus;
 
+    private Byte dataFrom;
+
     private Date createdAt;
 
     private Date updatedAt;
@@ -122,6 +124,14 @@ public class AccountManage implements Serializable {
         this.auditStatus = auditStatus;
     }
 
+    public Byte getDataFrom() {
+        return dataFrom;
+    }
+
+    public void setDataFrom(Byte dataFrom) {
+        this.dataFrom = dataFrom;
+    }
+
     public Date getCreatedAt() {
         return createdAt;
     }
@@ -163,6 +173,7 @@ public class AccountManage implements Serializable {
         sb.append(", submitterUserId=").append(submitterUserId);
         sb.append(", aduitUserId=").append(aduitUserId);
         sb.append(", auditStatus=").append(auditStatus);
+        sb.append(", dataFrom=").append(dataFrom);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);

src/main/java/com/ccsens/carbasics/bean/po/AccountManageExample.java

@@ -835,6 +835,66 @@ public class AccountManageExample {
             return (Criteria) this;
         }
 
+        public Criteria andDataFromIsNull() {
+            addCriterion("data_from is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromIsNotNull() {
+            addCriterion("data_from is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromEqualTo(Byte value) {
+            addCriterion("data_from =", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromNotEqualTo(Byte value) {
+            addCriterion("data_from <>", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromGreaterThan(Byte value) {
+            addCriterion("data_from >", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromGreaterThanOrEqualTo(Byte value) {
+            addCriterion("data_from >=", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromLessThan(Byte value) {
+            addCriterion("data_from <", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromLessThanOrEqualTo(Byte value) {
+            addCriterion("data_from <=", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromIn(List<Byte> values) {
+            addCriterion("data_from in", values, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromNotIn(List<Byte> values) {
+            addCriterion("data_from not in", values, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromBetween(Byte value1, Byte value2) {
+            addCriterion("data_from between", value1, value2, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromNotBetween(Byte value1, Byte value2) {
+            addCriterion("data_from not between", value1, value2, "dataFrom");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedAtIsNull() {
             addCriterion("created_at is null");
             return (Criteria) this;

src/main/java/com/ccsens/carbasics/service/AccountManageService.java

@@ -63,6 +63,7 @@ public class AccountManageService implements IAccountManageService {
         accountManage.setId(snowflake.nextId());
         accountManage.setSubmitterUserId(userId);
         accountManage.setAuditStatus((byte) 0);
+        accountManage.setDataFrom((byte) 0);
         accountManageDao.insertSelective(accountManage);
     }
 

src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java

@@ -223,6 +223,7 @@ public class QuestionnaireService implements IQuestionnaireService{
         accountManage.setSubmitterPhone(param.getPhone());
         accountManage.setSubmitterUserId(userId);
         accountManage.setAuditStatus((byte) 0);
+        accountManage.setDataFrom((byte) 1);
         accountManageDao.insertSelective(accountManage);
         return new QuestionnaireVo.SubmitInfo();
 //        if (ObjectUtil.isNotNull(submitId)) {

src/main/resources/mapper_raw/AccountManageMapper.xml

@@ -13,6 +13,7 @@
     <result column="submitter_user_id" jdbcType="BIGINT" property="submitterUserId" />
     <result column="aduit_user_id" jdbcType="BIGINT" property="aduitUserId" />
     <result column="audit_status" jdbcType="TINYINT" property="auditStatus" />
+    <result column="data_from" jdbcType="TINYINT" property="dataFrom" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -77,8 +78,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, hospital_name, department_name, department_code, position_name, position_code, 
-    submitter, submitter_phone, submitter_user_id, aduit_user_id, audit_status, created_at, 
-    updated_at, rec_status
+    submitter, submitter_phone, submitter_user_id, aduit_user_id, audit_status, data_from, 
+    created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.AccountManageExample" resultMap="BaseResultMap">
     select
@@ -114,13 +115,15 @@
     insert into t_qcp_account_manage (id, hospital_name, department_name, 
       department_code, position_name, position_code, 
       submitter, submitter_phone, submitter_user_id, 
-      aduit_user_id, audit_status, created_at, 
-      updated_at, rec_status)
+      aduit_user_id, audit_status, data_from, 
+      created_at, updated_at, rec_status
+      )
     values (#{id,jdbcType=BIGINT}, #{hospitalName,jdbcType=VARCHAR}, #{departmentName,jdbcType=VARCHAR}, 
       #{departmentCode,jdbcType=VARCHAR}, #{positionName,jdbcType=VARCHAR}, #{positionCode,jdbcType=VARCHAR}, 
       #{submitter,jdbcType=VARCHAR}, #{submitterPhone,jdbcType=VARCHAR}, #{submitterUserId,jdbcType=BIGINT}, 
-      #{aduitUserId,jdbcType=BIGINT}, #{auditStatus,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+      #{aduitUserId,jdbcType=BIGINT}, #{auditStatus,jdbcType=TINYINT}, #{dataFrom,jdbcType=TINYINT}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.AccountManage">
     insert into t_qcp_account_manage
@@ -158,6 +161,9 @@
       <if test="auditStatus != null">
         audit_status,
       </if>
+      <if test="dataFrom != null">
+        data_from,
+      </if>
       <if test="createdAt != null">
         created_at,
       </if>
@@ -202,6 +208,9 @@
       <if test="auditStatus != null">
         #{auditStatus,jdbcType=TINYINT},
       </if>
+      <if test="dataFrom != null">
+        #{dataFrom,jdbcType=TINYINT},
+      </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -255,6 +264,9 @@
       <if test="record.auditStatus != null">
         audit_status = #{record.auditStatus,jdbcType=TINYINT},
       </if>
+      <if test="record.dataFrom != null">
+        data_from = #{record.dataFrom,jdbcType=TINYINT},
+      </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -282,6 +294,7 @@
       submitter_user_id = #{record.submitterUserId,jdbcType=BIGINT},
       aduit_user_id = #{record.aduitUserId,jdbcType=BIGINT},
       audit_status = #{record.auditStatus,jdbcType=TINYINT},
+      data_from = #{record.dataFrom,jdbcType=TINYINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT}
@@ -322,6 +335,9 @@
       <if test="auditStatus != null">
         audit_status = #{auditStatus,jdbcType=TINYINT},
       </if>
+      <if test="dataFrom != null">
+        data_from = #{dataFrom,jdbcType=TINYINT},
+      </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -346,6 +362,7 @@
       submitter_user_id = #{submitterUserId,jdbcType=BIGINT},
       aduit_user_id = #{aduitUserId,jdbcType=BIGINT},
       audit_status = #{auditStatus,jdbcType=TINYINT},
+      data_from = #{dataFrom,jdbcType=TINYINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT}

src/main/resources/mbg.xml

@@ -21,7 +21,7 @@
 
         <!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://test.tall.wiki:3306/carbasics?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
+                        connectionURL="jdbc:mysql://test.tall.wiki:3306/carbasics_bak?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
                         userId="root"
                         password="po3OynBO[M3579p6L7)o">
         </jdbcConnection>
@@ -83,7 +83,8 @@
 <!--        <table tableName="t_qcp_first_aid_record" domainObjectName="FirstAidRecord"></table>-->
 <!--        <table tableName="t_constant" domainObjectName="ConstantDB"></table>-->
 <!--        <table tableName="t_qcp_last_role_choose" domainObjectName="LastRoleChoose"></table>-->
-        <table tableName="t_qcp_code_name" domainObjectName="CodeName"></table>
+<!--        <table tableName="t_qcp_code_name" domainObjectName="CodeName"></table>-->
+        <table tableName="t_qcp_account_manage" domainObjectName="AccountManage"></table>
 <!--        <table tableName="t_qcp_first_aid_record_log" domainObjectName="FirstAidRecordLog"></table>-->
 <!--        <table tableName="t_qcp_first_aid_record_log" domainObjectName="FirstAidRecordLog"></table>-->
 <!--        <table tableName="t_step" domainObjectName="Step"></table>-->