Merge remote-tracking branch 'origin/test' into test

sql/Online.sql

@@ -20,6 +20,8 @@ CREATE TABLE `settlement_documentary_fees`  (
                                                 `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
                                                 `settlement_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '结算金额',
                                                 `unsettled_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '未结算金额',
+                                                `company_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '保险公司id',
+                                                `signing_time` datetime(0) NULL DEFAULT NULL COMMENT '签单日期',
                                                 PRIMARY KEY (`id`) USING BTREE,
                                                 UNIQUE INDEX `id`(`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '跟单费结算' ROW_FORMAT = Dynamic;
@@ -37,17 +39,27 @@ CREATE TABLE `settlement_documentary_log`  (
                                                `handing_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '手续费结算金额',
                                                PRIMARY KEY (`id`) USING BTREE,
                                                UNIQUE INDEX `id`(`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '跟单费结算日志' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '跟单费结算' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
 --     菜单sql   结算菜单   提现菜单
-INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (645, '非跟单待提现', '201', '/financialManagement/withdrawalManagement/nonDocumentaryPending', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
-INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (646, '推广待提现', '201', '/financialManagement/withdrawalManagement/generalizationPending', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
-INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (647, '手续费已提现', '201', '/financialManagement/withdrawalManagement/withdrawalProceduresEnd', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
-INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (648, '非跟单已提现', '201', '/financialManagement/withdrawalManagement/nonDocumentaryEnd', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
-INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (649, '推广已提现', '201', '/financialManagement/withdrawalManagement/generalizationEnd', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
-INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (643, '手续费待提现', '201', '/financialManagement/withdrawalManagement/withdrawalProceduresPending', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (643, '手续费待提现', '663', '/financialManagement/withdrawalManagement/withdrawalProceduresPending', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (645, '非跟单待提现', '665', '/financialManagement/withdrawalManagement/nonDocumentaryPending', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (646, '推广待提现', '664', '/financialManagement/withdrawalManagement/generalizationPending', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (647, '手续费已提现', '663', '/financialManagement/withdrawalManagement/withdrawalProceduresEnd', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (648, '非跟单已提现', '665', '/financialManagement/withdrawalManagement/nonDocumentaryEnd', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (649, '推广已提现', '664', '/financialManagement/withdrawalManagement/generalizationEnd', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (650, '审核并支付', '643', NULL, 'sys:withdrawalProceduresPending:examine', 2, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (651, '审核提现', '643', NULL, 'sys:withdrawalProceduresPending:examinepay', 2, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (652, '审核并支付', '645', NULL, 'sys:nonDocumentaryPending:examine', 2, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (653, '审核提现', '645', NULL, 'sys:nonDocumentaryPending:examinepay', 2, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (654, '审核提现', '646', NULL, 'sys:generalizationPending:examinepay', 2, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (663, '手续费提现', '201', NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (664, '推广费提现', '201', NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (665, '非跟单费提现', '201', NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0);
+
+
 
 --  inv_source表 新增修改人名字 修改人id  前端还没联调  正式库先不加字段
 ALTER TABLE `inv_source` ADD COLUMN `update_name` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '修改人名字' AFTER `revenue_userid`;
@@ -75,7 +87,7 @@ CREATE TABLE `sys_user_link_pl_agreement`  (
 
 --  add by hxl   2024-04-18 添加子订单表操作人和操作时间和操作人名称
 ALTER TABLE ins_area_company ADD COLUMN operator_id VARCHAR(30) COMMENT '操作人';
-ALTER TABLE ins_area_company ADD COLUMN operator_name VARCHAR(30) COMMENT '操作人名称';
+ALTER TABLE ins_area_company ADD COLUMN operator_name VARCHAR(100) COMMENT '操作人名称';
 ALTER TABLE ins_area_company ADD COLUMN operator_time datetime COMMENT '操作时间';
 
 --  add  by  hxl  2024-04-18 添加子订单转发收回记录表
@@ -110,3 +122,38 @@ ALTER TABLE ptl_agreement ADD COLUMN products_code VARCHAR(30) COMMENT '产品
 -- add by hxl  2024-04-19  添加后线人员协议配置菜单
 INSERT INTO `sys_menu` (`name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES ('后线人员协议配置', '232', '/agreementManage/carInsurance/backlineAllocation', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
 
+--  add by hxl   2024-04-18 添加子订单表新操作人和新操作人名称
+ALTER TABLE ins_area_company ADD COLUMN new_operator_id VARCHAR(30) COMMENT '新操作人';
+ALTER TABLE ins_area_company ADD COLUMN new_operator_name VARCHAR(100) COMMENT '新操作人名称';
+
+
+-- 2024-0419  武鸿鹏
+ALTER TABLE `settlement_documentary_log` ADD COLUMN `company_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '保险公司id' AFTER `handing_amount`;
+ALTER TABLE `settlement_documentary_log` ADD COLUMN `year` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '年度' AFTER `company_id`;
+ALTER TABLE `ins_ply_income` ADD COLUMN `is_not_documentary` varchar(5) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '是否是跟单' AFTER `is_not_car`;
+
+
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (663, '手续费提现', '201', NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (664, '推广费提现', '201', NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (665, '非跟单费提现', '201', NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (667, '车险结算', '200', '/financialManagement/carInsurance/platformSettlement/carInsuranceBalance', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (668, '非车结算', '200', '/financialManagement/carInsurance/platformSettlement/nonVehicleBalance', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (669, '车险', '199', NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (670, '非车', '199', NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (671, '手续费结算', '669', '/financialManagement/carInsurance/companySettlement/carInsurance/handlingFees', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (672, '手续费结算', '670', '/financialManagement/carInsurance/companySettlement/noCarInsurance/handlingFees', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (673, '跟单费结算', '669', '/financialManagement/carInsurance/companySettlement/carInsurance/documentaryFees', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (674, '跟单费结算', '670', '/financialManagement/carInsurance/companySettlement/noCarInsurance/documentaryFees', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (675, '结算', '673', NULL, 'sys:', 2, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (676, '结算', '674', NULL, NULL, 2, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (677, '结算', '673', NULL, 'sys:documentaryFees1:balance', 2, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES (678, '结算', '674', NULL, 'sys:documentaryFees2:balance', 2, NULL, 0, NULL, NULL, NULL, NULL, 0);
+
+
+--  2024-0422   武鸿鹏
+ALTER TABLE `settlement_documentary_log` ADD COLUMN `crud_status` varchar(5) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '操作表示 1.新增 2 修改  3 删除' AFTER `handing_amount`;
+
+-- add by hxl  2024-04-22 添加渠道、保险公司、代理人任务池菜单
+INSERT INTO `sys_menu` ( `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES ('任务池（渠道）', '64', '/task/taskPoolChannel', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu` (`name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES ('任务池（保险公司）', '64', '/task/companyPoolChannel', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu` ( `name`, `parent_id`, `url`, `perms`, `type`, `icon`, `order_num`, `create_by`, `create_time`, `last_update_by`, `last_update_time`, `del_flag`) VALUES ( '任务池（代理人）', '64', '/task/agentPoolChannel', NULL, 1, NULL, 0, NULL, NULL, NULL, NULL, 0);

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -750,9 +750,9 @@ public class SysUserController extends BaseController {
      */
     @ApiOperation(value = "获取客服人员列表数据")
     @PostMapping(value = "/getCustomerUsers")
-    public HttpResult getCustomerUsers(@RequestBody SysUserVOExt sysUserVOExt) {
+    public HttpResult getCustomerUsers() {
         try{
-            List<SysUserBaseVO> userList = sysUserService.getCustomerUsers(sysUserVOExt);
+            List<SysUserBaseVO> userList = sysUserService.getCustomerUsers();
             return HttpResult.ok(userList);
         }catch (Exception e){
             return HttpResult.error("查询失败"+e.getMessage());

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -146,7 +146,7 @@ public interface SysUserService extends IService<SysUser> {
      *  @Date: 2024/4/18 16:14
      *  @Description: 获取客服人员列表数据
      */
-    List<SysUserBaseVO> getCustomerUsers(SysUserVOExt sysUserVOExt);
+    List<SysUserBaseVO> getCustomerUsers();
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -710,36 +710,25 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public List<SysUser> findTree() {
         //获取领导字段不为空的人的ID
-        List<SysUser> list1 = lambdaQuery().isNotNull(SysUser::getLeaderId).list();
-        if (list1 == null || list1.size() == 0){
+        List<SysUser> users = lambdaQuery().isNotNull(SysUser::getLeaderId).list();
+        if (users == null || users.size() == 0) {
             return new ArrayList<>();
         }
+        List<SysUser> topUsers = new ArrayList<>(); //存放1级用户
 
-        List<String> collect1 = list1.stream().map(SysUser::getLeaderId).collect(Collectors.toList());
+        List<String> topUserId = users.stream().map(SysUser::getLeaderId).collect(Collectors.toList());
 
-        //存放1级用户
-        List<SysUser> sysUsers = new ArrayList<>();
-        // 根据上面获取的ID列表，查询所有这些人的直接上级
-        List<SysUser> list2 = lambdaQuery().in(SysUser::getId, collect1).list();
+        List<SysUser> list2 = lambdaQuery().in(SysUser::getId, topUserId).list();
         // 从查询结果中筛选出没有上级的人员，作为组织结构树的顶层节点
         for (SysUser sysUser : list2) {
             if (Objects.isNull(sysUser.getLeaderId())) {
-                sysUsers.add(sysUser);
+                topUsers.add(sysUser);
             }
         }
-        // 为每个顶层节点分配其直接下级
-        for (SysUser sysUser : sysUsers) {
-            List<SysUser> chils = new ArrayList<>();
-            // 遍历所有人员，为当前顶层节点找出其所有直接下级
-            for (SysUser user : list2) {
-                if (sysUser.getId().equals(user.getLeaderId())) {
-                    chils.add(user);
-                }
-            }
-            // 将找到的直接下级列表设置到当前顶层节点用户对象中
-            sysUser.setChildren(chils);
-        }
-        return sysUsers;
+
+        // 递归构建用户树结构
+        buildUserTree(topUsers, users);
+        return topUsers;
     }
 
 
@@ -814,34 +803,33 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             quUserNumDto.setLevel("1");
             wrapper.eq(SysArea::getLevel, "1");
         }
-
-        // 如果没有查询到用户ID，则直接返回空的分页对象
-        if (strIds.size() == 0) {
-            return new Page<>();
-        }
-
-        // 根据查询条件获取用户数量统计信息
-        quUserNumDto.setUserIds(strIds);
-        List<QuUserNum> userNums = sysUserMapper.getUserNum(quUserNumDto);
-
         //遍历匹配区域名称
         List<SysArea> areaList = sysAreaService.list(wrapper);
 
-        // 根据区域名称匹配用户数量统计信息，并构造最终返回的结果列表
         List<QuUserNum> quUserNums = new ArrayList<>();
-        for (QuUserNum quUserNum : userNums) {
-            for (SysArea sysArea : areaList) {
-                if (!Objects.isNull(sysArea.getAreaCode())) {
-                    // 匹配区域名称
-                    String substring = sysArea.getAreaCode().substring(0, quUserNumDto.getGrouping());
-                    if (quUserNum.getAreaCode().equals(substring)) {
-                        quUserNum.setAreaName(sysArea.getAreaCname());
-                        quUserNums.add(quUserNum);
+
+        // 如果没有查询到用户ID，则直接返回空的分页对象
+        if (strIds.size() != 0) {
+            // 根据查询条件获取用户数量统计信息
+            quUserNumDto.setUserIds(strIds);
+            List<QuUserNum> userNums = sysUserMapper.getUserNum(quUserNumDto);
+
+            // 根据区域名称匹配用户数量统计信息，并构造最终返回的结果列表
+            for (QuUserNum quUserNum : userNums) {
+                for (SysArea sysArea : areaList) {
+                    if (!Objects.isNull(sysArea.getAreaCode())) {
+                        // 匹配区域名称
+                        String substring = sysArea.getAreaCode().substring(0, quUserNumDto.getGrouping());
+                        if (quUserNum.getAreaCode().equals(substring)) {
+                            quUserNum.setAreaName(sysArea.getAreaCname());
+                            quUserNums.add(quUserNum);
+                        }
                     }
                 }
             }
         }
 
+
         // 为每个区域生成未匹配到的统计信息
         for (SysArea sysArea : areaList) {
             if (exists(quUserNums, sysArea)) {
@@ -868,8 +856,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
 
-
-
     /**
      * 查询用户订单数量进行区域统计详细信息
      *
@@ -926,8 +912,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 手动对 QuUserNum 列表进行分页
      *
      * @param quUserNums 原始 QuUserNum 数据列表
-     * @param pageNum 期望获取的页码（从 1 开始）
-     * @param pageSize 每页包含的 QuUserNum 数量
+     * @param pageNum    期望获取的页码（从 1 开始）
+     * @param pageSize   每页包含的 QuUserNum 数量
      * @return 对应页码的 QuUserNum 子列表，若输入参数无效则返回空列表
      */
     public List<QuUserNum> paginate(List<QuUserNum> quUserNums, int pageNum, int pageSize) {
@@ -942,8 +928,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
 
-
-
     private void findChildren(List<SysUser> SysUsers, List<SysUser> users, List<String> strIds) {
         for (SysUser sysUser : SysUsers) {
             List<SysUser> children = new ArrayList<>();
@@ -971,6 +955,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         return exist;
     }
+
     private boolean exists(List<SysUser> sysUsers, SysUser sysUser) {
         boolean exist = false;
         for (SysUser user : sysUsers) {
@@ -980,26 +965,47 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         return exist;
     }
+
+    private void buildUserTree(List<SysUser> topUsers, List<SysUser> users) {
+        for (SysUser user : topUsers) {
+            List<SysUser> children = new ArrayList<>();
+            for (SysUser childUser : users) {
+                if (user.getId().equals(childUser.getLeaderId()) && !childUser.getId().contains("M")) {
+                    children.add(childUser);
+                    // 递归查找下一级
+                    buildUserTree(children, users);
+                }
+            }
+            user.setChildren(children);
+        }
+    }
+
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/16 15:51
-     *  @Description: 获取待客录入的可选业务员
-     *  查询
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/16 15:51
+     * @Description: 获取待客录入的可选业务员
+     * 查询
      */
     @Override
     public List<SysUserBaseVO> getAllUsersByHospitality(SysUserVOExt sysUserVOExt) {
-        return super.baseMapper.getAllUsersByHospitality(sysUserVOExt);
+        if(StringUtils.isNotEmpty(sysUserVOExt.getUserId()) || StringUtils.isNotEmpty(sysUserVOExt.getIdentity()) ||
+                StringUtils.isNotEmpty(sysUserVOExt.getMobile()) || StringUtils.isNotEmpty(sysUserVOExt.getName())){
+            return  super.baseMapper.getAllUsersByHospitality(sysUserVOExt);
+        }
+        return new ArrayList<SysUserBaseVO>();
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/18 16:14
-     *  @Description: 获取客服人员列表数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/18 16:14
+     * @Description: 获取客服人员列表数据
      */
     @Override
-    public List<SysUserBaseVO> getCustomerUsers(SysUserVOExt sysUserVOExt) {
-        return super.baseMapper.getCustomerUsers(sysUserVOExt);
+    public List<SysUserBaseVO> getCustomerUsers() {
+        return super.baseMapper.getCustomerUsers(new SysUserVOExt());
     }
 
 }

src/main/java/com/ydtech/modules/fnc/controller/InsPlyIncomeController.java

@@ -4,17 +4,18 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
+import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity;
 import com.ydtech.modules.fnc.service.InsPlyIncomeService;
 import com.ydtech.modules.fnc.vo.InsPlyIncomeVo;
+import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 import com.ydtech.utils.StringUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.time.LocalDate;
@@ -87,7 +88,7 @@ public class InsPlyIncomeController extends BaseController {
         return result;
     }
 
-    @PutMapping("/batchBalance")
+        @PutMapping("/batchBalance")
     @ApiModelProperty(value = "批量跟单费")
     public HttpResult<Object> batchBalance(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {
 
@@ -96,4 +97,54 @@ public class InsPlyIncomeController extends BaseController {
 
 
 
+    @PostMapping("/NonSettlementQuery")
+    @ApiOperation(value = "非跟单查询")
+    public HttpResult<BasePageResult<InsPlyIncome>>NonSettlementQuery(@Valid  @RequestBody InsPlyIncomeVo  insPlyIncomeVo) {
+        HttpResult<BasePageResult<InsPlyIncome>> result=insPlyIncomeService.nonSettlementQuery(insPlyIncomeVo);
+        return result;
+    }
+
+    @PostMapping("/NonSettldetail")
+    @ApiOperation(value = "非跟单明细查询")
+    public HttpResult<List<InsPlyIncome>>   NonSettldetail (@Valid  @RequestBody InsPlyIncomeVo  insPlyIncomeVo){
+        return  insPlyIncomeService.nonSettldetail(insPlyIncomeVo);
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "渠道数据导入（excel）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "excel文件", required = true, dataType = "__file")
+    })
+    public HttpResult importData(@RequestPart MultipartFile file , @RequestBody InsPlyIncomeVo  insPlyIncomeVo ) {
+
+        insPlyIncomeService.importData(file,insPlyIncomeVo);
+
+        return HttpResult.ok("导入成功");
+    }
+
+    @PutMapping("/update")
+    @ApiModelProperty(value = "修改")
+    public HttpResult<Object> updateByEntity(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {
+        insPlyIncomeService.updateByEntity(insPlyIncomeVo);
+        return HttpResult.ok("修改成功");
+    }
+    @PostMapping("/insert")
+    @ApiModelProperty(value = "新增")
+    public HttpResult<InsPlyIncome> insertByEntity(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {
+        return insPlyIncomeService.insertByEntity(insPlyIncomeVo);
+    }
+    @DeleteMapping("/delete")
+    @ApiModelProperty(value = "删除")
+    public HttpResult<InsPlyIncome>  deleteById(@RequestBody InsPlyIncomeVo insPlyIncomeVo){
+
+        return  insPlyIncomeService.deleteById(insPlyIncomeVo);
+
+    }
+    @GetMapping("/getById/{id}")
+    @ApiModelProperty(value = "回显")
+    public HttpResult<InsPlyIncome> getById(@PathVariable("id") String  id){
+        InsPlyIncome item = insPlyIncomeService.getById(id);
+        return  HttpResult.ok(item) ;
+    }
+
+
 }

src/main/java/com/ydtech/modules/fnc/dao/InsPlyIncomeMapper.java

@@ -83,4 +83,8 @@ public interface InsPlyIncomeMapper extends BaseMapper<InsPlyIncome> {
 
     void uopdateByOrderno(InsPlyIncome insPlyIncome);
 
+    List<InsPlyIncome> NonSettlementQuery(HashMap<String, Object> params);
+
+    InsPlyIncome findByLicenseno(@Param("licenseno") String licenseno);
+
 }

src/main/java/com/ydtech/modules/fnc/dao/SettlementDocumentaryFeesMapper.java

@@ -15,8 +15,6 @@ public interface SettlementDocumentaryFeesMapper  extends BaseMapper<SettlementD
 
     List<SettlementDocumentaryFeesEntity> querySettle(HashMap<String, Object> params);
 
-    List<SettlementDocumentaryFeesEntity> checkDate(HashMap<String, Object> params);
 
-    List<SettlementDocumentaryFeesEntity> selectAll(HashMap<String, Object> params);
 
 }

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -27,6 +27,11 @@ public class InsPlyIncome implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("id")
+    @TableField("id")
+    private String id;
+
+
     @ApiModelProperty("订单号")
     @TableField("orderno")
     private String orderno;
@@ -148,6 +153,10 @@ public class InsPlyIncome implements Serializable {
     @TableField("is_not_car")
     private String isNotCar;
 
+    @ApiModelProperty("是否是跟单")
+    @TableField("is_not_documentary")
+    private String isNotDocumentary;
+
 
     @ApiModelProperty("总单数")
     @TableField(exist = false)
@@ -173,5 +182,30 @@ public class InsPlyIncome implements Serializable {
     private String timeFrame;
 
 
+    @ApiModelProperty("保险跟单费总额")
+    @TableField(exist = false)
+    private BigDecimal allLOtherFeevalue;
+
+    @ApiModelProperty("跟单费结算金额")
+    @TableField(exist = false)
+    private BigDecimal settlementAmount;
+
+    @ApiModelProperty("跟单费未结算金额")
+    @TableField(exist = false)
+    private BigDecimal unsettledAmount;
+
+    @ApiModelProperty("开始时间")
+    @TableField(exist = false)
+    private BigDecimal sdfStartTime;
+
+
+    @ApiModelProperty("结束时间")
+    @TableField(exist = false)
+    private BigDecimal sdfEndTime;
+    @ApiModelProperty("月数")
+    @TableField(exist = false)
+    private String monthSigdate;
+
+
 
 }

src/main/java/com/ydtech/modules/fnc/entity/SettlementDocumentaryFeesEntity.java

@@ -11,6 +11,7 @@ import lombok.Setter;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Getter
@@ -49,16 +50,20 @@ public class SettlementDocumentaryFeesEntity implements Serializable {
 
     @ApiModelProperty("创建时间")
     @TableField("create_time")
-    private LocalDateTime createTime;
+    private LocalDate createTime;
 
 
     @ApiModelProperty("开始时间")
     @TableField("start_time")
-    private LocalDateTime startTime;
+    private LocalDate startTime;
 
     @ApiModelProperty("结束时间")
     @TableField("end_time")
-    private LocalDateTime endTime;
+    private LocalDate endTime;
+
+    @ApiModelProperty("保险id")
+    @TableField("company_id")
+    private String companyId;
 
 
 

src/main/java/com/ydtech/modules/fnc/entity/SettlementDocumentaryLogEntity.java

@@ -34,6 +34,11 @@ public class SettlementDocumentaryLogEntity implements Serializable {
     @TableField("amount_type")
     private String amountType;
 
+
+    @ApiModelProperty("操作标识  1.新增 2.修改 3.删除 ")
+    @TableField("crud_status")
+    private String crudStatus;
+
     @ApiModelProperty("创建时间")
     @TableField("create_time")
     private Date createTime;

src/main/java/com/ydtech/modules/fnc/service/InsPlyIncomeService.java

@@ -1,10 +1,14 @@
 package com.ydtech.modules.fnc.service;
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.fnc.entity.InsAreaCompany;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.fnc.vo.InsPlyIncomeVo;
 import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -19,9 +23,6 @@ import java.util.List;
 public interface InsPlyIncomeService extends IService<InsPlyIncome> {
     public HttpResult<BasePageResult<InsPlyIncome>> queryplyIncome(InsPlyIncomeVo insPlyIncomeVo);
 
-    void saveBalance(String companyId, String orderno);
-
-
 
     void uodateBalance(InsPlyIncomeVo insPlyIncomeVo);
 
@@ -31,4 +32,23 @@ public interface InsPlyIncomeService extends IService<InsPlyIncome> {
     HttpResult batchBalance(InsPlyIncomeVo insPlyIncomeVo);
 
     HttpResult<BasePageResult<InsPlyIncome>> queryNew(InsPlyIncomeVo insPlyIncomeVo);
+
+
+    HttpResult<BasePageResult<InsPlyIncome>> nonSettlementQuery(InsPlyIncomeVo insPlyIncomeVo);
+
+
+    void saveBalanceNew(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany);
+
+    HttpResult<List<InsPlyIncome>> nonSettldetail(InsPlyIncomeVo insPlyIncomeVo);
+
+
+    void importData(MultipartFile file, InsPlyIncomeVo insPlyIncomeVo);
+
+    void updateByEntity(InsPlyIncomeVo insPlyIncomeVo);
+
+
+    HttpResult<InsPlyIncome> deleteById(InsPlyIncomeVo insPlyIncomeVo);
+
+    HttpResult<InsPlyIncome> insertByEntity(InsPlyIncomeVo insPlyIncomeVo);
+
 }

src/main/java/com/ydtech/modules/fnc/service/SettlementDocumentaryFeesService.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.fnc.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity;
+import com.ydtech.modules.fnc.vo.InsPlyIncomeVo;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 
@@ -13,7 +14,6 @@ public interface SettlementDocumentaryFeesService extends IService<SettlementDoc
 
     HttpResult inertSettle(SettlementDocumentaryFeesVo settlementDocumentaryFeesVo);
 
-    String checkDate(HashMap<String, Object> params);
 
     HttpResult documentarySettle(SettlementDocumentaryFeesVo settlementDocumentaryFeesVo);
 

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -18,6 +18,7 @@ import com.ydtech.modules.fnc.dao.InsFeeAuditMapper;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.fnc.service.InsFeeAuditService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.fnc.service.InsPlyIncomeService;
 import com.ydtech.modules.ins.model.InsCommission;
 import com.ydtech.modules.ins.model.InsCompanyFee;
 import com.ydtech.modules.ins.model.InsDeptFee;
@@ -83,6 +84,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
     @Autowired
     private SysDeptAccountHistoryService sysDeptAccountHistoryService;
+    @Autowired
+    private InsPlyIncomeService insPlyIncomeService;
 
 
     public InsFeeAuditServiceImpl(FncInsAreaCompanyMapper insAreaCompanyMapper, InsOrdersMapper insOrdersMapper, InsFeeOrderService insFeeOrderService,InsDeptFeeService insDeptFeeService,EsmUserReferrerService esmUserReferrerService,SysUserService sysUserService,InsCommissionService insCommissionService,InsCompanyFeeService insCompanyFeeService,InsPlyIncomeMapper insPlyIncomeMapper) {
@@ -140,7 +143,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 //        saveRetail(order,insFeeOrderNew,insAreaCompany);
         //个代费用生成
 //        saveInsCompanyFee(order,insFeeOrderNew,insAreaCompany);
-
+//        结算费用生成
+        insPlyIncomeService.saveBalanceNew(order,insFeeOrderNew,insAreaCompany);
 
 //      生成  用户账户表  数据
         if(StringUtils.isNotEmpty(order.getUserid())){

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.fnc.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -8,8 +9,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
-import com.ydtech.modules.admin.model.po.SysUserAccountHistory;
+import com.ydtech.exception.SystemException;
+import com.ydtech.modules.esm.model.EsmInsCompany;
+import com.ydtech.modules.fnc.entity.InsAreaCompany;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.fnc.dao.InsPlyIncomeMapper;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryLogEntity;
@@ -19,25 +21,36 @@ import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesService;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryLogService;
 import com.ydtech.modules.fnc.vo.InsPlyIncomeVo;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesVo;
+import com.ydtech.modules.inv.model.InvChannelsExternalBillsDetails;
+import com.ydtech.modules.inv.model.dto.InsPlyIncomeExcelDto;
+import com.ydtech.modules.inv.model.dto.InvChannelExcelDto;
 import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
+import com.ydtech.modules.protocol.entity.po.PtlAgreement;
+import com.ydtech.modules.protocol.entity.vo.PtlAgreementQueryVo;
+import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
+import com.ydtech.utils.SnowFlakeUtil;
+import com.ydtech.utils.excel.ExcelEasypoiUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+import redis.clients.jedis.params.Params;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -52,6 +65,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
 
 
     @Autowired
+    @Lazy
     private InsOrdersService insOrdersService;
     @Autowired
     private InsAreaCompanyService insAreaCompanyService;
@@ -62,6 +76,8 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
     private SettlementDocumentaryFeesService settlementDocumentaryFeesService;
     @Autowired
     private SettlementDocumentaryLogService settlementDocumentaryLogService;
+    @Autowired
+    private PtlAgreementService  ptlAgreementService;
 
 
     public HttpResult<BasePageResult<InsPlyIncome>> queryplyIncome(InsPlyIncomeVo insPlyIncomeVo){
@@ -84,100 +100,262 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
     }
 
     @Override
-    public void saveBalance(String companyId, String orderno) {
-        InsOrders insOrders = insOrdersService.getById(orderno);
-        InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
-        InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(companyId);
-        this.saveBalanc(insFeeOrderNew, insOrders, insAreaCompany);
-    }
-
+    public void saveBalanceNew(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany) {
+        if (ObjectUtils.isEmpty(order) || ObjectUtils.isEmpty(insFeeOrderNew) || ObjectUtils.isEmpty(insAreaCompany)) {
+            return;
+        }
 
+        String agreeType = this.judgeAgreeType(insAreaCompany.getAgreementId());
+        if (StringUtils.isNotEmpty(agreeType)) {
+//            判断协议类型 平台  保险
+            if ("1".equals(agreeType)) {
+                // 平台逻辑处理   判断是否是 和手续费 非车
+                if (insFeeOrderNew.getJqSuperviseCostsPremiums() != null || insFeeOrderNew.getSySuperviseCostsPremiums() != null) { //平台车险
+//                    生成手续费  跟单费和手续费是一条单据
+                    this.savePinTai(order,insFeeOrderNew,insAreaCompany);
+                }
+                if(insFeeOrderNew.getNoSuperviseCostsPremiums() != null || insFeeOrderNew.getNoOtherCostsPremiums() != null){ // 平台非车
+                    this.saveNoPinTai(order,insFeeOrderNew,insAreaCompany);
+                }
+            }else {  // 保险  逻辑： 手续费生成一条  跟单费生成一条   非车手续费一条  非车跟单费一条
+                if (insFeeOrderNew.getJqSuperviseCostsPremiums() != null || insFeeOrderNew.getSySuperviseCostsPremiums() != null) { //手续费
+                    this.saveInsuranceProcedures(order,insFeeOrderNew,insAreaCompany);
+                }
+                if(insFeeOrderNew.getJqOtherCostsPremiums()!=null ){   //跟单费
+                    this.saveOtherAmount(order,insFeeOrderNew,insAreaCompany);
+                }
+                if(insFeeOrderNew.getNoSuperviseCostsPremiums()  !=null){  // 非车手续费
+                    this.saveNoSupervise(order,insFeeOrderNew,insAreaCompany);
+                }
+                if(insFeeOrderNew.getNoOtherCostsPremiums() !=null){  // 非车跟单费
+                    this.saveNoOtherAmount(order,insFeeOrderNew,insAreaCompany);
+                }
+            }
+        }
+    }
 
-    private void saveBalanc(InsFeeOrderNew insFeeOrderNew, InsOrders insOrders, InsAreaCompany insAreaCompany) {
+    private void saveNoOtherAmount(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany) {
         InsPlyIncome insPlyIncome = new InsPlyIncome();
+        insPlyIncome.setOrderno(insFeeOrderNew.getId());  // 子订单号
+        String noPolicyno  = this.setNoPolicyno(insAreaCompany);
+        if(StringUtils.isNotEmpty(noPolicyno)){
+            insPlyIncome.setNoPolicyno(noPolicyno); // 非车保单号
+        }
+        insPlyIncome.setOtherFeevalue(insFeeOrderNew.getNoOtherCostsPremiums());  //非车跟单费
+        insPlyIncome.setOtherFeerate(insFeeOrderNew.getNoOtherCostsProportion()); //非车跟单费用比例
+        insPlyIncome.setDeptId(insFeeOrderNew.getDeptId());
+        insPlyIncome.setRiskcode(order.getProductid());
+        insPlyIncome.setPayDate(insAreaCompany.getPayDate());
+        insPlyIncome.setSignDate(insAreaCompany.getSigningTime());
+        insPlyIncome.setCompanyId(insAreaCompany.getCompanyId());
+        insPlyIncome.setAgreementId(insFeeOrderNew.getAgreementId());
+        insPlyIncome.setLicenseno(order.getLicenseno());
+        insPlyIncome.setTaxamount(insAreaCompany.getTaxamount());
+        insPlyIncome.setCreateTime(LocalDateTime.now());
+        insPlyIncome.setDocumentaryFeesStatus("0");
+        insPlyIncome.setHandlingFeesStatus("0");
+        insPlyIncome.setIsNotCar("1");
+        insPlyIncome.setIsNotDocumentary("1");
+        insPlyIncome.setAllFeeValue(insFeeOrderNew.getNoOtherCostsPremiums());
+    }
 
-
+    private void saveNoSupervise(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany) {
+        InsPlyIncome insPlyIncome = new InsPlyIncome();
         insPlyIncome.setOrderno(insFeeOrderNew.getId());  // 子订单号
-//      存储保单号
-        try {
-            this.setPolicyno(insPlyIncome,insAreaCompany);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
+        insPlyIncome.setCommissionFeevalue(insFeeOrderNew.getNoSuperviseCostsPremiums());// 非车手续费
+        insPlyIncome.setCommissionFeerate(insFeeOrderNew.getNoSuperviseCostsProportion());// 非车手续费比例
+        String noPolicyno  = this.setNoPolicyno(insAreaCompany);
+        if(StringUtils.isNotEmpty(noPolicyno)){
+            insPlyIncome.setNoPolicyno(noPolicyno); // 非车保单号
         }
+        insPlyIncome.setDeptId(insFeeOrderNew.getDeptId());
+        insPlyIncome.setRiskcode(order.getProductid());
+        insPlyIncome.setPayDate(insAreaCompany.getPayDate());
+        insPlyIncome.setSignDate(insAreaCompany.getSigningTime());
+        insPlyIncome.setCompanyId(insAreaCompany.getCompanyId());
+        insPlyIncome.setAgreementId(insFeeOrderNew.getAgreementId());
+        insPlyIncome.setLicenseno(order.getLicenseno());
+        insPlyIncome.setTaxamount(insAreaCompany.getTaxamount());
+        insPlyIncome.setCreateTime(LocalDateTime.now());
+        insPlyIncome.setDocumentaryFeesStatus("0");
+        insPlyIncome.setHandlingFeesStatus("0");
+        insPlyIncome.setIsNotCar("1");
+        insPlyIncome.setIsNotDocumentary("0");
+        insPlyIncome.setAllFeeValue(insFeeOrderNew.getNoSuperviseCostsPremiums());
+        baseMapper.insert(insPlyIncome);
+    }
 
+    private void saveOtherAmount(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany) {
+        InsPlyIncome insPlyIncome = new InsPlyIncome();
+        insPlyIncome.setOrderno(insFeeOrderNew.getId());  // 子订单号
+        insPlyIncome.setPolicyno(insAreaCompany.getJqpolicyno());  // 商业保单号
+        insPlyIncome.setSyPolicyno(insAreaCompany.getSypolicyno());  // 商业保单号
+        BigDecimal otherAmount = this.calculateTotal(insFeeOrderNew.getJqOtherCostsPremiums(), insFeeOrderNew.getSyOtherCostsPremiums());
+        insPlyIncome.setOtherFeevalue(otherAmount);//跟单费用
+        BigDecimal otherProportion = this.calculateTotal(insFeeOrderNew.getSyOtherCostsProportion(), insFeeOrderNew.getJqOtherCostsProportion());
+        insPlyIncome.setOtherFeerate(otherProportion); // 跟单非比例
         insPlyIncome.setDeptId(insFeeOrderNew.getDeptId());
-        insPlyIncome.setRiskcode(insOrders.getProductid());
+        insPlyIncome.setRiskcode(order.getProductid());
         insPlyIncome.setPayDate(insAreaCompany.getPayDate());
         insPlyIncome.setSignDate(insAreaCompany.getSigningTime());
         insPlyIncome.setCompanyId(insAreaCompany.getCompanyId());
         insPlyIncome.setAgreementId(insFeeOrderNew.getAgreementId());
-        insPlyIncome.setLicenseno(insOrders.getLicenseno());
+        insPlyIncome.setLicenseno(order.getLicenseno());
         insPlyIncome.setTaxamount(insAreaCompany.getTaxamount());
+        insPlyIncome.setCreateTime(LocalDateTime.now());
+        insPlyIncome.setDocumentaryFeesStatus("0");
+        insPlyIncome.setHandlingFeesStatus("0");
+        insPlyIncome.setIsNotCar("0");
+        insPlyIncome.setIsNotDocumentary("1");
+        insPlyIncome.setAllFeeValue(otherAmount);
+        baseMapper.insert(insPlyIncome);
+    }
 
-        BigDecimal bigDecimal = this.sumAmount(insFeeOrderNew.getJqNoTaxPremium(), insFeeOrderNew.getSyNoTaxPremium(), insFeeOrderNew.getNoNoTaxPremium());
-        //      不含保费
-        insPlyIncome.setNoTaxPremium(bigDecimal);
-//      手续费比例
-        BigDecimal CostsProportion = this.sumAmount(insFeeOrderNew.getJqSuperviseCostsProportion(), insFeeOrderNew.getSySuperviseCostsProportion(), insFeeOrderNew.getNoSuperviseCostsProportion());
-        insPlyIncome.setCommissionFeerate(CostsProportion);
-//      其他费用比例
-        BigDecimal OtherCostsProportion = this.sumAmount(insFeeOrderNew.getJqOtherCostsProportion(), insFeeOrderNew.getSyOtherCostsProportion(), insFeeOrderNew.getNoOtherCostsProportion());
-        insPlyIncome.setOtherFeerate(OtherCostsProportion);
-//        手续费金额
-        BigDecimal SuperviseCostsPremiums = this.sumAmount(insFeeOrderNew.getJqSuperviseCostsPremiums(), insFeeOrderNew.getSySuperviseCostsPremiums(), insFeeOrderNew.getNoSuperviseCostsPremiums());
-        insPlyIncome.setCommissionFeevalue(SuperviseCostsPremiums);
-//      其他费用金额
-        BigDecimal OtherCostsPremiums = this.sumAmount(insFeeOrderNew.getJqOtherCostsPremiums(), insFeeOrderNew.getSyOtherCostsPremiums(), insFeeOrderNew.getNoOtherCostsPremiums());
-        insPlyIncome.setOtherFeevalue(OtherCostsPremiums);
-        insPlyIncome.setAllFeeValue(SuperviseCostsPremiums.add(OtherCostsPremiums));
+    private void saveInsuranceProcedures(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany) {
+//        保险手续费
+        InsPlyIncome insPlyIncome = new InsPlyIncome();
+        insPlyIncome.setOrderno(insFeeOrderNew.getId());  // 子订单号
+        insPlyIncome.setPolicyno(insAreaCompany.getJqpolicyno());   // 交强保单号
+        BigDecimal handlingAmount = this.calculateTotal(insFeeOrderNew.getJqSuperviseCostsPremiums(), insFeeOrderNew.getSySuperviseCostsPremiums());
+        insPlyIncome.setCommissionFeevalue(handlingAmount);//手续费
+        BigDecimal handlingProportion = this.calculateTotal(insFeeOrderNew.getJqSuperviseCostsProportion(), insFeeOrderNew.getSySuperviseCostsProportion());
+        insPlyIncome.setCommissionFeerate(handlingProportion);// 手续费比例
+
+        insPlyIncome.setSyPolicyno(insAreaCompany.getSypolicyno()); //商业保单号
+        insPlyIncome.setDeptId(insFeeOrderNew.getDeptId());
+        insPlyIncome.setRiskcode(order.getProductid());
+        insPlyIncome.setPayDate(insAreaCompany.getPayDate());
+        insPlyIncome.setSignDate(insAreaCompany.getSigningTime());
+        insPlyIncome.setCompanyId(insAreaCompany.getCompanyId());
+        insPlyIncome.setAgreementId(insFeeOrderNew.getAgreementId());
+        insPlyIncome.setLicenseno(order.getLicenseno());
+        insPlyIncome.setTaxamount(insAreaCompany.getTaxamount());
         insPlyIncome.setCreateTime(LocalDateTime.now());
         insPlyIncome.setDocumentaryFeesStatus("0");
         insPlyIncome.setHandlingFeesStatus("0");
+        insPlyIncome.setIsNotCar("0");
+        insPlyIncome.setIsNotDocumentary("0");
+        insPlyIncome.setAllFeeValue(handlingAmount);
         baseMapper.insert(insPlyIncome);
+    }
 
+    private void saveNoPinTai(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany) {
+        InsPlyIncome insPlyIncome = new InsPlyIncome();
+        insPlyIncome.setOrderno(insFeeOrderNew.getId());  // 子订单号
+        String noPolicyno  = this.setNoPolicyno(insAreaCompany);
+        if(StringUtils.isNotEmpty(noPolicyno)){
+            insPlyIncome.setNoPolicyno(noPolicyno); // 非车保单号
+        }
+        insPlyIncome.setCommissionFeevalue(insFeeOrderNew.getNoSuperviseCostsPremiums());// 非车手续费
+        insPlyIncome.setCommissionFeerate(insFeeOrderNew.getNoSuperviseCostsProportion()); // 非车手续费比例
+        insPlyIncome.setOtherFeevalue(insFeeOrderNew.getNoOtherCostsPremiums());  //非车跟单费
+        insPlyIncome.setOtherFeerate(insFeeOrderNew.getNoOtherCostsProportion()); //非车跟单费用比例
+        insPlyIncome.setDeptId(insFeeOrderNew.getDeptId());
+        insPlyIncome.setRiskcode(order.getProductid());
+        insPlyIncome.setPayDate(insAreaCompany.getPayDate());
+        insPlyIncome.setSignDate(insAreaCompany.getSigningTime());
+        insPlyIncome.setCompanyId(insAreaCompany.getCompanyId());
+        insPlyIncome.setAgreementId(insFeeOrderNew.getAgreementId());
+        insPlyIncome.setLicenseno(order.getLicenseno());
+        insPlyIncome.setTaxamount(insAreaCompany.getTaxamount());
+        insPlyIncome.setCreateTime(LocalDateTime.now());
+        insPlyIncome.setDocumentaryFeesStatus("0");
+        insPlyIncome.setHandlingFeesStatus("0");
+        insPlyIncome.setIsNotCar("1");
+        insPlyIncome.setIsNotDocumentary("0");
+        insPlyIncome.setAllFeeValue(insFeeOrderNew.getNoSuperviseCostsPremiums().add(insFeeOrderNew.getNoOtherCostsPremiums()));
+        baseMapper.insert(insPlyIncome);
     }
 
-    private void setPolicyno(InsPlyIncome insPlyIncome, InsAreaCompany insAreaCompany) throws JsonProcessingException {
-        ObjectMapper objJson = new ObjectMapper();
+    private String setNoPolicyno(com.ydtech.modules.fnc.entity.InsAreaCompany insAreaCompany) {
+        String crossInsurance = insAreaCompany.getCrossInsurance();
 
-        String jqpolicyno = insAreaCompany.getJqpolicyno();  // 交强保单号
-        String sypolicyno = insAreaCompany.getSypolicyno();  // 商业保单号
-        JSONArray crossInsurance = insAreaCompany.getCrossInsurance();  // 非车保单号
+        if (StringUtils.isEmpty(crossInsurance)) {
+            return null;
+        }
 
-        if(ObjectUtils.isNotEmpty(jqpolicyno)){
-            insPlyIncome.setPolicyno(jqpolicyno);
+        try {
+            ObjectMapper objJson = new ObjectMapper();
+            JsonNode jsonArryNode = objJson.readTree(crossInsurance);
 
-        }
-        if(ObjectUtils.isNotEmpty(sypolicyno)){
-            insPlyIncome.setSyPolicyno(sypolicyno);
-        }
-        if(ObjectUtils.isNotEmpty(crossInsurance)){
-         JsonNode   jsonArryNode= objJson.readTree(crossInsurance.toJSONString());
-            if (jsonArryNode.isArray()) {
-                for (JsonNode jsonNode : jsonArryNode) {
-                    JsonNode jsonNode1 = jsonNode.get("policyNumber");//非车保单号
-                    if(ObjectUtils.isNotEmpty(jsonNode1)){
-                        insPlyIncome.setNoPolicyno(jsonNode1.asText());
-                    }else {
-                       String  nopolicy =   jsonNode.get("policy").asText();   //非车保单号
-                        insPlyIncome.setNoPolicyno(nopolicy);
-                    }
+            if (jsonArryNode.isArray() && jsonArryNode.size() > 0) {
+                JsonNode firstNode = jsonArryNode.get(0);
+                JsonNode policyNumberNode = firstNode.get("policyNumber");
+
+                if (policyNumberNode != null) {
+                    return policyNumberNode.asText();
+                } else {
+                    return firstNode.get("policy").asText();
                 }
             }
-
+        } catch (IOException e) {
+            e.printStackTrace(); // 可以打印异常信息
         }
 
+        return null;
+    }
 
+    private void savePinTai(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany) {
+        InsPlyIncome insPlyIncome = new InsPlyIncome();
+        insPlyIncome.setOrderno(insFeeOrderNew.getId());  // 子订单号
+        BigDecimal handlingAmount = this.calculateTotal(insFeeOrderNew.getJqSuperviseCostsPremiums(), insFeeOrderNew.getSySuperviseCostsPremiums());
+        insPlyIncome.setCommissionFeevalue(handlingAmount);//手续费
+        BigDecimal handlingProportion = this.calculateTotal(insFeeOrderNew.getJqSuperviseCostsProportion(), insFeeOrderNew.getSySuperviseCostsProportion());
+        insPlyIncome.setCommissionFeerate(handlingProportion);// 手续费比例
+        BigDecimal otherAmount = this.calculateTotal(insFeeOrderNew.getJqOtherCostsPremiums(), insFeeOrderNew.getSyOtherCostsPremiums());
+        insPlyIncome.setOtherFeevalue(otherAmount);//跟单费用
+        BigDecimal otherProportion = this.calculateTotal(insFeeOrderNew.getSyOtherCostsProportion(), insFeeOrderNew.getJqOtherCostsProportion());
+        insPlyIncome.setOtherFeerate(otherProportion); // 跟单非比例
+        //保单号
+        insPlyIncome.setPolicyno(insAreaCompany.getJqpolicyno());  // 交强保单号
+        insPlyIncome.setSyPolicyno(insAreaCompany.getSypolicyno()); //商业保单号
+        insPlyIncome.setDeptId(insFeeOrderNew.getDeptId());
+        insPlyIncome.setRiskcode(order.getProductid());
+        insPlyIncome.setPayDate(insAreaCompany.getPayDate());
+        insPlyIncome.setSignDate(insAreaCompany.getSigningTime());
+        insPlyIncome.setCompanyId(insAreaCompany.getCompanyId());
+        insPlyIncome.setAgreementId(insFeeOrderNew.getAgreementId());
+        insPlyIncome.setLicenseno(order.getLicenseno());
+        insPlyIncome.setTaxamount(insAreaCompany.getTaxamount());
+        insPlyIncome.setCreateTime(LocalDateTime.now());
+        insPlyIncome.setDocumentaryFeesStatus("0");
+        insPlyIncome.setHandlingFeesStatus("0");
+        insPlyIncome.setIsNotCar("0");
+        insPlyIncome.setIsNotDocumentary("0");
+        insPlyIncome.setAllFeeValue(otherAmount.add(handlingAmount));
+        baseMapper.insert(insPlyIncome);
     }
 
-    private BigDecimal sumAmount(BigDecimal amount1, BigDecimal amount2, BigDecimal amount3) {
-        BigDecimal jqNoTaxPremium = (amount1 != null) ? amount1 : BigDecimal.ZERO;
-        BigDecimal syNoTaxPremium = (amount2 != null) ? amount2 : BigDecimal.ZERO;
-        BigDecimal noNoTaxPremium = (amount3 != null) ? amount3 : BigDecimal.ZERO;
+    private BigDecimal calculateTotal(BigDecimal value1, BigDecimal value2) {
+        BigDecimal total = BigDecimal.ZERO;
+
+        if (value1 != null) {
+            total = total.add(value1);
+        }
 
-        return jqNoTaxPremium.add(syNoTaxPremium).add(noNoTaxPremium);
+        if (value2 != null) {
+            total = total.add(value2);
+        }
+
+        return total;
     }
 
+    private String judgeAgreeType(Long agreementId) {
+        if (agreementId == null) {
+            return null;
+        }
+
+        HttpResult<PtlAgreementQueryVo> byAgreementId = ptlAgreementService.getByAgreementId(agreementId.toString());
+        if (byAgreementId != null && ObjectUtils.isNotEmpty(byAgreementId.getData())) {
+            PtlAgreement agreement = byAgreementId.getData().getAgreement();
+            String agreementType = agreement.getAgreementType();
+            if (StringUtils.isNotEmpty(agreementType)) {
+                return agreementType;
+            }
+        }
+
+        return null;
+    }
 
     public HttpResult<BasePageResult<InsPlyIncome>> queryNew(InsPlyIncomeVo insPlyIncomeVo){
         try{
@@ -199,6 +377,16 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
             if(StringUtils.isNotEmpty(insPlyIncomeVo.getPolicyno())){
                 params.put("policyno",insPlyIncomeVo.getPolicyno());
             }
+            if(StringUtils.isNotEmpty(insPlyIncomeVo.getIsNotDocumentary())){
+                params.put("isOther",insPlyIncomeVo.getIsNotDocumentary());
+            }
+
+            if(StringUtils.isNotEmpty(insPlyIncomeVo.getIsNotCar())){
+                params.put("isNotCar",insPlyIncomeVo.getIsNotCar());
+            }
+            if(StringUtils.isNotEmpty(insPlyIncomeVo.getAgreementType())){
+                params.put("agreementType",insPlyIncomeVo.getAgreementType());
+            }
 
             List<InsPlyIncome> list= this.baseMapper.queryNew(params);
             pageHelper=new PageInfo(list);
@@ -210,6 +398,176 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         }
     }
 
+    @Override
+    public HttpResult<BasePageResult<InsPlyIncome>> nonSettlementQuery(InsPlyIncomeVo insPlyIncomeVo) {
+        try{
+            HashMap<String, Object> params = new HashMap<>();
+            PageInfo<List<InsPlyIncome>> pageHelper = null;
+            PageHelper.startPage(insPlyIncomeVo.getPageNum(),insPlyIncomeVo.getPageSize());
+            params.put("pageNum",insPlyIncomeVo.getPageNum());
+            params.put("pageSize",insPlyIncomeVo.getPageSize());
+            if(StringUtils.isNotEmpty(insPlyIncomeVo.getIsNotCar())){
+                params.put("isNotCar",insPlyIncomeVo.getIsNotCar());
+            }
+            if(StringUtils.isNotEmpty(insPlyIncomeVo.getIsNotDocumentary())){
+                params.put("isOther",insPlyIncomeVo.getIsNotDocumentary());
+            }
+            if(StringUtils.isNotEmpty(insPlyIncomeVo.getYear())){
+                params.put("year",insPlyIncomeVo.getYear());
+            }
+            if(StringUtils.isNotEmpty(insPlyIncomeVo.getYear())){
+                params.put("year",insPlyIncomeVo.getYear());
+            }
+            if(StringUtils.isNotEmpty(insPlyIncomeVo.getDocumentaryFeesStatus())){
+                params.put("documentaryFeesStatus",insPlyIncomeVo.getDocumentaryFeesStatus());
+            }
+            List<InsPlyIncome> list= this.baseMapper.NonSettlementQuery(params);
+            pageHelper=new PageInfo(list);
+            BasePageResult<InsPlyIncome> pageResult=new BasePageResult<InsPlyIncome>(insPlyIncomeVo.getPageNum(), insPlyIncomeVo.getPageSize(), pageHelper.getTotal(), pageHelper.getPages(), list);
+            return HttpResult.ok(pageResult);
+        }catch (Exception e){
+            e.printStackTrace();
+            return HttpResult.error("查询异常");
+        }
+    }
+
+    @Override
+    public HttpResult<List<InsPlyIncome>> nonSettldetail(InsPlyIncomeVo insPlyIncomeVo) {
+        try {
+            String ids = insPlyIncomeVo.getIds();
+            ArrayList<InsPlyIncome> resultList = new ArrayList<>();
+            if (ObjectUtils.isNotEmpty(ids)) {
+                String[] split = ids.split(",");
+                    for (int i =0; i <split.length ; i++) {
+                    String id = split[i];
+                    resultList.add(baseMapper.selectById(id));
+                }
+            }
+            return HttpResult.ok(resultList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return HttpResult.error("查询异常");
+        }
+    }
+
+    @Override
+    public void importData(MultipartFile file, InsPlyIncomeVo insPlyIncomeVo) {
+        List<InsPlyIncome> list = null;
+        try {
+            List<InsPlyIncomeExcelDto> dtoList = ExcelEasypoiUtils.importExcel(file, InsPlyIncomeExcelDto.class, 0, 1, 1);
+            for (InsPlyIncomeExcelDto excelItem : dtoList) {
+                String licenseno = excelItem.getLicenseno();//车牌号
+                if(ObjectUtils.isNotEmpty(licenseno)){
+                    InsPlyIncome insPlyIncome=baseMapper.findByLicenseno(licenseno);
+                    if(ObjectUtils.isNotEmpty(insPlyIncome)){
+                        insPlyIncome.setContractFileId(insPlyIncomeVo.getContractFileId());
+                        insPlyIncome.setContractId(insPlyIncomeVo.getContractId());
+                        insPlyIncome.setVoucherNumber(insPlyIncomeVo.getVoucherNumber());
+                        baseMapper.updateById(insPlyIncome);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            throw new SystemException("导入失败！");
+        }
+    }
+
+    @Override
+    @Transactional
+    public void updateByEntity(InsPlyIncomeVo insPlyIncomeVo) {
+        InsPlyIncome insPlyIncome = new InsPlyIncome();
+        BeanUtils.copyProperties(insPlyIncomeVo, insPlyIncome);
+        baseMapper.updateById(insPlyIncome);
+
+        insPlyIncomeVo.setCrudStatus("2");
+        this.saveLog(insPlyIncomeVo);
+
+    }
+
+    private void saveLog(InsPlyIncomeVo insPlyIncomeVo) {
+        //         添加记录
+        SettlementDocumentaryLogEntity settlementDocumentaryLogEntity = new SettlementDocumentaryLogEntity();
+        settlementDocumentaryLogEntity.setCrudStatus(insPlyIncomeVo.getCrudStatus());
+        settlementDocumentaryLogEntity.setAmount(insPlyIncomeVo.getOtherFeevalue());
+        settlementDocumentaryLogEntity.setSettlementDocumentaryId(insPlyIncomeVo.getId());
+        settlementDocumentaryLogEntity.setAmountType("2");
+        settlementDocumentaryLogService.save(settlementDocumentaryLogEntity);
+    }
+
+
+    @Override
+    @Transactional
+    public HttpResult<InsPlyIncome> insertByEntity(InsPlyIncomeVo insPlyIncomeVo) {
+        Long id = new SnowFlakeUtil().nextId();
+        InsPlyIncome insPlyIncome = new InsPlyIncome();
+        insPlyIncomeVo.setOrderno(id.toString());
+        BeanUtils.copyProperties(insPlyIncomeVo, insPlyIncome);
+        insPlyIncome.setDocumentaryFeesStatus("0");
+        insPlyIncome.setHandlingFeesStatus("0");
+        insPlyIncome.setIsNotCar("0");
+        insPlyIncome.setIsNotDocumentary("1");
+        baseMapper.insert(insPlyIncome);
+        insPlyIncomeVo.setId(insPlyIncome.getId());
+        insPlyIncomeVo.setCrudStatus("1");
+        this.saveLog(insPlyIncomeVo);   //添加日志
+
+        HashMap<String, Object> params = new HashMap<>();
+
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getIsNotCar())){
+            params.put("isNotCar",insPlyIncomeVo.getIsNotCar());
+        }
+        params.put("isOther","1");
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getYear())){
+            params.put("year",insPlyIncomeVo.getYear());
+        }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getCompanyId())){
+            params.put("companyId",insPlyIncomeVo.getCompanyId());
+        }
+
+        List<InsPlyIncome> list= this.baseMapper.NonSettlementQuery(params);
+        if(!CollectionUtils.isEmpty(list)){
+            for (InsPlyIncome item :list){
+                return HttpResult.ok(item.getIds());
+            }
+        }
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public HttpResult<InsPlyIncome> deleteById(InsPlyIncomeVo insPlyIncomeVo) {
+
+        HashMap<String, Object> params = new HashMap<>();
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getIsNotCar())){
+            params.put("isNotCar",insPlyIncomeVo.getIsNotCar());
+        }
+            params.put("isOther","1");
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getYear())){
+            params.put("year",insPlyIncomeVo.getYear());
+        }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getCompanyId())){
+            params.put("companyId",insPlyIncomeVo.getCompanyId());
+        }
+        baseMapper.deleteById(insPlyIncomeVo.getId());
+        insPlyIncomeVo.setCrudStatus("3");
+        this.saveLog(insPlyIncomeVo);
+        List<InsPlyIncome> list = this.baseMapper.NonSettlementQuery(params);
+        if (!CollectionUtils.isEmpty(list)) {
+            for (InsPlyIncome item : list) {
+                return HttpResult.ok(item.getIds());
+            }
+        } else {
+            return HttpResult.ok(null);
+
+        }
+        return HttpResult.ok("删除成功");
+
+    }
+
+
+
+
+
     @Override
     @Transactional
     public void uodateBalance(InsPlyIncomeVo insPlyIncomeVo) {
@@ -225,7 +583,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
             settlementDocumentaryLogEntity.setAmount(insPlyIncomeVo.getOtherFeevalue());  // 跟单费金额
         }
         settlementDocumentaryLogEntity.setHandingAmount(insPlyIncomeVo.getCommissionFeevalue());  // 手续费金额
-        settlementDocumentaryLogEntity.setSettlementDocumentaryId(insPlyIncomeVo.getOrderno()); // 关联id
+        settlementDocumentaryLogEntity.setSettlementDocumentaryId(insPlyIncomeVo.getId()); // 关联id
         settlementDocumentaryLogEntity.setAmountType("1");  //手续费结算
         settlementDocumentaryLogEntity.setCreateTime(new Date());
         settlementDocumentaryLogService.save(settlementDocumentaryLogEntity);
@@ -236,14 +594,28 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
     public HttpResult<BasePageResult<InsPlyIncome>> totalQuery(InsPlyIncomeVo insPlyIncomeVo) {
         HashMap<String, Object> params = new HashMap<>();
         PageInfo<List<InsPlyIncome>> pageHelper = null;
-        params.put("startDate",insPlyIncomeVo.getStartDate().toString());
-        params.put("endDate",insPlyIncomeVo.getEndDate().toString());
-//      判断非跟单结算日期是否已经存在
-        String resultDate = this.JudgingDate(params);
-        if(StringUtils.isNotEmpty(resultDate)){
-            return HttpResult.error("该时间段已近有单据做过结算,请结算");
-        }
+        if(insPlyIncomeVo.getStartDate()!=null){
+            params.put("startDate",insPlyIncomeVo.getStartDate().toString());
 
+        }
+        if(insPlyIncomeVo.getEndDate()!=null){
+            params.put("endDate",insPlyIncomeVo.getEndDate().toString());
+        }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getYear())){
+            params.put("year",insPlyIncomeVo.getYear());
+        }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getIsNotCar())){
+            params.put("isNotCar",insPlyIncomeVo.getIsNotCar());
+        }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getIsNotDocumentary())){
+            params.put("isOther",insPlyIncomeVo.getIsNotDocumentary());
+        }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getDocumentaryFeesStatus())){
+            params.put("documentaryFeesStatus",insPlyIncomeVo.getDocumentaryFeesStatus());
+        }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getCompanyId())){
+            params.put("companyId",insPlyIncomeVo.getCompanyId());
+        }
         params.put("pageNum",insPlyIncomeVo.getPageNum());
         params.put("pageSize",insPlyIncomeVo.getPageSize());
         List<InsPlyIncome> list= this.baseMapper.totalQuery(params);
@@ -252,33 +624,30 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         return  HttpResult.ok(new BasePageResult<>(insPlyIncomeVo.getPageNum(), insPlyIncomeVo.getPageSize(), pageHelper.getTotal(), pageHelper.getPages(), list));
     }
 
-    private String JudgingDate(HashMap<String, Object> params) {
-        if(ObjectUtils.isNotEmpty(params.get("startDate"))  &&  ObjectUtils.isNotEmpty(params.get("endDate")) ){
-            String   checkResult = settlementDocumentaryFeesService.checkDate(params);
-            if(StringUtils.isNotEmpty(checkResult)){
-                return checkResult;
-            }
-        }
-        return  null;
-
-    }
 
     @Override
     @Transactional
     public HttpResult batchBalance(InsPlyIncomeVo insPlyIncomeVo) {
-//      生成新数据
-        SettlementDocumentaryFeesVo settlementDocumentaryFeesVo = new SettlementDocumentaryFeesVo();
+//  通过ids 查出跟单非结算单
+        String ids = insPlyIncomeVo.getIds();
+        if(StringUtils.isNotEmpty(ids)){
+            String[] split = ids.split(",");
+            for (int i =0; i <split.length ; i++) {
+                String id = split[i];
+                InsPlyIncome insPlyIncome = baseMapper.selectById(id);
+                insPlyIncome.setContractId(insPlyIncomeVo.getContractId()); // 合同id
+                insPlyIncome.setContractFileId(insPlyIncomeVo.getContractFileId());
+                insPlyIncome.setVoucherNumber(insPlyIncomeVo.getVoucherNumber());
+                insPlyIncome.setDocumentaryFeesStatus("1"); //1  为跟单费已经结算
+                baseMapper.updateById(insPlyIncome);
+            }
+        }
+        SettlementDocumentaryFeesVo settlementDocumentaryFeesVo = new SettlementDocumentaryFeesVo();  // 生成跟单费结算表
+        settlementDocumentaryFeesVo.setTimeFrame(insPlyIncomeVo.getYear());//年度
+        settlementDocumentaryFeesVo.setCompanyId(insPlyIncomeVo.getCompanyId());// 保险公司id
+        settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());
         settlementDocumentaryFeesVo.setTotalAmount(insPlyIncomeVo.getTotAmount());
-        settlementDocumentaryFeesVo.setTotalOrders(insPlyIncomeVo.getTotalorders());
-        settlementDocumentaryFeesVo.setTimeFrame(insPlyIncomeVo.getTimeFrame());
-        settlementDocumentaryFeesVo.setCreateTime(LocalDateTime.now());
-        settlementDocumentaryFeesVo.setStartTime(insPlyIncomeVo.getStartDate().atStartOfDay());
-        settlementDocumentaryFeesVo.setEndTime(insPlyIncomeVo.getEndDate().atStartOfDay());
-        settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());//  结算金额
-        settlementDocumentaryFeesVo.setUnsettledAmount(insPlyIncomeVo.getTotAmount().subtract(insPlyIncomeVo.getSettlementAmount()));  //未结算金额
-
         return  settlementDocumentaryFeesService.inertSettle(settlementDocumentaryFeesVo);
-
 //
     }
 }

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesServiceImpl.java

@@ -12,6 +12,7 @@ import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryLogEntity;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesService;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryLogService;
+import com.ydtech.modules.fnc.vo.InsPlyIncomeVo;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsOrders;
@@ -55,7 +56,6 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
     @Transactional
     public HttpResult inertSettle(SettlementDocumentaryFeesVo settlementDocumentaryFeesVo) {
 
-
         int i = this.compareAmount(settlementDocumentaryFeesVo.getTotalAmount(), settlementDocumentaryFeesVo.getSettlementAmount());
         if (i < 0) {
             return HttpResult.error("结算金额大于总金额,请重新结算");
@@ -74,15 +74,7 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
         return HttpResult.ok("结算成功");
     }
 
-    @Override
-    public String checkDate(HashMap<String, Object> params) {
 
-        List<SettlementDocumentaryFeesEntity> startList = baseMapper.checkDate(params);
-        if (startList.size() > 0) {
-            return "有重复";
-        }
-        return null;
-    }
 
     @Override
     @Transactional

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -33,6 +33,10 @@ public class InsPlyIncomeVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
+    @ApiModelProperty("主键id")
+    private String id;
+
     @ApiModelProperty("订单号")
     private String orderno;
 
@@ -126,4 +130,16 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty("手续费结算金额")
     private BigDecimal handingAmount;
 
+    @ApiModelProperty("是否跟单")
+    private  String isNotDocumentary;
+    @ApiModelProperty("年度")
+    @JsonFormat(pattern = "yyyy", timezone = "GMT+8")
+    private  String year;
+
+    @ApiModelProperty("其他费用比例")
+    private BigDecimal otherFeerate;
+
+    @ApiModelProperty("操作标识")
+    private String crudStatus;
+
 }

src/main/java/com/ydtech/modules/fnc/vo/SettlementDocumentaryFeesVo.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.fnc.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,6 +10,7 @@ import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -40,12 +42,12 @@ public class SettlementDocumentaryFeesVo implements Serializable {
     private BigDecimal unsettledAmount;
 
     @ApiModelProperty("开始时间")
-    @TableField("start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime startTime;
 
     @ApiModelProperty("结束时间")
-    @TableField("end_time")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endTime;
 
     @ApiModelProperty(value = "每页页数")
     @Min(value = 20, message = "页数最小为20")
@@ -55,4 +57,11 @@ public class SettlementDocumentaryFeesVo implements Serializable {
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")
     private int pageNum=1;
+    @ApiModelProperty("保险公司")
+    private String companyId;
+
+
+    @ApiModelProperty("签单日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate signingTime;
 }

src/main/java/com/ydtech/modules/inv/model/dto/InsPlyIncomeExcelDto.java

@@ -0,0 +1,14 @@
+package com.ydtech.modules.inv.model.dto;
+
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class InsPlyIncomeExcelDto {
+    /**
+     * 等级
+     */
+    @Excel(name = "车牌号")
+    private String licenseno;
+}

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -228,7 +228,7 @@ public class InsOrdersController extends BaseController {
             return HttpResult.error("待客录单人员id不能为空");
         }
         try{
-            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo,OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_1.getCode());
+            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo,OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_2.getCode());
             return HttpResult.ok("success", quoteResult);
         }catch (Exception e){
             return HttpResult.error("查询失败"+e.getMessage());
@@ -250,7 +250,7 @@ public class InsOrdersController extends BaseController {
         //   return HttpResult.error("订单状态不能为空");
         // }
         try{
-            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo,OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_1.getCode());
+            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo,OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_3.getCode());
             return HttpResult.ok("success", quoteResult);
         }catch (Exception e){
             return HttpResult.error("查询失败"+e.getMessage());

src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -387,6 +387,18 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "operator_name")
     private String operatorName;
 
+    /**
+     *  新操作人
+     */
+    @TableField(value = "new_operator_id")
+    private String newOperatorId;
+
+    /**
+     *  新操作人
+     */
+    @TableField(value = "new_operator_name")
+    private String newOperatorName;
+
     public InsAreaCompany(QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution) {
         this.id = IdGenerate.nextId();
         this.orderno = quoteRespVo.getOrderno();

src/main/java/com/ydtech/modules/order/service/impl/DaJiaOrderServiceImpl.java

@@ -732,7 +732,6 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
      * @return
      */
     @Override
-    @Transactional
     public HttpResult<Object> verifyPayment(String companyId) {
         try {
             InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(companyId);
@@ -810,7 +809,6 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                         //如果为自动审核 则自动进行审核
                         insFeeAuditService.autoFeeAudit( insAreaCompany.getOrderno(),insAreaCompany.getId());
                     }
-                    insPlyIncomeService.saveBalance(companyId,insAreaCompany.getOrderno());
                 }
             }
             return HttpResult.ok("查询订单状态成功");

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -132,7 +132,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     private SysUserLinkPtlAgreementMapper sysUserLinkPtlAgreementMapper;
 
 
-    
     public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService,
                                 SysUserRoleService sysUserRoleService,
                                 EsmUserReferrerService esmUserReferrerService, SysDeptService sysDeptService,
@@ -276,8 +275,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (ObjectUtils.isEmpty(insOrders1)) {
             insOrders1 = insOrders;
         }
+        String licenseNo = quoteInfoVo.getCarInfo().getLicenseNo();
 
-        if (!quoteInfoVo.getCarInfo().getLicenseNo().equals(insOrders1.getLicenseno())) {
+        if (StringUtils.isNotEmpty(licenseNo) && !licenseNo.equals(insOrders1.getLicenseno())) {
             throw new SystemException("1001", "车牌与此订单不符，请重新录单");
         }
 
@@ -371,11 +371,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         Page<InsOrders> resultOrders = new Page<>();
 
         //查询未审核
-        if(orderQueryVo.getAuditStatus().equals("0")){
+        if (orderQueryVo.getAuditStatus().equals("0")) {
             resultOrders = insAreaCompanyService.getPendingAuditOrders(page, orderQueryVo);
-        }else if(orderQueryVo.getAuditStatus().equals("1")){
+        } else if (orderQueryVo.getAuditStatus().equals("1")) {
             //已审核
-            resultOrders = insAreaCompanyService.getAlreadyAuditOrders(page,orderQueryVo);
+            resultOrders = insAreaCompanyService.getAlreadyAuditOrders(page, orderQueryVo);
         }
 
         return new BasePageResult<>(resultOrders.getCurrent(), page.getSize(), resultOrders.getTotal(),
@@ -663,12 +663,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 //            }
 //        }
         if (!Objects.isNull(insFeeOrderNew)) {
-            PtlAgreementProductCostsNew ptlAgreementProductCostsNew = ptlAgreementProductCostsNewService.getById(insFeeOrderNew.getCostsId());
+            PtlAgreementProductCostsNew ptlAgreementProductCostsNew =
+                    ptlAgreementProductCostsNewService.getById(insFeeOrderNew.getCostsId());
             List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(insFeeOrderNew);
             orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
 //            List<FeeOrderNewVo> feeOrderNewVoList = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew);
 //            orderAndAreaCompany.setFeeOrderNewVoList(feeOrderNewVoList);
-            FeeOrderNewVo  feeOrderNewVo =   feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew,ptlAgreementProductCostsNew);
+            FeeOrderNewVo feeOrderNewVo = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew, ptlAgreementProductCostsNew);
             feeOrderNewVo.setFeeId(insFeeOrderNew.getId());
             orderAndAreaCompany.setFeeOrderNewVo(feeOrderNewVo);
             List<DistributionLevelVo> distributionLevelVoList = feeRuleSchemeService.converDistrbutionData(insFeeOrderNew);
@@ -765,11 +766,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrdersTrackService.save(insOrdersTrack);
         return true;
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/17 15:38
-     *  @Description: 通过待客录单id和订单状态查询订单数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/17 15:38
+     * @Description: 通过待客录单id和订单状态查询订单数据
      */
     @Override
     public BasePageResult<InsOrders> queryPageHospitalityOrder(OrderQueryVo orderQueryVo) {
@@ -786,49 +788,53 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     public BasePageResult<InsOrders> queryPageOrderByLinkType(OrderQueryVo orderQueryVo, int type) {
+
+        //orderQueryVo.setUserId("admin");
         Page<InsOrders> page = new Page<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize());
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
-        List<String> agentUserIds =new ArrayList<>();
-        List<String> agreeIds =new ArrayList<>();
-        if(type==1){
+        List<String> agentUserIds = new ArrayList<>();
+        List<String> agreeIds = new ArrayList<>();
+        if (type == 1) {
             //渠道
             //查询用户表中的信息为领带id为用户id的数据
             List<SysUserBaseVO> allUsersByLeaderId = sysUserMapper.getAllUsersByLeaderId(orderQueryVo.getUserId());
-            if(allUsersByLeaderId!=null && allUsersByLeaderId.size()>0){
+            if (allUsersByLeaderId != null && allUsersByLeaderId.size() > 0) {
                 for (SysUserBaseVO sysUserBaseVO : allUsersByLeaderId) {
                     agentUserIds.add(sysUserBaseVO.getUserId());
                 }
             }
-        }else if(type==2){
+        } else if (type == 2) {
             //查询所有的代理人
             agentUserIds = sysUserMapper.getAgentUserIds();
 
-        }else if(type==3){
+        } else if (type == 3) {
             //查询用户关联的协议
-            List<SysUserLinkPtlAgreementDto> ptlAgreementListByUserIds = sysUserLinkPtlAgreementMapper.findPtlAgreementListByUserId(orderQueryVo.getUserId());
-            if(ptlAgreementListByUserIds!=null && ptlAgreementListByUserIds.size()>0){
+            List<SysUserLinkPtlAgreementDto> ptlAgreementListByUserIds =
+                    sysUserLinkPtlAgreementMapper.findPtlAgreementListByUserId(orderQueryVo.getUserId());
+            if (ptlAgreementListByUserIds != null && ptlAgreementListByUserIds.size() > 0) {
                 for (SysUserLinkPtlAgreementDto sysUserLinkPtlAgreementDto : ptlAgreementListByUserIds) {
                     agreeIds.add(sysUserLinkPtlAgreementDto.getPtlAgreement().getId());
                 }
             }
         }
-        Long total=0l;
-        Page<InsOrders> orderVoPage=new Page<>();
+        Long total = 0l;
+        Page<InsOrders> orderVoPage = new Page<>();
         //注释逻辑给前台返回数据
-        //if((agentUserIds!=null && agentUserIds.size()>0) || (agreeIds!=null && agreeIds.size()>0)){
-            orderVoPage= baseMapper.queryPageOrderByLinkType(page, orderQueryVo,agentUserIds,agreeIds);
-            total = baseMapper.queryPageOrderByLinkTypeCount(orderQueryVo,agentUserIds,agreeIds);
-        //}
+        if((agentUserIds!=null && agentUserIds.size()>0) || (agreeIds!=null && agreeIds.size()>0)){
+        orderVoPage = baseMapper.queryPageOrderByLinkType(page, orderQueryVo, agentUserIds, agreeIds);
+        total = baseMapper.queryPageOrderByLinkTypeCount(orderQueryVo, agentUserIds, agreeIds);
+        }
         orderVoPage.setTotal(total);
         return new BasePageResult<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize(), orderVoPage.getTotal(),
                 orderVoPage.getPages()
                 , orderVoPage.getRecords());
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/18 10:51
-     *  @Description: 查询子订单的数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/18 10:51
+     * @Description: 查询子订单的数据
      */
     @Override
     public BasePageResult<InsOrders> queryPageSubOrders(OrderTaskPoolsVo orderTaskPoolsVo) {

src/main/java/com/ydtech/modules/order/service/impl/OrderTaskPoolsServiceImpl.java

@@ -155,6 +155,15 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
     @Override
     @Transactional
     public HttpResult forwardingSubOrders(TaskForwardingVo taskForwardingVo,SysUser sysUser) {
+        if(StringUtils.isEmpty(taskForwardingVo.getOrderNo()) ){
+            throw  new SystemException("参数错误，主订单号orderNo不能为空！！");
+        }
+        if(StringUtils.isEmpty(taskForwardingVo.getSubOrderId()) ){
+            throw  new SystemException("参数错误，子订单号subOrderId不能为空！！");
+        }
+        if(StringUtils.isEmpty(taskForwardingVo.getAuditId())){
+            throw  new SystemException("参数错误，受理人号auditId不能为空！！");
+        }
         SysUser sysUserNew = sysUserService.getById(taskForwardingVo.getAuditId());
         InsOrders insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(taskForwardingVo.getSubOrderId());
@@ -163,17 +172,20 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         }
         //查询最新数据的
         InsOrderSetUserHis one = insOrderSetUserHisService.getOneBySubOrderId(taskForwardingVo.getSubOrderId());
-        if(one!=null && !one.getNewOperatorId().equals(sysUser.getId())){
-            throw  new SystemException("该订单已经转发给"+one.getNewOperatorName());
+        //有历史任务且子订单的转发人不为空的情况
+        if(one!=null && StringUtils.hasLength(insAreaCompany.getNewOperatorId())){
+            throw  new SystemException("该订单已经转发给"+insAreaCompany.getNewOperatorName());
         }
         //插入轨迹表
         InsOrderSetUserHis  his=new InsOrderSetUserHis(insOrders.getOrderno(), insOrders.getQuoteno(), sysUser.getId(), taskForwardingVo.getAuditId(), new Date(), sysUser.getId(),taskForwardingVo.getSubOrderId(),sysUserNew.getName()+"转发给"+sysUser.getName()+"的任务",sysUser.getName(),sysUserNew.getName());
         insOrderSetUserHisService.addOrUpdate(his);
-        insAreaCompany.setOperatorId(taskForwardingVo.getAuditId());
+        insAreaCompany.setOperatorId(sysUser.getId());
         insAreaCompany.setOperatorTime(new Date());
-        insAreaCompany.setOperatorName(sysUserNew.getName());
+        insAreaCompany.setOperatorName(sysUser.getName());
+        insAreaCompany.setNewOperatorId(taskForwardingVo.getAuditId());
+        insAreaCompany.setNewOperatorName(sysUserNew.getName());
         insAreaCompanyService.updateById(insAreaCompany);
-        return HttpResult.ok("保存成功");
+        return HttpResult.ok("转发成功");
     }
     /**
      *  @version
@@ -185,6 +197,12 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
     @Override
     @Transactional
     public HttpResult recover(TaskForwardingVo taskForwardingVo,SysUser sysUser) {
+        if(StringUtils.isEmpty(taskForwardingVo.getOrderNo()) ){
+            throw  new SystemException("参数错误，主订单号orderNo不能为空！！");
+        }
+        if(StringUtils.isEmpty(taskForwardingVo.getSubOrderId()) ){
+            throw  new SystemException("参数错误，子订单号subOrderId不能为空！！");
+        }
         InsOrders insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(taskForwardingVo.getSubOrderId());
         if(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insAreaCompany.getOrderstatus()) ){
@@ -192,16 +210,22 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         }
         //查询最新数据的
         InsOrderSetUserHis one = insOrderSetUserHisService.getOneBySubOrderId(taskForwardingVo.getSubOrderId());
-        if(one!=null && !one.getOldOperatorId().equals(sysUser.getId())){
-            throw  new SystemException("该订单的回收人为"+one.getOldOperatorName());
+        //判断没有历史记录
+        if(one==null){
+            throw  new SystemException("该订单没有做转发操作无法收回");
+            //有历史记录且子订单表中的操作人不为空 且旧的操作人等于当前登陆人才可以收回
+        }else if(one!=null && StringUtils.hasLength(insAreaCompany.getOperatorId()) && !sysUser.getId().equals(insAreaCompany.getOperatorId())){
+            throw  new SystemException("该订单的收回人为"+insAreaCompany.getOperatorName());
         }
         //插入轨迹表
         InsOrderSetUserHis  his=new InsOrderSetUserHis(insOrders.getOrderno(), insOrders.getQuoteno(), one.getNewOperatorId(), one.getOldOperatorId(), new Date(), sysUser.getId(),taskForwardingVo.getSubOrderId(),one.getOldOperatorName()+"回收"+one.getNewOperatorName()+"任务",one.getOldOperatorName(),one.getNewOperatorName());
         insOrderSetUserHisService.addOrUpdate(his);
-        insAreaCompany.setOperatorId(null);
+        insAreaCompany.setOperatorId("");
         insAreaCompany.setOperatorTime(new Date());
-        insAreaCompany.setOperatorName(null);
+        insAreaCompany.setOperatorName("");
+        insAreaCompany.setNewOperatorId("");
+        insAreaCompany.setNewOperatorName("");
         insAreaCompanyService.updateById(insAreaCompany);
-        return HttpResult.ok("保存成功");
+        return HttpResult.ok("收回成功");
     }
 }

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.protocol.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.config.DictEnumConfig;
 import com.ydtech.constants.enums.dict.DictionaryData;
@@ -702,7 +701,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
      */
     public List<PtlAgreement> findCheckAgreementList(PtlAgreement ptlAgreement){
         LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(PtlAgreement::getAuditStatus,"1");
+       // wrapper.eq(PtlAgreement::getAuditStatus,"1");
         List<PtlAgreement> list = proxyObject.list(wrapper);
         return list;
     }

src/main/java/com/ydtech/modules/protocol/service/impl/TaxSourceServiceImpl.java

@@ -191,7 +191,7 @@ public class TaxSourceServiceImpl extends ServiceImpl<TaxSourceMapper, TaxSource
         // 领导标志
         SysUserRole userRole = sysUserRoleService.selectByUserId(userId);
 
-        if (Arrays.asList(SystemConstant.getSysRoleTeamLeader()).contains(userRole.getRoleId().toString()) && !RoleConstants.R21.getCode().equals(userRole.getRoleId().toString())) { //团队长可查询下面所有人员订单
+        if (userRole!=null && Arrays.asList(SystemConstant.getSysRoleTeamLeader()).contains(userRole.getRoleId().toString()) && !RoleConstants.R21.getCode().equals(userRole.getRoleId().toString())) { //团队长可查询下面所有人员订单
             deptId = null;
         }
 

src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductQueryVo.java

@@ -8,6 +8,9 @@ import lombok.Data;
 import java.time.LocalDate;
 @Data
 public class AgreementProductQueryVo extends PageRequest {
+    @ApiModelProperty(value = "保险公司id")
+    private String companyId;
+
     @ApiModelProperty(value = "协议id")
     private String agreementId;
 

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -1091,6 +1091,13 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
     public Page<PtlAgreementProductCostsNew> getCostsAuditList(Page page, AgreementProductQueryVo agreementProductQueryVo){
         LambdaQueryWrapper<PtlAgreementProductCostsNew> ptlAgreementProductCostsNewLambdaQueryWrapper = new LambdaQueryWrapper<>();
 //        ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductQueryVo.getAgreementId());
+        //保险公司id
+        if(agreementProductQueryVo.getCompanyId() != null){
+            LambdaQueryWrapper<PtlAgreement> eq = new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getPartnerCompaniesId, agreementProductQueryVo.getCompanyId());
+            List<PtlAgreement> list = ptlAgreementService.list(eq);
+            List<String> agreementIds = list.stream().map(PtlAgreement::getId).collect(Collectors.toList());
+            ptlAgreementProductCostsNewLambdaQueryWrapper.in(PtlAgreementProductCostsNew::getAgreementId, agreementIds);
+        }
 
         //协议id
         if(agreementProductQueryVo.getAgreementId() != null){

src/main/resources/mapper/modules/admin/SysUserLinkPtlAgreementMapper.xml

@@ -83,7 +83,5 @@
             )  as flag
         FROM
             ptl_agreement pl
-        WHERE
-            audit_type =1
     </select>
 </mapper>

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -4,8 +4,9 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.ydtech.modules.fnc.entity.InsPlyIncome">
-        <id column="orderno" property="orderno" />
-        <id column="policyno" property="policyno" />
+        <id column="id" property="id" />
+        <result column="orderno" property="orderno" />
+        <result column="policyno" property="policyno" />
         <result column="dept_id" property="deptId" />
         <result column="dept_name" property="deptName" />
         <result column="riskcode" property="riskcode" />
@@ -31,10 +32,13 @@
         <result column="documentary_fees_status" property="documentaryFeesStatus"/>
         <result column="no_policyno" property="noPolicyno"/>
         <result column="sy_policyno" property="syPolicyno"/>
+        <result column="is_not_car" property="isNotCar"/>
+        <result column="is_not_documentary" property="isNotDocumentary"/>
     </resultMap>
 
     <select id="queryNew"  resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">
             select
+                a.id      as  "id",
                 a.orderno  as  "orderno",
                 a.policyno  as  "policyno",
                 a.dept_id  as  "deptId",
@@ -60,6 +64,8 @@
                 a.no_policyno  as  "noPolicyno",
                 a.sy_policyno  as  "syPolicyno",
                 a.documentary_fees_status  as  "documentaryFeesStatus",
+                a.is_not_car  as  "isNotCar",
+                a.is_not_documentary  as  "isNotDocumentary",
                 a.create_time  as  "createTime"
                 from  ins_ply_income a
                 LEFT  JOIN  ptl_agreement  pa  on  a.agreement_id  = pa.id
@@ -85,36 +91,50 @@
                 <if test="documentaryFeesStatus !=null  and  documentaryFeesStatus  !=''">
                     and a.documentary_fees_status =#{documentaryFeesStatus}
                 </if>
-            </where>
-    </select>
-
 
-    <select id="totalQuery"  resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">
-            select
-                sum(a.other_feevalue) as "totAmount",
-                GROUP_CONCAT(orderno) as  "ids",
-                count(1) as "totalorders"
-                from  ins_ply_income a
-                LEFT  JOIN  ptl_agreement  pa  on  a.agreement_id  = pa.id
-            <where>
-                <if test="startDate !=null  and  startDate!='' and  endDate !=null and endDate !=''">
-                    and DATE_FORMAT( a.signdate, '%Y-%m-%d')  between DATE_FORMAT(#{startDate}, '%Y-%m-%d') and DATE_FORMAT(#{endDate}, '%Y-%m-%d')
-                </if>
-
-                <if test="agreementtype !=null  and  agreementtype  !=''">
-                    and pa.agreement_type =#{agreementtype}
+                <if test="isNotCar !=null  and  isNotCar  !=''">
+                    and a.is_not_car =#{isNotCar}
                 </if>
 
-                <if test="handlingFeesStatus !=null  and  handlingFeesStatus  !=''">
-                    and a.handling_fees_status =#{handlingFeesStatus}
+                <if test="isOther !=null  and  isOther  !=''">
+                    and a.is_not_documentary   =#{isOther}
                 </if>
 
-                <if test="documentaryFeesStatus !=null  and  documentaryFeesStatus  !=''">
-                    and a.documentary_fees_status =#{documentaryFeesStatus}
-                </if>
             </where>
     </select>
 
+
+    <select id="totalQuery"  resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">
+        select
+              count(MONTH(a.signdate))  as "totalorders",
+              MONTH(a.signdate)    as  "monthSigdate",
+              sum(a.other_feevalue)    as  "allLOtherFeevalue",
+              GROUP_CONCAT(a.id) as  "ids"
+              from  ins_ply_income a
+              LEFT  JOIN  ptl_agreement  pa  on  a.agreement_id  = pa.id
+        <where>
+            <if test="isNotCar !=null  and  isNotCar  !=''" >
+                 a.is_not_car =#{isNotCar}
+            </if>
+            <if test="isOther !=null  and  isOther  !=''">
+                and a.is_not_documentary   =#{isOther}
+            </if>
+            <if test="agreementType !=null  and  agreementType  !=''">
+                and pa.agreement_type =#{agreementType}
+            </if>
+            <if test="documentaryFeesStatus !=null  and  documentaryFeesStatus  !=''">
+                and a.documentary_fees_status =#{documentaryFeesStatus}
+            </if>
+            <if test="companyId !=null  and  companyId  !=''">
+                and a.company_id =#{companyId}
+            </if>
+            <if test="year !=null  and  year  !=''">
+                and YEAR(a.signdate) =#{year}
+            </if>
+            group by  MONTH(a.signdate)
+        </where>
+    </select>
+
     <update id="uopdateByOrderno" parameterType="com.ydtech.modules.fnc.entity.InsPlyIncome">
         update ins_ply_income
         <set>
@@ -136,4 +156,84 @@
         </set>
         where  orderno  =#{orderno}
     </update>
+
+
+    <select id="NonSettlementQuery"  resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">
+        SELECT
+        a.companyId  as  "companyId",
+        a.totalorders  as  "totalorders",
+        a.ids as  "ids",
+        a.allLOtherFeevalue as  "allLOtherFeevalue"
+        FROM
+        (
+        SELECT
+        a.company_id AS "companyId",
+        count(a.orderno)  as  "totalorders",
+        sum( a.other_feevalue ) AS "allLOtherFeevalue",
+        GROUP_CONCAT(a.id) as  "ids"
+        FROM
+        ins_ply_income a
+        LEFT JOIN ptl_agreement pa ON a.agreement_id = pa.id
+        WHERE
+         pa.agreement_type = '2'
+        <if test="isNotCar !=null  and  isNotCar  !=''" >
+                and a.is_not_car =#{isNotCar}
+        </if>
+        <if test="documentaryFeesStatus != null and documentaryFeesStatus != '' ">
+            AND  a.documentary_fees_status = #{documentaryFeesStatus},
+        </if>
+
+        <if test="isOther !=null  and  isOther  !=''">
+            and a.is_not_documentary   =#{isOther}
+        </if>
+        <if test="companyId !=null  and  companyId  !=''">
+            and a.company_id   =#{companyId}
+        </if>
+        <if test="year !=null  and  year  !=''">
+            and YEAR(a.signdate) =#{year}
+        </if>
+        GROUP BY
+        a.company_id
+        ) a
+        LEFT JOIN ptl_agreement pa ON a.companyId = pa.association_companies_id
+    </select>
+
+    <select id="findByLicenseno" resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">
+       select
+            a.id      as  "id",
+            a.orderno  as  "orderno",
+            a.policyno  as  "policyno",
+            a.dept_id  as  "deptId",
+            a.riskcode  as  "riskcode",
+            a.pay_date  as  "payDate",
+            a.signdate  as  "signdate",
+            a.company_id  as  "companyId",
+            a.agreement_id  as  "agreementId",
+            a.licenseno  as  "licenseno",
+            a.taxamount  as  "taxamount",
+            a.no_tax_premium  as  "noTaxPremium",
+            a.commission_feerate  as  "commissionFeerate",
+            a.other_feerate  as  "otherFeerate",
+            a.commission_feevalue  as  "commissionFeevalue",
+            a.other_feevalue  as  "otherFeevalue",
+            a.all_fee_value  as  "allFeeValue",
+            a.final_fee_value  as  "finalFeeValue",
+            a.doing_fee_value  as  "doingFeeValue",
+            a.voucher_number  as  "voucherNumber",
+            a.contract_id  as  "contractId",
+            a.contract_file_id  as  "contractFileId",
+            a.handling_fees_status  as  "handlingFeesStatus",
+            a.no_policyno  as  "noPolicyno",
+            a.sy_policyno  as  "syPolicyno",
+            a.documentary_fees_status  as  "documentaryFeesStatus",
+            a.is_not_car  as  "isNotCar",
+            a.is_not_documentary  as  "isNotDocumentary",
+            a.create_time  as  "createTime"
+        from  ins_ply_income a
+        <where>
+            <if test="licenseno !=null  and  licenseno !=''">
+                a.licenseno=#{licenseno}
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/mapper/modules/fnc/SettlementDocumentaryFeesMapper.xml

@@ -13,6 +13,7 @@
         <result column="end_time" property="endTime"/>
         <result column="settlement_amount" property="settlementAmount"/>
         <result column="unsettled_amount" property="unsettledAmount"/>
+        <result column="company_id" property="companyId"/>
     </resultMap>
 
 
@@ -31,31 +32,8 @@
             from  settlement_documentary_fees  a
     </select>
 
-    <select id="selectAll" resultType="com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity">
-        select
-            *
-            from  settlement_documentary_fees  a
-    </select>
 
 
-    <select id="checkDate" resultType="com.ydtech.modules.fnc.entity.SettlementDocumentaryLogEntity">
-        select a.id                as "id",
-        a.total_orders      as "totalOrders",
-        a.time_frame        as "timeFrame",
-        a.total_amount      as "totalAmount",
-        a.create_time       as "createTime",
-        a.start_time        as "startTime",
-        a.end_time          as "endTime",
-        a.settlement_amount as "settlementAmount",
-        a.unsettled_amount  as "unsettledAmount"
-        from settlement_documentary_fees a
-        <where>
-            <if test="startDate !=null  and  startDate  !=''  and endDate !=null  and  endDate  !=''" >
-                (start_time &lt; #{endDate} AND start_time &gt; #{startDate}) OR (end_time &lt;  #{endDate} AND end_time &gt; #{startDate})
-            </if>
-        </where>
-    </select>
-
 
 
 </mapper>

src/main/resources/mapper/modules/fnc/SettlementDocumentaryLogMapper.xml

@@ -10,6 +10,7 @@
         <result column="amount_type" property="amountType"/>
         <result column="create_time" property="createTime"/>
         <result column="handing_amount" property="handingAmount"/>
+        <result column="crud_status" property="crudStatus"/>
     </resultMap>
 
 

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -778,14 +778,40 @@
 
     <select id="queryPageOrderByLinkType" resultMap="BaseResultMap">
         select
-            io.*,
-            iac.id as subOrderId
+        io.orderno as orderno,
+        io.quoteno as  quoteno,
+        io.orderstatus as orderstatus,
+        io.carinfo as  carinfo,
+        io.userid as userid,
+        io.username as username,
+        io.deptid as deptid,
+        io.deptname as deptname,
+        io.ownerinfo as ownerinfo,
+        io.applyinfo as applyinfo,
+        io.insureinfo as insureinfo,
+        io.agreeid as agreeid,
+        io.productid as productid,
+        io.product as product,
+        io.createtime as createtime,
+        io.frameno as frameno,
+        io.licenseno as licenseno,
+        io.insuredname as insuredname,
+        io.jqstartdate as jqstartdate,
+        io.jqenddate as jqenddate,
+        io.systartdate as systartdate,
+        io.syenddate as syenddate,
+        io.risk as risk,
+        io.king as king,
+        io.vehicle_and_vessel_tax as vehicleAndVesselTax,
+        iac.id as subOrderId,
+        iac.id as company_id,
+        iac.inscompany as ins_company
         from
             ins_area_company iac
         left JOIN
              ins_orders io  on iac.orderno = io.orderno
         <where>
-             (iac.operator_id is null or  iac.operator_id =#{orderQueryVo.userId})
+             ( (iac.new_operator_id is null or iac.new_operator_id ='') or iac.new_operator_id =#{orderQueryVo.userId} or   iac.operator_id =#{orderQueryVo.userId})
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
             </if>
@@ -837,7 +863,7 @@
             left JOIN
         ins_orders io  on iac.orderno = io.orderno
         <where>
-            (iac.operator_id is null or  iac.operator_id =#{orderQueryVo.userId})
+            ( (iac.new_operator_id is null or iac.new_operator_id ='') or iac.new_operator_id =#{orderQueryVo.userId} or   iac.operator_id =#{orderQueryVo.userId})
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
             </if>