QXP

dgtly-admin/src/main/java/com/dgtly/web/controller/company/CompanyController.java

@@ -33,6 +33,7 @@ import com.dgtly.common.core.controller.BaseController;
 import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.common.utils.poi.ExcelUtil;
 import com.dgtly.common.core.page.TableDataInfo;
+import org.springframework.web.servlet.ModelAndView;
 
 /**
  * 公司表Controller
@@ -100,6 +101,23 @@ public class CompanyController extends BaseController
     }
 
 
+
+    /**
+     * @descption: 查看公司详情
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020-2-25
+     */
+    @RequiresPermissions("company:info:view")
+    @GetMapping("/info/{id}")
+    public String info(@PathVariable("id")Long id, ModelMap mmap)
+    {
+        mmap.put("sysCompany",sysCompanyService.selectSysCompanyById(id));
+        return prefix + "/info";
+    }
+
+
     /**
      * @descption: 商户入驻审核
      * @param:
@@ -115,7 +133,7 @@ public class CompanyController extends BaseController
     }
 
     /**
-     * 查询商户扩展信息列表
+     * 查询商户入驻信息审核列表
      */
     @RequiresPermissions("company:enterexamine:list")
     @PostMapping("/enterexamine/list")
@@ -169,7 +187,33 @@ public class CompanyController extends BaseController
     }
 
 
+    /**
+     * @descption: 商户修改审核
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020-2-25
+     */
+    @RequiresPermissions("company:editexamine:view")
+    @GetMapping("/editexamine")
+    public String editexamine()
+    {
+        return prefix + "/editexamine/reviewed";
+    }
 
+    /**
+     * 查询商户修改信息审核列表
+     */
+    @RequiresPermissions("company:editexamine:list")
+    @PostMapping("/editexamine/list")
+    @ResponseBody
+    public TableDataInfo editexamine(CompanyReviewed companyReviewed)
+    {
+        startPage();
+        companyReviewed.setReason("1");
+        List<CompanyReviewed> list = companyReviewedService.selectCompanyReviewedListWiteAudit(companyReviewed);
+        return getDataTable(list);
+    }
 
 
 }

dgtly-admin/src/main/resources/templates/company/company.html

@@ -45,12 +45,12 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:company:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:company:remove')}]];
         var prefix = ctx + "company";
 
         $(function() {
             var options = {
                 url: prefix + "/list",
+                updateUrl: prefix + "/info/{id}",
                 modalName: "公司表",
                 columns: [{
                     checkbox: true
@@ -64,29 +64,45 @@
                     field : 'companyName',
                     title : '公司名称'
                 },
-                    {
-                        visible: editFlag == 'hidden' ? false : true,
-                        title: '公司状态',
-                        align: 'center',
-                        formatter: function (value, row, index) {
-                            return statusTools(row);
-                        }
-                    },
-                    {
-                        field : 'createTime',
-                        title: '创建时间',
-                        align: 'center'
-                    },
-                /*{
+                {
+                    field : 'primaryBusiness',
+                    title : '主营业务'
+                },
+                {
+                    field : 'contactNumber',
+                    title : '联系电话'
+                },
+                {
+                    field : 'defaultImgUrl',
+                    title : '企业图片',
+                    formatter: function(value, row, index) {
+                        // 图片预览（注意：如存储在本地直接获取数据库路径，如有配置context-path需要使用ctx+路径）
+                        // 如：/profile/upload/2019/08/08/3b7a839aced67397bac694d77611ce72.png
+                        return $.table.imageView(value,250,250);
+                    }
+                },
+                {
+                    visible: editFlag == 'hidden' ? false : true,
+                    title: '公司状态',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return statusTools(row);
+                    }
+                },
+                {
+                    field : 'createTime',
+                    title: '创建时间',
+                    align: 'center'
+                },
+                {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看详情</a> ');
                         return actions.join('');
                     }
-                }*/]
+                }]
             };
             $.table.init(options);
 

dgtly-admin/src/main/resources/templates/company/edit.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改公司表')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-company-edit" th:object="${sysCompany}">
-            <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">公司名称：</label>
-                <div class="col-sm-8">
-                    <input name="company" th:field="*{company}" class="form-control" type="text" required>
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script type="text/javascript">
-        var prefix = ctx + "system/company";
-        $("#form-company-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-company-edit').serialize());
-            }
-        }
-    </script>
-</body>
-</html>

dgtly-admin/src/main/resources/templates/company/editexamine/approve.html

@@ -0,0 +1,271 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改商户审核')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <input  id="input_status"  th:value="${companyReviewed.status}" type="hidden">
+        <!-- 提交信息查看-->
+        <form class="form-horizontal m" id="form-companyReviewed" th:object="${companyReviewed}">
+            <div class="row">
+                <div class="col-sm-6"></div>
+                <div class="col-sm-6"></div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">公司名称：</label>
+                        <div class="col-sm-8">
+                            <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">企业类型：</label>
+                        <div class="col-sm-8">
+                            <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">详细地址：</label>
+                        <div class="col-sm-8">
+                            <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">企业法人：</label>
+                        <div class="col-sm-8">
+                            <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">经度：</label>
+                        <div class="col-sm-8">
+                            <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">纬度：</label>
+                        <div class="col-sm-8">
+                            <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">联系电话：</label>
+                        <div class="col-sm-8">
+                            <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">成立日期：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group date">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <input name="establishDate" th:value="${#dates.format(companyReviewed.establishDate, 'yyyy-MM-dd')}"
+                                       class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">统一社会信用代码：</label>
+                        <div class="col-sm-8">
+                            <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">主营业务：</label>
+                        <div class="col-sm-8">
+                            <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">营业执照：</label>
+                        <div class="col-sm-8">
+                            <img th:src="*{businessLicenseUrl}" />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">企业默认图片：</label>
+                        <div class="col-sm-8">
+                            <img th:src="*{defaultImgUrl}" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                    <label class="col-sm-4 control-label">企业宣传图片：</label>
+                    <div class="col-sm-8">
+                        <img th:src="*{propagandaImgUrl}" />
+                    </div>
+                </div></div>
+                <div class="col-sm-6"></div>
+            </div>
+
+            <div class="form-group">
+                <label class="col-sm-2 control-label">企业介绍：</label>
+                <div class="col-sm-10">
+                    <textarea name="companyIntroduce" class="form-control" disabled>[[*{companyIntroduce}]]</textarea>
+                </div>
+            </div>
+
+        </form>
+        <h4 class="form-header h4">审核信息 </h4>
+        <!--已审核信息回显-->
+        <form class="form-horizontal m" id="form-status1">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">审核结果：</label>
+                        <div class="col-sm-8" id="div_status">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">审核人：</label>
+                        <label class="col-sm-4">
+                            <input name="primaryBusiness" th:field="${companyReviewed.companyExamine.createBy}" class="form-control" type="text" disabled>
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-label">审核时间：</label>
+                <div class="col-sm-2">
+                    <input name="establishDate" th:value="${companyReviewed.companyExamine.examineDate}"
+                           class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-label">审核结论：</label>
+                <div class="col-sm-10">
+                    <textarea name="rejectReason" class="form-control" disabled>[[${companyReviewed.companyExamine.rejectReason}]]</textarea>
+                </div>
+            </div>
+        </form>
+        <!--未审核的审核提交-->
+        <form id="form_status0" class="form-horizontal m" >
+            <input name="companyReviewedId" id="input_companyReviewedId"  th:value="${companyReviewed.id}" type="hidden">
+            <input name="status" id="input_CEstatus"  type="hidden">
+            <div class="row">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">审核结论：</label>
+                    <div class="col-sm-10">
+                        <textarea name="rejectReason" class="form-control">[[${companyReviewed.companyExamine.rejectReason}]]</textarea>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-8"></div>
+                <div class="col-sm-4">
+                    <a class="btn btn-primary single " href="javascript:void(0)" onclick="approve(1)" >
+                        <i class="fa fa-edit"></i> 通过
+                    </a>
+                    <a class="btn btn-danger multiple " href="javascript:void(0)" onclick="approve(2)" >
+                        <i class="fa fa-remove"></i> 拒绝
+                    </a>
+                </div>
+            </div>
+
+        </form>
+
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var datas = [[${@dict.getType('examine_status')}]];
+        var prefix = ctx + "company/enterexamine";
+
+
+        $(function() {
+          /*判断是否审核*/
+            var status = $("#input_status").val()
+            if(status=="0"){
+                $("#form_status0").show();
+                $("#form-status1").hide();
+            }else{
+
+                var div_statusHtml = $.table.selectDictLabel(datas, status)
+                /***********添加审核****************************/
+                $("#div_status").append(div_statusHtml);
+
+                $("#form_status0").hide();
+                $("#form-status1").show();
+            }
+
+        })
+
+
+        function submitHandler(){
+            $.modal.close()
+
+        }
+        function approve(status){
+            $("#input_CEstatus").val(status);
+            $.ajax({
+                type: "POST",
+                url: prefix + "/approve",
+                data: $('#form_status0').serialize(),
+                processData: false,
+                dataType: 'json',
+                success: function(result) {
+                    if (result.code == web_status.SUCCESS) {
+                        $.modal.msgReload("成功","success")
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                },
+                error: function(error) {
+                    $.modal.alertWarning("审核失败。");
+                }
+            });
+        }
+
+    </script>
+</body>
+</html>

dgtly-admin/src/main/resources/templates/company/editexamine/reviewed.html

@@ -0,0 +1,164 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('入驻列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <p>企业名称：</p>
+                                <input type="text" name="companyName"/>
+                            </li>
+                            <li>
+                                <p>企业类型：</p>
+                                <select name="companyType" th:with="type=${@dict.getType('company_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>企业法人：</p>
+                                <input type="text" name="legalPerson"/>
+                            </li>
+                            <li>
+                                    <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:examine:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:examine:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:examine:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="companyext:examine:export">
+                    <i class="fa fa-download"></i> 导出
+                 </a>-->
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var approveFlag = [[${@permission.hasPermi('companyext:noexamine:approve')}]];
+        var companyTypes = [[${@dict.getType('company_type')}]];
+        var examineStatus = [[${@dict.getType('examine_status')}]];
+        var prefix = ctx + "company/editexamine";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                modalName: "商户审核",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field : 'id', 
+                    title : '主键',
+                    visible: false
+                },
+                {
+                    field : 'companyId', 
+                    title : '商户(公司)Id',
+                    visible: false
+                },
+                {
+                    field : 'companyName',
+                    title : '企业名称'
+                },
+                {
+                    field : 'companyType',
+                    title : '企业类型',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(companyTypes, value);
+                    }
+                },
+                {
+                    field : 'legalPerson',
+                    title : '企业法人'
+                },
+                {
+                    field : 'contactNumber',
+                    title : '联系电话'
+                },
+                {
+                    field : 'status', 
+                    title : '审核状态',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(examineStatus, value)
+                       /* if(value=='0'){
+                            return '<span class="badge badge-warning">'+ $.table.selectDictLabel(examineStatus, value)+'</span>'
+                        }else if(value=='1'){
+                            return '<span class="badge badge-danger">'+ $.table.selectDictLabel(examineStatus, value)+'</span>'
+                        }*/
+                    }
+                },
+                {
+                    field : 'createTime',
+                    title : '申请日期'
+                },
+                {
+                    field : 'companyExamine.examineDate',
+                    title : '审核日期'
+                },
+                {
+                    field : 'companyExamine.createBy',
+                    title : '审核人'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        if(row.status=="0"){
+                            actions.push('<a class="btn btn-primary btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="approve(' + row.id + ')"><i class="fa fa-edit"></i>审核</a> ');
+                        }else{
+                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="approve(' + row.id + ')"><i class="fa fa-edit"></i>查看详情</a> ');
+                        }
+
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+            approve=function(id){
+                if(id==null && id==""){
+                    return;
+                }
+                var modalOption ={
+                    title:"审核商户",
+                    url:prefix + "/approvePage/"+id,
+                    width:1400,
+                    height:800,
+                    callBack:cb,
+                    btn:[],
+                }
+                $.modal.openOptions(modalOption);
+            }
+
+        });
+        function cb(index, layero){
+            layer.close(index);
+            $.table.refresh()
+        }
+    </script>
+</body>
+</html>

dgtly-admin/src/main/resources/templates/company/enterexamine/add.html

@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增商户审核')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-examine-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">商户(公司)Id：</label>
-                <div class="col-sm-8">
-                    <span class="help-block m-b-none">审核状态</span>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核状态：</label>
-                <div class="col-sm-8">
-                    <div class="radio-box">
-                        <input type="radio" name="status" value="" required>
-                        <label th:for="status" th:text="未知"></label>
-                    </div>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">申请日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="applyDate" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="examineDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">驳回理由：</label>
-                <div class="col-sm-8">
-                    <textarea name="rejectReason" class="form-control"></textarea>
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script type="text/javascript">
-        var prefix = ctx + "system/examine"
-        $("#form-examine-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-examine-add').serialize());
-            }
-        }
-
-        $("input[name='applyDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='examineDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>

dgtly-admin/src/main/resources/templates/company/enterexamine/approve.html

@@ -6,48 +6,256 @@
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <input  id="input_status"  th:value="${companyReviewed.status}" type="hidden">
         <!-- 提交信息查看-->
+        <form class="form-horizontal m" id="form-companyReviewed" th:object="${companyReviewed}">
+            <div class="row">
+                <div class="col-sm-6"></div>
+                <div class="col-sm-6"></div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">公司名称：</label>
+                        <div class="col-sm-8">
+                            <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">企业类型：</label>
+                        <div class="col-sm-8">
+                            <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">详细地址：</label>
+                        <div class="col-sm-8">
+                            <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">企业法人：</label>
+                        <div class="col-sm-8">
+                            <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">经度：</label>
+                        <div class="col-sm-8">
+                            <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">纬度：</label>
+                        <div class="col-sm-8">
+                            <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">联系电话：</label>
+                        <div class="col-sm-8">
+                            <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">成立日期：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group date">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <input name="establishDate" th:value="${#dates.format(companyReviewed.establishDate, 'yyyy-MM-dd')}"
+                                       class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">统一社会信用代码：</label>
+                        <div class="col-sm-8">
+                            <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">主营业务：</label>
+                        <div class="col-sm-8">
+                            <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">营业执照：</label>
+                        <div class="col-sm-8">
+                            <img th:src="*{businessLicenseUrl}" />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">企业默认图片：</label>
+                        <div class="col-sm-8">
+                            <img th:src="*{defaultImgUrl}" />
+                        </div>
+                    </div>
+                </div>
+            </div>
 
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                    <label class="col-sm-4 control-label">企业宣传图片：</label>
+                    <div class="col-sm-8">
+                        <img th:src="*{propagandaImgUrl}" />
+                    </div>
+                </div></div>
+                <div class="col-sm-6"></div>
+            </div>
 
-        <form class="form-horizontal m" id="form-examine-edit">
-            <input name="companyReviewedId" th:value="*{companyReviewed.id}" type="hidden">
-            <input name="status" id="input_status" type="hidden">
             <div class="form-group">
+                <label class="col-sm-2 control-label">企业介绍：</label>
+                <div class="col-sm-10">
+                    <textarea name="companyIntroduce" class="form-control" disabled>[[*{companyIntroduce}]]</textarea>
+                </div>
+            </div>
 
+        </form>
+        <h4 class="form-header h4">审核信息 </h4>
+        <!--已审核信息回显-->
+        <form class="form-horizontal m" id="form-status1">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">审核结果：</label>
+                        <div class="col-sm-8" id="div_status">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">审核人：</label>
+                        <label class="col-sm-4">
+                            <input name="primaryBusiness" th:field="${companyReviewed.companyExamine.createBy}" class="form-control" type="text" disabled>
+                        </label>
+                    </div>
+                </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">审核结论：</label>
-                <div class="col-sm-8">
-                    <textarea name="rejectReason" class="form-control" maxlength="250"></textarea>
+                <label class="col-sm-2 control-label">审核时间：</label>
+                <div class="col-sm-2">
+                    <input name="establishDate" th:value="${companyReviewed.companyExamine.examineDate}"
+                           class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-label">审核结论：</label>
+                <div class="col-sm-10">
+                    <textarea name="rejectReason" class="form-control" disabled>[[${companyReviewed.companyExamine.rejectReason}]]</textarea>
                 </div>
             </div>
         </form>
-        <div class="col-sm-8">
-            <a class="btn btn-primary single " href="javascript:void(0)" onclick="approve(1)" >
-                <i class="fa fa-edit"></i> 通过
-            </a>
-            <a class="btn btn-danger multiple " href="javascript:void(0)" onclick="approve(0)" >
-                <i class="fa fa-remove"></i> 拒绝
-            </a>
-        </div>
+        <!--未审核的审核提交-->
+        <form id="form_status0" class="form-horizontal m" >
+            <input name="companyReviewedId" id="input_companyReviewedId"  th:value="${companyReviewed.id}" type="hidden">
+            <input name="status" id="input_CEstatus"  type="hidden">
+            <div class="row">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">审核结论：</label>
+                    <div class="col-sm-10">
+                        <textarea name="rejectReason" class="form-control">[[${companyReviewed.companyExamine.rejectReason}]]</textarea>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-8"></div>
+                <div class="col-sm-4">
+                    <a class="btn btn-primary single " href="javascript:void(0)" onclick="approve(1)" >
+                        <i class="fa fa-edit"></i> 通过
+                    </a>
+                    <a class="btn btn-danger multiple " href="javascript:void(0)" onclick="approve(2)" >
+                        <i class="fa fa-remove"></i> 拒绝
+                    </a>
+                </div>
+            </div>
+
+        </form>
+
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
-    <script type="text/javascript">
+    <script th:inline="javascript">
+        var datas = [[${@dict.getType('examine_status')}]];
         var prefix = ctx + "company/enterexamine";
 
 
+        $(function() {
+          /*判断是否审核*/
+            var status = $("#input_status").val()
+            if(status=="0"){
+                $("#form_status0").show();
+                $("#form-status1").hide();
+            }else{
+
+                var div_statusHtml = $.table.selectDictLabel(datas, status)
+                /***********添加审核****************************/
+                $("#div_status").append(div_statusHtml);
+
+                $("#form_status0").hide();
+                $("#form-status1").show();
+            }
+
+        })
+
+
+        function submitHandler(){
+            $.modal.close()
+
+        }
         function approve(status){
-            $("#input_status").val(status);
+            $("#input_CEstatus").val(status);
             $.ajax({
                 type: "POST",
                 url: prefix + "/approve",
-                data: $('#form-examine-edit').serialize(),
+                data: $('#form_status0').serialize(),
                 processData: false,
                 dataType: 'json',
                 success: function(result) {
                     if (result.code == web_status.SUCCESS) {
-
+                        $.modal.msgReload("成功","success")
                     } else {
                         $.modal.alertError(result.msg);
                     }

dgtly-admin/src/main/resources/templates/company/enterexamine/edit.html

@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改商户审核')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-examine-edit" th:object="${companyExamine}">
-            <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">商户(公司)Id：</label>
-                <div class="col-sm-8">
-                    <input name="companyId" th:field="*{companyId}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核状态：</label>
-                <div class="col-sm-8">
-                    <div class="radio-box">
-                        <input type="radio" name="status" value="" required>
-                        <label th:for="status" th:text="未知"></label>
-                    </div>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">申请日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="applyDate" th:value="${#dates.format(companyExamine.applyDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="examineDate" th:value="${#dates.format(companyExamine.examineDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">驳回理由：</label>
-                <div class="col-sm-8">
-                    <textarea name="rejectReason" class="form-control">[[*{rejectReason}]]</textarea>
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script type="text/javascript">
-        var prefix = ctx + "system/examine";
-        $("#form-examine-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-examine-edit').serialize());
-            }
-        }
-
-        $("input[name='applyDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
-        $("input[name='examineDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>

dgtly-admin/src/main/resources/templates/company/enterexamine/examine.html

@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('商户审核列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <p>商户(公司)Id：</p>
-                                <input type="text" name="companyId"/>
-                            </li>
-                            <li>
-                                <p>审核状态：</p>
-                                <select name="status">
-                                    <option value="">所有</option>
-                                </select>
-                            </li>
-                            <li class="select-time">
-                                <p>申请日期：</p>
-                                <input type="text" class="time-input" id="beginApplyDate" placeholder="开始时间" name="params[beginApplyDate]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endApplyDate" placeholder="结束时间" name="params[endApplyDate]"/>
-                            </li>
-                            <li class="select-time">
-                                <p>审核日期：</p>
-                                <input type="text" class="time-input" id="beginExamineDate" placeholder="开始时间" name="params[beginExamineDate]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endExamineDate" placeholder="结束时间" name="params[endExamineDate]"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:examine:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:examine:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:examine:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>-->
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "/enterexamine/list";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                modalName: "商户审核",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field : 'id', 
-                    title : '主键',
-                    visible: false
-                },
-                {
-                    field : 'companyId', 
-                    title : '商户(公司)Id',
-                    visible: false
-                },
-                {
-                    field : 'status', 
-                    title : '审核状态'
-                },
-                {
-                    field : 'applyDate', 
-                    title : '申请日期'
-                },
-                {
-                    field : 'examineDate', 
-                    title : '审核日期'
-                },
-                {
-                    field : 'rejectReason', 
-                    title : '驳回理由'
-                },
-                {
-                    field : 'remark', 
-                    title : '备注'
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                       /* actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        */
-                       return actions.join('');
-                    }
-                }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>

dgtly-admin/src/main/resources/templates/company/enterexamine/reviewed.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('商户审核列表')" />
+    <th:block th:include="include :: header('修改列表')" />
 </head>
 <body class="gray-bg">
      <div class="container-div">
@@ -25,17 +25,9 @@
                                 <p>企业法人：</p>
                                 <input type="text" name="legalPerson"/>
                             </li>
-                            <li class="select-time">
-                                <p>申请日期：</p>
-                                <input type="text" class="time-input" id="applyDate" placeholder="申请日期" name="applyDate"/>
-                            </li>
-                            <li class="select-time">
-                                <p>审核日期：</p>
-                                <input type="text" class="time-input" id="examineDate" placeholder="审核日期" name="examineDate"/>
-                            </li>
                             <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                    <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>
@@ -66,7 +58,7 @@
         var approveFlag = [[${@permission.hasPermi('companyext:noexamine:approve')}]];
         var companyTypes = [[${@dict.getType('company_type')}]];
         var examineStatus = [[${@dict.getType('examine_status')}]];
-        var prefix = ctx + "company/enterexamine";
+        var prefix = ctx + "company/editexamine";
 
         $(function() {
             var options = {
@@ -111,26 +103,35 @@
                     title : '审核状态',
                     align: 'center',
                     formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(examineStatus, value);
+                        return $.table.selectDictLabel(examineStatus, value)
+                       /* if(value=='0'){
+                            return '<span class="badge badge-warning">'+ $.table.selectDictLabel(examineStatus, value)+'</span>'
+                        }else if(value=='1'){
+                            return '<span class="badge badge-danger">'+ $.table.selectDictLabel(examineStatus, value)+'</span>'
+                        }*/
                     }
                 },
                 {
-                    field : 'applyDate', 
+                    field : 'createTime',
                     title : '申请日期'
                 },
                 {
-                    field : 'examineDate', 
+                    field : 'companyExamine.examineDate',
                     title : '审核日期'
                 },
+                {
+                    field : 'companyExamine.createBy',
+                    title : '审核人'
+                },
                 {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
                         if(row.status=="0"){
-                            actions.push('<a class="btn btn-primary btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="approve(\'' + row.id + '\')"><i class="fa fa-edit"></i>审核</a> ');
+                            actions.push('<a class="btn btn-primary btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="approve(' + row.id + ')"><i class="fa fa-edit"></i>审核</a> ');
                         }else{
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick=""><i class="fa fa-edit"></i>查看详情</a> ');
+                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="approve(' + row.id + ')"><i class="fa fa-edit"></i>查看详情</a> ');
                         }
 
                         return actions.join('');
@@ -138,16 +139,26 @@
                 }]
             };
             $.table.init(options);
-
             approve=function(id){
                 if(id==null && id==""){
                     return;
                 }
-                $.modal.open("审核商户" , prefix + "/approvePage/"+id);
+                var modalOption ={
+                    title:"审核商户",
+                    url:prefix + "/approvePage/"+id,
+                    width:1400,
+                    height:800,
+                    callBack:cb,
+                    btn:[],
+                }
+                $.modal.openOptions(modalOption);
             }
 
-
         });
+        function cb(index, layero){
+            layer.close(index);
+            $.table.refresh()
+        }
     </script>
 </body>
 </html>

dgtly-admin/src/main/resources/templates/company/enterexamine/yesExamine.html

@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('商户审核列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <p>企业名称：</p>
-                                <input type="text" name="companyName"/>
-                            </li>
-                            <li>
-                                <p>企业类型：</p>
-                                <select name="companyType" th:with="type=${@dict.getType('company_type')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <p>审核状态：</p>
-                                <select name="status">
-                                    <option value="">所有</option>
-                                    <option value="1">已通过</option>
-                                    <option value="2">已驳回</option>
-                                </select>
-                            </li>
-                            <li>
-                                <p>企业法人：</p>
-                                <input type="text" name="legalPerson"/>
-                            </li>
-                            <li class="select-time">
-                                <p>申请日期：</p>
-                                <input type="text" class="time-input" id="applyDate" placeholder="申请日期" name="applyDate"/>
-                            </li>
-                            <li class="select-time">
-                                <p>审核日期：</p>
-                                <input type="text" class="time-input" id="examineDate" placeholder="审核日期" name="examineDate"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:examine:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>-->
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:examine:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:examine:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:examine:export">
-                    <i class="fa fa-download"></i> 导出
-                 </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var companyTypes = [[${@dict.getType('company_type')}]];
-        var examineStatus = [[${@dict.getType('examine_status')}]];
-        var prefix = ctx + "companyext/examine";
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "商户审核",
-                columns: [{
-                    checkbox: true
-                },
-                    {
-                        field : 'id',
-                        title : '主键',
-                        visible: false
-                    },
-                    {
-                        field : 'companyId',
-                        title : '商户(公司)Id',
-                        visible: false
-                    },
-                    {
-                        field : 'companyName',
-                        title : '企业名称'
-                    },
-                    {
-                        field : 'companyType',
-                        title : '企业类型',
-                        align: 'center',
-                        formatter: function(value, row, index) {
-                            return $.table.selectDictLabel(companyTypes, value);
-                        }
-                    },
-                    {
-                        field : 'legalPerson',
-                        title : '企业法人'
-                    },
-                    {
-                        field : 'contactNumber',
-                        title : '联系电话'
-                    },
-                    {
-                        field : 'status',
-                        title : '审核状态',
-                        align: 'center',
-                        formatter: function(value, row, index) {
-                            return $.table.selectDictLabel(examineStatus, value);
-                        }
-                    },
-                    {
-                        field : 'applyDate',
-                        title : '申请日期'
-                    },
-                    {
-                        field : 'examineDate',
-                        title : '审核日期'
-                    },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                       return actions.join('');
-                    }
-                }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>

dgtly-admin/src/main/resources/templates/company/info.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('商户信息')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-company-edit" th:object="${sysCompany}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">公司名称：</label>
+                <div class="col-sm-8">
+                    <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">企业类型：</label>
+                <div class="col-sm-8">
+                    <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">详细地址：</label>
+                <div class="col-sm-8">
+                    <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">经度：</label>
+                <div class="col-sm-8">
+                    <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">纬度：</label>
+                <div class="col-sm-8">
+                    <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">企业法人：</label>
+                <div class="col-sm-8">
+                    <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">成立日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="establishDate" th:value="${#dates.format(sysCompany.establishDate, 'yyyy-MM-dd')}"
+                               class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">统一社会信用代码：</label>
+                <div class="col-sm-8">
+                    <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">营业执照：</label>
+                <div class="col-sm-8">
+                    <img th:src="*{businessLicenseUrl}" />
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">企业默认图片：</label>
+                <div class="col-sm-8">
+                    <img th:src="*{defaultImgUrl}" />
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">企业宣传图片：</label>
+                <div class="col-sm-8">
+                    <img th:src="*{propagandaImgUrl}" />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">企业介绍：</label>
+                <div class="col-sm-8">
+                    <textarea name="companyIntroduce" class="form-control" disabled>[[*{companyIntroduce}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">主营业务：</label>
+                <div class="col-sm-8">
+                    <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "system/company";
+        $("#form-company-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            $.modal.close();
+        }
+
+    </script>
+</body>
+</html>

dgtly-api/src/main/java/com/dgtly/api/controller/CommonController.java

@@ -12,6 +12,8 @@ import com.dgtly.common.utils.StringUtils;
 import com.dgtly.common.utils.file.FileUploadUtils;
 import com.dgtly.common.utils.file.FileUtils;
 import com.dgtly.system.service.ISysDictDataService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +34,8 @@ import java.util.Map;
  */
 @ApiNoCheckSign
 @ApiPassToken
-@RestController("/common")
+@RestController()
+@RequestMapping("/common")
 public class CommonController extends ApiBaseController
 {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
@@ -44,6 +47,8 @@ public class CommonController extends ApiBaseController
     private ISysDictDataService dictDataService;
 
 
+    @ApiOperation(value = "获取字典")
+    @ApiImplicitParam(name = "params" , paramType = "body")
     @PostMapping("/dict")
     public Object getDict(){
         ParameterObject obj = getParameterObject();

dgtly-api/src/main/java/com/dgtly/api/controller/SysCompanyController.java

@@ -13,6 +13,7 @@ import com.dgtly.member.domain.MemberFollow;
 import com.dgtly.member.service.IMemberFollowService;
 import com.dgtly.system.domain.SysCompany;
 import com.dgtly.system.service.ISysCompanyService;
+import com.dgtly.system.service.ISysDictDataService;
 import com.dgtly.system.service.ISysUserService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -40,6 +41,8 @@ public class SysCompanyController extends ApiBaseController {
 
     @Autowired
     private ICompanyReviewedService companyReviewedService;
+    @Autowired
+    private ISysDictDataService dictDataService;
 
     @ApiOperation(value = "商家详情")
     @ApiImplicitParam(name = "params" , paramType = "body")
@@ -47,22 +50,32 @@ public class SysCompanyController extends ApiBaseController {
     public Object detail(){
         ParameterObject obj =  getParameterObject();
         obj.checkParameterNotNull("id");
-        Long companyId = obj.getLong(" id");
+        Long companyId = obj.getLong("id");
         SysCompany sysCompany =  companyService.selectSysCompanyById(companyId);
+        /*处理公司类型*/
+
+        String companyTypeName = dictDataService.selectDictLabel("company_type",sysCompany.getCompanyType());
+
+
+
         int isFollow = 0;
         /*判断用户是否关注商户*/
-        String memberId = TokenUtil.getTokenUserId();
-        if(memberId!=null){
-            MemberFollow mf= new MemberFollow();
-            mf.setCompanyId(companyId);
-            mf.setMemberId(Long.parseLong(memberId));
-            List<MemberFollow> mfList=  memberFollowService.selectMemberFollowList(mf);
-            if(mfList.size()>0){
-                isFollow=1;
+        try{
+            String memberId = TokenUtil.getTokenUserId();
+            if(memberId!=null){
+                MemberFollow mf= new MemberFollow();
+                mf.setCompanyId(companyId);
+                mf.setMemberId(Long.parseLong(memberId));
+                List<MemberFollow> mfList=  memberFollowService.selectMemberFollowList(mf);
+                if(mfList.size()>0){
+                    isFollow=1;
+                }
             }
+        }catch (Exception e){
         }
         if(sysCompany!=null){
-            return AjaxResult.success(sysCompany).putKV("isFollow",isFollow);
+            return AjaxResult.success(sysCompany).putKV("isFollow",isFollow)
+                    .putKV("companyTypeName",companyTypeName);
         }else{
             return AjaxResult.error(ResultType.NUll);
         }

dgtly-system/src/main/java/com/dgtly/companyext/domain/CompanyReviewed.java

@@ -92,11 +92,13 @@ public class CompanyReviewed extends BaseEntity
     /** 记录状态，0未处理，1已处理*/
     private String status;
 
-
-
     /** 主营业务*/
     private String primaryBusiness;
 
+    /** 审核信息*/
+    private CompanyExamine companyExamine;
+
+
     public String getReason() {
         return reason;
     }
@@ -282,6 +284,14 @@ public class CompanyReviewed extends BaseEntity
         this.primaryBusiness = primaryBusiness;
     }
 
+    public CompanyExamine getCompanyExamine() {
+        return companyExamine;
+    }
+
+    public void setCompanyExamine(CompanyExamine companyExamine) {
+        this.companyExamine = companyExamine;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

dgtly-system/src/main/java/com/dgtly/companyext/service/impl/CompanyReviewedServiceImpl.java

@@ -159,7 +159,7 @@ public class CompanyReviewedServiceImpl implements ICompanyReviewedService
         cr.setId(companyExamine.getCompanyReviewedId());
         cr.setStatus("2");
         cr.setUpdateBy(companyExamine.getCreateBy());
-        companyReviewedMapper.updateCompanyReviewed(cr);
+       companyReviewedMapper.updateCompanyReviewed(cr);
 
         return companyExamineMapper.insertCompanyExamine(companyExamine);
     }

dgtly-system/src/main/resources/mapper/companyext/CompanyExamineMapper.xml

@@ -8,7 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="companyReviewedId"    column="company_reviewed_id"    />
         <result property="status"    column="status"    />
-        <result property="applyDate"    column="apply_date"    />
         <result property="examineDate"    column="examine_date"    />
         <result property="rejectReason"    column="reject_reason"    />
         <result property="createBy"    column="create_by"    />

dgtly-system/src/main/resources/mapper/companyext/CompanyReviewedMapper.xml

@@ -31,47 +31,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reason"    column="reason"    />
         <result property="status"    column="status"    />
         <result property="primaryBusiness"    column="primary_business"    />
+        <association property="companyExamine"    column="company_reviewed_id" javaType="CompanyExamine" resultMap="CompanyExamineResult" />
+    </resultMap>
+
+    <resultMap type="CompanyExamine" id="CompanyExamineResult">
+        <result property="id"    column="id"    />
+        <result property="companyReviewedId"    column="company_reviewed_id"    />
+        <result property="status"    column="status"    />
+        <result property="examineDate"    column="examine_date"    />
+        <result property="rejectReason"    column="reject_reason"    />
+        <result property="createBy"    column="examine_by"    />
     </resultMap>
 
     <sql id="selectCompanyReviewedVo">
-        select id, company_id, company_name, company_type, detail_address, longitude, latitude, legal_person, contact_number, establish_date,
-         unified_social_credit_code, business_license_url, default_img_url, propaganda_img_url, company_introduce, version_num, create_by,
-         create_time, update_by, update_time, remark ,login_name,password,reason,status,primary_business
-         from company_reviewed
+        select cr.id, cr.company_id, cr.company_name, cr.company_type, cr.detail_address, cr.longitude, cr.latitude, cr.legal_person, cr.contact_number,
+         cr.establish_date,cr.unified_social_credit_code, cr.business_license_url, cr.default_img_url, cr.propaganda_img_url, cr.company_introduce, cr.version_num, cr.create_by,
+         cr.create_time, cr.update_by, cr.update_time, cr.remark ,cr.login_name,cr.password,cr.reason,cr.status,cr.primary_business,
+         ce.company_reviewed_id,ce.status,ce.examine_date,ce.reject_reason,ce.create_by examine_by
+         from company_reviewed cr
+         left join company_examine ce on ce.company_reviewed_id = cr.id
+
     </sql>
 
     <select id="selectCompanyReviewedList" parameterType="CompanyReviewed" resultMap="CompanyReviewedResult">
         <include refid="selectCompanyReviewedVo"/>
         <where>  
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
-            <if test="companyType != null "> and company_type = #{companyType}</if>
-            <if test="detailAddress != null  and detailAddress != ''"> and detail_address = #{detailAddress}</if>
-            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
-            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
-            <if test="legalPerson != null  and legalPerson != ''"> and legal_person = #{legalPerson}</if>
-            <if test="contactNumber != null  and contactNumber != ''"> and contact_number = #{contactNumber}</if>
-            <if test="establishDate != null "> and establish_date = #{establishDate}</if>
-            <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''"> and unified_social_credit_code = #{unifiedSocialCreditCode}</if>
-            <if test="businessLicenseUrl != null  and businessLicenseUrl != ''"> and business_license_url = #{businessLicenseUrl}</if>
-            <if test="defaultImgUrl != null  and defaultImgUrl != ''"> and default_img_url = #{defaultImgUrl}</if>
-            <if test="propagandaImgUrl != null  and propagandaImgUrl != ''"> and propaganda_img_url = #{propagandaImgUrl}</if>
-            <if test="companyIntroduce != null  and companyIntroduce != ''"> and company_introduce = #{companyIntroduce}</if>
-            <if test="versionNum != null "> and version_num = #{versionNum}</if>
-            <if test="loginName != null  and loginName != ''"> and login_name = #{loginName}</if>
-            <if test="password != null  and password != ''"> and password = #{password}</if>
-            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
-            <if test="status != null "> and status = #{status}</if>
+            <if test="companyId != null "> and cr.company_id = #{companyId}</if>
+            <if test="companyName != null  and companyName != ''"> and cr.company_name like concat('%', #{companyName}, '%')</if>
+            <if test="companyType != null  and companyType != ''"> and cr.company_type = #{companyType}</if>
+            <if test="detailAddress != null  and detailAddress != ''"> and cr.detail_address = #{detailAddress}</if>
+            <if test="longitude != null  and longitude != ''"> and cr.longitude = #{longitude}</if>
+            <if test="latitude != null  and latitude != ''"> and cr.latitude = #{latitude}</if>
+            <if test="legalPerson != null  and legalPerson != ''"> and cr.legal_person = #{legalPerson}</if>
+            <if test="contactNumber != null  and contactNumber != ''"> and cr.contact_number = #{contactNumber}</if>
+            <if test="establishDate != null "> and cr.establish_date = #{establishDate}</if>
+            <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''"> and cr.unified_social_credit_code = #{unifiedSocialCreditCode}</if>
+            <if test="businessLicenseUrl != null  and businessLicenseUrl != ''"> and cr.business_license_url = #{businessLicenseUrl}</if>
+            <if test="defaultImgUrl != null  and defaultImgUrl != ''"> and cr.default_img_url = #{defaultImgUrl}</if>
+            <if test="propagandaImgUrl != null  and propagandaImgUrl != ''"> and cr.propaganda_img_url = #{propagandaImgUrl}</if>
+            <if test="companyIntroduce != null  and companyIntroduce != ''"> and cr.company_introduce = #{companyIntroduce}</if>
+            <if test="versionNum != null "> and cr.version_num = #{versionNum}</if>
+            <if test="loginName != null  and loginName != ''"> and cr.login_name = #{loginName}</if>
+            <if test="password != null  and password != ''"> and cr.password = #{password}</if>
+            <if test="reason != null  and reason != ''"> and cr.reason = #{reason}</if>
+            <if test="status != null "> and cr.status = #{status}</if>
         </where>
     </select>
     
     <select id="selectCompanyReviewedById" parameterType="Long" resultMap="CompanyReviewedResult">
         <include refid="selectCompanyReviewedVo"/>
-        where id = #{id}
+        where cr.id = #{id}
     </select>
     <select id="selectCompanyReviewedByCompanyId" parameterType="Long" resultMap="CompanyReviewedResult">
         <include refid="selectCompanyReviewedVo"/>
-        where company_id = #{companyId}
+        where cr.company_id = #{companyId}
     </select>
         
     <insert id="insertCompanyReviewed" parameterType="CompanyReviewed" useGeneratedKeys="true" keyProperty="id">
@@ -79,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="companyId != null ">company_id,</if>
             <if test="companyName != null  and companyName != ''">company_name,</if>
-            <if test="companyType != null ">company_type,</if>
+            <if test="companyType != null and companyType != '' ">company_type,</if>
             <if test="detailAddress != null  and detailAddress != ''">detail_address,</if>
             <if test="longitude != null  and longitude != ''">longitude,</if>
             <if test="latitude != null  and latitude != ''">latitude,</if>
@@ -106,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyId != null ">#{companyId},</if>
             <if test="companyName != null  and companyName != ''">#{companyName},</if>
-            <if test="companyType != null ">#{companyType},</if>
+            <if test="companyType != null  and companyType != ''">#{companyType},</if>
             <if test="detailAddress != null  and detailAddress != ''">#{detailAddress},</if>
             <if test="longitude != null  and longitude != ''">#{longitude},</if>
             <if test="latitude != null  and latitude != ''">#{latitude},</if>
@@ -137,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="companyId != null ">company_id = #{companyId},</if>
             <if test="companyName != null  and companyName != ''">company_name = #{companyName},</if>
-            <if test="companyType != null ">company_type = #{companyType},</if>
+            <if test="companyType != null  and companyType != ''">company_type = #{companyType},</if>
             <if test="detailAddress != null  and detailAddress != ''">detail_address = #{detailAddress},</if>
             <if test="longitude != null  and longitude != ''">longitude = #{longitude},</if>
             <if test="latitude != null  and latitude != ''">latitude = #{latitude},</if>
@@ -176,32 +189,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="checkLoginNameUnique"  resultType="int">
-		select count(1) from company_reviewed where login_name=#{loginName} and reason='0' and status="0"
+		select count(1) from company_reviewed where login_name=#{loginName} and reason='0' and status='0'
 	</select>
 
     <select id="selectCompanyReviewedListWiteAudit" parameterType="CompanyReviewed" resultMap="CompanyReviewedResult">
         <include refid="selectCompanyReviewedVo"/>
         <where>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
-            <if test="companyType != null "> and company_type = #{companyType}</if>
-            <if test="detailAddress != null  and detailAddress != ''"> and detail_address = #{detailAddress}</if>
-            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
-            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
-            <if test="legalPerson != null  and legalPerson != ''"> and legal_person = #{legalPerson}</if>
-            <if test="contactNumber != null  and contactNumber != ''"> and contact_number = #{contactNumber}</if>
-            <if test="establishDate != null "> and establish_date = #{establishDate}</if>
-            <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''"> and unified_social_credit_code = #{unifiedSocialCreditCode}</if>
-            <if test="businessLicenseUrl != null  and businessLicenseUrl != ''"> and business_license_url = #{businessLicenseUrl}</if>
-            <if test="defaultImgUrl != null  and defaultImgUrl != ''"> and default_img_url = #{defaultImgUrl}</if>
-            <if test="propagandaImgUrl != null  and propagandaImgUrl != ''"> and propaganda_img_url = #{propagandaImgUrl}</if>
-            <if test="companyIntroduce != null  and companyIntroduce != ''"> and company_introduce = #{companyIntroduce}</if>
-            <if test="versionNum != null "> and version_num = #{versionNum}</if>
-            <if test="loginName != null  and loginName != ''"> and login_name = #{loginName}</if>
-            <if test="password != null  and password != ''"> and password = #{password}</if>
-            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="companyId != null "> and cr.company_id = #{companyId}</if>
+            <if test="companyName != null  and companyName != ''"> and cr.company_name like concat('%', #{companyName}, '%')</if>
+            <if test="companyType != null and companyType != '' "> and cr.company_type = #{companyType}</if>
+            <if test="detailAddress != null  and detailAddress != ''"> and cr.detail_address = #{detailAddress}</if>
+            <if test="longitude != null  and longitude != ''"> and cr.longitude = #{longitude}</if>
+            <if test="latitude != null  and latitude != ''"> and cr.latitude = #{latitude}</if>
+            <if test="legalPerson != null  and legalPerson != ''"> and cr.legal_person = #{legalPerson}</if>
+            <if test="contactNumber != null  and contactNumber != ''"> and cr.contact_number = #{contactNumber}</if>
+            <if test="establishDate != null "> and cr.establish_date = #{establishDate}</if>
+            <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''"> and cr.unified_social_credit_code = #{unifiedSocialCreditCode}</if>
+            <if test="businessLicenseUrl != null  and businessLicenseUrl != ''"> and cr.business_license_url = #{businessLicenseUrl}</if>
+            <if test="defaultImgUrl != null  and defaultImgUrl != ''"> and cr.default_img_url = #{defaultImgUrl}</if>
+            <if test="propagandaImgUrl != null  and propagandaImgUrl != ''"> and cr.propaganda_img_url = #{propagandaImgUrl}</if>
+            <if test="companyIntroduce != null  and companyIntroduce != ''"> and cr.company_introduce = #{companyIntroduce}</if>
+            <if test="versionNum != null "> and cr.version_num = #{versionNum}</if>
+            <if test="loginName != null  and loginName != ''"> and cr.login_name = #{loginName}</if>
+            <if test="password != null  and password != ''"> and cr.password = #{password}</if>
+            <if test="reason != null  and reason != ''"> and cr.reason = #{reason}</if>
         </where>
-        order by status,create_time
+        order by cr.status,ce.examine_date desc,cr.create_time desc
     </select>
     
 </mapper>