Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
db9eca18
Commit
db9eca18
authored
Apr 17, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单优化修改
parent
44cbd7e9
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
1 deletion
+29
-1
TOrder.java
...java/com/yifu/cloud/plus/v1/yifu/order/entity/TOrder.java
+6
-0
OrderAddVO.java
...java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderAddVO.java
+6
-0
OrderListVO.java
...ava/com/yifu/cloud/plus/v1/yifu/order/vo/OrderListVO.java
+6
-0
TOrderMapper.xml
...yifu-order-biz/src/main/resources/mapper/TOrderMapper.xml
+11
-1
No files found.
yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/entity/TOrder.java
View file @
db9eca18
...
@@ -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
yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderAddVO.java
View file @
db9eca18
...
@@ -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
;
}
}
yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderListVO.java
View file @
db9eca18
...
@@ -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
;
}
}
yifu-order/yifu-order-biz/src/main/resources/mapper/TOrderMapper.xml
View file @
db9eca18
...
@@ -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}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment