瀏覽代碼

提交代码

wks 1 年之前
父節點
當前提交
90025a91bb
共有 2 個文件被更改,包括 7 次插入440 次删除
  1. 0 431
      sql/Online.sql
  2. 7 9
      src/main/java/com/ydtech/modules/scheme/service/impl/PtlSchemeRulesServiceImpl.java

+ 0 - 431
sql/Online.sql

@@ -1,431 +0,0 @@
--- add by caiyaru 20240806
-DROP TABLE IF EXISTS `sys_qr_code_relation`;
-create table `sys_qr_code_relation`(
-                                           `id` bigint auto_increment PRIMARY KEY comment '主键id',
-                                           `api_type` tinyint comment 'api类型(1、api对接,2、python对接)',
-                                           `ins_company_id` varchar(32) comment '保险公司ID',
-                                           `ins_company_name` varchar(255) comment '保险公司名称',
-                                           `qr_code_type` tinyint comment '二维码类型(0:Base64,1:内部链接,2:外部链接)',
-                                           `create_by` varchar(255) comment '创建操作人',
-                                           `create_time` timestamp comment '创建时间',
-                                           `last_update_by` varchar(255) comment '更新操作人',
-                                           `last_update_time` timestamp comment '更新时间',
-                                           CONSTRAINT  `sys_qr_code_relation_uk` unique(`api_type`,`ins_company_id`,`ins_company_name`,`qr_code_type`)
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin comment='二维码类型关联表' ROW_FORMAT = Dynamic;
-
-INSERT INTO `sys_dict_type`(`id`, `name`, `parent_id`, `itemname`, `description`, `create_time`, `update_time`, `remarks`, `del_flag`, `tenant_id`) VALUES ('108', '车险平台', NULL, 'insurancePlatform', NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, '0', 0);
-INSERT INTO `sys_dict_type`(`id`, `name`, `parent_id`, `itemname`, `description`, `create_time`, `update_time`, `remarks`, `del_flag`, `tenant_id`) VALUES ('108001', '二维码', '108', 'QRCode', NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, '0', 0);
-
-INSERT INTO `sys_dict`( `value`, `label`, `itemname`, `description`, `sort`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `remarks`, `del_flag`, `create_user_id`, `update_user_id`, `update_time`) VALUES ('0', 'Base64', 'QRCode', 'desc', 0, NULL, NULL, NULL, NULL, 'remark', 0, 0, 0, CURRENT_TIMESTAMP);
-INSERT INTO `sys_dict`( `value`, `label`, `itemname`, `description`, `sort`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `remarks`, `del_flag`, `create_user_id`, `update_user_id`, `update_time`) VALUES ('1', '内部链接', 'QRCode', 'desc', 0, NULL, NULL, NULL, NULL, 'remark', 0, 0, 0, CURRENT_TIMESTAMP);
-INSERT INTO `sys_dict`( `value`, `label`, `itemname`, `description`, `sort`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `remarks`, `del_flag`, `create_user_id`, `update_user_id`, `update_time`) VALUES ('2', '外部链接', 'QRCode', 'desc', 0, NULL, NULL, NULL, NULL, 'remark', 0, 0, 0, CURRENT_TIMESTAMP);
-
-
-DROP TABLE IF EXISTS `sys_user_track`;
-create table `sys_user_track`(
-                                     `id` bigint auto_increment PRIMARY KEY comment '主键id',
-                                     `user_id` varchar(30) not null comment '用户id',
-                                     `status` tinyint comment '状态  0,"离司",1,"正常",2,"入司待审核",3,"入司审核驳回",4,"离司待审核",5,"离司审核驳回"',
-                                     `approve_by` varchar(255) comment '审核人',
-                                     `approve_time` timestamp comment '审核时间',
-                                     `approve_mess` varchar(255) comment '审核信息',
-                                     index `idx_sys_user_track_user_id`(`user_id`),
-                                     index `idx_sys_user_track_approve_time`(`approve_time`)
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin comment='系统用户审核轨迹表' ROW_FORMAT = Dynamic;
-
-
---add by helixiao 20240812
-DROP TABLE IF EXISTS `sys_agency_fee_approval`;
-CREATE TABLE `sys_agency_fee_approval` (
-                                           `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-                                           `user_id` varchar(30) DEFAULT NULL COMMENT '员工id',
-                                           `user_name` varchar(50) DEFAULT NULL COMMENT '员工姓名',
-                                           `dept_id` varchar(30) DEFAULT NULL COMMENT '机构id',
-                                           `dept_name` varchar(50) DEFAULT NULL COMMENT '机构名称',
-                                           `real_user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '银行卡户主',
-                                           `bank_number` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '银行卡号',
-                                           `bank_account` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '开户行',
-                                           `bank_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '开户行地址',
-                                           `number` varchar(255) DEFAULT NULL COMMENT '提现编号',
-                                           `sumpremium` decimal(10,2) DEFAULT NULL COMMENT '总保费',
-                                           `proportional` varchar(10) DEFAULT NULL COMMENT '抽成比例(总保费抽成)',
-                                           `extract_fee` decimal(10,2) DEFAULT NULL COMMENT '总保费抽成费用',
-                                           `history_fee` decimal(10,2) DEFAULT NULL COMMENT '已提现抽成费用',
-                                           `cash_fee` decimal(10,2) DEFAULT NULL COMMENT '可提现抽成费用',
-                                           `start_time` datetime DEFAULT NULL COMMENT '提层计算时间',
-                                           `audit_user` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '审核人',
-                                           `status` varchar(5) NOT NULL DEFAULT '0' COMMENT '审核状态0未审核 1审核通过 2审核驳回',
-                                           `audit_time` datetime DEFAULT NULL COMMENT '审核时间',
-                                           `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                           `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
-                                           `remark` varchar(255) DEFAULT NULL COMMENT '审批意见',
-                                           `picture` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '附件图片',
-                                           PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='机构保费抽成审批表';
-
-DROP TABLE IF EXISTS `sys_agency_fee_approval_record`;
-CREATE TABLE `sys_agency_fee_approval_record` (
-                                                  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-                                                  `approval_id` int DEFAULT NULL COMMENT '审批id',
-                                                  `user_id` varchar(30) DEFAULT NULL COMMENT '员工id',
-                                                  `user_name` varchar(50) DEFAULT NULL COMMENT '员工姓名',
-                                                  `dept_id` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '机构id',
-                                                  `dept_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '机构名称',
-                                                  `real_user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '银行卡户主',
-                                                  `bank_number` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '银行卡号',
-                                                  `bank_account` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '开户行',
-                                                  `bank_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '开户行地址',
-                                                  `number` varchar(255) DEFAULT NULL COMMENT '提现编号',
-                                                  `sumpremium` decimal(10,2) DEFAULT NULL COMMENT '总保费',
-                                                  `proportional` varchar(10) DEFAULT NULL COMMENT '抽成比例(总保费抽成)',
-                                                  `extract_fee` decimal(10,2) DEFAULT NULL COMMENT '总保费抽成费用',
-                                                  `history_fee` decimal(10,2) DEFAULT NULL COMMENT '已提现抽成费用',
-                                                  `cash_fee` decimal(10,2) DEFAULT NULL COMMENT '可提现抽成费用',
-                                                  `start_time` datetime DEFAULT NULL COMMENT '提层计算时间',
-                                                  `audit_user` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '审核人',
-                                                  `status` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '审核状态0未审核 1审核通过 2审核驳回',
-                                                  `audit_time` datetime DEFAULT NULL COMMENT '审核时间',
-                                                  `create_time` datetime DEFAULT NULL COMMENT '操作时间',
-                                                  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '操作人',
-                                                  `remark` varchar(255) DEFAULT NULL COMMENT '审批意见',
-                                                  `picture` varchar(255) DEFAULT NULL COMMENT '附件图片',
-                                                  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='机构保费抽成审批表记录表';
-
-DROP TABLE IF EXISTS `sys_agency_leader`;
-CREATE TABLE `sys_agency_leader` (
-                                     `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
-                                     `user_id` varchar(30) DEFAULT NULL COMMENT '员工id',
-                                     `user_name` varchar(50) DEFAULT NULL COMMENT '员工姓名',
-                                     `dept_id` varchar(30) DEFAULT NULL COMMENT '机构id',
-                                     `dept_name` varchar(50) DEFAULT NULL COMMENT '机构name',
-                                     `comlevel` varchar(10) DEFAULT NULL COMMENT '机构级别',
-                                     `source` varchar(5) DEFAULT NULL COMMENT '业务来源',
-                                     `proportional` varchar(10) DEFAULT NULL COMMENT '抽成比例(总保费抽成)',
-                                     `suggest_id` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '推荐人id',
-                                     `suggest_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '推荐人name',
-                                     `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                     `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
-                                     `del_flag` tinyint NOT NULL DEFAULT '1' COMMENT '删除( 0:删除 1:正常)',
-                                     `update_time` datetime DEFAULT NULL COMMENT '修改时间',
-                                     `update_by` varchar(50) DEFAULT NULL COMMENT '修改人',
-                                     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='配置机构负责人表';
-
-DROP TABLE IF EXISTS `sys_partner`;
-CREATE TABLE `sys_partner` (
-                               `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
-                               `user_id` varchar(30) DEFAULT NULL COMMENT '员工id',
-                               `user_name` varchar(50) DEFAULT NULL COMMENT '员工姓名',
-                               `proportional` varchar(10) DEFAULT NULL COMMENT '抽成比例(总保费抽成)',
-                               `suggest_id` varchar(30) DEFAULT NULL COMMENT '推荐人id',
-                               `suggest_name` varchar(50) DEFAULT NULL COMMENT '推荐人name',
-                               `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                               `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
-                               `del_flag` tinyint NOT NULL DEFAULT '1' COMMENT '删除( 0:删除 1:正常)',
-                               PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='配置机构合伙人表';
-
-DROP TABLE IF EXISTS `sys_relation_person`;
-CREATE TABLE `sys_relation_person` (
-                                       `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
-                                       `agency_leader_id` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '被推荐人id',
-                                       `suggest_id` varchar(50) DEFAULT NULL COMMENT '推荐人id',
-                                       `source` tinyint DEFAULT NULL COMMENT '推荐等级(0:直接推荐;1:间接推荐)',
-                                       `type` tinyint DEFAULT NULL COMMENT '推荐类型(0:合伙人  1:机构负责人)',
-                                       `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                       `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
-                                       `del_flag` tinyint NOT NULL DEFAULT '1' COMMENT '删除( 0:删除 1:正常)',
-                                       PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='合伙人/推荐人和机构负责人关系表';
-
---add by caiyaru 20240813
-ALTER TABLE `sys_user_bank_card` ADD COLUMN `bank_verify` tinyint  DEFAULT 0 COMMENT '0 未验证 1 已验证';
-
--- 控制台角色关联菜单表
-DROP TABLE IF EXISTS `sys_role_menu_kzt`;
-CREATE TABLE `sys_role_menu_kzt`  (
-                                      `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-                                      `role_id` bigint NULL DEFAULT NULL COMMENT '角色ID',
-                                      `menu_id` bigint NULL DEFAULT NULL COMMENT '菜单ID',
-                                      `sys_type` varchar(10) NULL DEFAULT NULL COMMENT '系统类型',
-                                      `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-                                      `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                      `last_update_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
-                                      `last_update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-                                      PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '控制台角色关联菜单' ROW_FORMAT = Dynamic;
-
--- 控制台用户关联角色表
-DROP TABLE IF EXISTS `sys_user_role_kzt`;
-CREATE TABLE `sys_user_role_kzt`  (
-                                      `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-                                      `user_id` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户ID',
-                                      `role_id` bigint NULL DEFAULT NULL COMMENT '角色ID',
-                                      `sys_type` varchar(10) NULL DEFAULT NULL COMMENT '系统类型',
-                                      `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-                                      `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                      `last_update_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
-                                      `last_update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-                                      PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '控制台用户关联角色' ROW_FORMAT = Dynamic;
-
-
--- 保险手续费结算关联表
-DROP TABLE IF EXISTS `sys_insurance_handling_settlement_month`;
-CREATE TABLE `sys_insurance_handling_settlement_month`  (
-                                                            `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
-                                                            `task_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务id',
-                                                            `settlement_documentary_fees_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '结算id',
-                                                            `settlement_amount` decimal(15,5) DEFAULT NULL COMMENT '结算金额',
-                                                            `total_amount` decimal(15,5) DEFAULT NULL COMMENT '开票金额',
-                                                            `remaining_amount` decimal(15,5) DEFAULT NULL COMMENT '剩余结算金额',
-                                                            `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                                            `signing_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                                            `creater_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-                                                            PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '保险手续费结算关联表' ROW_FORMAT = Dynamic;
-
-
--- 添加平安记录表  add by  hxl
-DROP TABLE IF EXISTS `pingan_record`;
-CREATE TABLE `pingan_record`  (
-                                  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-                                  `sub_order_no` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '子订单号',
-                                  `ahs_upc_total_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '财意险总保费',
-                                  `ahs_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '意外险保费',
-                                  `upc_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '财产险保费',
-                                  `xw_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '小微险保费',
-                                  `com_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '组合产品保费',
-                                  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = Dynamic;
-
--- 添加控制台数据权限表   add by  hxl
-DROP TABLE IF EXISTS `kzt_data_permission`;
-CREATE TABLE `kzt_data_permission`  (
-                                        `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-                                        `menu_id` bigint NULL DEFAULT NULL COMMENT '菜单id',
-                                        `custom_script_flag` tinyint(1) NULL DEFAULT NULL COMMENT '是否自定义脚本',
-                                        `data_permission_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据权限字典id',
-                                        `script_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '自定义脚本内容',
-                                        `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                        `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据访问url',
-                                        PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '控制台数据权限表' ROW_FORMAT = Dynamic;
-
--- 平安事后文件上传资料   add by  hxl
-DROP TABLE IF EXISTS `pingan_sh_uploafile`;
-CREATE TABLE `pingan_sh_uploafile`  (
-                                        `id` bigint NOT NULL COMMENT '主键',
-                                        `sub_order_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '子订单id',
-                                        `document_class` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '文件大类编码',
-                                        `document_class_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '文件大类名称',
-                                        `is_any_one` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '是否以上之一均可【1-是,0-否】\r\n 1表示当前大类,只需要上传其中一种小类 0表示全部上传',
-                                        `document_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '文件小类编码',
-                                        `document_type_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '文件小类名称',
-                                        `is_need_during_audit` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '是否需要事中审核【1-需要,0-不需要】',
-                                        `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '是否上传',
-                                        `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                        PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '平安事后文件上传资料' ROW_FORMAT = Dynamic;
-
---add by helixiao 20240827
-ALTER TABLE `sys_partner` ADD COLUMN `type` tinyint NOT NULL DEFAULT '1' COMMENT '合伙人等级';
-
-
---add by helixiao 20240902
-DROP TABLE IF EXISTS `sys_geography_position`;
-CREATE TABLE `sys_geography_position` (
-                                          `id` varchar(50) NOT NULL COMMENT '员工编号',
-                                          `user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '员工姓名',
-                                          `longitude` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '经度',
-                                          `latitude` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '纬度',
-                                          `address` varchar(255) DEFAULT NULL COMMENT '地址',
-                                          `status` tinyint NOT NULL DEFAULT '1' COMMENT '在线状态(0:离线; 1:在线)',
-                                          `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                          `create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人',
-                                          PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='APP用户地理位置表';
-
-DROP TABLE IF EXISTS `sys_geography_position_record`;
-CREATE TABLE `sys_geography_position_record` (
-                                                 `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
-                                                 `user_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '员工编号',
-                                                 `user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '员工姓名',
-                                                 `longitude` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '经度',
-                                                 `latitude` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '纬度',
-                                                 `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '地址',
-                                                 `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                                 `create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人',
-                                                 PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='APP用户地理位置记录表';
-
-
---add by helixiao 20240827
-ALTER TABLE `sys_pc_address` ADD COLUMN `prov` varchar(30) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '省会';
-ALTER TABLE `sys_pc_address` ADD COLUMN `city` varchar(30) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '城市';
-ALTER TABLE `sys_pc_address` ADD COLUMN `district` varchar(30) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '区县';
-
-ALTER TABLE `sys_pc_address_history` ADD COLUMN `prov` varchar(30) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '省会';
-ALTER TABLE `sys_pc_address_history` ADD COLUMN `city` varchar(30) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '城市';
-ALTER TABLE `sys_pc_address_history` ADD COLUMN `district` varchar(30) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '区县';
-
--- add by  hxl  2024-09-04
-ALTER TABLE `sys_dept_internal_agent` ADD COLUMN `bind_dept_id` varchar(30) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '绑定机构id';
--- add by  helixiao  2024-09-11
-ALTER TABLE `sys_geography_position` ADD COLUMN  `leader_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '领导人姓名';
-ALTER TABLE `sys_geography_position_record` ADD COLUMN  `source` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '机构来源(1-渠道、2-个代)';
-
-ALTER TABLE `sys_pc_address` ADD COLUMN  `leader_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '领导人姓名';
-ALTER TABLE `sys_pc_address_history` ADD COLUMN  `source` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '机构来源(1-渠道、2-个代)';
-ALTER TABLE sys_pc_address_history RENAME COLUMN 'prov' TO 'province';
-
---  2024-09-24
-ALTER TABLE `agent`.`sys_user_info` ADD COLUMN `live_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '居住地址' AFTER `is_speciality`;
-
-ALTER TABLE `agent`.`sys_user_info` ADD COLUMN `we_chat` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '微信绑定' AFTER `live_address`;
-
-ALTER TABLE `agent`.`sys_user_info` ADD COLUMN `alipay` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '支付宝绑定' AFTER `we_chat`;
-
-ALTER TABLE `agent`.`sys_user_info` ADD COLUMN `real_name` tinyint(1) NULL DEFAULT NULL COMMENT '是否实名认证' AFTER `alipay`;
-
-ALTER TABLE `agent`.`sys_user_info` ADD COLUMN `bank_authentication` tinyint(1) NULL DEFAULT NULL COMMENT '银行卡是否认证' AFTER `real_name`;
-
-CREATE TABLE `sys_user_record` (
-                                   `id` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '编号',
-                                   `user_id` varchar(30) DEFAULT NULL COMMENT '用户编号',
-                                   `sys_user` longtext CHARACTER SET utf8 COLLATE utf8_general_ci,
-                                   `sys_user_info` longtext CHARACTER SET utf8 COLLATE utf8_general_ci,
-                                   `esm_user_image_vo` longtext CHARACTER SET utf8 COLLATE utf8_general_ci,
-                                   `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-                                   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                   `update_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '更新人',
-                                   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-                                   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户信息修改记录';
-
---  2024-09-24  end
-
-
---add by dongxin 20240918
-DROP TABLE IF EXISTS `sys_channel_area_relation`;
-CREATE TABLE `sys_channel_area_relation`  (
-                                              `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键/自增',
-                                              `grade_id` bigint NULL DEFAULT NULL COMMENT '渠道分组级别id',
-                                              `area_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机构id',
-                                              PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '分组机构关联表' ROW_FORMAT = DYNAMIC;
-
-DROP TABLE IF EXISTS `sys_channel_cost`;
-CREATE TABLE `sys_channel_cost`  (
-                                     `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键/自增',
-                                     `order_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '订单号',
-                                     `user_id` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '工号',
-                                     `user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '渠道名称',
-                                     `leader_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '维护人员',
-                                     `status` tinyint NULL DEFAULT NULL COMMENT '审核状态0未审核 1审核通过',
-                                     `settle_status` tinyint NULL DEFAULT NULL COMMENT '结算状态 0.未结算 1.已结算',
-                                     `license_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '车牌号',
-                                     `insured_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '被保险人姓名',
-                                     `company_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '保险公司编号',
-                                     `inscompany` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '保险名称',
-                                     `partner_companies_id` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '合作公司id',
-                                     `partner_companies_name` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '合作公司名称',
-                                     `product_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '产品id',
-                                     `product_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '产品名称',
-                                     `docking_person` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '对接人',
-                                     `jq_costs_proportion` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '加投比例(交强)',
-                                     `sy_costs_proportion` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '加投比例(商业)',
-                                     `no_costs_proportion` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '加投比例(非车)',
-                                     `signing_time` datetime NULL DEFAULT NULL COMMENT '签单时间',
-                                     `pay_date` datetime NULL DEFAULT NULL COMMENT '支付时间',
-                                     `jq_jt_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '加投金额(交强)',
-                                     `sy_jt_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '加投金额(商业)',
-                                     `jy_jt_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '加投金额(非车)',
-                                     `voucher_number` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '凭证号',
-                                     `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-                                     `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                     `update_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
-                                     `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-                                     `jq_policy_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交强保单号',
-                                     `sy_policy_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商业保单号',
-                                     `no_policy_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '非车保单号',
-                                     `tax_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '车船税费用',
-                                     `jq_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '交强险费用',
-                                     `sy_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '商业险费用',
-                                     `jy_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '驾意险费用',
-                                     `jq_costs_export_proportion` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '交强出口比例',
-                                     `sy_costs_export_proportion` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '商业出口比例',
-                                     `no_costs_export_proportion` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '非车出口比例',
-                                     `total_premium` decimal(10, 2) NULL DEFAULT NULL COMMENT '加投补贴金额',
-                                     `settlement_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '结算金额',
-                                     `deleted` tinyint NULL DEFAULT NULL COMMENT '是否删除  1:已删除  0:正常',
-                                     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '加投结算管理表' ROW_FORMAT = DYNAMIC;
-
-DROP TABLE IF EXISTS `sys_channel_cost_relation`;
-CREATE TABLE `sys_channel_cost_relation`  (
-                                              `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键/自增',
-                                              `channel_id` bigint NULL DEFAULT NULL COMMENT '渠道费用分组id',
-                                              `agreement_id` bigint NULL DEFAULT NULL COMMENT '协议id',
-                                              `cost_id` bigint NULL DEFAULT NULL COMMENT '费用id',
-                                              PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '渠道分组费用关联表' ROW_FORMAT = DYNAMIC;
-
-DROP TABLE IF EXISTS `sys_channel_grade`;
-CREATE TABLE `sys_channel_grade`  (
-                                      `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键/自增',
-                                      `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分组级别',
-                                      `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-                                      `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                      `update_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
-                                      `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-                                      PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '渠道分组表' ROW_FORMAT = DYNAMIC;
-
-DROP TABLE IF EXISTS `sys_channel_group`;
-CREATE TABLE `sys_channel_group`  (
-                                      `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
-                                      `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分组名称',
-                                      `enabled` tinyint NULL DEFAULT NULL COMMENT '是否启动 1 启动 0 关闭',
-                                      `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
-                                      `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-                                      `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                      `update_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
-                                      `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-                                      `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间',
-                                      `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间',
-                                      PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '渠道费用分组表' ROW_FORMAT = DYNAMIC;
-
-
-DROP TABLE IF EXISTS `sys_channel_group_info`;
-CREATE TABLE `sys_channel_group_info`  (
-                                           `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键/自增',
-                                           `channel_id` bigint NULL DEFAULT NULL COMMENT '渠道费用分组id',
-                                           `grade_id` bigint NULL DEFAULT NULL COMMENT '渠道分组id',
-                                           `grade_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '渠道分组名称',
-                                           `jq_costs_proportion` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '加投比例(交强)',
-                                           `sy_costs_proportion` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '加投比例(商业)',
-                                           `no_costs_proportion` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '加投比例(非车)',
-                                           `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-                                           `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                           `update_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
-                                           `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-                                           PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 19 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '渠道分组费用关联表' ROW_FORMAT = DYNAMIC;
-
-
-DROP TABLE IF EXISTS `sys_cost_operate_log`;
-CREATE TABLE `sys_cost_operate_log`  (
-                                         `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键/自增',
-                                         `opt_id` bigint NULL DEFAULT NULL COMMENT '操作数据id',
-                                         `opt_type` tinyint NULL DEFAULT NULL COMMENT '操作类型0.新增加投1.修改加投',
-                                         `opt_content` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作内容',
-                                         `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-                                         `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                         PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '加投结算日志' ROW_FORMAT = Dynamic;
-
---add by dongxin 20240918 end

+ 7 - 9
src/main/java/com/ydtech/modules/scheme/service/impl/PtlSchemeRulesServiceImpl.java

@@ -19,14 +19,14 @@ import com.ydtech.modules.scheme.dao.PtlSchemeRulesMapper;
 import com.ydtech.modules.scheme.entity.po.*;
 import com.ydtech.modules.scheme.entity.vo.*;
 import com.ydtech.modules.scheme.service.*;
+import com.ydtech.utils.ObjectUtil;
 import com.ydtech.utils.idgen.IdGenerate;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -148,11 +148,10 @@ public class PtlSchemeRulesServiceImpl extends ServiceImpl<PtlSchemeRulesMapper,
 
         //获取所有规则的保险公司id
         List<PtlAgreementInsCompanyDto> ptlAgreementInsCompanyDtos = new ArrayList<>();
+
         List<PtlSchemeRules> userAllSchemeByCompanyIds = ptlSchemeService.getUserAllSchemeByCompanyIds(ruleFilterVo.getProductId(), companyIds,
                 ruleFilterVo.getCarInfo().getCimodelclass(), EnergyType.isNewEnergy(ruleFilterVo.getCarInfo().getEnergyType()));
 
-
-
         //获取所有规则属性
         List<PtlSchemeRulesAttr> rulesAttrList = ptlSchemeRulesAttrService.getAllRulesAttrList();
         //映射的规则属性
@@ -185,12 +184,11 @@ public class PtlSchemeRulesServiceImpl extends ServiceImpl<PtlSchemeRulesMapper,
                             });
                     break;
                 }
-
             }
-
-
         });
-        return ptlAgreementInsCompanyDtos;
+        Map<String, PtlAgreementInsCompanyDto> collect = ptlAgreementInsCompanyDtos.stream().collect(Collectors.toMap(PtlAgreementInsCompanyDto::getId, x -> x));
+        List<PtlAgreementInsCompanyDto> collect1 = companyIds.stream().map(collect::get).filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
+        return collect1;
     }
 
     /**