Commit db9eca18 authored by huyuchen's avatar huyuchen

订单优化修改

parent 44cbd7e9
...@@ -107,4 +107,10 @@ public class TOrder implements Serializable { ...@@ -107,4 +107,10 @@ public class TOrder implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 星级
*/
@Schema(description = "星级")
private String level;
} }
\ No newline at end of file
...@@ -78,4 +78,10 @@ public class OrderAddVO implements Serializable { ...@@ -78,4 +78,10 @@ public class OrderAddVO implements Serializable {
*/ */
@Schema(description = "附件") @Schema(description = "附件")
private MultipartFile[] file; private MultipartFile[] file;
/**
* 星级
*/
@Schema(description = "星级")
private String level;
} }
...@@ -65,4 +65,10 @@ public class OrderListVO implements Serializable{ ...@@ -65,4 +65,10 @@ public class OrderListVO implements Serializable{
*/ */
@Schema(description = "订单状态 0待办理 1办理中 2已办结") @Schema(description = "订单状态 0待办理 1办理中 2已办结")
private Integer orderStatus; private Integer orderStatus;
/**
* 星级
*/
@Schema(description = "星级")
private String level;
} }
...@@ -16,12 +16,13 @@ ...@@ -16,12 +16,13 @@
<result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/> <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/> <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
<result property="updateName" column="UPDATE_NAME" jdbcType="VARCHAR"/> <result property="updateName" column="UPDATE_NAME" jdbcType="VARCHAR"/>
<result property="level" column="LEVEL" jdbcType="VARCHAR"/>
<result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/> <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
<result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/> <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
ID,ORDER_NO,CUSTOMER_NAME, ID,ORDER_NO,CUSTOMER_NAME,LEVEL,
DEPT_NAME,DEPT_NO,ORDER_STATUS, DEPT_NAME,DEPT_NO,ORDER_STATUS,
ORDER_CONTENT,CREATE_NAME,CREATE_TIME, ORDER_CONTENT,CREATE_NAME,CREATE_TIME,
UPDATE_BY,UPDATE_NAME,UPDATE_TIME, UPDATE_BY,UPDATE_NAME,UPDATE_TIME,
...@@ -61,6 +62,9 @@ ...@@ -61,6 +62,9 @@
<if test="param.orderStatus != null"> <if test="param.orderStatus != null">
and a.ORDER_STATUS = #{param.orderStatus} and a.ORDER_STATUS = #{param.orderStatus}
</if> </if>
<if test="param.level != null">
and a.LEVEL = #{param.level}
</if>
<if test="param.authSql != null and param.authSql.trim() != ''"> <if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql} ${param.authSql}
</if> </if>
...@@ -76,6 +80,7 @@ ...@@ -76,6 +80,7 @@
t.CUSTOMER_NAME as customerName, t.CUSTOMER_NAME as customerName,
t.DEPT_NAME as deptName, t.DEPT_NAME as deptName,
t.DEPT_NO as deptNo, t.DEPT_NO as deptNo,
t.LEVEL as level,
t.ORDER_STATUS as orderStatus t.ORDER_STATUS as orderStatus
from t_order t from t_order t
where t.DELETE_FLAG = 0 and t.id in where t.DELETE_FLAG = 0 and t.id in
...@@ -93,6 +98,7 @@ ...@@ -93,6 +98,7 @@
a.CUSTOMER_NAME as customerName, a.CUSTOMER_NAME as customerName,
a.DEPT_NAME as deptName, a.DEPT_NAME as deptName,
a.DEPT_NO as deptNo, a.DEPT_NO as deptNo,
a.LEVEL as level,
a.ORDER_STATUS as orderStatus a.ORDER_STATUS as orderStatus
from t_order a from t_order a
left join t_order_handler h on h.ORDER_NO = a.ORDER_NO left join t_order_handler h on h.ORDER_NO = a.ORDER_NO
...@@ -118,6 +124,9 @@ ...@@ -118,6 +124,9 @@
<if test="param.orderStatus != null"> <if test="param.orderStatus != null">
and a.ORDER_STATUS = #{param.orderStatus} and a.ORDER_STATUS = #{param.orderStatus}
</if> </if>
<if test="param.level != null">
and a.LEVEL = #{param.level}
</if>
<if test="param.authSql != null and param.authSql.trim() != ''"> <if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql} ${param.authSql}
</if> </if>
...@@ -134,6 +143,7 @@ ...@@ -134,6 +143,7 @@
t.ORDER_NO as orderNo, t.ORDER_NO as orderNo,
t.CUSTOMER_NAME as customerName, t.CUSTOMER_NAME as customerName,
t.ORDER_STATUS as orderStatus, t.ORDER_STATUS as orderStatus,
t.LEVEL as level,
t.ORDER_CONTENT as orderContent t.ORDER_CONTENT as orderContent
from t_order t from t_order t
where t.ID = #{id} where t.ID = #{id}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment