From 4881547c722ed501de6d64022b28c84b04885fc8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 06 九月 2023 19:09:01 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 1 +
src/main/java/com/zy/crm/manager/entity/Order.java | 12 ++++++++++--
src/main/webapp/views/order/order.html | 16 ++++++++++++++++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/Order.java b/src/main/java/com/zy/crm/manager/entity/Order.java
index 2104193..a114a16 100644
--- a/src/main/java/com/zy/crm/manager/entity/Order.java
+++ b/src/main/java/com/zy/crm/manager/entity/Order.java
@@ -178,16 +178,22 @@
@TableField("step")
private int step;
-
/**
* 娉ㄩ噴
*/
@ApiModelProperty(value= "娉ㄩ噴")
private String memo;
+ /**
+ * 棰勮鎴愪氦鐜�
+ */
+ @ApiModelProperty(value= "棰勮鎴愪氦鐜�")
+ private String transactionRate;
+
public Order() {}
- public Order(Long hostId,Long deptId,Long userId,Long cstmrId,String uuid,String name,Double money,Long company,String remarks,Long director,String province,String city,String district,String town,String addr,String files,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,Integer step,String memo) {
+ public Order(Long id, Long hostId, Long deptId, Long userId, Long cstmrId, String uuid, String name, Double money, Long company, String remarks, Long director, String province, String city, String district, String town, String addr, String files, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, int step, String memo, String transactionRate, String pcd) {
+ this.id = id;
this.hostId = hostId;
this.deptId = deptId;
this.userId = userId;
@@ -211,6 +217,8 @@
this.updateTime = updateTime;
this.step = step;
this.memo = memo;
+ this.transactionRate = transactionRate;
+ this.pcd = pcd;
}
// Order order = new Order(
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 92140e8..e4c3ef7 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -27,6 +27,7 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
+ <result column="transaction_rate" property="transactionRate" />
</resultMap>
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 44b363e..15c5573 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -176,6 +176,22 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">棰勮鎴愪氦鐜�: </label>
+ <div class="layui-input-block">
+ <select name="transactionRate">
+ <option value="">璇烽�夋嫨棰勮鎴愪氦鐜�</option>
+ <option value="30">30%</option>
+ <option value="40">40%</option>
+ <option value="50">50%</option>
+ <option value="60">60%</option>
+ <option value="70">70%</option>
+ <option value="80">80%</option>
+ <option value="90">90%</option>
+ <option value="100">100%</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label">椤圭洰鍦板潃: </label>
<div class="layui-input-block">
<input class="layui-input" name="addr" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" autocomplete="off">
--
Gitblit v1.9.1