Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改成交时间

Browse Source
This commit is contained in:
huangdeliang
2020-10-14 22:21:20 +08:00
parent 23a4647696
commit a74f2238be
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java
View File

@ -170,7 +170,7 @@ public class SysOrder extends BaseEntity {
* 成交日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "成交日期", width = 30, dateFormat = "yyyy-MM-dd")
@Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderTime;
public String getServeTime() {

8
ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.custom.service.impl;
import java.util.Date;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
@ -50,9 +51,10 @@ public class SysOrderServiceImpl implements ISysOrderService {
*/
@Override
public int insertSysOrder(SysOrder sysOrder) {
sysOrder.setCreateTime(DateUtils.getNowDate());
sysOrder.setOrderTime(DateUtils.getNowDate());
sysOrder.setOrderId(new Long(DateUtils.dateTimeNow()));
Date orderTime = DateUtils.getNowDate();
sysOrder.setCreateTime(orderTime);
sysOrder.setOrderTime(orderTime);
sysOrder.setOrderId(Long.parseLong(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, orderTime)));
return sysOrderMapper.insertSysOrder(sysOrder);
}

4
ruoyi-ui/src/views/custom/order/index.vue
View File

@ -207,9 +207,9 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="成交日期" align="center" prop="orderTime" width="120" fixed="left">
<el-table-column label="成交时间" align="center" prop="orderTime" width="160" fixed="left">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.orderTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="客户姓名" align="center" prop="customer" width="120" fixed="left"/>