From 0769d8d905cbd2973e742cc0138a3c78db7e18f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 11:51:07 +0800
Subject: [PATCH] 前端
---
admin/src/views/business/identityInfo.vue | 15 +++++++--------
server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java | 3 ---
server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java | 21 ++++++++-------------
3 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/admin/src/views/business/identityInfo.vue b/admin/src/views/business/identityInfo.vue
index 04c95b3..ff07962 100644
--- a/admin/src/views/business/identityInfo.vue
+++ b/admin/src/views/business/identityInfo.vue
@@ -46,7 +46,13 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
-
+ <el-table-column prop="auditStatus" label="瀹℃牳鐘舵��" min-width="100px" fixed="left">
+ <template slot-scope="{row}">
+ <span class="bluestate" v-if="row.auditStatus ==1">鐢宠涓�</span>
+ <span class="greenstate" v-if="row.auditStatus ==2">宸查�氳繃</span>
+ <span class="redstate" v-if="row.auditStatus ==3">鏈�氳繃</span>
+ </template>
+ </el-table-column>
<el-table-column prop="openid" label="openid" min-width="100px"></el-table-column>
<el-table-column prop="memberName" label="浼氬憳鏄电О" min-width="100px"></el-table-column>
<el-table-column prop="type" label="绫诲瀷" min-width="100px">
@@ -54,13 +60,6 @@
<span v-if="row.type ==0">鐢ㄥ伐韬唤</span>
<span v-if="row.type ==1">璐ц繍韬唤</span>
<span v-if="row.type ==2">渚涢韬唤</span>
- </template>
- </el-table-column>
- <el-table-column prop="auditStatus" label="瀹℃牳鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span class="bluestate" v-if="row.auditStatus ==1">鐢宠涓�</span>
- <span class="greenstate" v-if="row.auditStatus ==2">宸查�氳繃</span>
- <span class="redstate" v-if="row.auditStatus ==3">鏈�氳繃</span>
</template>
</el-table-column>
<el-table-column prop="authType" label="璁よ瘉绫诲瀷" min-width="100px">
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
index 7ea95d9..5cf29cc 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
@@ -37,7 +37,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -46,7 +45,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
@@ -111,7 +109,6 @@
@ApiModelProperty(value = "璁よ瘉瀹℃壒鏃堕棿")
@ExcelColumn(name="璁よ瘉瀹℃壒鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date auditTime;
@ApiModelProperty(value = "璁よ瘉瀹℃壒澶囨敞")
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
index a23d9d5..8545329 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
@@ -281,7 +281,7 @@
queryWrapper.le(IdentityInfo::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.eq(IdentityInfo::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.like(IdentityInfo::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getType() != null) {
queryWrapper.eq(IdentityInfo::getType, pageWrap.getModel().getType());
@@ -293,16 +293,16 @@
queryWrapper.eq(IdentityInfo::getAuthType, pageWrap.getModel().getAuthType());
}
if (pageWrap.getModel().getLinkName() != null) {
- queryWrapper.eq(IdentityInfo::getLinkName, pageWrap.getModel().getLinkName());
+ queryWrapper.like(IdentityInfo::getLinkName, pageWrap.getModel().getLinkName());
}
if (pageWrap.getModel().getTelephone() != null) {
- queryWrapper.eq(IdentityInfo::getTelephone, pageWrap.getModel().getTelephone());
+ queryWrapper.like(IdentityInfo::getTelephone, pageWrap.getModel().getTelephone());
}
if (pageWrap.getModel().getLocation() != null) {
- queryWrapper.eq(IdentityInfo::getLocation, pageWrap.getModel().getLocation());
+ queryWrapper.like(IdentityInfo::getLocation, pageWrap.getModel().getLocation());
}
if (pageWrap.getModel().getCompanyName() != null) {
- queryWrapper.eq(IdentityInfo::getCompanyName, pageWrap.getModel().getCompanyName());
+ queryWrapper.like(IdentityInfo::getCompanyName, pageWrap.getModel().getCompanyName());
}
if (pageWrap.getModel().getLat() != null) {
queryWrapper.eq(IdentityInfo::getLat, pageWrap.getModel().getLat());
@@ -318,15 +318,10 @@
queryWrapper.le(IdentityInfo::getAuditTime, Utils.Date.getEnd(pageWrap.getModel().getAuditTime()));
}
if (pageWrap.getModel().getAuditRemark() != null) {
- queryWrapper.eq(IdentityInfo::getAuditRemark, pageWrap.getModel().getAuditRemark());
+ queryWrapper.like(IdentityInfo::getAuditRemark, pageWrap.getModel().getAuditRemark());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.orderByAsc(IdentityInfo::getAuditStatus );
+ queryWrapper.orderByDesc(IdentityInfo::getCreateTime );
PageData<IdentityInfo> result = PageData.from(identityInfoMapper.selectJoinPage(page,IdentityInfo.class, queryWrapper));
if(result!=null && result.getRecords()!=null){
String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
--
Gitblit v1.9.3