72crm_9.0.1_20190603

72crm_9.0.1_20190603

新增
商业智能“员工客户分析、员工业绩分析、客户画像分析、产品分析、排行榜分析”等29个多维度报表

优化
1.仪表盘时间筛选优化
2.合同、回款的高级筛选中增加“审核状态”筛选

修复：
1.线索转客户出错问题
2.办公查看下属负责任务出错问题
3.合同审批在某些情况下不正确的问题

修复：
线索转客户出错问题
办公查看下属负责任务出错问题
合同审批状态在某些情况下不正确的问题
系统部门在某些情况下编辑错误问题

下载地址：www.5kcrm.com （官网 - 升级日志-JAVA版升级日志）

官方社区：bbs.72crm.net

官方帮助文档：book.5kcrm.com

Author: WukongSoftware

docs/crm9.sql

@@ -1,17 +1,3 @@
-/*
-Navicat MySQL Data Transfer
-
-Source Server         : local
-Source Server Version : 50720
-Source Host           : localhost:3306
-Source Database       : crm9
-
-Target Server Type    : MYSQL
-Target Server Version : 50720
-File Encoding         : 65001
-
-Date: 2019-05-11 16:33:30
-*/
 
 SET FOREIGN_KEY_CHECKS=0;
 
@@ -387,7 +373,7 @@ CREATE TABLE `72crm_admin_menu` (
   `status` tinyint(4) DEFAULT '1' COMMENT '状态 1 启用 0 禁用',
   `remarks` varchar(255) DEFAULT NULL COMMENT '菜单说明',
   PRIMARY KEY (`menu_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=107 DEFAULT CHARSET=utf8 COMMENT='后台菜单表';
+) ENGINE=InnoDB AUTO_INCREMENT=127 DEFAULT CHARSET=utf8 COMMENT='后台菜单表';
 
 -- ----------------------------
 -- Records of 72crm_admin_menu
@@ -471,10 +457,27 @@ INSERT INTO `72crm_admin_menu` VALUES ('103', '98', '查看', 'read', '3', '0',
 INSERT INTO `72crm_admin_menu` VALUES ('104', '99', '查看', 'read', '3', '0', '1', null);
 INSERT INTO `72crm_admin_menu` VALUES ('105', '100', '查看', 'read', '3', '0', '1', null);
 INSERT INTO `72crm_admin_menu` VALUES ('106', '101', '查看', 'read', '3', '0', '1', null);
-INSERT INTO `72crm_admin_menu` (`parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ('11', '联系人导出', 'excelexport', '3', '1', '1', NULL);
-INSERT INTO `72crm_admin_menu` (`parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ('11', '联系人导入', 'excelimport', '3', '1', '1', NULL);
-INSERT INTO `72crm_admin_menu` (`parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ('15', '产品导入', 'excelimport', '3', '1', '1', NULL);
-INSERT INTO `72crm_admin_menu` (`parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ('15', '产品导出', 'excelexport', '3', '1', '1', NULL);
+INSERT INTO `72crm_admin_menu` VALUES ('107', '11', '联系人导出', 'excelexport', '3', '1', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('108', '11', '联系人导入', 'excelimport', '3', '1', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('109', '15', '产品导入', 'excelimport', '3', '1', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('110', '15', '产品导出', 'excelexport', '3', '1', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('111', '2', '员工客户分析', 'customer', '1', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('112', '111', '查看', 'read', '3', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('113', '2', '销售漏斗', 'funnel', '1', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('114', '113', '查看', 'read', '3', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('115', '2', '回款统计', 'receivables', '1', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('116', '115', '查看', 'read', '3', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('117', '2', '产品分析', 'product', '1', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('118', '117', '查看', 'read', '3', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('119', '2', '业绩目标完成情况', 'performance', '1', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('120', '119', '查看', 'read', '3', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('121', '2', '员工业绩分析', 'employe', '1', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('122', '121', '查看', 'read', '3', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('123', '2', '客户画像分析', 'portrait', '1', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('124', '123', '查看', 'read', '3', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('125', '2', '排行榜', 'ranking', '1', '0', '1', null);
+INSERT INTO `72crm_admin_menu` VALUES ('126', '125', '查看', 'read', '3', '0', '1', null);
+
 -- ----------------------------
 -- Table structure for 72crm_admin_record
 -- ----------------------------
@@ -496,14 +499,6 @@ CREATE TABLE `72crm_admin_record` (
   UNIQUE KEY `record_id` (`record_id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=152 DEFAULT CHARSET=utf8 COMMENT='跟进记录';
 
-DROP TABLE IF EXISTS `72crm_crm_contacts_business`;
-CREATE TABLE `72crm_crm_contacts_business` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `business_id` int(11) NOT NULL,
-  `contacts_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='商机联系人关联表';
-
 -- ----------------------------
 -- Records of 72crm_admin_record
 -- ----------------------------
@@ -831,6 +826,21 @@ CREATE TABLE `72crm_crm_contacts` (
 -- Records of 72crm_crm_contacts
 -- ----------------------------
 
+-- ----------------------------
+-- Table structure for 72crm_crm_contacts_business
+-- ----------------------------
+DROP TABLE IF EXISTS `72crm_crm_contacts_business`;
+CREATE TABLE `72crm_crm_contacts_business` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `business_id` int(11) NOT NULL,
+  `contacts_id` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='商机联系人关联表';
+
+-- ----------------------------
+-- Records of 72crm_crm_contacts_business
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for 72crm_crm_contract
 -- ----------------------------
@@ -920,6 +930,22 @@ CREATE TABLE `72crm_crm_customer` (
 -- Records of 72crm_crm_customer
 -- ----------------------------
 
+-- ----------------------------
+-- Table structure for 72crm_crm_customer_stats
+-- ----------------------------
+DROP TABLE IF EXISTS `72crm_crm_customer_stats`;
+CREATE TABLE `72crm_crm_customer_stats` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `user_id` int(20) NOT NULL COMMENT '用户id',
+  `customer_num` int(10) NOT NULL DEFAULT '0' COMMENT '客户总数',
+  `create_time` datetime NOT NULL COMMENT '统计时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=190 DEFAULT CHARSET=utf8 COMMENT='每日客户统计';
+
+-- ----------------------------
+-- Records of 72crm_crm_customer_stats
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for 72crm_crm_leads
 -- ----------------------------
@@ -946,6 +972,24 @@ CREATE TABLE `72crm_crm_leads` (
 -- Records of 72crm_crm_leads
 -- ----------------------------
 
+-- ----------------------------
+-- Table structure for 72crm_crm_owner_record
+-- ----------------------------
+DROP TABLE IF EXISTS `72crm_crm_owner_record`;
+CREATE TABLE `72crm_crm_owner_record` (
+  `record_id` int(11) NOT NULL AUTO_INCREMENT,
+  `type_id` int(11) NOT NULL COMMENT '对象id',
+  `type` int(4) NOT NULL COMMENT '对象类型',
+  `pre_owner_user_id` int(20) DEFAULT NULL COMMENT '上一负责人',
+  `post_owner_user_id` int(20) DEFAULT NULL COMMENT '接手负责人',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  PRIMARY KEY (`record_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='负责人变更记录表';
+
+-- ----------------------------
+-- Records of 72crm_crm_owner_record
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for 72crm_crm_product
 -- ----------------------------

src/main/java/com/kakarote/crm9/common/config/JfinalConfig.java

@@ -18,7 +18,6 @@
 import com.kakarote.crm9.erp.crm.common.CrmRouter;
 import com.kakarote.crm9.erp.oa.common.OaRouter;
 import com.kakarote.crm9.erp.work.common.WorkRouter;
-import com.kakarote.crm9.erp.work.cron.TaskCron;
 import com.jfinal.config.*;
 import com.jfinal.core.paragetter.ParaProcessorBuilder;
 import com.jfinal.kit.PathKit;

src/main/java/com/kakarote/crm9/common/config/cache/RedisCache.java

@@ -47,7 +47,7 @@ public void removeAll(String cacheName) {
                 cache.del(cache.keys("*").toArray());
             }catch (JedisDataException exception){
                 //TODO keys同样被禁用
-                throw new RuntimeException();
+                throw new RuntimeException(exception);
             }
         }
 

src/main/java/com/kakarote/crm9/common/interceptor/AuthInterceptor.java

@@ -38,16 +38,16 @@ public void intercept(Invocation invocation) {
 
         invocation.invoke();
     }
+    @SuppressWarnings("unchecked")
     private List<String> queryAuth(Map<String,Object> map,String key){
         List<String> permissions=new ArrayList<>();
         map.keySet().forEach(str->{
             if(map.get(str) instanceof Map){
-                permissions.addAll(queryAuth((Map<String, Object>) map.get(str),key+str+":"));
+                permissions.addAll(this.queryAuth((Map<String, Object>) map.get(str),key+str+":"));
             }else {
                 permissions.add(key+str);
             }
         });
-
         return permissions;
     }
 }

src/main/java/com/kakarote/crm9/erp/_MappingKit.java

@@ -49,7 +49,9 @@ public static void mapping(ActiveRecordPlugin arp) {
 		arp.addMapping("72crm_crm_contract", "contract_id", CrmContract.class);
 		arp.addMapping("72crm_crm_contract_product", "r_id", CrmContractProduct.class);
 		arp.addMapping("72crm_crm_customer", "customer_id", CrmCustomer.class);
+		arp.addMapping("72crm_crm_customer_stats", "id", CrmCustomerStats.class);
 		arp.addMapping("72crm_crm_leads", "leads_id", CrmLeads.class);
+		arp.addMapping("72crm_crm_owner_record", "record_id", CrmOwnerRecord.class);
 		arp.addMapping("72crm_crm_product", "product_id", CrmProduct.class);
 		arp.addMapping("72crm_crm_product_category", "category_id", CrmProductCategory.class);
 		arp.addMapping("72crm_crm_receivables", "receivables_id", CrmReceivables.class);

src/main/java/com/kakarote/crm9/erp/admin/common/AdminInterceptor.java

@@ -6,7 +6,6 @@
 public class AdminInterceptor implements Interceptor {
     @Override
     public void intercept(Invocation invocation) {
-
         invocation.invoke();
     }
 }

src/main/java/com/kakarote/crm9/erp/admin/controller/AdminLoginController.java

@@ -62,6 +62,7 @@ public void login(@Para("username") String username, @Para("password") String pa
                 user.setLastLoginTime(new Date());
                 user.update();
                 user.setRoles(adminRoleService.queryRoleIdsByUserId(user.getUserId()));
+                user.remove("password","salt");
                 Redis.use().setex(token, 360000, user);
                 setCookie("Admin-Token", token, 360000);
                 renderJson(R.ok().put("Admin-Token", token).put("user", user).put("auth", adminRoleService.auth(user.getUserId())));

src/main/java/com/kakarote/crm9/erp/admin/controller/AdminMenuController.java

@@ -24,6 +24,6 @@ public void getRoleMenu(@Para("roleId") Integer roleId){
      * 展示全部菜单
      */
     public void getAllMenuList(){
-        renderJson(R.ok().put("data",adminMenuService.getAllMenuList(0)));
+        renderJson(R.ok().put("data",adminMenuService.getAllMenuList(0,20)));
     }
 }

src/main/java/com/kakarote/crm9/erp/admin/controller/AdminSysConfigController.java

@@ -44,7 +44,7 @@ public void setSysConfig(){
     public void querySysConfig(){
         Cache cache = Redis.use();
         if (cache.get(SYS_CONFIG_KEY) == null){
-            renderJson(R.ok().put("data",null));
+            renderJson(R.ok().put("data",Kv.by("logo","").set("name","")));
             return;
         }
         String data = cache.get(SYS_CONFIG_KEY);

src/main/java/com/kakarote/crm9/erp/admin/controller/AdminUserController.java

@@ -139,4 +139,8 @@ public void updateUser(@Para("")AdminUser adminUser){
         boolean b=adminUserService.updateUser(adminUser);
         renderJson(R.isSuccess(b,"修改信息失败"));
     }
+
+    public void queryUserByDeptId(@Para("deptId")Integer deptId){
+        renderJson(R.ok().put("data",adminUserService.queryUserByDeptId(deptId)));;
+    }
 }