提交企业信息处理代码

suishenbang-order/src/main/java/com/dgtly/order/controller/OrderCustomersController.java

@@ -96,5 +96,31 @@ public class OrderCustomersController extends BaseController
         return prefix + "/edit";
     }
 
+    @GetMapping("/dealHistoryData")
+    @ResponseBody
+    public Object dealHistoryData(String customerCode){
+        String str="";
+        String url = "";
+        if (customerCode!=null&&customerCode!=""){
+             url = cloudPath +"order/order/meta-hana-sales-order/dealHistoryData?customerCode="+customerCode;
+        }else {
+             url = cloudPath +"order/order/meta-hana-sales-order/dealHistoryData";
+        }
+        try {
+            //设置为form方式
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+//            MultiValueMap<String, Object> map = MapDataUtil.convertMultiValueMap(null);
+//            HttpEntity<Object> requestEntity
+//                    = new HttpEntity<>(map, headers);
+            str = restTemplate.getForObject(url, String.class);
+        }catch (Exception e){
+            logger.error("经销商历史数据处理接口报错:"+url,e);
+            throw e;
+        }
+        JSONObject json = JSONObject.parseObject(str);
+        return json;
+    }
+
 
 }

suishenbang-order/src/main/resources/templates/order/customers/customers.html

@@ -44,6 +44,9 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" id="dealHistoryDataAll">
+                    <i class="fa fa-plus"></i> 全部处理
+                </a>
                 <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:customers:add">-->
                     <!--<i class="fa fa-plus"></i> 添加-->
                 <!--</a>-->
@@ -122,6 +125,7 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.editTitle(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="dealHistoryData(\'' + row.chainsCode + '\')"><i class="fa fa-edit"></i>处理</a> ');
                         return actions.join('');
                     }
                 }]
@@ -135,7 +139,47 @@
                 val = val.replace(/^\s+|\s+$/g,"")
                 $(event.target).val(val);
             })
+
+
+
+            $("#dealHistoryDataAll").click(function () {
+                $.ajax({
+                    cache : true,
+                    type : "GET",
+                    url : prefix+"/dealHistoryData",
+                    error : function(request) {
+                        $.modal.alertError("系统错误");
+                    },
+                    success : function(data) {
+                        if (data.success){
+                            alert("处理完成");
+                        } else {
+                            alert("处理失败");
+                        }
+                    }
+                })
+            })
         });
+        function dealHistoryData(customerCode){
+            $.ajax({
+                cache : true,
+                type : "GET",
+                url : prefix+"/dealHistoryData",
+                data : {
+                    "customerCode":customerCode
+                },
+                error : function(request) {
+                    $.modal.alertError("系统错误");
+                },
+                success : function(data) {
+                    if (data.success){
+                        alert("处理完成");
+                    } else {
+                        alert("处理失败");
+                    }
+                }
+            })
+        }
     </script>
 </body>
 </html>

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

@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 	
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar,
+		select u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name,u.id_type,u.id_number,u.account_id,u.is_authentication,u.receive_url_mobile_no, u.email, u.avatar,
           u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag,
           u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
           d.dept_name, d.leader,
@@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id,u.company_id, u.dept_id,u.id_type,u.id_number,u.account_id,u.is_authentication,u.receive_url_mobile_no, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_company c on u.company_id = c.id
@@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id,u.company_id,u.id_type,u.id_number,u.account_id,u.is_authentication,u.receive_url_mobile_no, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_company c on u.company_id = c.id

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/orderfile/orderfile.html

@@ -30,18 +30,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:file:add">
-                <i class="fa fa-plus"></i> 添加
-            </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:file:edit">
-                <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:file:remove">
-                <i class="fa fa-remove"></i> 删除
-            </a>
-            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:file:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
+
         </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
@@ -85,7 +74,7 @@
                     field : 'fileUrl',
                     title : '操作',
                     formatter : function (value,row,index) {
-                        return '<a class="btn btn-success btn-xs" href='+value+' target="_blank"><i class="fa fa-download"></i>下载</a>';
+                        return '<a class="btn btn-success btn-xs" href='+ctx+value+' target="_blank"><i class="fa fa-download"></i>查看</a>';
                     }
                 }
                 /*,
@@ -103,6 +92,9 @@
         };
         $.table.init(options);
     });
+
+
+    
 </script>
 </body>
 </html>