Browse Source

阿米巴开发

anderx 3 years ago
parent
commit
cd03381c21

+ 15 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -48,6 +48,7 @@
     <result column="channel_id" jdbcType="VARCHAR" property="channelId" />
     <result column="other" jdbcType="VARCHAR" property="other" />
     <result column="user_type" jdbcType="INTEGER" property="userType" />
+    <result column="examine_name" jdbcType="VARCHAR" property="examineName" />
   </resultMap>
   <sql id="Base_Column_List">
     order_no, order_type, creater, create_time, update_time, buyer_id, first_amount,
@@ -57,7 +58,7 @@
     contract_type, contacts, contact_mobile, legal_person, legal_person_tel, proof_count,
     proof_aid, proof_time, proof_status, order_dep, outsource, additional_order, primary_order,
     old_salesman_id, back_status, agreement_url, new_user, service_content, sales_type,
-    channel_id, other, user_type
+    channel_id, other, user_type, examine_name
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
@@ -85,7 +86,7 @@
       primary_order, old_salesman_id, back_status,
       agreement_url, new_user, service_content,
       sales_type, channel_id, other,
-      user_type)
+      user_type, examine_name)
     values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR},
       #{firstAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{settlementAmount,jdbcType=DECIMAL},
@@ -101,7 +102,7 @@
       #{primaryOrder,jdbcType=VARCHAR}, #{oldSalesmanId,jdbcType=VARCHAR}, #{backStatus,jdbcType=INTEGER},
       #{agreementUrl,jdbcType=VARCHAR}, #{newUser,jdbcType=INTEGER}, #{serviceContent,jdbcType=VARCHAR},
       #{salesType,jdbcType=INTEGER}, #{channelId,jdbcType=VARCHAR}, #{other,jdbcType=VARCHAR},
-      #{userType,jdbcType=INTEGER})
+      #{userType,jdbcType=INTEGER}, #{examineName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderNew">
     insert into t_order_new
@@ -244,6 +245,9 @@
       <if test="userType != null">
         user_type,
       </if>
+      <if test="examineName != null">
+        examine_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -384,6 +388,9 @@
       <if test="userType != null">
         #{userType,jdbcType=INTEGER},
       </if>
+      <if test="examineName != null">
+        #{examineName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderNew">
@@ -524,6 +531,9 @@
       <if test="userType != null">
         user_type = #{userType,jdbcType=INTEGER},
       </if>
+      <if test="examineName != null">
+        examine_name = #{examineName,jdbcType=VARCHAR},
+      </if>
     </set>
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
@@ -573,7 +583,8 @@
       sales_type = #{salesType,jdbcType=INTEGER},
       channel_id = #{channelId,jdbcType=VARCHAR},
       other = #{other,jdbcType=VARCHAR},
-      user_type = #{userType,jdbcType=INTEGER}
+      user_type = #{userType,jdbcType=INTEGER},
+      examine_name = #{examineName,jdbcType=VARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
 

+ 18 - 4
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -6,9 +6,9 @@ import java.util.Date;
 
 /**
  * t_order_new
- * @author
+ * @author 
  */
-public class TOrderNew {
+public class TOrderNew implements Serializable {
     /**
      * 订单编号
      */
@@ -80,7 +80,7 @@ public class TOrderNew {
     private Integer projectStatus;
 
     /**
-     * 特批状态 0-非特批 ,1-待审核,2-通过,3-驳回
+     * 特批状态 0-非特批 ,1-总裁待审核,2-总裁通过,3-总裁驳回 4董事长待审核 5董事长通过 6董事长驳回
      */
     private Integer approval;
 
@@ -239,6 +239,12 @@ public class TOrderNew {
      */
     private Integer userType;
 
+    /**
+     * 审核人员名称
+     */
+    private String examineName;
+
+    private static final long serialVersionUID = 1L;
 
     public String getOrderNo() {
         return orderNo;
@@ -607,4 +613,12 @@ public class TOrderNew {
     public void setUserType(Integer userType) {
         this.userType = userType;
     }
-}
+
+    public String getExamineName() {
+        return examineName;
+    }
+
+    public void setExamineName(String examineName) {
+        this.examineName = examineName;
+    }
+}