chenyanan hace 1 año
padre
commit
3bfc9ecf14

+ 110 - 97
suishenbang-admin/src/main/resources/templates/system/magnetLog/magnetLog.html

@@ -1,93 +1,102 @@
 <!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">
-        <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="userId"/>
-                            </li>-->
-                            <li>
-                                <p>访问者名称:</p>
-                                <input type="text" name="userName"/>
-                            </li>
-                            <li>
-                                <p>组织code:</p>
-                                <input type="text" name="orgCode"/>
-                            </li>
-                            <li>
-                                <p>组织名称:</p>
-                                <input type="text" name="orgName"/>
-                            </li>
-                            <li>
-                                <p>用户级别:</p>
-                                <input type="text" name="level"/>
-                            </li>
-                            <li>
-                                <p>磁铁名称:</p>
-                                <input type="text" name="magnetName"/>
-                            </li>
-                            <li class="select-time">
-                                <p>访问时间: </p>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始日期" name="params[beginTime]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束日期" name="params[endTime]"/>
-                            </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="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="userId"/>
+                        </li>-->
+                        <li>
+                            <p>访问者名称:</p>
+                            <input type="text" name="userName"/>
+                        </li>
+                        <li>
+                            <p>登陆名:</p>
+                            <input type="text" name="loginName"/>
+                        </li>
+                        <li>
+                            <p>组织code:</p>
+                            <input type="text" name="orgCode"/>
+                        </li>
+                        <li>
+                            <p>组织名称:</p>
+                            <input type="text" name="orgName"/>
+                        </li>
+                        <li>
+                            <p>用户级别:</p>
+                            <input type="text" name="level"/>
+                        </li>
+                        <li>
+                            <p>磁铁名称:</p>
+                            <input type="text" name="magnetName"/>
+                        </li>
+                        <li class="select-time">
+                            <p>访问时间: </p>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始日期"
+                                   name="params[beginTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束日期"
+                                   name="params[endTime]"/>
+                        </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:magnetLog:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:magnetLog:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>-->
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:magnetLog:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:magnetLog: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 class="btn-group-sm" id="toolbar" role="group">
+            <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:magnetLog:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:magnetLog:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>-->
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="system:magnetLog:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:magnetLog: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>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:magnetLog:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:magnetLog:remove')}]];
-        var prefix = ctx + "system/magnetLog";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:magnetLog:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:magnetLog:remove')}]];
+    var prefix = ctx + "system/magnetLog";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "磁铁日志",
-                columns: [{
-                    checkbox: true
-                },
+    $(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 : '主键',
+                    field: 'id',
+                    title: '主键',
                     visible: false
                 },
                 /*{
@@ -95,42 +104,46 @@
                     title : '用户id'
                 },*/
                 {
-                    field : 'userName', 
-                    title : '访问者名称'
+                    field: 'userName',
+                    title: '访问者名称'
+                },
+                {
+                    field: 'loginName',
+                    title: '登陆名'
                 },
                 {
-                    field : 'orgCode', 
-                    title : '组织code'
+                    field: 'orgCode',
+                    title: '组织code'
                 },
                 {
-                    field : 'orgName', 
-                    title : '组织名称'
+                    field: 'orgName',
+                    title: '组织名称'
                 },
                 {
-                    field : 'level', 
-                    title : '用户级别'
+                    field: 'level',
+                    title: '用户级别'
                 },
                 {
-                    field : 'magnetName', 
-                    title : '磁铁名称'
+                    field: 'magnetName',
+                    title: '磁铁名称'
                 },
                 {
-                    field : 'createTime',
-                    title : '访问时间'
+                    field: 'createTime',
+                    title: '访问时间'
                 },
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    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>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>

+ 12 - 7
suishenbang-order/src/main/resources/mapper/order/MetaHanaSalesOrderMapper.xml

@@ -61,13 +61,18 @@
     </select>
 
     <select id="selectDistinctMetaHanaSalesOrder1" parameterType="MetaHanaSalesOrder" resultMap="MetaHanaSalesResult">
-        select distinct mhso.DOC_NUMBER, mhso.CUSTOMER_CODE, mhso.CUSTOMER_NAME,
-        mhso.CREATE_DATE, mhso.CREDIT_DATE, mhso.CREDIT_STATUS, mhso.REJECT_REASON
-            ,sob.expected_time as expectedTime
-
-        from meta_hana_sales_order mhso
-        LEFT JOIN sales_order_base sob
-        on mhso.DOC_NUMBER = sob.order_number
+        SELECT DISTINCT
+        mhso.DOC_NUMBER,
+        mhso.CUSTOMER_CODE,
+        mhso.CUSTOMER_NAME,
+        mhso.CREATE_DATE,
+        mhso.CREDIT_DATE,
+        mhso.CREDIT_STATUS,
+        mhso.REJECT_REASON,
+        sob.expected_time AS expectedTime
+        FROM
+        meta_hana_sales_order mhso
+        LEFT JOIN sales_order_base sob ON mhso.DOC_NUMBER = sob.order_number
         <where>
             <if test="docNumber != null  and docNumber != ''"> and mhso.DOC_NUMBER like concat('%', #{docNumber}, '%')</if>
             <if test="salesOrg != null  and salesOrg != ''"> and mhso.SALES_ORG =#{salesOrg}</if>

+ 75 - 6
suishenbang-system/src/main/java/com/dgtly/system/domain/SysMagnetLog.java

@@ -22,9 +22,11 @@ public class SysMagnetLog extends BaseEntity
     private Long id;
 
     /** 用户id */
-    @Excel(name = "用户id")
+//    @Excel(name = "用户id")
     private Long userId;
 
+    @Excel(name = "登陆名")
+    private String loginName;
     /** 访问者名称 */
     @Excel(name = "访问者名称")
     private String userName;
@@ -37,10 +39,21 @@ public class SysMagnetLog extends BaseEntity
     @Excel(name = "组织名称")
     private String orgName;
 
+    @Excel(name = "公司")
+    private String salesCompanyName;
+    @Excel(name="大区")
+    private String salesOfficeName;
+    @Excel(name = "销售部")
+    private String salesGroupName;
+
     /** 用户级别 */
-    @Excel(name = "用户级别")
     private String level;
 
+
+    /** 用户级别 */
+    @Excel(name = "用户级别")
+    private String dictLabel;
+
     /** 磁铁名称 */
     @Excel(name = "磁铁名称")
     private String magnetName;
@@ -58,7 +71,8 @@ public class SysMagnetLog extends BaseEntity
     {
         return id;
     }
-    public void setUserId(Long userId) 
+
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
@@ -67,7 +81,16 @@ public class SysMagnetLog extends BaseEntity
     {
         return userId;
     }
-    public void setUserName(String userName) 
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public void setUserName(String userName)
     {
         this.userName = userName;
     }
@@ -99,7 +122,39 @@ public class SysMagnetLog extends BaseEntity
         this.level = level;
     }
 
-    public String getLevel() 
+    public String getDictLabel() {
+        return dictLabel;
+    }
+
+    public void setDictLabel(String dictLabel) {
+        this.dictLabel = dictLabel;
+    }
+
+    public String getSalesCompanyName() {
+        return salesCompanyName;
+    }
+
+    public void setSalesCompanyName(String salesCompanyName) {
+        this.salesCompanyName = salesCompanyName;
+    }
+
+    public String getSalesOfficeName() {
+        return salesOfficeName;
+    }
+
+    public void setSalesOfficeName(String salesOfficeName) {
+        this.salesOfficeName = salesOfficeName;
+    }
+
+    public String getSalesGroupName() {
+        return salesGroupName;
+    }
+
+    public void setSalesGroupName(String salesGroupName) {
+        this.salesGroupName = salesGroupName;
+    }
+
+    public String getLevel()
     {
         return level;
     }
@@ -123,16 +178,30 @@ public class SysMagnetLog extends BaseEntity
         this.createTime = createTime;
     }
 
+
+    /*
+    *   @Excel(name = "公司")
+    private String salesCompanyName;
+    @Excel(name="大区")
+    private String salesOfficeName;
+    @Excel(name = "销售部")
+    private String salesGroupName;
+    *
+    * */
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("userId", getUserId())
             .append("userName", getUserName())
+                .append("loginName",getLoginName())
             .append("orgCode", getOrgCode())
             .append("orgName", getOrgName())
             .append("level", getLevel())
-            .append("magnetName", getMagnetName())
+                .append("salesCompanyName", getSalesCompanyName())
+                .append("salesOfficeName", getSalesOfficeName())
+                .append("salesGroupName", getSalesGroupName())
+                .append("magnetName", getMagnetName())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

+ 30 - 2
suishenbang-system/src/main/resources/mapper/system/SysMagnetLogMapper.xml

@@ -7,10 +7,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="SysMagnetLog" id="SysMagnetLogResult">
         <result property="id"    column="id"    />
         <result property="userId"    column="user_id"    />
+        <result property="loginName"    column="login_name"    />
         <result property="userName"    column="user_name"    />
         <result property="orgCode"    column="org_code"    />
         <result property="orgName"    column="org_name"    />
+        <result property="salesCompanyName"    column="sales_company_name"    />
+        <result property="salesOfficeName"    column="sales_office_name"    />
+        <result property="salesGroupName"    column="sales_group_name"    />
         <result property="level"    column="level"    />
+        <result property="dictLabel"    column="dict_label"    />
         <result property="magnetName"    column="magnet_name"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -23,11 +28,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSysMagnetLogList" parameterType="SysMagnetLog" resultMap="SysMagnetLogResult">
-        select a.id, a.user_id, a.user_name, b.org_code, b.org_name, b.sales_level level, a.magnet_name, a.create_by, a.create_time, a.update_by, a.update_time
-        from sys_magnet_log a left join sys_user_ext b on a.user_id=b.user_id
+        SELECT
+        a.id,
+        a.user_id,
+        c.login_name,
+        a.user_name,
+        b.org_code,
+        b.org_name,
+        b.sales_level LEVEL,
+        e.dict_label,
+        a.magnet_name,
+        d.division_unit,
+        d.sales_company_name,
+        d.sales_office_name,
+        d.sales_group_name,
+        a.create_by,
+        a.create_time,
+        a.update_by,
+        a.update_time
+        FROM
+        sys_magnet_log a
+        LEFT JOIN sys_user_ext b ON a.user_id = b.user_id
+        LEFT JOIN sys_user c ON a.user_id = c.user_id
+        LEFT JOIN sys_dict_data e ON b.sales_level = e.dict_value
+        LEFT JOIN data_master_customer d ON a.org_code = d.CustomerCode
         <where>
             <if test="userId != null "> and a.user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and a.user_name like concat('%', #{userName}, '%')</if>
+            <if test="loginName != null  and loginName != ''"> and c.login_name like concat('%', #{loginName}, '%')</if>
             <if test="orgCode != null  and orgCode != ''"> and b.org_code = #{orgCode}</if>
             <if test="orgName != null  and orgName != ''"> and b.org_name like concat('%', #{orgName}, '%')</if>
             <if test="level != null  and level != ''"> and b.sales_level = #{level}</if>