1.师傅技能审核增加点击查看身份证照片；

2.分销申请同意/拒绝；
3.分销申请审核增加状态显示。

ghy-admin/src/main/resources/templates/customer/place/place.html

@@ -36,10 +36,10 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-primary multiple disabled" onclick="auditStatus(2)" shiro:hasPermission="customer:place:add">
+            <a class="btn btn-primary multiple disabled" onclick="auditStatus(1)" shiro:hasPermission="customer:place:add">
                 <i class="fa fa-edit"></i> 通过
             </a>
-            <a class="btn btn-danger multiple disabled" onclick="auditStatus(0)" shiro:hasPermission="customer:place:remove">
+            <a class="btn btn-danger multiple disabled" onclick="auditStatus(2)" shiro:hasPermission="customer:place:remove">
                 <i class="fa fa-remove"></i> 拒绝
             </a>
             <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="customer:place:edit">
@@ -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: '备注'

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 '<a href="' + value+ '" >查看图片<a/>';}
+                        else {return '<a>无<a/>'}
+                    }
                 },
                 {
                     field: 'idCardUrl2',
-                    title: '身份证照片'
+                    title: '身份证反面照片',
+                    formatter: function(value) {
+                        if (value != null && value !== ''){return '<a href="' + value+ '" >查看图片<a/>';}
+                        else {return '<a>无<a/>'}
+                    }
                 },
                 {
                     field: 'brandName',

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)

ghy-custom/src/main/resources/mapper/customer/CustomerPlaceMapper.xml

@@ -10,6 +10,7 @@
         <result property="customerId"    column="customer_id"    />
         <result property="phone"    column="phone"    />
         <result property="city"    column="city"    />
+        <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -18,7 +19,7 @@
     </resultMap>
 
     <sql id="selectCustomerPlaceVo">
-        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
     </sql>
 
     <select id="selectCustomerPlaceList" parameterType="com.ghy.customer.domain.CustomerPlace" resultMap="CustomerPlaceResult">