From 95e05964b08e2fc26d606f4f0c5b3daa43df126f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 七月 2024 17:24:47 +0800
Subject: [PATCH] 提交
---
admin/src/views/business/customerLog.vue | 9 ++++++---
server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java | 8 +-------
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 1 +
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/admin/src/views/business/customerLog.vue b/admin/src/views/business/customerLog.vue
index d972e83..018720f 100644
--- a/admin/src/views/business/customerLog.vue
+++ b/admin/src/views/business/customerLog.vue
@@ -69,7 +69,12 @@
<span v-if="row.crmStatus ==2" style="color: red">鎻愪氦澶辫触</span>
</template>
</el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="120px"></el-table-column>
+ <el-table-column prop="provinceName" label="鐪佷唤鍚嶇О" min-width="100px">
+ <template slot-scope="{row}">
+ {{row.provinceName||''}}{{row.cityName||''}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="140px"></el-table-column>
<el-table-column prop="orderDate" label="棰勭害閲忔埧鏃堕棿" min-width="120px"></el-table-column>
<el-table-column prop="plaDate" label="璁″垝瑁呬慨寮�濮嬫椂闂�" min-width="120px">
<template slot-scope="{row}">
@@ -126,8 +131,6 @@
</template>
</el-table-column>
<el-table-column prop="styleInfo" label="椋庢牸" min-width="100px"></el-table-column>
- <el-table-column prop="provinceName" label="鐪佷唤鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="cityName" label="鍩庡競鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="budget" label="瑁呬慨棰勭畻(鍏�)" min-width="100px"></el-table-column>
<el-table-column prop="crmDate" label="crm鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="crmInfo" label="crm鎻愪氦澶囨敞" min-width="100px"></el-table-column>
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
index 8b65880..5fdc7af 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
@@ -191,13 +191,7 @@
if (pageWrap.getModel().getAreaCode() != null) {
queryWrapper.lambda().eq(Customer::getAreaCode, pageWrap.getModel().getAreaCode());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByDesc(Customer::getCreateDate );
return PageData.from(customerMapper.selectPage(page, queryWrapper));
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 979f5ff..37739e1 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -28,6 +28,7 @@
import com.doumee.dao.business.CustomerUserMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.UsersMapper;
+import com.doumee.dao.business.model.CustomerUser;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Users;
import com.doumee.dao.web.reqeust.EditMemberRequest;
--
Gitblit v1.9.3