qxp

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

@@ -0,0 +1,117 @@
+package com.dgtly.web.controller.company;
+
+import java.util.List;
+
+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.CompanyHonour;
+import com.dgtly.companyext.service.ICompanyHonourService;
+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 qxp
+ * @date 2020-03-02
+ */
+@Controller
+@RequestMapping("/company/honour")
+public class CompanyHonourController extends BaseController
+{
+    private String prefix = "company/honour";
+
+    @Autowired
+    private ICompanyHonourService companyHonourService;
+
+    @RequiresPermissions("company:honour:view")
+    @GetMapping()
+    public String company_honour()
+    {
+        return prefix + "/honour";
+    }
+
+    /**
+     * 查询企业荣誉列表
+     */
+    @RequiresPermissions("company:honour:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(CompanyHonour companyHonour)
+    {
+        startPage();
+        List<CompanyHonour> list = companyHonourService.selectCompanyHonourList(companyHonour);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 新增企业荣誉
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存企业荣誉
+     */
+    @RequiresPermissions("company:honour:add")
+    @Log(title = "企业荣誉", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(CompanyHonour companyHonour)
+    {
+        companyHonour.setCompanyId(ShiroUtils.getCompanyId());
+        return toAjax(companyHonourService.insertCompanyHonour(companyHonour));
+    }
+
+    /**
+     * 修改企业荣誉
+     */
+    @GetMapping("/edit/{honourId}")
+    public String edit(@PathVariable("honourId") Long honourId, ModelMap mmap)
+    {
+        CompanyHonour companyHonour = companyHonourService.selectCompanyHonourById(honourId);
+        mmap.put("companyHonour", companyHonour);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存企业荣誉
+     */
+    @RequiresPermissions("company:honour:edit")
+    @Log(title = "企业荣誉", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(CompanyHonour companyHonour)
+    {
+        return toAjax(companyHonourService.updateCompanyHonour(companyHonour));
+    }
+
+    /**
+     * 删除企业荣誉
+     */
+    @RequiresPermissions("company:honour:remove")
+    @Log(title = "企业荣誉", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(companyHonourService.deleteCompanyHonourByIds(ids));
+    }
+}

dgtly-admin/src/main/resources/application-dev-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://182.92.160.141:3306/SteelfurnitureManager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: qxp
-                password: qxp
+                url: jdbc:mysql://192.168.100.254:3306/Steelfurniture?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

dgtly-admin/src/main/resources/application-test-druid.yml

@@ -0,0 +1,57 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://localhost:3306/Steelfurniture?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: 123456
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: 
+                login-password: 
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true

dgtly-admin/src/main/resources/application-test.yml

@@ -0,0 +1,130 @@
+# 项目相关配置
+ruoyi:
+  # 名称
+  name: SteelfurnitureManager
+  # 版本
+  version: 4.0.0
+  # 版权年份
+  copyrightYear: 2019
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  profile: /home/project/steelfurniture/file
+  # 获取ip地址开关
+  addressEnabled: true
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为80
+  port: 10000
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # tomcat最大线程数，默认为200
+    max-threads: 800
+    # Tomcat启动初始化的线程数，默认值25
+    min-spare-threads: 30
+ 
+# 日志配置
+logging:
+  level:
+    com.dgtly: debug
+    org.springframework: warn
+
+# 用户配置
+user:
+  password:
+    # 密码错误{maxRetryCount}次锁定10分钟
+    maxRetryCount: 5
+
+# Spring配置
+spring:
+  # 模板引擎
+  thymeleaf:
+    mode: HTML
+    encoding: utf-8
+    # 禁用缓存
+    cache: false
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: static/i18n/messages
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  profiles:
+    include: test-druid
+  # 文件上传
+  servlet:
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+
+# MyBatis
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.dgtly.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper: 
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql 
+
+# Shiro
+shiro:
+  user:
+    # 登录地址
+    loginUrl: /login
+    # 权限认证失败地址
+    unauthorizedUrl: /unauth
+    # 首页地址
+    indexUrl: /index
+    # 验证码开关
+    captchaEnabled: true
+    # 验证码类型 math 数组计算 char 字符
+    captchaType: math
+  cookie:
+    # 设置Cookie的域名 默认空，即当前访问的域名
+    domain: 
+    # 设置cookie的有效访问路径
+    path: /
+    # 设置HttpOnly属性
+    httpOnly: true
+    # 设置Cookie的过期时间，天为单位
+    maxAge: 30
+  session:
+    # Session超时时间，-1代表永不过期（默认30分钟）
+    expireTime: 30
+    # 同步session到数据库的周期（默认1分钟）
+    dbSyncPeriod: 1
+    # 相隔多久检查一次session的有效性，默认就是10分钟
+    validationInterval: 10
+    # 同一个用户最大会话数，比如2的意思是同一个账号允许最多同时两个人登录（默认-1不限制）
+    maxSession: -1
+    # 踢出之前登录的/之后登录的用户，默认踢出之前登录的用户
+    kickoutAfter: false
+
+# 防止XSS攻击
+xss: 
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice/*
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*

dgtly-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/dgtly/logs" />
+	<property name="log.path" value="/home/project/steelfurniture/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

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

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增企业荣誉')" />
+    <th:block th:include="include :: jasny-bootstrap-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-company_honour-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">荣誉描述：</label>
+                <div class="col-sm-8">
+                    <textarea name="des" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">荣誉图片：</label>
+                <div class="col-sm-8">
+                    <input id="input-img" name="img"  type="hidden">
+                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                        <div class="fileinput-preview thumbnail" style="width: 200px; height: 150px;">
+
+                        </div>
+                        <div>
+                            <span class="btn btn-white btn-file">
+                                <span class="fileinput-new">选择图片</span>
+                                <span class="fileinput-exists">更改</span>
+                                <input id="input-fileinput" type="file">
+                            </span>
+                            <a href="#" class="btn btn-white fileinput-exists" data-dismiss="fileinput">清除</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: jasny-bootstrap-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "company/honour"
+        $("#form-company_honour-add").validate({
+            focusCleanup: true
+        });
+        $('.fileinput').on('change.bs.fileinput ', function (e) {
+            debugger
+            if ($("#input-fileinput").val() == '') {
+                return;
+            }var data = new FormData();
+            data.append('file', document.getElementById('input-fileinput').files[0]);
+            $.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) {
+                        $("#input-img").val(result.data.fileName);
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                },
+                error:function(result) {
+                    alert("上传失败")
+                }
+            });
+        });
+        function submitHandler() {
+            if($("#input-img").val()==undefined||$("#input-img").val()==""){
+                $.modal.msgError("请选择荣誉图片")
+            }
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-company_honour-add').serialize());
+            }
+        }
+
+
+    </script>
+</body>
+</html>

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

@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改企业荣誉')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-company_honour-edit" th:object="${companyHonour}">
+            <input name="honourId" th:field="*{honourId}" type="hidden">
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label">荣誉描述：</label>
+                <div class="col-sm-8">
+                    <textarea name="des" class="form-control">[[*{des}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">荣誉图片：</label>
+                <div class="col-sm-8">
+                    <input id="input-img" name="img"  type="hidden">
+                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                        <div class="fileinput-preview thumbnail" style="width: 200px; height: 150px;">
+
+                        </div>
+                        <div>
+                            <span class="btn btn-white btn-file">
+                                <span class="fileinput-new">选择图片</span>
+                                <span class="fileinput-exists">更改</span>
+                                <input id="input-fileinput" type="file">
+                            </span>
+                            <a href="#" class="btn btn-white fileinput-exists" data-dismiss="fileinput">清除</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script type="text/javascript">
+        var prefix = ctx + "system/company_honour";
+        $("#form-company_honour-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-company_honour-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

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

@@ -0,0 +1,87 @@
+<!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">
+
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="compant:honout:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="compant:honout:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="compant:honout:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('compant:honout:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('compant:honout:remove')}]];
+        var prefix = ctx + "company/honour";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                modalName: "企业荣誉",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field : 'honourId', 
+                    title : '商户荣誉id',
+                    visible: false
+                },
+                {
+                    field : 'companyId', 
+                    title : '商户id',
+                    visible: false
+                },
+                {
+                    field : 'des',
+                    title : '荣誉描述'
+                },
+                {
+                    field : 'img', 
+                    title : '荣誉图片',
+                    formatter: function(value, row, index) {
+                        // 图片预览（注意：如存储在本地直接获取数据库路径，如有配置context-path需要使用ctx+路径）
+                        // 如：/profile/upload/2019/08/08/3b7a839aced67397bac694d77611ce72.png
+                        return $.table.imageView(value,250,250);
+                    }
+                },
+                {
+                    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.honourId + '\')"><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.honourId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

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

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

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

@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改商户审核')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-examine-edit" th:object="${companyExamine}">
-            <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">企业名称：</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();
-            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

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

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

@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('商户审核列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <p>商户(公司)Id：</p>
-                                <input type="text" name="companyId"/>
-                            </li>
-                            <li>
-                                <p>审核状态：</p>
-                                <select name="status">
-                                    <option value="">所有</option>
-                                </select>
-                            </li>
-                            <li class="select-time">
-                                <p>申请日期：</p>
-                                <input type="text" class="time-input" id="beginApplyDate" placeholder="开始时间" name="params[beginApplyDate]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endApplyDate" placeholder="结束时间" name="params[endApplyDate]"/>
-                            </li>
-                            <li class="select-time">
-                                <p>审核日期：</p>
-                                <input type="text" class="time-input" id="beginExamineDate" placeholder="开始时间" name="params[beginExamineDate]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endExamineDate" placeholder="结束时间" name="params[endExamineDate]"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:examine:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:examine:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:examine:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <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

@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('商户审核列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <p>企业名称：</p>
-                                <input type="text" name="companyName"/>
-                            </li>
-                            <li>
-                                <p>企业类型：</p>
-                                <select name="companyType" th:with="type=${@dict.getType('company_type')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <p>企业法人：</p>
-                                <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

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

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

@@ -1,129 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增商户扩展信息')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-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

@@ -1,130 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改商户扩展信息')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-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

@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('商户扩展信息列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <p>企业名称：</p>
-                                <input type="text" name="companyName"/>
-                            </li>
-                            <li>
-                                <p>企业类型：</p>
-                                <select name="companyType" th:with="type=${@dict.getType('company_type')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <p>企业法人：</p>
-                                <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-api/src/main/resources/application-dev-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://182.92.160.141:3306/SteelfurnitureManager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: qxp
-                password: qxp
+                url: jdbc:mysql://192.168.100.254:3306/Steelfurniture?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

dgtly-api/src/main/resources/application-test-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/SteelfurnitureManager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: qxp
-                password: qxp
+                url: jdbc:mysql://localhost:3306/Steelfurniture?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

dgtly-api/src/main/resources/application-test.yml

@@ -7,7 +7,7 @@ ruoyi:
   # 版权年份
   copyrightYear: 2019
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /home/softfile/steelfurniture
+  profile: /home/project/steelfurniture/file
   # 获取ip地址开关
   addressEnabled: true
   #是否开启swagger
@@ -25,7 +25,7 @@ security:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 9002
+  port: 10002
   servlet:
     # 应用的访问路径
     context-path: /

dgtly-api/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/dgtly/logs" />
+	<property name="log.path" value="/home/project/steelfurniture/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

dgtly-goods/dgtly-goods-common/src/main/java/com/dgtly/goods/domain/GoodsInfo.java

@@ -69,6 +69,10 @@ public class GoodsInfo extends BaseEntity
     @Excel(name = "单重")
     private String weight;
 
+    /** 商品材质 */
+    @Excel(name = "商品材质")
+    private String material;
+
     /** 上架标志（0代表草稿状态 1代表上架） */
     @Excel(name = "上架标志", readConverterExp = "0=代表草稿状态,1=代表上架")
     private String putawayFlag;
@@ -265,6 +269,15 @@ public class GoodsInfo extends BaseEntity
         this.typeName = typeName;
     }
 
+    public String getMaterial() {
+        return material;
+    }
+
+    public void setMaterial(String material) {
+        this.material = material;
+    }
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

dgtly-goods/dgtly-goods-common/src/main/resources/mapper/goods/GoodsInfoMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="producedAddress"    column="produced_address"    />
         <result property="warehouseAddress"    column="warehouse_address"    />
         <result property="weight"    column="weight"    />
+        <result property="material"    column="material"    />
         <result property="putawayFlag"    column="putaway_flag"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createTime"    column="create_time"    />
@@ -53,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectGoodsInfoVo">
         select gi.id, gi.name, gi.company_id, gi.type_id, gi.price, gi.cover, gi.slideshow, gi.des, gi.delivery, gi.produced_time, gi.produced_address,
-         gi.warehouse_address, gi.weight,gi.putaway_flag, gi.del_flag, gi.create_time, gi.create_by, gi.update_time, gi.update_by, gi.remark,
+         gi.warehouse_address, gi.weight,gi.material,gi.putaway_flag, gi.del_flag, gi.create_time, gi.create_by, gi.update_time, gi.update_by, gi.remark,
          gt.name typeName,sc.company_name companyName,
          ga.attribute_id,ga.value,gs.size,gc.color,
          gta.attribute_name attributeName,gta.sort
@@ -68,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectGoodsInfoList" parameterType="GoodsInfo" resultMap="GoodsInfoResult">
         select gi.id, gi.name, gi.company_id, gi.type_id, gi.price, gi.cover, gi.slideshow, gi.create_time, gi.create_by, gi.update_time, gi.update_by, gi.remark,
-        gi.putaway_flag,gi.weight,gi.produced_time,
+        gi.putaway_flag,gi.weight,gi.material,gi.produced_time,
         gt.name typeName,sc.company_name companyName
         from goods_info gi
         left join goods_type gt on gt.id =gi.type_id
@@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="producedAddress != null  and producedAddress != ''"> and gi.produced_address = #{producedAddress}</if>
             <if test="warehouseAddress != null  and warehouseAddress != ''"> and gi.warehouse_address = #{warehouseAddress}</if>
             <if test="weight != null  and weight != ''"> and gi.weight = #{weight}</if>
+            <if test="material != null  and material != ''"> and gi.material like concat('%', #{material}, '%')</if>
             <if test="putawayFlag != null  and putawayFlag != ''"> and gi.putaway_flag = #{putawayFlag}</if>
         </where>
         order by gi.putaway_flag ,gi.create_time
@@ -115,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="producedAddress != null  and producedAddress != ''">produced_address,</if>
             <if test="warehouseAddress != null  and warehouseAddress != ''">warehouse_address,</if>
             <if test="weight != null  and weight != ''">weight,</if>
+            <if test="material != null  and material != ''">material,</if>
             <if test="putawayFlag != null  and putawayFlag != ''">putaway_flag,</if>
             <if test="delFlag != null  and delFlag != ''">del_flag,</if>
             <if test="createTime != null ">create_time,</if>
@@ -136,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="producedAddress != null  and producedAddress != ''">#{producedAddress},</if>
             <if test="warehouseAddress != null  and warehouseAddress != ''">#{warehouseAddress},</if>
             <if test="weight != null  and weight != ''">#{weight},</if>
+            <if test="material != null  and material != ''">#{material},</if>
             <if test="putawayFlag != null  and putawayFlag != ''">#{putawayFlag},</if>
             <if test="delFlag != null  and delFlag != ''">#{delFlag},</if>
             <if test="createTime != null ">#{createTime},</if>
@@ -161,6 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="producedAddress != null  and producedAddress != ''">produced_address = #{producedAddress},</if>
             <if test="warehouseAddress != null  and warehouseAddress != ''">warehouse_address = #{warehouseAddress},</if>
             <if test="weight != null  and weight != ''">weight = #{weight},</if>
+            <if test="material != null  and material != ''">material = #{material},</if>
             <if test="putawayFlag != null  and putawayFlag != ''">putaway_flag = #{putawayFlag},</if>
             <if test="delFlag != null  and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
@@ -185,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectGoodsInfoHotList" parameterType="GoodsInfo" resultMap="GoodsInfoResult">
         select gi.id, gi.name, gi.company_id, gi.type_id, gi.price, gi.cover, gi.slideshow, gi.create_time, gi.create_by, gi.update_time, gi.update_by, gi.remark,
-        gi.putaway_flag,gi.weight,gi.produced_time,
+        gi.putaway_flag,gi.weight,gi.produced_time,gi.material,
         gt.name typeName,sc.company_name companyName
         from goods_info gi
         left join goods_type gt on gt.id =gi.type_id

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

@@ -0,0 +1,84 @@
+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;
+
+/**
+ * 企业荣誉对象 company_honour
+ * 
+ * @author qxp
+ * @date 2020-03-02
+ */
+public class CompanyHonour extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商户荣誉id */
+    private Long honourId;
+
+    /** 商户id */
+    @Excel(name = "商户id")
+    private Long companyId;
+
+    /** 荣誉描述 */
+    @Excel(name = "荣誉描述")
+    private String des;
+
+    /** 荣誉图片 */
+    @Excel(name = "荣誉图片")
+    private String img;
+
+    public void setHonourId(Long honourId) 
+    {
+        this.honourId = honourId;
+    }
+
+    public Long getHonourId() 
+    {
+        return honourId;
+    }
+    public void setCompanyId(Long companyId) 
+    {
+        this.companyId = companyId;
+    }
+
+    public Long getCompanyId() 
+    {
+        return companyId;
+    }
+    public void setDes(String des)
+    {
+        this.des = des;
+    }
+
+    public String getDes()
+    {
+        return des;
+    }
+    public void setImg(String img) 
+    {
+        this.img = img;
+    }
+
+    public String getImg() 
+    {
+        return img;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("honourId", getHonourId())
+            .append("companyId", getCompanyId())
+            .append("des", getDes())
+            .append("img", getImg())
+            .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/CompanyHonourMapper.java

@@ -0,0 +1,61 @@
+package com.dgtly.companyext.mapper;
+
+import com.dgtly.companyext.domain.CompanyHonour;
+import java.util.List;
+
+/**
+ * 企业荣誉Mapper接口
+ * 
+ * @author qxp
+ * @date 2020-03-02
+ */
+public interface CompanyHonourMapper 
+{
+    /**
+     * 查询企业荣誉
+     * 
+     * @param honourId 企业荣誉ID
+     * @return 企业荣誉
+     */
+    public CompanyHonour selectCompanyHonourById(Long honourId);
+
+    /**
+     * 查询企业荣誉列表
+     * 
+     * @param companyHonour 企业荣誉
+     * @return 企业荣誉集合
+     */
+    public List<CompanyHonour> selectCompanyHonourList(CompanyHonour companyHonour);
+
+    /**
+     * 新增企业荣誉
+     * 
+     * @param companyHonour 企业荣誉
+     * @return 结果
+     */
+    public int insertCompanyHonour(CompanyHonour companyHonour);
+
+    /**
+     * 修改企业荣誉
+     * 
+     * @param companyHonour 企业荣誉
+     * @return 结果
+     */
+    public int updateCompanyHonour(CompanyHonour companyHonour);
+
+    /**
+     * 删除企业荣誉
+     * 
+     * @param honourId 企业荣誉ID
+     * @return 结果
+     */
+    public int deleteCompanyHonourById(Long honourId);
+
+    /**
+     * 批量删除企业荣誉
+     * 
+     * @param honourIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCompanyHonourByIds(String[] honourIds);
+}

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

@@ -0,0 +1,61 @@
+package com.dgtly.companyext.service;
+
+import com.dgtly.companyext.domain.CompanyHonour;
+import java.util.List;
+
+/**
+ * 企业荣誉Service接口
+ * 
+ * @author qxp
+ * @date 2020-03-02
+ */
+public interface ICompanyHonourService 
+{
+    /**
+     * 查询企业荣誉
+     * 
+     * @param honourId 企业荣誉ID
+     * @return 企业荣誉
+     */
+    public CompanyHonour selectCompanyHonourById(Long honourId);
+
+    /**
+     * 查询企业荣誉列表
+     * 
+     * @param companyHonour 企业荣誉
+     * @return 企业荣誉集合
+     */
+    public List<CompanyHonour> selectCompanyHonourList(CompanyHonour companyHonour);
+
+    /**
+     * 新增企业荣誉
+     * 
+     * @param companyHonour 企业荣誉
+     * @return 结果
+     */
+    public int insertCompanyHonour(CompanyHonour companyHonour);
+
+    /**
+     * 修改企业荣誉
+     * 
+     * @param companyHonour 企业荣誉
+     * @return 结果
+     */
+    public int updateCompanyHonour(CompanyHonour companyHonour);
+
+    /**
+     * 批量删除企业荣誉
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCompanyHonourByIds(String ids);
+
+    /**
+     * 删除企业荣誉信息
+     * 
+     * @param honourId 企业荣誉ID
+     * @return 结果
+     */
+    public int deleteCompanyHonourById(Long honourId);
+}

dgtly-system/src/main/java/com/dgtly/companyext/service/impl/CompanyHonourServiceImpl.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.CompanyHonourMapper;
+import com.dgtly.companyext.domain.CompanyHonour;
+import com.dgtly.companyext.service.ICompanyHonourService;
+import com.dgtly.common.core.text.Convert;
+
+/**
+ * 企业荣誉Service业务层处理
+ * 
+ * @author qxp
+ * @date 2020-03-02
+ */
+@Service
+public class CompanyHonourServiceImpl implements ICompanyHonourService 
+{
+    @Autowired
+    private CompanyHonourMapper companyHonourMapper;
+
+    /**
+     * 查询企业荣誉
+     * 
+     * @param honourId 企业荣誉ID
+     * @return 企业荣誉
+     */
+    @Override
+    public CompanyHonour selectCompanyHonourById(Long honourId)
+    {
+        return companyHonourMapper.selectCompanyHonourById(honourId);
+    }
+
+    /**
+     * 查询企业荣誉列表
+     * 
+     * @param companyHonour 企业荣誉
+     * @return 企业荣誉
+     */
+    @Override
+    public List<CompanyHonour> selectCompanyHonourList(CompanyHonour companyHonour)
+    {
+        return companyHonourMapper.selectCompanyHonourList(companyHonour);
+    }
+
+    /**
+     * 新增企业荣誉
+     * 
+     * @param companyHonour 企业荣誉
+     * @return 结果
+     */
+    @Override
+    public int insertCompanyHonour(CompanyHonour companyHonour)
+    {
+        companyHonour.setCreateTime(DateUtils.getNowDate());
+        return companyHonourMapper.insertCompanyHonour(companyHonour);
+    }
+
+    /**
+     * 修改企业荣誉
+     * 
+     * @param companyHonour 企业荣誉
+     * @return 结果
+     */
+    @Override
+    public int updateCompanyHonour(CompanyHonour companyHonour)
+    {
+        companyHonour.setUpdateTime(DateUtils.getNowDate());
+        return companyHonourMapper.updateCompanyHonour(companyHonour);
+    }
+
+    /**
+     * 删除企业荣誉对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCompanyHonourByIds(String ids)
+    {
+        return companyHonourMapper.deleteCompanyHonourByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除企业荣誉信息
+     * 
+     * @param honourId 企业荣誉ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCompanyHonourById(Long honourId)
+    {
+        return companyHonourMapper.deleteCompanyHonourById(honourId);
+    }
+}

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

@@ -0,0 +1,87 @@
+<?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.CompanyHonourMapper">
+    
+    <resultMap type="CompanyHonour" id="CompanyHonourResult">
+        <result property="honourId"    column="honour_id"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="des"    column="des"    />
+        <result property="img"    column="img"    />
+        <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="selectCompanyHonourVo">
+        select honour_id, company_id, des, img, create_by, create_time, update_by, update_time, remark from company_honour
+    </sql>
+
+    <select id="selectCompanyHonourList" parameterType="CompanyHonour" resultMap="CompanyHonourResult">
+        <include refid="selectCompanyHonourVo"/>
+        <where>  
+            <if test="companyId != null "> and company_id = #{companyId}</if>
+            <if test="des != null  and des != ''"> and des = #{des}</if>
+            <if test="img != null  and img != ''"> and img = #{img}</if>
+        </where>
+    </select>
+    
+    <select id="selectCompanyHonourById" parameterType="Long" resultMap="CompanyHonourResult">
+        <include refid="selectCompanyHonourVo"/>
+        where honour_id = #{honourId}
+    </select>
+        
+    <insert id="insertCompanyHonour" parameterType="CompanyHonour" useGeneratedKeys="true" keyProperty="honourId">
+        insert into company_honour
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="companyId != null ">company_id,</if>
+            <if test="des != null  and des != ''">des,</if>
+            <if test="img != null  and img != ''">img,</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="des != null  and des != ''">#{des},</if>
+            <if test="img != null  and img != ''">#{img},</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="updateCompanyHonour" parameterType="CompanyHonour">
+        update company_honour
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="companyId != null ">company_id = #{companyId},</if>
+            <if test="des != null  and des != ''">des = #{des},</if>
+            <if test="img != null  and img != ''">img = #{img},</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 honour_id = #{honourId}
+    </update>
+
+    <delete id="deleteCompanyHonourById" parameterType="Long">
+        delete from company_honour where honour_id = #{honourId}
+    </delete>
+
+    <delete id="deleteCompanyHonourByIds" parameterType="String">
+        delete from company_honour where honour_id in 
+        <foreach item="honourId" collection="array" open="(" separator="," close=")">
+            #{honourId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -139,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectCompanyHotList"  resultMap="SysCompanyResult">
-        select sc.id, sc.company_name,sc.establish_date,sc.default_img_url,sc.primary_business
+        select sc.id, sc.company_name,sc.establish_date,sc.default_img_url,sc.primary_business,sc.propaganda_img_url
         from sys_company sc
         where sc.id != 1 and sc.status = 0
         limit 0,5