diff --git a/ghy-admin/src/main/resources/templates/customer/place/place.html b/ghy-admin/src/main/resources/templates/customer/place/place.html index 4bacf724..8badc26a 100644 --- a/ghy-admin/src/main/resources/templates/customer/place/place.html +++ b/ghy-admin/src/main/resources/templates/customer/place/place.html @@ -36,10 +36,10 @@
- + 通过 - + 拒绝 @@ -59,6 +59,7 @@ var editFlag = [[${@permission.hasPermi('customer:place:edit')}]]; var removeFlag = [[${@permission.hasPermi('customer:place:remove')}]]; var prefix = ctx + "customer/place"; + var customerPlaceStatus = [[${@dict.getType('customer_place_status')}]]; $(function() { var options = { @@ -90,6 +91,13 @@ field: 'city', title: '城市id' }, + { + field: 'status', + title: '审核状态', + formatter: function(value) { + return $.table.selectDictLabel(customerPlaceStatus, value); + } + }, { field: 'remark', title: '备注' diff --git a/ghy-admin/src/main/resources/templates/worker/certification/certification.html b/ghy-admin/src/main/resources/templates/worker/certification/certification.html index 94c0fcf1..5c268175 100644 --- a/ghy-admin/src/main/resources/templates/worker/certification/certification.html +++ b/ghy-admin/src/main/resources/templates/worker/certification/certification.html @@ -87,11 +87,19 @@ }, { field: 'idCardUrl1', - title: '身份证照片' + title: '身份证正面照片', + formatter: function(value) { + if (value != null && value !== ''){return '查看图片';} + else {return ''} + } }, { field: 'idCardUrl2', - title: '身份证照片' + title: '身份证反面照片', + formatter: function(value) { + if (value != null && value !== ''){return '查看图片';} + else {return ''} + } }, { field: 'brandName', diff --git a/ghy-custom/src/main/java/com/ghy/customer/domain/CustomerPlace.java b/ghy-custom/src/main/java/com/ghy/customer/domain/CustomerPlace.java index b3f545a6..15a438c3 100644 --- a/ghy-custom/src/main/java/com/ghy/customer/domain/CustomerPlace.java +++ b/ghy-custom/src/main/java/com/ghy/customer/domain/CustomerPlace.java @@ -36,6 +36,8 @@ public class CustomerPlace extends BaseEntity public String code; + public Integer status; + public void setId(String id) { this.id = id; @@ -90,6 +92,14 @@ public class CustomerPlace extends BaseEntity this.code = code; } + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ghy-custom/src/main/resources/mapper/customer/CustomerPlaceMapper.xml b/ghy-custom/src/main/resources/mapper/customer/CustomerPlaceMapper.xml index 6279103f..163ba922 100644 --- a/ghy-custom/src/main/resources/mapper/customer/CustomerPlaceMapper.xml +++ b/ghy-custom/src/main/resources/mapper/customer/CustomerPlaceMapper.xml @@ -10,6 +10,7 @@ + @@ -18,7 +19,7 @@ - select id, name, customer_id, phone, city, create_by, create_time, update_by, update_time, remark from customer_place + select id, name, customer_id, phone, city, status, create_by, create_time, update_by, update_time, remark from customer_place