From 5371cd3262eea83baa626edddb5a6b1a9ede3cae Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 01 Apr 2021 21:52:59 +0800
Subject: [PATCH] 业绩新增收款方式
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index c99b814..408bb1b 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -44,12 +44,12 @@
<result property="guwen" column="guwen" />
<result property="meiliao" column="meiliao" />
<result property="zkTotal" column="zk_total" />
-
+ <result property="payMethod" column="pay_method" />
<result property="arriveCnt" column="arrive_cnt" />
<result property="goodsNo" column="goodsNo" />
<result property="goodsName" column="goodsName" />
- <result property="payMethod" column="pay_method" />
+
<result property="cateName" column="cateName" />
</resultMap>
@@ -287,7 +287,7 @@
<result property="remark" column="remark" />
<result property="orderType" column="order_type" />
<result property="projPercentage" column="proj_percentage" />
-
+ <result property="payMethod" column="pay_method" />
<result property="t1" column="t1" />
<result property="t2" column="t2" />
<result property="achieveType" column="achieveType" />
@@ -330,7 +330,8 @@
t6,
t8,
t9,
- company_id
+ company_id,
+pay_method
</sql>
<!-- 属性sql -->
@@ -364,7 +365,8 @@
#{item.t6},
#{item.t8},
#{item.t9},
- #{item.companyId}
+ #{item.companyId},
+ #{item.payMethod}
</sql>
<!-- where sql -->
@@ -612,6 +614,9 @@
<if test="_parameter.containsKey('t9')">
t9 = #{t9},
</if>
+ <if test="_parameter.containsKey('payMethod')">
+ pay_method = #{payMethod},
+ </if>
</set>
WHERE id=#{id}
</update>
@@ -724,6 +729,9 @@
</if>
<if test="record.t9 != null and record.t9 != '' ">
t9 = #{record.t9},
+ </if>
+ <if test="record.payMethod != null and record.payMethod != '' ">
+ pay_method = #{record.payMethod},
</if>
</set>
WHERE id=#{record.id}
@@ -1002,8 +1010,7 @@
b.code goodsNo,
b.name goodsName,
c.su_name meiliao,
- d.count*d.zk_price zk_total,
- d.pay_method
+ d.count*d.zk_price zk_total
from achieve_new a
left join shopping_goods b on a.shopping_goods_id=b.id
left join sys_users c on a.beault_id=c.su_id
--
Gitblit v1.9.1