Browse Source

Merge branch 'test'

anderx 2 years ago
parent
commit
8e76b28bed

+ 18 - 7
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -50,6 +50,7 @@
     <result column="user_type" jdbcType="INTEGER" property="userType" />
     <result column="examine_name" jdbcType="VARCHAR" property="examineName" />
     <result column="tag" jdbcType="INTEGER" property="tag" />
+    <result column="patent_status" jdbcType="INTEGER" property="patentStatus" />
   </resultMap>
   <sql id="Base_Column_List">
     order_no, order_type, creater, create_time, update_time, buyer_id, first_amount,
@@ -59,7 +60,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, examine_name, tag
+    channel_id, other, user_type, examine_name, tag, patent_status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
@@ -87,8 +88,8 @@
       primary_order, old_salesman_id, back_status,
       agreement_url, new_user, service_content,
       sales_type, channel_id, other,
-      user_type, examine_name, tag
-      )
+      user_type, examine_name, tag,
+      patent_status)
     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},
@@ -104,8 +105,8 @@
       #{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}, #{examineName,jdbcType=VARCHAR}, #{tag,jdbcType=INTEGER}
-      )
+      #{userType,jdbcType=INTEGER}, #{examineName,jdbcType=VARCHAR}, #{tag,jdbcType=INTEGER},
+      #{patentStatus,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderNew">
     insert into t_order_new
@@ -254,6 +255,9 @@
       <if test="tag != null">
         tag,
       </if>
+      <if test="patentStatus != null">
+        patent_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -400,6 +404,9 @@
       <if test="tag != null">
         #{tag,jdbcType=INTEGER},
       </if>
+      <if test="patentStatus != null">
+        #{patentStatus,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderNew">
@@ -546,6 +553,9 @@
       <if test="tag != null">
         tag = #{tag,jdbcType=INTEGER},
       </if>
+      <if test="patentStatus != null">
+        patent_status = #{patentStatus,jdbcType=INTEGER},
+      </if>
     </set>
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
@@ -597,7 +607,8 @@
       other = #{other,jdbcType=VARCHAR},
       user_type = #{userType,jdbcType=INTEGER},
       examine_name = #{examineName,jdbcType=VARCHAR},
-      tag = #{tag,jdbcType=INTEGER}
+      tag = #{tag,jdbcType=INTEGER},
+      patent_status = #{patentStatus,jdbcType=INTEGER}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
 
@@ -1455,7 +1466,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       a.liquidation_status as liquidationStatus, a.process_status as processStatus, a.project_status as projectStatus, a.approval,a.sales_type salesType,
       a.order_remarks as orderRemarks, a.delete_sign as deleteSign, a.salesman_id as salesmanId, a.finance_id as financeId, technician_id as technicianId,
       a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts,a.channel_id channelId,
-      a.contact_mobile as contactMobile, a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount,
+      a.contact_mobile as contactMobile, a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount,a.patent_status patentStatus,
       a.proof_aid as proofAid,contract_picture_url as contractPictureUrl, c.name as salesmanName,dep.name as depName,d.name as financeName,
       c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.username as userName ,b.nickname as nickname ,e.back_status as backStatus,f.name as initiateName,
       e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,

+ 13 - 0
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -249,6 +249,11 @@ public class TOrderNew implements Serializable {
      */
     private Integer tag;
 
+    /**
+     * 0=客户自己完成,1=非客户自己完成
+     */
+    private Integer patentStatus;
+
     private static final long serialVersionUID = 1L;
 
     public String getOrderNo() {
@@ -634,4 +639,12 @@ public class TOrderNew implements Serializable {
     public void setTag(Integer tag) {
         this.tag = tag;
     }
+
+    public Integer getPatentStatus() {
+        return patentStatus;
+    }
+
+    public void setPatentStatus(Integer patentStatus) {
+        this.patentStatus = patentStatus;
+    }
 }

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -569,7 +569,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				createContractNo(t);
 			}
 			t.setBuyerId(t2.getBuyerId());
-			// 修改订单中间表信息
+			// 修改订单信息与中间表信息
 			updateOrderMid(t);
 			List<String> aids = new ArrayList<>();
 			Integer type=NoticeStatus.OTHER.getCode();