Merge branch 'master' of http://git.dgtis.com/qxp/SteelfurnitureManager

dgtly-admin/src/main/java/com/dgtly/web/controller/companyext/CompanyExamineController.java

@@ -0,0 +1,166 @@
+package com.dgtly.web.controller.companyext;
+
+import com.dgtly.framework.util.ShiroUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.dgtly.common.annotation.Log;
+import com.dgtly.common.enums.BusinessType;
+import com.dgtly.companyext.domain.CompanyExamine;
+import com.dgtly.companyext.service.ICompanyExamineService;
+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 java.util.List;
+
+/**
+ * 商户审核Controller
+ * 
+ * @author dgtly
+ * @date 2020-02-13
+ */
+@Controller
+@RequestMapping("/companyext/examine")
+public class CompanyExamineController extends BaseController
+{
+    private String prefix = "companyext/examine";
+
+    @Autowired
+    private ICompanyExamineService companyExamineService;
+
+    @RequiresPermissions("companyext:examine:view")
+    @GetMapping()
+    public String examine()
+    {
+        return prefix + "/examine";
+    }
+
+    /*
+     * @Description: 待审核列表页面
+     * @Author: koucx
+     * @Date: 2020-02-13
+    **/
+    @RequiresPermissions("companyext:noexamine:view")
+    @GetMapping("/noexamine")
+    public String noexamine()
+    {
+        return prefix + "/noexamine";
+    }
+
+    /*
+     * @Description: 已经审核列表页面
+     * @Author: koucx
+     * @Date: 2020-02-13
+     **/
+    @RequiresPermissions("companyext:yesexamine:view")
+    @GetMapping("/yesexamine")
+    public String yesexamine()
+    {
+        return prefix + "/yesexamine";
+    }
+
+    /**
+     * 查询商户审核列表
+     */
+    @RequiresPermissions("companyext:examine:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(CompanyExamine companyExamine)
+    {
+        startPage();
+        if(companyExamine.getStatus()==null){
+            companyExamine.setStatus(3);
+        }
+        List<CompanyExamine> list = companyExamineService.selectCompanyExamineList(companyExamine);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户审核列表
+     */
+    @RequiresPermissions("companyext:examine:export")
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(CompanyExamine companyExamine)
+    {
+        List<CompanyExamine> list = companyExamineService.selectCompanyExamineList(companyExamine);
+        ExcelUtil<CompanyExamine> util = new ExcelUtil<CompanyExamine>(CompanyExamine.class);
+        return util.exportExcel(list, "examine");
+    }
+
+    /**
+     * 新增商户审核
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存商户审核
+     */
+    @RequiresPermissions("companyext:examine:add")
+    @Log(title = "商户审核", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(CompanyExamine companyExamine)
+    {
+        return toAjax(companyExamineService.insertCompanyExamine(companyExamine));
+    }
+
+    /**
+     * 修改商户审核
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        CompanyExamine companyExamine = companyExamineService.selectCompanyExamineById(id);
+        mmap.put("companyExamine", companyExamine);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 商户审核页面跳转
+     */
+    @GetMapping("/approvePage/{id}")
+    public String approvePage(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        CompanyExamine companyExamine = companyExamineService.selectCompanyExamineById(id);
+        mmap.put("companyExamine", companyExamine);
+        return prefix + "/approve";
+    }
+
+    /**
+     * 修改保存商户审核
+     */
+    @RequiresPermissions("companyext:examine:edit")
+    @Log(title = "商户审核", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(CompanyExamine companyExamine)
+    {
+        companyExamine.setUpdateBy(ShiroUtils.getUserId().toString());
+        return toAjax(companyExamineService.updateCompanyExamine(companyExamine));
+    }
+
+    /**
+     * 删除商户审核
+     */
+    @RequiresPermissions("companyext:examine:remove")
+    @Log(title = "商户审核", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(companyExamineService.deleteCompanyExamineByIds(ids));
+    }
+}

dgtly-admin/src/main/java/com/dgtly/web/controller/companyext/CompanyExtInfoController.java

@@ -0,0 +1,125 @@
+package com.dgtly.web.controller.companyext;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.dgtly.common.annotation.Log;
+import com.dgtly.common.enums.BusinessType;
+import com.dgtly.companyext.domain.CompanyExtInfo;
+import com.dgtly.companyext.service.ICompanyExtInfoService;
+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;
+
+/**
+ * 商户扩展信息Controller
+ * 
+ * @author dgtly
+ * @date 2020-02-13
+ */
+@Controller
+@RequestMapping("/companyext/info")
+public class CompanyExtInfoController extends BaseController
+{
+    private String prefix = "companyext/info";
+
+    @Autowired
+    private ICompanyExtInfoService companyExtInfoService;
+
+    @RequiresPermissions("companyext:info:view")
+    @GetMapping()
+    public String info()
+    {
+        return prefix + "/info";
+    }
+
+    /**
+     * 查询商户扩展信息列表
+     */
+    @RequiresPermissions("companyext:info:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(CompanyExtInfo companyExtInfo)
+    {
+        startPage();
+        List<CompanyExtInfo> list = companyExtInfoService.selectCompanyExtInfoList(companyExtInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户扩展信息列表
+     */
+    @RequiresPermissions("companyext:info:export")
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(CompanyExtInfo companyExtInfo)
+    {
+        List<CompanyExtInfo> list = companyExtInfoService.selectCompanyExtInfoList(companyExtInfo);
+        ExcelUtil<CompanyExtInfo> util = new ExcelUtil<CompanyExtInfo>(CompanyExtInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 新增商户扩展信息
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存商户扩展信息
+     */
+    @RequiresPermissions("companyext:info:add")
+    @Log(title = "商户扩展信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(CompanyExtInfo companyExtInfo)
+    {
+        return toAjax(companyExtInfoService.insertCompanyExtInfo(companyExtInfo));
+    }
+
+    /**
+     * 修改商户扩展信息
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        CompanyExtInfo companyExtInfo = companyExtInfoService.selectCompanyExtInfoById(id);
+        mmap.put("companyExtInfo", companyExtInfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存商户扩展信息
+     */
+    @RequiresPermissions("companyext:info:edit")
+    @Log(title = "商户扩展信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(CompanyExtInfo companyExtInfo)
+    {
+        return toAjax(companyExtInfoService.updateCompanyExtInfo(companyExtInfo));
+    }
+
+    /**
+     * 删除商户扩展信息
+     */
+    @RequiresPermissions("companyext:info:remove")
+    @Log(title = "商户扩展信息", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(companyExtInfoService.deleteCompanyExtInfoByIds(ids));
+    }
+}

dgtly-admin/src/main/resources/templates/companyext/examine/add.html

@@ -0,0 +1,79 @@
+<!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/companyext/examine/approve.html

@@ -0,0 +1,138 @@
+<!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">企业名称：</label>
+                <div class="col-sm-8">
+                    <input name="companyName" th:field="*{companyName}" class="form-control" type="text" disabled="disabled">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">企业类型：</label>
+                <div class="col-sm-8">
+                    <select name="companyType" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" readonly="readonly">
+                        <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">
+                    <textarea name="detailAddress" class="form-control" readonly="readonly">[[*{detailAddress}]]</textarea>
+                </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" readonly="readonly">
+                </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" readonly="readonly">
+                </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" readonly="readonly">
+                </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" readonly="readonly">
+                </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:field="*{establishDate}" class="form-control" readonly="readonly" type="text">
+                    </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" readonly="readonly">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">营业执照：</label>
+                <div class="col-sm-8">
+                    <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;">
+                        <img th:src="@{businessLicenseUrl}">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">企业默认图片：</label>
+                <div class="col-sm-8">
+                    <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;">
+                        <img th:src="@{defaultImgUrl}">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">企业宣传图片：</label>
+                <div class="col-sm-8">
+                    <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;">
+                        <img th:src="@{propagandaImgUrl}">
+                    </div>
+                </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" readonly="readonly">[[*{companyIntroduce}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">审批状态：</label>
+                <div class="col-sm-8">
+                    <label class="radio-box"> <input type="radio" name="status" value="1" th:checked="true"/> 通过 </label>
+                    <label class="radio-box"> <input type="radio" name="status" value="2" /> 驳回 </label>
+                </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>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "companyext/examine";
+        $("#form-examine-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            var status = $('input[name="status"]:checked').val();
+            var rejectReason = $("textarea[name='rejectReason']").val();
+            debugger;
+            if(status == 2 ){
+                if(rejectReason==null || rejectReason.trim()==0){
+                    $.modal.alertWarning("请填写驳回理由！");
+                    return;
+                }
+            }
+            $.operate.save(prefix + "/edit", "id="+$("input[name='id']").val()+"&status="+status+"&rejectReason="+rejectReason);
+
+        }
+    </script>
+</body>
+</html>

dgtly-admin/src/main/resources/templates/companyext/examine/edit.html

@@ -0,0 +1,80 @@
+<!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/companyext/examine/examine.html

@@ -0,0 +1,124 @@
+<!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>
+                <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 editFlag = [[${@permission.hasPermi('system:examine:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:examine:remove')}]];
+        var prefix = ctx + "system/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'
+                },
+                {
+                    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/companyext/examine/noExamine.html

@@ -0,0 +1,151 @@
+<!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 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="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 + "companyext/examine";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list?status=0",
+                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 = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + approveFlag + '" 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;
+                }
+                $.modal.open("审核商户" , prefix + "/approvePage/"+id);
+            }
+
+
+        });
+    </script>
+</body>
+</html>

dgtly-admin/src/main/resources/templates/companyext/examine/yesExamine.html

@@ -0,0 +1,147 @@
+<!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/companyext/info/add.html

@@ -0,0 +1,129 @@
+<!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-info-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">商户：</label>
+                <div class="col-sm-8">
+                    <input name="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">
+                    <input name="companyName" 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">
+                    <select name="companyType" class="form-control m-b" required>
+                        <option value="">所有</option>
+                    </select>
+                    <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">
+                    <textarea name="detailAddress" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">经度：</label>
+                <div class="col-sm-8">
+                    <input name="longitude" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">纬度：</label>
+                <div class="col-sm-8">
+                    <input name="latitude" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">企业法人：</label>
+                <div class="col-sm-8">
+                    <input name="legalPerson" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="contactNumber" class="form-control" type="text">
+                </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" 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">
+                    <input name="unifiedSocialCreditCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">营业执照：</label>
+                <div class="col-sm-8">
+                    <input name="businessLicenseUrl" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">企业默认图片：</label>
+                <div class="col-sm-8">
+                    <input name="defaultImgUrl" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">企业宣传图片：</label>
+                <div class="col-sm-8">
+                    <input name="propagandaImgUrl" class="form-control" type="text">
+                </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"></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">版本号：</label>
+                <div class="col-sm-8">
+                    <input name="versionNum" class="form-control" type="text">
+                </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/info"
+        $("#form-info-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-info-add').serialize());
+            }
+        }
+
+        $("input[name='establishDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

dgtly-admin/src/main/resources/templates/companyext/info/edit.html

@@ -0,0 +1,130 @@
+<!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-info-edit" th:object="${companyExtInfo}">
+            <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="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">
+                    <input name="companyName" th:field="*{companyName}" 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">
+                    <select name="companyType" class="form-control m-b" required>
+                        <option value="">所有</option>
+                    </select>
+                    <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">
+                    <textarea name="detailAddress" class="form-control">[[*{detailAddress}]]</textarea>
+                </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">
+                </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">
+                </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">
+                </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">
+                </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(companyExtInfo.establishDate, '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">
+                    <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">营业执照：</label>
+                <div class="col-sm-8">
+                    <input name="businessLicenseUrl" th:field="*{businessLicenseUrl}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">企业默认图片：</label>
+                <div class="col-sm-8">
+                    <input name="defaultImgUrl" th:field="*{defaultImgUrl}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">企业宣传图片：</label>
+                <div class="col-sm-8">
+                    <input name="propagandaImgUrl" th:field="*{propagandaImgUrl}" class="form-control" type="text">
+                </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">[[*{companyIntroduce}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">版本号：</label>
+                <div class="col-sm-8">
+                    <input name="versionNum" th:field="*{versionNum}" class="form-control" type="text">
+                </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/info";
+        $("#form-info-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-info-edit').serialize());
+            }
+        }
+
+        $("input[name='establishDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

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

@@ -0,0 +1,132 @@
+<!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>
+                                <p>联系电话：</p>
+                                <input type="text" name="contactNumber"/>
+                            </li>
+                            <li class="select-time">
+                                <p>成立日期：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginEstablishDate]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endEstablishDate]"/>
+                            </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="companyext:info:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="companyext:info:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="companyext:info:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="companyext:info: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 editFlag = [[${@permission.hasPermi('companyext:info:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('companyext:info:remove')}]];
+        var prefix = ctx + "companyext/info";
+
+        $(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 : '商户',
+                    visible: false
+                },
+                {
+                    field : 'companyName', 
+                    title : '企业名称'
+                },
+                {
+                    field : 'companyType', 
+                    title : '企业类型'
+                },
+                {
+                    field : 'legalPerson', 
+                    title : '企业法人'
+                },
+                {
+                    field : 'contactNumber', 
+                    title : '联系电话'
+                },
+                {
+                    field : 'establishDate', 
+                    title : '成立日期'
+                },
+                {
+                    field : 'unifiedSocialCreditCode', 
+                    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/system/company/add.html

@@ -25,12 +25,6 @@
                 </div>
             </div>
 
-            <div class="form-group">
-                <label class="col-sm-3 control-label">优图权限编号：</label>
-                <div class="col-sm-8">
-                    <input name="authorizeId" id="authorizeId" class="form-control" type="text" required>
-                </div>
-            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />

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

@@ -0,0 +1,272 @@
+package com.dgtly.companyext.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.dgtly.common.annotation.Excel;
+import com.dgtly.common.core.domain.BaseEntity;
+import java.util.Date;
+
+/**
+ * 商户审核对象 company_examine
+ * 
+ * @author dgtly
+ * @date 2020-02-13
+ */
+public class CompanyExamine extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 商户(公司)Id */
+    private Long companyId;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Integer status;
+
+    /** 申请日期 */
+    @Excel(name = "申请日期")
+    private String applyDate;
+
+    /** 审核日期 */
+    @Excel(name = "审核日期")
+    private String examineDate;
+
+    /** 驳回理由 */
+    @Excel(name = "驳回理由")
+    private String rejectReason;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCompanyId(Long companyId) 
+    {
+        this.companyId = companyId;
+    }
+
+    public Long getCompanyId() 
+    {
+        return companyId;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+
+    public String getApplyDate() {
+        return applyDate;
+    }
+
+    public void setApplyDate(String applyDate) {
+        this.applyDate = applyDate;
+    }
+
+    public String getExamineDate() {
+        return examineDate;
+    }
+
+    public void setExamineDate(String examineDate) {
+        this.examineDate = examineDate;
+    }
+
+    public void setRejectReason(String rejectReason)
+    {
+        this.rejectReason = rejectReason;
+    }
+
+    public String getRejectReason() 
+    {
+        return rejectReason;
+    }
+
+    @Excel(name = "企业名称")
+    private String companyName;
+
+    /** 企业类型 */
+    @Excel(name = "企业类型")
+    private Integer companyType;
+
+    /** 详细地址 */
+    @Excel(name = "详细地址")
+    private String detailAddress;
+
+    /** 经度 */
+    private String longitude;
+
+    /** 纬度 */
+    private String latitude;
+
+    /** 企业法人 */
+    @Excel(name = "企业法人")
+    private String legalPerson;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String contactNumber;
+
+    /** 成立日期 */
+    @Excel(name = "成立日期")
+    private String establishDate;
+
+    /** 统一社会信用代码 */
+    @Excel(name = "统一社会信用代码")
+    private String unifiedSocialCreditCode;
+
+    /** 营业执照 */
+    private String businessLicenseUrl;
+
+    /** 企业默认图片 */
+    private String defaultImgUrl;
+
+    /** 企业宣传图片 */
+    private String propagandaImgUrl;
+
+    /** 企业介绍 */
+    @Excel(name = "企业介绍")
+    private String companyIntroduce;
+
+    /** 版本号 */
+    private Integer versionNum;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public Integer getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(Integer companyType) {
+        this.companyType = companyType;
+    }
+
+    public String getLegalPerson() {
+        return legalPerson;
+    }
+
+    public void setLegalPerson(String legalPerson) {
+        this.legalPerson = legalPerson;
+    }
+
+    public String getContactNumber() {
+        return contactNumber;
+    }
+
+    public void setContactNumber(String contactNumber) {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getDetailAddress() {
+        return detailAddress;
+    }
+
+    public void setDetailAddress(String detailAddress) {
+        this.detailAddress = detailAddress;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getEstablishDate() {
+        return establishDate;
+    }
+
+    public void setEstablishDate(String establishDate) {
+        this.establishDate = establishDate;
+    }
+
+    public String getUnifiedSocialCreditCode() {
+        return unifiedSocialCreditCode;
+    }
+
+    public void setUnifiedSocialCreditCode(String unifiedSocialCreditCode) {
+        this.unifiedSocialCreditCode = unifiedSocialCreditCode;
+    }
+
+    public String getBusinessLicenseUrl() {
+        return businessLicenseUrl;
+    }
+
+    public void setBusinessLicenseUrl(String businessLicenseUrl) {
+        this.businessLicenseUrl = businessLicenseUrl;
+    }
+
+    public String getDefaultImgUrl() {
+        return defaultImgUrl;
+    }
+
+    public void setDefaultImgUrl(String defaultImgUrl) {
+        this.defaultImgUrl = defaultImgUrl;
+    }
+
+    public String getPropagandaImgUrl() {
+        return propagandaImgUrl;
+    }
+
+    public void setPropagandaImgUrl(String propagandaImgUrl) {
+        this.propagandaImgUrl = propagandaImgUrl;
+    }
+
+    public String getCompanyIntroduce() {
+        return companyIntroduce;
+    }
+
+    public void setCompanyIntroduce(String companyIntroduce) {
+        this.companyIntroduce = companyIntroduce;
+    }
+
+    public Integer getVersionNum() {
+        return versionNum;
+    }
+
+    public void setVersionNum(Integer versionNum) {
+        this.versionNum = versionNum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("companyId", getCompanyId())
+            .append("status", getStatus())
+            .append("applyDate", getApplyDate())
+            .append("examineDate", getExamineDate())
+            .append("rejectReason", getRejectReason())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,253 @@
+package com.dgtly.companyext.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.dgtly.common.annotation.Excel;
+import com.dgtly.common.core.domain.BaseEntity;
+import java.util.Date;
+
+/**
+ * 商户扩展信息对象 company_ext_info
+ * 
+ * @author dgtly
+ * @date 2020-02-13
+ */
+public class CompanyExtInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 商户（公司）ID */
+    @Excel(name = "商户", readConverterExp = "公=司")
+    private Long companyId;
+
+    /** 企业名称 */
+    @Excel(name = "企业名称")
+    private String companyName;
+
+    /** 企业类型 */
+    @Excel(name = "企业类型")
+    private Integer companyType;
+
+    /** 详细地址 */
+    @Excel(name = "详细地址")
+    private String detailAddress;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String latitude;
+
+    /** 企业法人 */
+    @Excel(name = "企业法人")
+    private String legalPerson;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String contactNumber;
+
+    /** 成立日期 */
+    @Excel(name = "成立日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date establishDate;
+
+    /** 统一社会信用代码 */
+    @Excel(name = "统一社会信用代码")
+    private String unifiedSocialCreditCode;
+
+    /** 营业执照 */
+    @Excel(name = "营业执照")
+    private String businessLicenseUrl;
+
+    /** 企业默认图片 */
+    @Excel(name = "企业默认图片")
+    private String defaultImgUrl;
+
+    /** 企业宣传图片 */
+    @Excel(name = "企业宣传图片")
+    private String propagandaImgUrl;
+
+    /** 企业介绍 */
+    @Excel(name = "企业介绍")
+    private String companyIntroduce;
+
+    /** 版本号 */
+    @Excel(name = "版本号")
+    private Integer versionNum;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCompanyId(Long companyId) 
+    {
+        this.companyId = companyId;
+    }
+
+    public Long getCompanyId() 
+    {
+        return companyId;
+    }
+    public void setCompanyName(String companyName) 
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName() 
+    {
+        return companyName;
+    }
+    public void setCompanyType(Integer companyType) 
+    {
+        this.companyType = companyType;
+    }
+
+    public Integer getCompanyType() 
+    {
+        return companyType;
+    }
+    public void setDetailAddress(String detailAddress) 
+    {
+        this.detailAddress = detailAddress;
+    }
+
+    public String getDetailAddress() 
+    {
+        return detailAddress;
+    }
+    public void setLongitude(String longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public String getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(String latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public String getLatitude() 
+    {
+        return latitude;
+    }
+    public void setLegalPerson(String legalPerson) 
+    {
+        this.legalPerson = legalPerson;
+    }
+
+    public String getLegalPerson() 
+    {
+        return legalPerson;
+    }
+    public void setContactNumber(String contactNumber) 
+    {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getContactNumber() 
+    {
+        return contactNumber;
+    }
+    public void setEstablishDate(Date establishDate) 
+    {
+        this.establishDate = establishDate;
+    }
+
+    public Date getEstablishDate() 
+    {
+        return establishDate;
+    }
+    public void setUnifiedSocialCreditCode(String unifiedSocialCreditCode) 
+    {
+        this.unifiedSocialCreditCode = unifiedSocialCreditCode;
+    }
+
+    public String getUnifiedSocialCreditCode() 
+    {
+        return unifiedSocialCreditCode;
+    }
+    public void setBusinessLicenseUrl(String businessLicenseUrl) 
+    {
+        this.businessLicenseUrl = businessLicenseUrl;
+    }
+
+    public String getBusinessLicenseUrl() 
+    {
+        return businessLicenseUrl;
+    }
+    public void setDefaultImgUrl(String defaultImgUrl) 
+    {
+        this.defaultImgUrl = defaultImgUrl;
+    }
+
+    public String getDefaultImgUrl() 
+    {
+        return defaultImgUrl;
+    }
+    public void setPropagandaImgUrl(String propagandaImgUrl) 
+    {
+        this.propagandaImgUrl = propagandaImgUrl;
+    }
+
+    public String getPropagandaImgUrl() 
+    {
+        return propagandaImgUrl;
+    }
+    public void setCompanyIntroduce(String companyIntroduce) 
+    {
+        this.companyIntroduce = companyIntroduce;
+    }
+
+    public String getCompanyIntroduce() 
+    {
+        return companyIntroduce;
+    }
+    public void setVersionNum(Integer versionNum) 
+    {
+        this.versionNum = versionNum;
+    }
+
+    public Integer getVersionNum() 
+    {
+        return versionNum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("companyId", getCompanyId())
+            .append("companyName", getCompanyName())
+            .append("companyType", getCompanyType())
+            .append("detailAddress", getDetailAddress())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("legalPerson", getLegalPerson())
+            .append("contactNumber", getContactNumber())
+            .append("establishDate", getEstablishDate())
+            .append("unifiedSocialCreditCode", getUnifiedSocialCreditCode())
+            .append("businessLicenseUrl", getBusinessLicenseUrl())
+            .append("defaultImgUrl", getDefaultImgUrl())
+            .append("propagandaImgUrl", getPropagandaImgUrl())
+            .append("companyIntroduce", getCompanyIntroduce())
+            .append("versionNum", getVersionNum())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

dgtly-system/src/main/java/com/dgtly/companyext/mapper/CompanyExamineMapper.java

@@ -0,0 +1,61 @@
+package com.dgtly.companyext.mapper;
+
+import com.dgtly.companyext.domain.CompanyExamine;
+import java.util.List;
+
+/**
+ * 商户审核Mapper接口
+ * 
+ * @author dgtly
+ * @date 2020-02-13
+ */
+public interface CompanyExamineMapper 
+{
+    /**
+     * 查询商户审核
+     * 
+     * @param id 商户审核ID
+     * @return 商户审核
+     */
+    public CompanyExamine selectCompanyExamineById(Long id);
+
+    /**
+     * 查询商户审核列表
+     * 
+     * @param companyExamine 商户审核
+     * @return 商户审核集合
+     */
+    public List<CompanyExamine> selectCompanyExamineList(CompanyExamine companyExamine);
+
+    /**
+     * 新增商户审核
+     * 
+     * @param companyExamine 商户审核
+     * @return 结果
+     */
+    public int insertCompanyExamine(CompanyExamine companyExamine);
+
+    /**
+     * 修改商户审核
+     * 
+     * @param companyExamine 商户审核
+     * @return 结果
+     */
+    public int updateCompanyExamine(CompanyExamine companyExamine);
+
+    /**
+     * 删除商户审核
+     * 
+     * @param id 商户审核ID
+     * @return 结果
+     */
+    public int deleteCompanyExamineById(Long id);
+
+    /**
+     * 批量删除商户审核
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCompanyExamineByIds(String[] ids);
+}

dgtly-system/src/main/java/com/dgtly/companyext/mapper/CompanyExtInfoMapper.java

@@ -0,0 +1,61 @@
+package com.dgtly.companyext.mapper;
+
+import com.dgtly.companyext.domain.CompanyExtInfo;
+import java.util.List;
+
+/**
+ * 商户扩展信息Mapper接口
+ * 
+ * @author dgtly
+ * @date 2020-02-13
+ */
+public interface CompanyExtInfoMapper 
+{
+    /**
+     * 查询商户扩展信息
+     * 
+     * @param id 商户扩展信息ID
+     * @return 商户扩展信息
+     */
+    public CompanyExtInfo selectCompanyExtInfoById(Long id);
+
+    /**
+     * 查询商户扩展信息列表
+     * 
+     * @param companyExtInfo 商户扩展信息
+     * @return 商户扩展信息集合
+     */
+    public List<CompanyExtInfo> selectCompanyExtInfoList(CompanyExtInfo companyExtInfo);
+
+    /**
+     * 新增商户扩展信息
+     * 
+     * @param companyExtInfo 商户扩展信息
+     * @return 结果
+     */
+    public int insertCompanyExtInfo(CompanyExtInfo companyExtInfo);
+
+    /**
+     * 修改商户扩展信息
+     * 
+     * @param companyExtInfo 商户扩展信息
+     * @return 结果
+     */
+    public int updateCompanyExtInfo(CompanyExtInfo companyExtInfo);
+
+    /**
+     * 删除商户扩展信息
+     * 
+     * @param id 商户扩展信息ID
+     * @return 结果
+     */
+    public int deleteCompanyExtInfoById(Long id);
+
+    /**
+     * 批量删除商户扩展信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCompanyExtInfoByIds(String[] ids);
+}

dgtly-system/src/main/java/com/dgtly/companyext/service/ICompanyExamineService.java

@@ -0,0 +1,62 @@
+package com.dgtly.companyext.service;
+
+import com.dgtly.companyext.domain.CompanyExamine;
+import java.util.List;
+
+/**
+ * 商户审核Service接口
+ * 
+ * @author dgtly
+ * @date 2020-02-13
+ */
+public interface ICompanyExamineService 
+{
+    /**
+     * 查询商户审核
+     * 
+     * @param id 商户审核ID
+     * @return 商户审核
+     */
+    public CompanyExamine selectCompanyExamineById(Long id);
+
+    /**
+     * 查询商户审核列表
+     * 
+     * @param companyExamine 商户审核
+     * @return 商户审核集合
+     */
+    public List<CompanyExamine> selectCompanyExamineList(CompanyExamine companyExamine);
+
+    /**
+     * 新增商户审核
+     * 
+     * @param companyExamine 商户审核
+     * @return 结果
+     */
+    public int insertCompanyExamine(CompanyExamine companyExamine);
+
+    /**
+     * 修改商户审核
+     * 
+     * @param companyExamine 商户审核
+     * @return 结果
+     */
+    public int updateCompanyExamine(CompanyExamine companyExamine);
+
+    /**
+     * 批量删除商户审核
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCompanyExamineByIds(String ids);
+
+    /**
+     * 删除商户审核信息
+     * 
+     * @param id 商户审核ID
+     * @return 结果
+     */
+    public int deleteCompanyExamineById(Long id);
+
+}

dgtly-system/src/main/java/com/dgtly/companyext/service/ICompanyExtInfoService.java

@@ -0,0 +1,61 @@
+package com.dgtly.companyext.service;
+
+import com.dgtly.companyext.domain.CompanyExtInfo;
+import java.util.List;
+
+/**
+ * 商户扩展信息Service接口
+ * 
+ * @author dgtly
+ * @date 2020-02-13
+ */
+public interface ICompanyExtInfoService 
+{
+    /**
+     * 查询商户扩展信息
+     * 
+     * @param id 商户扩展信息ID
+     * @return 商户扩展信息
+     */
+    public CompanyExtInfo selectCompanyExtInfoById(Long id);
+
+    /**
+     * 查询商户扩展信息列表
+     * 
+     * @param companyExtInfo 商户扩展信息
+     * @return 商户扩展信息集合
+     */
+    public List<CompanyExtInfo> selectCompanyExtInfoList(CompanyExtInfo companyExtInfo);
+
+    /**
+     * 新增商户扩展信息
+     * 
+     * @param companyExtInfo 商户扩展信息
+     * @return 结果
+     */
+    public int insertCompanyExtInfo(CompanyExtInfo companyExtInfo);
+
+    /**
+     * 修改商户扩展信息
+     * 
+     * @param companyExtInfo 商户扩展信息
+     * @return 结果
+     */
+    public int updateCompanyExtInfo(CompanyExtInfo companyExtInfo);
+
+    /**
+     * 批量删除商户扩展信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCompanyExtInfoByIds(String ids);
+
+    /**
+     * 删除商户扩展信息信息
+     * 
+     * @param id 商户扩展信息ID
+     * @return 结果
+     */
+    public int deleteCompanyExtInfoById(Long id);
+}

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

@@ -0,0 +1,97 @@
+package com.dgtly.companyext.service.impl;
+
+import java.util.List;
+import com.dgtly.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.dgtly.companyext.mapper.CompanyExamineMapper;
+import com.dgtly.companyext.domain.CompanyExamine;
+import com.dgtly.companyext.service.ICompanyExamineService;
+import com.dgtly.common.core.text.Convert;
+
+/**
+ * 商户审核Service业务层处理
+ * 
+ * @author dgtly
+ * @date 2020-02-13
+ */
+@Service
+public class CompanyExamineServiceImpl implements ICompanyExamineService 
+{
+    @Autowired
+    private CompanyExamineMapper companyExamineMapper;
+
+    /**
+     * 查询商户审核
+     * 
+     * @param id 商户审核ID
+     * @return 商户审核
+     */
+    @Override
+    public CompanyExamine selectCompanyExamineById(Long id)
+    {
+        return companyExamineMapper.selectCompanyExamineById(id);
+    }
+
+    /**
+     * 查询商户审核列表
+     * 
+     * @param companyExamine 商户审核
+     * @return 商户审核
+     */
+    @Override
+    public List<CompanyExamine> selectCompanyExamineList(CompanyExamine companyExamine)
+    {
+        return companyExamineMapper.selectCompanyExamineList(companyExamine);
+    }
+
+    /**
+     * 新增商户审核
+     * 
+     * @param companyExamine 商户审核
+     * @return 结果
+     */
+    @Override
+    public int insertCompanyExamine(CompanyExamine companyExamine)
+    {
+        companyExamine.setCreateTime(DateUtils.getNowDate());
+        return companyExamineMapper.insertCompanyExamine(companyExamine);
+    }
+
+    /**
+     * 修改商户审核
+     * 
+     * @param companyExamine 商户审核
+     * @return 结果
+     */
+    @Override
+    public int updateCompanyExamine(CompanyExamine companyExamine)
+    {
+        companyExamine.setUpdateTime(DateUtils.getNowDate());
+        return companyExamineMapper.updateCompanyExamine(companyExamine);
+    }
+
+    /**
+     * 删除商户审核对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCompanyExamineByIds(String ids)
+    {
+        return companyExamineMapper.deleteCompanyExamineByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除商户审核信息
+     * 
+     * @param id 商户审核ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCompanyExamineById(Long id)
+    {
+        return companyExamineMapper.deleteCompanyExamineById(id);
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.dgtly.companyext.service.impl;
+
+import java.util.List;
+import com.dgtly.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.dgtly.companyext.mapper.CompanyExtInfoMapper;
+import com.dgtly.companyext.domain.CompanyExtInfo;
+import com.dgtly.companyext.service.ICompanyExtInfoService;
+import com.dgtly.common.core.text.Convert;
+
+/**
+ * 商户扩展信息Service业务层处理
+ * 
+ * @author dgtly
+ * @date 2020-02-13
+ */
+@Service
+public class CompanyExtInfoServiceImpl implements ICompanyExtInfoService 
+{
+    @Autowired
+    private CompanyExtInfoMapper companyExtInfoMapper;
+
+    /**
+     * 查询商户扩展信息
+     * 
+     * @param id 商户扩展信息ID
+     * @return 商户扩展信息
+     */
+    @Override
+    public CompanyExtInfo selectCompanyExtInfoById(Long id)
+    {
+        return companyExtInfoMapper.selectCompanyExtInfoById(id);
+    }
+
+    /**
+     * 查询商户扩展信息列表
+     * 
+     * @param companyExtInfo 商户扩展信息
+     * @return 商户扩展信息
+     */
+    @Override
+    public List<CompanyExtInfo> selectCompanyExtInfoList(CompanyExtInfo companyExtInfo)
+    {
+        return companyExtInfoMapper.selectCompanyExtInfoList(companyExtInfo);
+    }
+
+    /**
+     * 新增商户扩展信息
+     * 
+     * @param companyExtInfo 商户扩展信息
+     * @return 结果
+     */
+    @Override
+    public int insertCompanyExtInfo(CompanyExtInfo companyExtInfo)
+    {
+        companyExtInfo.setCreateTime(DateUtils.getNowDate());
+        return companyExtInfoMapper.insertCompanyExtInfo(companyExtInfo);
+    }
+
+    /**
+     * 修改商户扩展信息
+     * 
+     * @param companyExtInfo 商户扩展信息
+     * @return 结果
+     */
+    @Override
+    public int updateCompanyExtInfo(CompanyExtInfo companyExtInfo)
+    {
+        companyExtInfo.setUpdateTime(DateUtils.getNowDate());
+        return companyExtInfoMapper.updateCompanyExtInfo(companyExtInfo);
+    }
+
+    /**
+     * 删除商户扩展信息对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCompanyExtInfoByIds(String ids)
+    {
+        return companyExtInfoMapper.deleteCompanyExtInfoByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除商户扩展信息信息
+     * 
+     * @param id 商户扩展信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCompanyExtInfoById(Long id)
+    {
+        return companyExtInfoMapper.deleteCompanyExtInfoById(id);
+    }
+}

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

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dgtly.companyext.mapper.CompanyExamineMapper">
+    
+    <resultMap type="CompanyExamine" id="CompanyExamineResult">
+        <result property="id"    column="id"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="companyName"    column="company_name"    />
+        <result property="companyType"    column="company_type"    />
+        <result property="detailAddress"    column="detail_address"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="legalPerson"    column="legal_person"    />
+        <result property="contactNumber"    column="contact_number"    />
+        <result property="establishDate"    column="establish_date"    />
+        <result property="unifiedSocialCreditCode"    column="unified_social_credit_code"    />
+        <result property="businessLicenseUrl"    column="business_license_url"    />
+        <result property="defaultImgUrl"    column="default_img_url"    />
+        <result property="propagandaImgUrl"    column="propaganda_img_url"    />
+        <result property="companyIntroduce"    column="company_introduce"    />
+        <result property="versionNum"    column="version_num"    />
+        <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"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCompanyExamineVo">
+        select id, company_id, status, apply_date, examine_date, reject_reason, create_by, create_time, update_by, update_time, remark from company_examine
+    </sql>
+
+    <select id="selectCompanyExamineList" parameterType="CompanyExamine" resultMap="CompanyExamineResult">
+        SELECT
+        ce.id,
+        ce.company_id,
+        cei.company_name,
+        cei.company_type,
+        cei.legal_person,
+        cei.contact_number,
+        ce.STATUS,
+        date_format(ce.apply_date,'%Y-%m-%d') as 'apply_date',
+        date_format(ce.examine_date,'%Y-%m-%d') as 'examine_date',
+        ce.reject_reason
+        FROM
+        company_examine ce,company_ext_info cei
+        WHERE ce.company_id = cei.company_id AND ce.del_flag  = '0' AND cei.del_flag = '0'
+        AND cei.version_num = (SELECT MAX(a.version_num) FROM company_ext_info a WHERE a.company_id = ce.company_id)
+        <if test="companyName != null and companyName != ''"> and cei.company_name like concat('%', #{companyName}, '%')</if>
+        <if test="companyType != null and companyType != ''"> and cei.company_type = #{companyType}</if>
+        <if test="legalPerson != null and legalPerson != ''"> and cei.legal_person like concat('%', #{legalPerson}, '%')</if>
+        <if test="status != null and status != 3"> and ce.status = #{status}</if>
+        <if test="status != null and status == 3"> and (ce.status = 1 or ce.status = 2)</if>
+        <if test="applyDate != null and applyDate != ''"> and date_format(ce.apply_date,'%Y-%m-%d') = #{applyDate}</if>
+        <if test="examineDate != null and examineDate != ''"> and date_format(ce.examine_date,'%Y-%m-%d') = #{examineDate}</if>
+    </select>
+
+    <select id="selectCompanyExamineById" parameterType="Long" resultMap="CompanyExamineResult">
+         SELECT
+            ce.id,
+            ce.company_id,
+            cei.company_name,
+            cei.company_type,
+            cei.legal_person,
+            cei.detail_address,
+            cei.longitude,
+            cei.latitude,
+            cei.legal_person,
+            cei.contact_number,
+            date_format(cei.establish_date,'%Y-%m-%d') as 'establish_date',
+            cei.unified_social_credit_code,
+            cei.business_license_url,
+            cei.default_img_url,
+            cei.propaganda_img_url,
+            cei.company_introduce,
+            cei.version_num,
+            cei.contact_number,
+            ce.STATUS,
+            ce.apply_date,
+            ce.examine_date,
+            ce.reject_reason
+        FROM
+            company_examine ce
+        LEFT JOIN	company_ext_info cei on ce.company_id = cei.company_id
+        WHERE
+        ce.del_flag = '0'
+        AND cei.del_flag = '0'
+        AND cei.version_num = (
+            SELECT
+                MAX(a.version_num)
+            FROM
+                company_ext_info a
+            WHERE
+                a.company_id = ce.company_id
+        )
+        AND ce.id = #{id}
+    </select>
+        
+    <insert id="insertCompanyExamine" parameterType="CompanyExamine" useGeneratedKeys="true" keyProperty="id">
+        insert into company_examine
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="companyId != null ">company_id,</if>
+            <if test="status != null ">status,</if>
+            <if test="applyDate != null ">apply_date,</if>
+            <if test="examineDate != null ">examine_date,</if>
+            <if test="rejectReason != null  and rejectReason != ''">reject_reason,</if>
+            <if test="createBy != null  and createBy != ''">create_by,</if>
+            <if test="createTime != null ">create_time,</if>
+            <if test="updateBy != null  and updateBy != ''">update_by,</if>
+            <if test="updateTime != null ">update_time,</if>
+            <if test="remark != null  and remark != ''">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="companyId != null ">#{companyId},</if>
+            <if test="status != null ">#{status},</if>
+            <if test="applyDate != null ">#{applyDate},</if>
+            <if test="examineDate != null ">#{examineDate},</if>
+            <if test="rejectReason != null  and rejectReason != ''">#{rejectReason},</if>
+            <if test="createBy != null  and createBy != ''">#{createBy},</if>
+            <if test="createTime != null ">#{createTime},</if>
+            <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null ">#{updateTime},</if>
+            <if test="remark != null  and remark != ''">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCompanyExamine" parameterType="CompanyExamine">
+        update company_examine
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="status != null ">status = #{status},</if>
+            examine_date = NOW(),
+            <if test="rejectReason != null  and rejectReason != ''">reject_reason = #{rejectReason},</if>
+            <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = NOW(),
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCompanyExamineById" parameterType="Long">
+        delete from company_examine where id = #{id}
+    </delete>
+
+    <delete id="deleteCompanyExamineByIds" parameterType="String">
+        delete from company_examine where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dgtly.companyext.mapper.CompanyExtInfoMapper">
+    
+    <resultMap type="CompanyExtInfo" id="CompanyExtInfoResult">
+        <result property="id"    column="id"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="companyName"    column="company_name"    />
+        <result property="companyType"    column="company_type"    />
+        <result property="detailAddress"    column="detail_address"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="legalPerson"    column="legal_person"    />
+        <result property="contactNumber"    column="contact_number"    />
+        <result property="establishDate"    column="establish_date"    />
+        <result property="unifiedSocialCreditCode"    column="unified_social_credit_code"    />
+        <result property="businessLicenseUrl"    column="business_license_url"    />
+        <result property="defaultImgUrl"    column="default_img_url"    />
+        <result property="propagandaImgUrl"    column="propaganda_img_url"    />
+        <result property="companyIntroduce"    column="company_introduce"    />
+        <result property="versionNum"    column="version_num"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCompanyExtInfoVo">
+        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 from company_ext_info
+    </sql>
+
+    <select id="selectCompanyExtInfoList" parameterType="CompanyExtInfo" resultMap="CompanyExtInfoResult">
+        <include refid="selectCompanyExtInfoVo"/>
+        <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>
+        </where>
+    </select>
+    
+    <select id="selectCompanyExtInfoById" parameterType="Long" resultMap="CompanyExtInfoResult">
+        <include refid="selectCompanyExtInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertCompanyExtInfo" parameterType="CompanyExtInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into company_ext_info
+        <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="detailAddress != null  and detailAddress != ''">detail_address,</if>
+            <if test="longitude != null  and longitude != ''">longitude,</if>
+            <if test="latitude != null  and latitude != ''">latitude,</if>
+            <if test="legalPerson != null  and legalPerson != ''">legal_person,</if>
+            <if test="contactNumber != null  and contactNumber != ''">contact_number,</if>
+            <if test="establishDate != null ">establish_date,</if>
+            <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''">unified_social_credit_code,</if>
+            <if test="businessLicenseUrl != null  and businessLicenseUrl != ''">business_license_url,</if>
+            <if test="defaultImgUrl != null  and defaultImgUrl != ''">default_img_url,</if>
+            <if test="propagandaImgUrl != null  and propagandaImgUrl != ''">propaganda_img_url,</if>
+            <if test="companyIntroduce != null  and companyIntroduce != ''">company_introduce,</if>
+            <if test="versionNum != null ">version_num,</if>
+            <if test="createBy != null  and createBy != ''">create_by,</if>
+            <if test="createTime != null ">create_time,</if>
+            <if test="updateBy != null  and updateBy != ''">update_by,</if>
+            <if test="updateTime != null ">update_time,</if>
+            <if test="remark != null  and remark != ''">remark,</if>
+         </trim>
+        <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="detailAddress != null  and detailAddress != ''">#{detailAddress},</if>
+            <if test="longitude != null  and longitude != ''">#{longitude},</if>
+            <if test="latitude != null  and latitude != ''">#{latitude},</if>
+            <if test="legalPerson != null  and legalPerson != ''">#{legalPerson},</if>
+            <if test="contactNumber != null  and contactNumber != ''">#{contactNumber},</if>
+            <if test="establishDate != null ">#{establishDate},</if>
+            <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''">#{unifiedSocialCreditCode},</if>
+            <if test="businessLicenseUrl != null  and businessLicenseUrl != ''">#{businessLicenseUrl},</if>
+            <if test="defaultImgUrl != null  and defaultImgUrl != ''">#{defaultImgUrl},</if>
+            <if test="propagandaImgUrl != null  and propagandaImgUrl != ''">#{propagandaImgUrl},</if>
+            <if test="companyIntroduce != null  and companyIntroduce != ''">#{companyIntroduce},</if>
+            <if test="versionNum != null ">#{versionNum},</if>
+            <if test="createBy != null  and createBy != ''">#{createBy},</if>
+            <if test="createTime != null ">#{createTime},</if>
+            <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null ">#{updateTime},</if>
+            <if test="remark != null  and remark != ''">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCompanyExtInfo" parameterType="CompanyExtInfo">
+        update company_ext_info
+        <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="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>
+            <if test="legalPerson != null  and legalPerson != ''">legal_person = #{legalPerson},</if>
+            <if test="contactNumber != null  and contactNumber != ''">contact_number = #{contactNumber},</if>
+            <if test="establishDate != null ">establish_date = #{establishDate},</if>
+            <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''">unified_social_credit_code = #{unifiedSocialCreditCode},</if>
+            <if test="businessLicenseUrl != null  and businessLicenseUrl != ''">business_license_url = #{businessLicenseUrl},</if>
+            <if test="defaultImgUrl != null  and defaultImgUrl != ''">default_img_url = #{defaultImgUrl},</if>
+            <if test="propagandaImgUrl != null  and propagandaImgUrl != ''">propaganda_img_url = #{propagandaImgUrl},</if>
+            <if test="companyIntroduce != null  and companyIntroduce != ''">company_introduce = #{companyIntroduce},</if>
+            <if test="versionNum != null ">version_num = #{versionNum},</if>
+            <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null ">create_time = #{createTime},</if>
+            <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null ">update_time = #{updateTime},</if>
+            <if test="remark != null  and remark != ''">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCompanyExtInfoById" parameterType="Long">
+        delete from company_ext_info where id = #{id}
+    </delete>
+
+    <delete id="deleteCompanyExtInfoByIds" parameterType="String">
+        delete from company_ext_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

dgtly-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -25,10 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"     column="update_by"    />
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
-		<result property="workAddr"       column="work_addr"       />
-		<result property="workSchedul"       column="work_schedul"       />
-		<result property="addrNum"       column="addr_num"       />
-		<result property="schedulDetail"       column="schedul_detail"       />
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
 		<association property="company"    column="company_id" javaType="SysCompany" resultMap="companyResult" />
 		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
@@ -69,12 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 	
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
-		a.addr_detail as work_addr,a.addr_num as addr_num,s.schedul_name as work_schedul,s.schedul_detail as schedul_detail from sys_user u
+		select u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join sys_company c on u.company_id = c.id
-		LEFT JOIN sign_addr a ON a.id = u.work_addr
-		LEFT JOIN sign_schedul s ON s.id = u.work_schedul
 		where u.del_flag = '0'
 		<if test="loginName != null and loginName != ''">
 			AND u.login_name like concat('%', #{loginName}, '%')
@@ -257,12 +251,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 
 	<select id="needSignUser" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
-		a.addr_detail as work_addr,a.addr_num as addr_num,s.schedul_name as work_schedul,s.schedul_detail as schedul_detail from sys_user u
+		select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
-		LEFT JOIN sign_addr a ON a.id = u.work_addr
-		LEFT JOIN sign_schedul s ON s.id = u.work_schedul
-		where u.del_flag = '0' and u.work_schedul != '' and u.work_schedul is not null
 		<if test="companyId != null and companyId != 0"> and u.company_id = #{companyId}</if>
 
 	</select>