Browse Source

订单开票审核负责人开发

anderx 3 years ago
parent
commit
0bd77becb1

+ 25 - 25
src/main/java/com/goafanti/common/mapper/TOrderPaymentMapper.xml

@@ -31,8 +31,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
-    id, tid, node_id, choose_type, payment_type, company_name, quantity, payment_status, 
-    `status`, application_amount, payment_amount, remarks, create_time, aid, aname, tpc_id, 
+    id, tid, node_id, choose_type, payment_type, company_name, quantity, payment_status,
+    `status`, application_amount, payment_amount, remarks, create_time, aid, aname, tpc_id,
     process_status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -41,7 +41,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
-    select 
+    select
     <include refid="Base_Column_List" />
     from t_order_payment
     where id = #{id,jdbcType=INTEGER}
@@ -61,17 +61,17 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
-    insert into t_order_payment (id, tid, node_id, 
-      choose_type, payment_type, company_name, 
-      quantity, payment_status, `status`, 
-      application_amount, payment_amount, remarks, 
-      create_time, aid, aname, 
+    insert into t_order_payment (id, tid, node_id,
+      choose_type, payment_type, company_name,
+      quantity, payment_status, `status`,
+      application_amount, payment_amount, remarks,
+      create_time, aid, aname,
       tpc_id, process_status)
-    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, 
-      #{chooseType,jdbcType=INTEGER}, #{paymentType,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR}, 
-      #{quantity,jdbcType=INTEGER}, #{paymentStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
-      #{applicationAmount,jdbcType=DECIMAL}, #{paymentAmount,jdbcType=DECIMAL}, #{remarks,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR}, #{aname,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER},
+      #{chooseType,jdbcType=INTEGER}, #{paymentType,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR},
+      #{quantity,jdbcType=INTEGER}, #{paymentStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
+      #{applicationAmount,jdbcType=DECIMAL}, #{paymentAmount,jdbcType=DECIMAL}, #{remarks,jdbcType=VARCHAR},
+      #{createTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR}, #{aname,jdbcType=VARCHAR},
       #{tpcId,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderPayment">
@@ -272,8 +272,8 @@
       process_status = #{processStatus,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  
-  
+
+
     <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderPayment" useGeneratedKeys="true">
      insert into t_order_payment
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -393,13 +393,13 @@ select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name com
 	 from t_order_payment a
 	 left join t_order_task c on a.tid=c.id left join t_order_mid d on c.order_no=d.order_no where a.id= #{id}
   </select>
-  
+
   <select id="selectByTid" resultType="com.goafanti.organization.bo.outOrderPayment">
 		select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,choose_type chooseType,tpc.id tpcId,
 	  a.payment_status paymentStatus, a.status,a.payment_amount paymentAmount,a.remarks ,tpc.company_name tpcName,d.finance_name financeName ,
-	  c.order_no orderNo,date_format(a.create_time,'%Y-%m-%d %H:%i:%s')createTimes,a.application_amount applicationAmount 
-	 from t_order_payment a	 left join t_order_task c on a.tid=c.id left join t_order_mid d on c.order_no=d.order_no 
-	 left join third_party_company tpc on tpc.id=a.tpc_id where  a.tid= #{tid} 
+	  c.order_no orderNo,date_format(a.create_time,'%Y-%m-%d %H:%i:%s')createTimes,a.application_amount applicationAmount,d.finance_name  examineName
+	 from t_order_payment a	 left join t_order_task c on a.tid=c.id left join t_order_mid d on c.order_no=d.order_no
+	 left join third_party_company tpc on tpc.id=a.tpc_id where  a.tid= #{tid}
 	 <if test="chooseType != null">
 	 and a.choose_type = #{chooseType}
 	 </if>
@@ -407,7 +407,7 @@ select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name com
 	 and a.status in(0,1,2,3)
 	 </if>
   </select>
-  
+
   <select id="selectList" resultType="com.goafanti.organization.bo.outOrderPayment">
   select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,
 	  a.payment_status paymentStatus, a.status,a.payment_amount paymentAmount,a.remarks , b.quantity NodeQuantity,
@@ -425,19 +425,19 @@ select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name com
 	 and a.choose_type= #{chooseType}
 	 </if>
   </select>
-  
+
   <update id="updateByids">
   	 update t_order_payment set process_status= #{processStatus}
-	 where id in 
+	 where id in
   <foreach close=")" collection="list" index="" item="item" open="(" separator=",">
        #{item}
      </foreach>
   </update>
-  
+
   <select id="selectByCid" resultType="java.lang.Integer">
   select count(*) from t_order_payment where tpc_id = #{tpcId}
   </select>
-  
+
   <delete id="deleteByParam">
   delete from t_order_payment
     where 1=1
@@ -446,4 +446,4 @@ select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name com
     and choose_type = #{chooseType}
     </if>
   </delete>
-</mapper>
+</mapper>

+ 9 - 0
src/main/java/com/goafanti/organization/bo/outOrderPayment.java

@@ -87,6 +87,7 @@ public class outOrderPayment {
 	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private String aname;
+	private String examineName;
 
 	/**
 	 * Database Column Remarks: 流程状态 0发起 1咨询师管理员 2财务 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.process_status
@@ -94,6 +95,14 @@ public class outOrderPayment {
 	 */
 	private Integer processStatus;
 
+	public String getExamineName() {
+		return examineName;
+	}
+
+	public void setExamineName(String examineName) {
+		this.examineName = examineName;
+	}
+
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.id
 	 * @return  the value of t_order_payment.id