商户信息修改及商户信息审核

dgtly-admin/src/main/java/com/dgtly/web/controller/common/CommonController.java

@@ -93,30 +93,7 @@ public class CommonController
         }
     }
 
-    /**
-     * 通用上传请求
-     */
-    @PostMapping("/common/upload.if")
-    @ResponseBody
-    public AjaxResult uploadFileApi(MultipartFile file) throws Exception
-    {
-        try
-        {
-            Map<String,Object> rs = new HashMap<>();
-            // 上传文件路径
-            String filePath = Global.getUploadPath();
-            // 上传并返回新文件名称
-            String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
-            rs.put("fileName", fileName);
-            rs.put("url", url);
-            return AjaxResult.success(rs);
-        }
-        catch (Exception e)
-        {
-            return AjaxResult.error(e.getMessage());
-        }
-    }
+
 
     /**
      * 本地资源通用下载

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

@@ -147,7 +147,7 @@ public class CompanyController extends BaseController
     }
 
     /**
-     * @descption: 商户审核
+     * @descption: 商户入驻审核
      * @param:
      * @return:
      * @auther: qxp
@@ -162,8 +162,6 @@ public class CompanyController extends BaseController
         return prefix + "/enterexamine/approve";
     }
 
-
-
     /**
      * 审核商户入驻
      */
@@ -181,12 +179,15 @@ public class CompanyController extends BaseController
 
         }else{
             /*审核拒绝*/
-            i=companyReviewedService.refuseEnter(companyExamine);
+            i=companyReviewedService.refuse(companyExamine);
         }
         return toAjax(i);
     }
 
 
+
+    /*****************************审核商户信息提交相关*************************************************/
+
     /**
      * @descption: 商户修改审核
      * @param:
@@ -219,7 +220,57 @@ public class CompanyController extends BaseController
         List<CompanyReviewed> list = companyReviewedService.selectCompanyReviewedListWiteAudit(companyReviewed);
         return getDataTable(list);
     }
+    /**
+     * @descption: 审核商户信息修改
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020-2-25
+     */
+    @RequiresPermissions("company:editexamine:approvePage")
+    @GetMapping("/editexamine/approvePage/{id}")
+    public String audit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        CompanyReviewed companyReviewed = companyReviewedService.selectCompanyReviewedById(id);
+        SysCompany sysCompany = sysCompanyService.selectSysCompanyById(companyReviewed.getCompanyId());
+        mmap.put("companyReviewed", companyReviewed);
+        mmap.put("sysCompany", sysCompany);
+        return prefix + "/editexamine/approve";
+    }
+
+    /**
+     * 审核商户入驻
+     */
+    @RequiresPermissions("companyext:editexamine:approve")
+    @Log(title = "审核商户入驻", businessType = BusinessType.UPDATE)
+    @PostMapping("/editexamine/approve")
+    @ResponseBody
+    public AjaxResult editapprove(CompanyExamine companyExamine)
+    {
+        companyExamine.setCreateBy(ShiroUtils.getLoginName());
+        int i =0;
+        if(companyExamine.getStatus().equals(1)){
+            /*审核通过*/
+            i=sysCompanyService.allowEdit(companyExamine);
+
+        }else{
+            /*审核拒绝*/
+            i=companyReviewedService.refuse(companyExamine);
+        }
+        return toAjax(i);
+    }
+
+
 
+
+    /**************************************商户查看自身信息相关*****************************************************/
+    /**
+     * @descption: 商户信息查看
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020/3/3 14:03
+     */
     @RequiresPermissions("company:edit:view")
     @GetMapping("/edit")
     public String edit(ModelMap mmp)
@@ -231,4 +282,57 @@ public class CompanyController extends BaseController
         return prefix + "/edit/edit";
     }
 
+    /**
+     * @descption: 商户信息申请修改
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020/3/3 14:03
+     */
+    @RequiresPermissions("company:edit:submit")
+    @PostMapping("/edit/submit")
+    @ResponseBody
+    public Object submit(CompanyReviewed companyReviewed)
+    {
+        companyReviewed.setReason("1");
+        companyReviewed.setStatus("0");
+        int i =  companyReviewedService.insertCompanyReviewed(companyReviewed);
+        return toAjax(i);
+    }
+
+    /**
+     * @descption: 查看商户信息修改历史
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020/3/3 14:03
+     */
+    @RequiresPermissions("company:edit:infoHistory")
+    @GetMapping("/edit/infoHistory")
+    public Object infoHistory(ModelMap mmp)
+    {
+        CompanyReviewed cr = new CompanyReviewed();
+        cr.setCompanyId(ShiroUtils.getCompanyId());
+        List<CompanyReviewed> crs =  companyReviewedService.selectCompanyReviewedListById(cr);
+        mmp.addAttribute("list",crs);
+        return prefix + "/edit/infoHistory";
+    }
+
+
+    /**
+     * @descption: 商户修改详情
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020-2-25
+     */
+    @GetMapping("/edit/historyInfo/{id}")
+    public String historyInpo(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        CompanyReviewed companyReviewed = companyReviewedService.selectCompanyReviewedById(id);
+        mmap.put("companyReviewed", companyReviewed);
+        return prefix + "/edit/historyInfo";
+    }
+
+
 }

dgtly-admin/src/main/java/com/dgtly/web/controller/system/SysIndexController.java

@@ -67,14 +67,6 @@ public class SysIndexController extends BaseController
         return "index";
     }
 
-    // 访客页面
-    @RequiresPermissions("youtu:visitor:view")
-    @GetMapping("/visitor")
-    public String visitor()
-    {
-        return "visitor/youtuVisitorList";
-    }
-
 
 
     // 切换主题
@@ -119,9 +111,11 @@ public class SysIndexController extends BaseController
         // 取身份信息
         SysUser user = ShiroUtils.getSysUser();
         // 根据用户id以及menu取出菜单
+        SysMenu menu = menuService.selectMenuById(Long.parseLong(menuId));
         List<SysMenu> menus = menuService.selectMenusByUserMenu(user,Integer.parseInt(menuId));
         mmap.put("menus", menus);
         mmap.put("user", user);
+        mmap.put("menuUrl",menu.getUrl());
         mmap.put("copyrightYear", Global.getCopyrightYear());
         return "appIndex";
     }

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

@@ -57,7 +57,7 @@
                 	<a th:class="@{${menu.url != '' && menu.url != '#'} ? ${menu.target}}" th:href="@{${menu.url == ''} ? |#| : ${menu.url}}">
                 		<i class="fa fa-bar-chart-o" th:class="${menu.icon}"></i>
                     	<span class="nav-label" th:text="${menu.menuName}">一级菜单</span> 
-                    	<span th:class="${menu.url == '' || menu.url == '#'} ? |fa arrow|"></span>
+                    	<span th:class="${not #lists.isEmpty(menu.children)} ? |fa arrow|"></span>
                 	</a>
                     <ul class="nav nav-second-level collapse">
 						<li th:each="cmenu : ${menu.children}">
@@ -211,7 +211,7 @@
             </button>
             <nav class="page-tabs menuTabs">
                 <div class="page-tabs-content">
-                    <a href="javascript:;" class="active menuTab" data-id="/system/main">首页</a>
+                    <!--<a href="javascript:;" class="active menuTab" data-id="/system/main">首页</a>-->
                 </div>
             </nav>
             <button class="roll-nav roll-right tabRight">
@@ -247,6 +247,7 @@
 <script th:inline="javascript">
 var ctx = [[@{/}]];
 var skin = storage.get("skin");
+var menuUrl=[[${menuUrl}]] ;
 // 本地主题优先，未设置取系统配置
 if($.common.isNotEmpty(skin)){
 	$("body").addClass(skin.split('|')[0]);
@@ -275,9 +276,8 @@ function switchSkin() {
 }
 
 $(function() {
-    var hash = location.hash;
-    if (hash !== '') {
-        var url = hash.substring(1, hash.length);
+    if (menuUrl !== '' &&menuUrl!='#') {
+        var url = menuUrl.substring(1, menuUrl.length);
         $('a[href$="' + url + '"]').parent("li").addClass("selected").parents("li").addClass("active").end().parents("ul").addClass("in");
         $('a[href$="' + url + '"]').click();
     }

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('公司表列表')" />
+    <th:block th:include="include :: header('商户表列表')" />
 </head>
 <body class="gray-bg">
     <div class="container-div">
@@ -11,7 +11,7 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <p>公司名称：</p>
+                                <p>商户名称：</p>
                                 <input type="text" name="companyName"/>
                             </li>
                             <li>
@@ -51,18 +51,18 @@
             var options = {
                 url: prefix + "/list",
                 updateUrl: prefix + "/info/{id}",
-                modalName: "公司表",
+                modalName: "商户表",
                 columns: [{
                     checkbox: true
                 },
                 {
                     field : 'id', 
-                    title : '公司编号',
+                    title : '商户编号',
                     visible: false
                 },
                 {
                     field : 'companyName',
-                    title : '公司名称'
+                    title : '商户名称'
                 },
                 {
                     field : 'primaryBusiness',
@@ -83,7 +83,7 @@
                 },
                 {
                     visible: editFlag == 'hidden' ? false : true,
-                    title: '公司状态',
+                    title: '商户状态',
                     align: 'center',
                     formatter: function (value, row, index) {
                         return statusTools(row);
@@ -110,7 +110,7 @@
 
 
         });
-        /* 公司状态显示 */
+        /* 商户状态显示 */
         function statusTools(row) {
             if (row.status == 1) {
                 return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.id + '\')"></i> ';

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

@@ -3,27 +3,30 @@
 <head>
     <th:block th:include="include :: header('商户信息')" />
     <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: jasny-bootstrap-css" />
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <div class="row">
-            <div class="col-sm-Offsets-11 col-sm-1">
-                <a class="btn btn-primary btn-rounded btn-sm" onclick="edit()" shiro:hasPermission="system:dept:add>
-                    <i class="fa fa-search"></i>&nbsp;搜索</a>
+            <div class="col-sm-1 col-sm-offset-10">
+                <a class="btn btn-primary btn-rounded btn-sm" onclick="edit()" shiro:hasPermission="company:edit:submit">
+                    <i class="fa fa-edit"></i>&nbsp;修改信息
+                </a>
+
             </div>
         </div>
         <form class="form-horizontal m" id="form-company-edit" th:object="${sysCompany}">
-            <input name="id" th:field="*{id}" type="hidden">
+            <input name="companyId" th:value="*{id}" type="hidden">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">公司名称：</label>
+                <label class="col-sm-3 control-label">商户名称：</label>
                 <div class="col-sm-8">
-                    <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
+                    <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled="true" required>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">企业类型：</label>
                 <div class="col-sm-8">
-                    <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled>
+                    <select name="companyType" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled="true">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
                     </select>
                 </div>
@@ -31,94 +34,210 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">详细地址：</label>
                 <div class="col-sm-8">
-                    <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled>
+                    <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled="true">
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">经度：</label>
                 <div class="col-sm-8">
-                    <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled>
+                    <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled="true">
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">纬度：</label>
                 <div class="col-sm-8">
-                    <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled>
+                    <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled="true">
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">企业法人：</label>
                 <div class="col-sm-8">
-                    <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled>
+                    <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled="true">
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">联系电话：</label>
                 <div class="col-sm-8">
-                    <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled>
+                    <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled="true">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group draggable">
                 <label class="col-sm-3 control-label">成立日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                         <input name="establishDate" th:value="${#dates.format(sysCompany.establishDate, 'yyyy-MM-dd')}"
-                               class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                               class="form-control" placeholder="yyyy-MM-dd" type="text"  disabled="true">
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
+
                 <label class="col-sm-3 control-label">统一社会信用代码：</label>
                 <div class="col-sm-8">
-                    <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled>
+                    <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled="true">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">营业执照：</label>
                 <div class="col-sm-8">
-                    <img th:src="*{businessLicenseUrl}" />
+                    <div class="fileinput fileinput-new">
+                        <input id="input-businessLicenseUrl" name="businessLicenseUrl" type="hidden"/>
+                        <div class="fileinput-new thumbnail" style="max-width: 140px; max-height: 140px;" onclick="openImg(this)">
+                            <img th:src="@{*{businessLicenseUrl}}" id="img-businessLicenseUrl" >
+                        </div>
+                        <div class="div-imgButton" style="display: none;">
+                            <input type="file" accept="image/*" style="display: none" onchange="imgChange(this,'businessLicenseUrl')">
+                            <a class="btn btn-primary btn-sm" onclick="upImg(this)" >
+                                上传营业执照
+                            </a>
+                            <a  class="btn btn-white" onclick="clearImg('businessLicenseUrl')">清除</a>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">企业默认图片：</label>
+            <div class="form-group">
+                <input id="fmzFile" name="fmzFile" type="hidden"/>
+                <label class="col-sm-3 control-label">商户封面：</label>
                 <div class="col-sm-8">
-                    <img th:src="*{defaultImgUrl}" />
+                    <div class="fileinput fileinput-new">
+                        <input id="input-defaultImgUrl" name="defaultImgUrl" type="hidden"/>
+                        <div class="fileinput-new thumbnail" style="max-width: 140px; max-height: 140px;" onclick="openImg(this)">
+                            <img th:src="@{*{defaultImgUrl}}" id="img-defaultImgUrl" >
+                        </div>
+                        <div class="div-imgButton" style="display: none;">
+                            <input type="file" accept="image/*" style="display: none" onchange="imgChange(this,'defaultImgUrl')">
+                            <a class="btn btn-primary btn-sm" onclick="upImg(this)" >
+                                上传商户封面
+                            </a>
+                            <a  class="btn btn-white" onclick="clearImg('defaultImgUrl')">清除</a>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">企业宣传图片：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">商户宣传图片：</label>
                 <div class="col-sm-8">
-                    <img th:src="*{propagandaImgUrl}" />
+                    <div class="fileinput fileinput-new">
+                        <input id="input-propagandaImgUrl" name="propagandaImgUrl" type="hidden"/>
+                        <div class="fileinput-new thumbnail" style="max-width: 140px; max-height: 140px;" onclick="openImg(this)">
+                            <img th:src="@{*{propagandaImgUrl}}" id="img-propagandaImgUrl" >
+                        </div>
+                        <div class="div-imgButton" style="display: none;">
+                            <input type="file" accept="image/*" style="display: none" onchange="imgChange(this,'propagandaImgUrl')">
+                            <a class="btn btn-primary btn-sm" onclick="upImg(this)" >
+                                上传宣传图片
+                            </a>
+                            <a  class="btn btn-white" onclick="clearImg('propagandaImgUrl')">清除</a>
+                        </div>
+                    </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" disabled>[[*{companyIntroduce}]]</textarea>
+                    <textarea name="companyIntroduce" class="form-control" disabled="true">[[*{companyIntroduce}]]</textarea>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">主营业务：</label>
                 <div class="col-sm-8">
-                    <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled>
+                    <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled="true">
                 </div>
             </div>
         </form>
+        <div id="div-button" class="row" style="display: none">
+            <div class="col-sm-2 col-sm-offset-10">
+                <a class="btn btn-primary  btn-sm" onclick="editUpdate()" >
+                    <i class="fa fa-edit"></i>&nbsp;确定
+                </a>
+                <a class="btn btn-defult  btn-sm" onclick="reload()" >
+                    <i class="fa fa-cancel"></i>&nbsp;取消
+                </a>
+            </div>
+        </div>
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
-        var prefix = ctx + "system/company";
+        var prefix = ctx + "company/";
         $("#form-company-edit").validate({
             focusCleanup: true
         });
+        $("input[name='establishDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
 
-        function submitHandler() {
-            $.modal.close();
-        }
         function edit(){
-            alert(111111111111111)
+            $("#div-button").show();
+            $(".div-imgButton").show();
+            var forms = $("#form-company-edit");
+            forms.each(function(index, form){
+                for ( var i = 0; i < form.length; i++) {
+                    var element = form.elements[i];
+                    element.disabled = false;
+                }
+            });
+        }
+        function reload(){
+            location.reload()
+        }
+        function editUpdate(){
+            $.modal.confirm("提交修改信息将在审核后生效，是否确认",function(){
+                var data = $("#form-company-edit").serialize()
+                $.operate.save(prefix+"edit/submit",data,reload())
+            })
+        }
+
+        function upImg(self){
+            $(self).siblings("input").click()
+        }
+        function clearImg(name){
+            $("#img-"+name).attr("src","")
+            $("#input-"+name).val("")
+        }
+        function imgChange(self,name){
+            if ($(self).val() == '') {
+                return;
+            }var data = new FormData();
+            data.append('file', self.files[0]);
+            $.modal.loading("正在上传，请稍后...");
+            $.ajax({
+                url:ctx+"common/upload",
+                type:"post",
+                data: data,
+                cache: false,
+                contentType: false,
+                processData: false,
+                dataType: 'json',
+                success: function(result) {
+                    if (result.code == web_status.SUCCESS) {
+                        $("#img-"+name).attr("src",result.data.fileName)
+                        $("#input-"+name).val(result.data.fileName)
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                    $.modal.closeLoading();
+                },
+                error:function(result) {
+                    alert("上传失败")
+                    $.modal.closeLoading();
+                }
+            });
+        }
+        function openImg(self){
+            var img = $(self).children("img")
+            layer.open({
+                type: 1,
+                title: false,
+                shade: 0.0001,
+                area: ['auto'],
+                shadeClose: true,
+                content: $(img)
+            });
         }
     </script>
 </body>

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

@@ -0,0 +1,239 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改商户审核')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <input  id="input_status"  th:value="${companyReviewed.status}" type="hidden">
+        <!-- 提交信息查看-->
+        <form class="form-horizontal m" id="form-companyReviewed" th:object="${companyReviewed}">
+            <div class="row">
+                <div class="col-sm-6"></div>
+                <div class="col-sm-6"></div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">商户名称：</label>
+                        <div class="col-sm-8">
+                            <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">企业类型：</label>
+                        <div class="col-sm-8">
+                            <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">详细地址：</label>
+                        <div class="col-sm-8">
+                            <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">企业法人：</label>
+                        <div class="col-sm-8">
+                            <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">经度：</label>
+                        <div class="col-sm-8">
+                            <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">纬度：</label>
+                        <div class="col-sm-8">
+                            <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">联系电话：</label>
+                        <div class="col-sm-8">
+                            <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">成立日期：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group date">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <input name="establishDate" th:value="${#dates.format(companyReviewed.establishDate, 'yyyy-MM-dd')}"
+                                       class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">统一社会信用代码：</label>
+                        <div class="col-sm-8">
+                            <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">主营业务：</label>
+                        <div class="col-sm-8">
+                            <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">营业执照：</label>
+                        <div class="col-sm-8">
+                            <div class="fileinput fileinput-new">
+                                <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;" onclick="openImg(this)">
+                                    <img th:src="@{*{businessLicenseUrl}}" >
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">企业默认图片：</label>
+                        <div class="col-sm-8">
+                            <div class="fileinput fileinput-new">
+                                <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;" onclick="openImg(this)">
+                                    <img th:src="@{*{defaultImgUrl}}"  style="width: 100%;height: 100%">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                    <label class="col-sm-4 control-label">企业宣传图片：</label>
+                    <div class="col-sm-8">
+                        <div class="fileinput fileinput-new">
+                            <div class="fileinput-new thumbnail" style="max-width: 140px; max-width: 140px;" onclick="openImg(this)">
+                                <img th:src="@{*{propagandaImgUrl}}"   style="max-width: 100%;max-width: 100%">
+                            </div>
+                        </div>
+                    </div>
+                </div></div>
+                <div class="col-sm-6"></div>
+            </div>
+
+            <div class="form-group">
+                <label class="col-sm-2 control-label">企业介绍：</label>
+                <div class="col-sm-10">
+                    <textarea name="companyIntroduce" class="form-control" disabled>[[*{companyIntroduce}]]</textarea>
+                </div>
+            </div>
+
+        </form>
+        <div th:if="@{${companyReviewed.status}!='0'}">
+            <h4  class="form-header h4">审核信息 </h4>
+            <!--已审核信息回显-->
+            <form class="form-horizontal m" id="form-status1">
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">审核结果：</label>
+                            <div class="col-sm-8" id="div_status">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">审核人：</label>
+                            <label class="col-sm-4">
+                                <input name="primaryBusiness" th:field="${companyReviewed.companyExamine.createBy}" class="form-control" type="text" disabled>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">审核时间：</label>
+                    <div class="col-sm-2">
+                        <input name="establishDate" th:value="${companyReviewed.companyExamine.examineDate}"
+                               class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">审核结论：</label>
+                    <div class="col-sm-10">
+                        <textarea name="rejectReason" class="form-control" disabled>[[${companyReviewed.companyExamine.rejectReason}]]</textarea>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+
+
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var datas = [[${@dict.getType('examine_status')}]];
+        var prefix = ctx + "company/enterexamine";
+
+
+        $(function() {
+
+        })
+
+
+        function submitHandler(){
+            $.modal.close()
+        }
+
+        function openImg(self){
+            var img = $(self).children("img")
+            layer.open({
+                type: 1,
+                title: false,
+                shade: 0.0001,
+                area: ['auto    '],
+                shadeClose: true,
+                content: $(img)
+            });
+        }
+
+    </script>
+</body>
+</html>

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

@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
+    <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
+    <link th:href="@{/css/main/animate.min.css}" rel="stylesheet"/>
+    <link th:href="@{/css/style.css}" rel="stylesheet"/>
+</head>
+<body class="gray-bg">
+<div class="row animated fadeInRight">
+    <div class="ibox float-e-margins">
+        <div class="text-center float-e-margins p-md">
+            <h1>商户信息修改记录</h1>
+        </div>
+        <div>
+            <div class="vertical-container light-timeline">
+                <div class="vertical-timeline-block" th:each="item:${list}">
+
+                    <div th:switch="*{item.status}">
+                        <div class="vertical-timeline-icon yellow-bg" th:case="0">
+                            <i th:class="@{*{item.reason}=='1'}?'fa fa-edit':'fa fa-reply'"></i>
+                        </div>
+                        <div class="vertical-timeline-icon navy-bg" th:case="1 ">
+                            <i th:class="@{*{item.reason}=='1'}?'fa fa-edit':'fa fa-reply'"></i>
+                        </div>
+                        <div class="vertical-timeline-icon red-bg" th:case="2">
+                            <i th:class="@{*{item.reason}=='1'}?'fa fa-edit':'fa fa-reply'"></i>
+                        </div>
+                    </div>
+                    <div class="vertical-timeline-content">
+                        <h2 >
+                            <span th:text="@{*{item.reason}=='1'}?'修改商户信息':'商户入驻'"></span>
+                            <span th:if="@{*{item.status}=='0'}">（审核中...）</span>
+                            <span th:if="@{*{item.status}=='1'}">（已审核）</span>
+                            <span th:if="@{*{item.status}=='2'}">（已拒绝）</span>
+                        </h2>
+                        <div>
+                            <div class="row">
+                                <label class="col-sm-2 control-label">商户名称：</label>
+                                <label class="col-sm-4 control-label">[[*{item.companyName}]]</label>
+
+                                <label class="col-sm-2 control-label">详细地址：</label>
+                                <label class="col-sm-4 control-label">[[*{item.detailAddress}]]</label>
+                            </div>
+                            <div class="row">
+                                <label class="col-sm-2 control-label">联系电话：</label>
+                                <label class="col-sm-4 control-label">[[*{item.contactNumber}]]</label>
+
+                                <label class="col-sm-2 control-label">法人：</label>
+                                <label class="col-sm-4 control-label">[[*{item.legalPerson}]]</label>
+                            </div>
+
+                        </div>
+                        <button type="button" class="btn btn-sm btn-primary"
+                                th:onclick="'javascript:openM('+*{item.id}+')'">查看详情</button>
+                        <span class="vertical-date">
+                                <small th:text="${#dates.format(item.createTime, 'yyyy年MM月dd日 HH:mm:ss')}"></small>
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    function openM(id){
+        $.modal.openFull("提交详情","/company/edit/historyInfo/"+id)
+    }
+</script>
+</body>
+</html>

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

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

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

@@ -55,7 +55,7 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var approveFlag = [[${@permission.hasPermi('companyext:noexamine:approve')}]];
+        var approveFlag = [[${@permission.hasPermi('company:editexamine:approvePage')}]];
         var companyTypes = [[${@dict.getType('company_type')}]];
         var examineStatus = [[${@dict.getType('examine_status')}]];
         var prefix = ctx + "company/editexamine";
@@ -129,9 +129,9 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         if(row.status=="0"){
-                            actions.push('<a class="btn btn-primary btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="approve(' + row.id + ')"><i class="fa fa-edit"></i>审核</a> ');
+                            actions.push('<a class="btn btn-primary btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="audit(' + row.id + ')"><i class="fa fa-edit"></i>审核</a> ');
                         }else{
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="approve(' + row.id + ')"><i class="fa fa-edit"></i>查看详情</a> ');
+                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="audit(' + row.id + ')"><i class="fa fa-edit"></i>查看详情</a> ');
                         }
 
                         return actions.join('');
@@ -139,19 +139,12 @@
                 }]
             };
             $.table.init(options);
-            approve=function(id){
+            audit=function(id){
                 if(id==null && id==""){
                     return;
                 }
-                var modalOption ={
-                    title:"审核商户",
-                    url:prefix + "/approvePage/"+id,
-                    width:1400,
-                    height:800,
-                    callBack:cb,
-                    btn:[],
-                }
-                $.modal.openOptions(modalOption);
+
+                $.modal.openFull("审核商户信息修改",prefix + "/approvePage/"+id);
             }
 
         });

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

@@ -16,7 +16,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">公司名称：</label>
+                        <label class="col-sm-4 control-label">商户名称：</label>
                         <div class="col-sm-8">
                             <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
                         </div>

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

@@ -35,18 +35,6 @@
             </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>
@@ -58,7 +46,7 @@
         var approveFlag = [[${@permission.hasPermi('companyext:noexamine:approve')}]];
         var companyTypes = [[${@dict.getType('company_type')}]];
         var examineStatus = [[${@dict.getType('examine_status')}]];
-        var prefix = ctx + "company/editexamine";
+        var prefix = ctx + "company/enterexamine";
 
         $(function() {
             var options = {
@@ -129,9 +117,9 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         if(row.status=="0"){
-                            actions.push('<a class="btn btn-primary btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="approve(' + row.id + ')"><i class="fa fa-edit"></i>审核</a> ');
+                            actions.push('<a class="btn btn-primary btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="audit(' + row.id + ')"><i class="fa fa-edit"></i>审核</a> ');
                         }else{
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="approve(' + row.id + ')"><i class="fa fa-edit"></i>查看详情</a> ');
+                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="audit(' + row.id + ')"><i class="fa fa-edit"></i>查看详情</a> ');
                         }
 
                         return actions.join('');
@@ -139,7 +127,7 @@
                 }]
             };
             $.table.init(options);
-            approve=function(id){
+            audit=function(id){
                 if(id==null && id==""){
                     return;
                 }

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

@@ -9,7 +9,7 @@
         <form class="form-horizontal m" id="form-company-edit" th:object="${sysCompany}">
             <input name="id" th:field="*{id}" type="hidden">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">公司名称：</label>
+                <label class="col-sm-3 control-label">商户名称：</label>
                 <div class="col-sm-8">
                     <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
                 </div>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('公司选择列表')" />
+    <th:block th:include="include :: header('商户选择列表')" />
     <th:block th:include="include :: ztree-css" />
 </head>
 <style>
@@ -34,7 +34,7 @@
         $(function() {
             var options = {
                 url: prefix + "/treeData",
-                modalName: "公司表",
+                modalName: "商户表",
                 expandLevel: 2,
                 onClick: zOnClick
             };

dgtly-common/src/main/java/com/dgtly/common/utils/file/FileUploadUtils.java

@@ -247,6 +247,7 @@ public class FileUploadUtils
     {
 
         File file = null;
+        System.out.println("文件名称："+fileName);
         //创建文件目录
         String filePath=uploadPath + "/" + DateUtils.datePath() + "/";
         File  dir=new File(filePath);
@@ -257,7 +258,7 @@ public class FileUploadUtils
         java.io.FileOutputStream fos = null;
         try {
             byte[] bytes = Base64.getDecoder().decode(base64);
-            file=new File(filePath+"\\"+fileName);
+            file=new File(filePath+fileName);
             fos = new java.io.FileOutputStream(file);
             bos = new BufferedOutputStream(fos);
             bos.write(bytes);

dgtly-goods/dgtly-goods-admin/src/main/resources/templates/goods/info/add.html

@@ -88,10 +88,10 @@
                 <div class="col-sm-6">
                     <div class="form-group">
                         <input name="companyId" type="hidden" id="input_companyId">
-                        <label class="col-sm-2 control-label"><span style="color: red; ">*</span>所属公司：</label>
+                        <label class="col-sm-2 control-label"><span style="color: red; ">*</span>所属商户：</label>
                         <div class="col-sm-8">
                             <div class="input-group">
-                                <input name="companyName" onclick="selectCompanyList()" id="input_companyTreeName" type="text" placeholder="请选择所属公司"
+                                <input name="companyName" onclick="selectCompanyList()" id="input_companyTreeName" type="text" placeholder="请选择所属商户"
                                        class="form-control required" readonly="readonly" required>
                                 <span class="input-group-addon"><i class="fa fa-search"></i></span>
                             </div>
@@ -423,11 +423,11 @@
             $("#div_area").html(str);
         }
 
-        /******************选择公司列表**********************************/
+        /******************选择商户列表**********************************/
         function selectCompanyList() {
             var url = ctx + "company/tree";
             var options2 = {
-                title: '选择公司',
+                title: '选择商户',
                 width: "700",
                 url: url,
                 callBack: selectCompany

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

@@ -15,7 +15,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">所属公司id：</label>
+                <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>

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

@@ -15,7 +15,7 @@
                                 <input type="text" name="name"/>
                             </li>
                             <li>
-                                <p>所属公司id：</p>
+                                <p>所属商户id：</p>
                                 <input type="text" name="companyId"/>
                             </li>
                             <li>
@@ -79,7 +79,7 @@
                 },
                 {
                     field : 'companyName',
-                    title : '所属公司'
+                    title : '所属商户'
                 },
                 {
                     field : 'typeName',

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

@@ -93,4 +93,13 @@ public interface CompanyReviewedMapper
      * @date: 2020/3/3 13:25
      */
     List<CompanyReviewed> selectEnterPublicityList();
+
+    /**
+     * @descption: 查询商户信息变更记录
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020/3/3 13:25
+     */
+    List<CompanyReviewed> selectCompanyReviewedListById(CompanyReviewed cr);
 }

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

@@ -89,13 +89,13 @@ public interface ICompanyReviewedService
 
 
     /**
-     * @descption: 拒绝入驻申请
+     * @descption: 拒绝申请
      * @param:
      * @return:
      * @auther: qxp
      * @date: 2020-2-25
      */
-    public int refuseEnter(CompanyExamine companyExamine);
+    public int refuse(CompanyExamine companyExamine);
 
     /**
      * @descption: 查询入驻申请公示列表
@@ -105,4 +105,13 @@ public interface ICompanyReviewedService
      * @date: 2020/3/3 13:25
      */
     List<CompanyReviewed> selectEnterPublicityList();
+
+    /**
+     * @descption: 查询商户信息变更记录
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020/3/3 13:25
+     */
+    List<CompanyReviewed> selectCompanyReviewedListById(CompanyReviewed cr);
 }

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

@@ -146,7 +146,7 @@ public class CompanyReviewedServiceImpl implements ICompanyReviewedService
     }
 
     /**
-     * @descption: 拒绝入驻申请
+     * @descption: 拒绝申请
      * @param:
      * @return:
      * @auther: qxp
@@ -154,7 +154,7 @@ public class CompanyReviewedServiceImpl implements ICompanyReviewedService
      */
     @Override
     @Transactional
-    public int refuseEnter(CompanyExamine companyExamine) {
+    public int refuse(CompanyExamine companyExamine) {
         CompanyReviewed cr = new CompanyReviewed();
         cr.setId(companyExamine.getCompanyReviewedId());
         cr.setStatus("2");
@@ -175,4 +175,16 @@ public class CompanyReviewedServiceImpl implements ICompanyReviewedService
     public List<CompanyReviewed> selectEnterPublicityList() {
         return companyReviewedMapper.selectEnterPublicityList();
     }
+
+    /**
+     * @descption: 查询商户信息变更记录
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020/3/3 13:25
+     */
+    @Override
+    public List<CompanyReviewed> selectCompanyReviewedListById(CompanyReviewed cr) {
+        return companyReviewedMapper.selectCompanyReviewedListById(cr);
+    }
 }

dgtly-system/src/main/java/com/dgtly/system/service/ISysCompanyService.java

@@ -104,4 +104,13 @@ public interface ISysCompanyService
      * @date: 2020-2-25
      */
     public int allowEnter(CompanyExamine companyExamine);
+
+    /**
+     * 审核修改申请通过
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020-2-25
+     */
+    public int allowEdit(CompanyExamine companyExamine);
 }

dgtly-system/src/main/java/com/dgtly/system/service/impl/SysCompanyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.dgtly.system.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import com.dgtly.common.constant.UserConstants;
@@ -261,6 +262,44 @@ public class SysCompanyServiceImpl implements ISysCompanyService
         }
     }
 
+    /**
+     * 修改商户信息申请通过
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020-2-25
+     */
+    @Override
+    @Transactional
+    public int allowEdit(CompanyExamine companyExamine) {
+        /*1.修改公司信息SysCompany*/
+        /*2.修改审核信息状态*/
+        /*3.插入审核信息*/
+        int i = 0;
+        CompanyReviewed cr = companyReviewedMapper.selectCompanyReviewedById(companyExamine.getCompanyReviewedId());
+        if(cr==null){
+            throw  new RuntimeException("创建公司实体时出错!");
+        }
+        SysCompany company = reviewedTocompany(cr);
+        company.setId(cr.getCompanyId());
+        company.setUpdateBy(cr.getCreateBy());
+        company.setUpdateTime(new Date());
+        i = sysCompanyMapper.updateSysCompany(company);
+        if(i>0){
+            CompanyReviewed upCr = new CompanyReviewed();
+            upCr.setId(cr.getId());
+            upCr.setCompanyId(cr.getCompanyId());
+            upCr.setStatus("1");
+            i = companyReviewedMapper.updateCompanyReviewed(upCr);
+            i +=companyExamineMapper.insertCompanyExamine(companyExamine);
+        }
+        if(i==2){
+            return 1;
+        }else{
+            throw new RuntimeException("创建公司实体时出错!");
+        }
+    }
+
     public SysCompany reviewedTocompany (CompanyReviewed cr) {
         SysCompany result = new SysCompany();
         result.setCompanyName(cr.getCompanyName());
@@ -277,7 +316,6 @@ public class SysCompanyServiceImpl implements ISysCompanyService
         result.setDefaultImgUrl(cr.getDefaultImgUrl());
         result.setPropagandaImgUrl(cr.getPropagandaImgUrl());
         result.setCompanyIntroduce(cr.getCompanyIntroduce());
-        result.setVersionNum(cr.getVersionNum());
         result.setRemark(cr.getRemark());
         result.setPrimaryBusiness(cr.getPrimaryBusiness());
         return result;

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

@@ -217,6 +217,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by cr.status,ce.examine_date desc,cr.create_time desc
     </select>
 
+    <select id="selectCompanyReviewedListById" parameterType="CompanyReviewed" resultMap="CompanyReviewedResult">
+        <include refid="selectCompanyReviewedVo"/>
+        <where>
+            <if test="companyId != null "> and cr.company_id = #{companyId}</if>
+        </where>
+        order by cr.create_time desc
+    </select>
 
     <select id="selectEnterPublicityList" parameterType="CompanyReviewed" resultMap="CompanyReviewedResult">
         select  cr.company_name,cr.default_img_url, cr.propaganda_img_url, cr.company_introduce,cr.create_time,

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

@@ -103,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update sys_company
         <trim prefix="SET" suffixOverrides=",">
             update_time = now(),
+            version_num=version_num+1,
             <if test="status != null">status = #{status},</if>
             <if test="companyName != null  and companyName != ''">company_name= #{companyName},</if>
             <if test="companyType != null  and companyType != ''">company_type= #{companyType},</if>
@@ -113,11 +114,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 != ''">businessLicenseUrl= #{businessLicenseUrl},</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  and versionNum != ''">version_num= #{versionNum},</if>
             <if test="createBy != null  and createBy != ''">create_by= #{createBy},</if>
             <if test="updateBy != null  and updateBy != ''">update_by= #{updateBy},</if>
             <if test="remark != null  and remark != ''">remark= #{remark},</if>