Merge branch 'test' into test-dismantle

sql/Online.sql

@@ -75,7 +75,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 +110,6 @@ 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 '新操作人名称';

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

@@ -1,14 +1,9 @@
 package com.ydtech.modules.admin.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.admin.model.SysDeptAccountHistory;
 import com.ydtech.modules.admin.model.dto.SysDeptAccountHistoryDto;
 import com.ydtech.modules.admin.service.SysDeptAccountHistoryService;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.ser.model.SerAnnualAuditOrder;
-import com.ydtech.modules.ser.model.vo.SerAnnualAuditOrderQueryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -67,9 +67,6 @@ public class SysDeptController extends BaseController {
                 return HttpResult.error("机构已被设置来源无法修改");
             }
         }
-        if (record.getComlevel() == null && record.getWithdrawUser() != null) {
-            return HttpResult.error("机构级别为空,无法设置提现人员");
-        }
         sysDeptService.updateDept(record);
         return HttpResult.ok();
     }

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/dao/SysDeptAccountHistoryMapper.java

@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.admin.model.SysDeptAccountHistory;
 import com.ydtech.modules.admin.model.dto.SysDeptAccountHistoryDto;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 
-@Mapper
+
 public interface SysDeptAccountHistoryMapper extends BaseMapper<SysDeptAccountHistory> {
     Page<SysDeptAccountHistoryDto> getDeptHistory(Page page,@Param("sysDeptAccountHistoryDto") SysDeptAccountHistoryDto sysDeptAccountHistoryDto);
 }

src/main/java/com/ydtech/modules/admin/dao/SysDeptAccountMapper.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.admin.model.SysDeptAccount;
 import com.ydtech.modules.admin.model.dto.SysDeptAccountDto;
 import com.ydtech.modules.admin.model.vo.SysDeptAccountByUserVo;
@@ -11,7 +12,7 @@ import java.util.List;
 
 @Mapper
 public interface SysDeptAccountMapper extends BaseMapper<SysDeptAccount> {
-    List<SysDeptAccountDto> getDept(@Param("sysDeptAccountDto") SysDeptAccountDto sysDeptAccountDto);
+    Page<SysDeptAccountDto> getDept(Page page, @Param("sysDeptAccountDto") SysDeptAccountDto sysDeptAccountDto);
 
 
     List<SysDeptAccountByUserVo> getDeptAccountByUser(String userId);

src/main/java/com/ydtech/modules/admin/model/SysDept.java

@@ -130,10 +130,6 @@ public class SysDept implements Serializable {
     @ApiModelProperty(value = "机构来源(渠道、个代)")
     private String managementSource;
 
-    @TableField(value = "withdraw_user")
-    @ApiModelProperty(value = "提现人员")
-    private String withdrawUser;
-
     @TableField(exist = false)
     private List<SysDept> children;
 

src/main/java/com/ydtech/modules/admin/model/dto/SysDeptAccountDto.java

@@ -27,4 +27,7 @@ public class SysDeptAccountDto {
     @ApiModelProperty(value = "已提现金额")
     @JsonFormat(pattern = "0.00")
     private BigDecimal totalAmount;
+    private int pageNo;
+
+    private int pageSize;
 }

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

@@ -4,12 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.model.SysDeptAccountHistory;
 import com.ydtech.modules.admin.model.dto.SysDeptAccountHistoryDto;
-import com.ydtech.modules.inv.model.InvAccountOperate;
-import com.ydtech.modules.ser.model.SerAnnualAuditOrder;
-import com.ydtech.modules.ser.model.vo.SerAnnualAuditOrderQueryVo;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
 
 
 public interface SysDeptAccountHistoryService extends IService<SysDeptAccountHistory> {

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/SysDeptAccountServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.constants.sys.SysDeptAccountStatus;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.core.page.PageRequest;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysDeptAccountMapper;
 import com.ydtech.modules.admin.model.*;
@@ -58,10 +59,11 @@ public class SysDeptAccountServiceImpl extends ServiceImpl<SysDeptAccountMapper,
     }
 
     public IPage<SysDeptAccountDto> getDept(SysDeptAccountDto sysDeptAccountDto) {
-        Page<SysDeptAccountDto> page = new Page<>();
-        List<SysDeptAccountDto> deptList = sysDeptAccountMapper.getDept(sysDeptAccountDto);
-        page.setRecords(deptList);
-        page.setTotal(deptList.size());
+        PageRequest pageRequest = new PageRequest();
+        pageRequest.setPageNum(sysDeptAccountDto.getPageNo());
+        pageRequest.setPageSize(sysDeptAccountDto.getPageSize());
+        Page page = PageRequest.buildPageRequest(pageRequest);
+        Page<SysDeptAccountDto> deptList = sysDeptAccountMapper.getDept(page,sysDeptAccountDto);
         return page;
     }
 
@@ -77,9 +79,6 @@ public class SysDeptAccountServiceImpl extends ServiceImpl<SysDeptAccountMapper,
         queryWrapper.eq(SysDept::getId, sysDeptAccount.getDeptId());
         SysDept sysDept = sysDeptService.getOne(queryWrapper);
 
-        if (!BaseController.getUser().getId().equals(sysDept.getWithdrawUser())) {
-            throw new SystemException("您不为该机构账户提现人员");
-        }
         if (sysDeptAccount.getAmount().compareTo(deptAccount.getManagementFee()) > 0) {
             throw new SystemException("提现金额大于机构账户金额");
         }

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,43 @@ 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);
     }
+
     /**
-     *  @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/inv/model/excel/InvSourceExcel.java

@@ -42,6 +42,12 @@ public class InvSourceExcel implements Serializable {
     @ExcelProperty("保司机构id")
     private String insuranceDeptId;
 
+    /**
+     * 含税/不含税
+     */
+    @ExcelProperty("含税/不含税")
+    private String invSourceType;
+
     /**
      * 险种
      */

src/main/java/com/ydtech/modules/inv/model/po/InvSource.java

@@ -79,6 +79,11 @@ public class InvSource implements Serializable {
     @ExcelProperty("保司名称")
     private String insuranceName;
 
+    @TableField(value = "inv_source_type")
+    @ApiModelProperty("应收类型(含税/不含税)")
+    @ExcelProperty("含税/不含税")
+    private String invSourceType;
+
     /**
      * 险种
      */
@@ -386,9 +391,6 @@ public class InvSource implements Serializable {
     @ApiModelProperty("修改人Id")
     private String updateUserId;
 
-    @TableField(value = "inv_source_type")
-    @ApiModelProperty("应收类型(含税,不含税)")
-    private String invSourceType;
 
     @TableField(exist = false)
     private String[] ids;

src/main/java/com/ydtech/modules/inv/service/impl/InvReceivableServiceImpl.java

@@ -407,6 +407,8 @@ public class InvReceivableServiceImpl implements InvReceivableService {
                     "2".equals(x.getClearingState()) ? "孤儿单" : x.getClearingState());
             x.setInsuranceClearingState("0".equals(x.getInsuranceClearingState()) ? "未结算" :
                     "1".equals(x.getInsuranceClearingState()) ? "已结算" : x.getInsuranceClearingState());
+            x.setInvSourceType(null == (x.getInvSourceType()) ? "" :
+                    ("platform".equals(x.getInvSourceType()) ? "平台" : "私有"));
         });
         return pageData;
     }

src/main/java/com/ydtech/modules/inv/service/impl/InvSourceServiceImpl.java

@@ -49,7 +49,20 @@ public class InvSourceServiceImpl extends ServiceImpl<InvSourceMapper, InvSource
             invSource.setRevenueName(user.getName());
             invSource.setRevenueTime(dateTime.toString());
             invSource.setRevenueUserId(user.getId());
-            invSource.setInvSourceType("platform");
+            if (invSource.getInvSourceType().equals("含税")) {
+                invSource.setInvSourceType("platform");
+            } else if (invSource.getInvSourceType().equals("不含税")) {
+                invSource.setInvSourceType("privately");
+            }
+            if (invSource.getClearingState().equals("已结算")) {
+                invSource.setClearingState("1");
+            } else if (invSource.getClearingState().equals("未结算")) {
+                invSource.setClearingState("0");
+            } else if (invSource.getClearingState().equals("未认领")) {
+                invSource.setClearingState("2");
+            } else if (invSource.getClearingState().equals("孤儿单")) {
+                invSource.setClearingState("3");
+            }
         }
 
         boolean result = invSourceService.saveOrUpdateBatchWithConditions(invSources);

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

@@ -227,7 +227,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());
@@ -249,7 +249,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

@@ -411,6 +411,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/InsOrdersServiceImpl.java

@@ -139,7 +139,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     private InsOrdersCarInfoService insOrdersCarInfoService;
 
 
-    
     public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService,
                                 SysUserRoleService sysUserRoleService,
                                 EsmUserReferrerService esmUserReferrerService, SysDeptService sysDeptService,
@@ -282,8 +281,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", "车牌与此订单不符，请重新录单");
         }
 
@@ -377,11 +377,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(),
@@ -669,12 +669,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);
@@ -771,11 +772,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) {
@@ -792,49 +794,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());
@@ -169,11 +178,13 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         //插入轨迹表
         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 +196,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 +209,20 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         }
         //查询最新数据的
         InsOrderSetUserHis one = insOrderSetUserHisService.getOneBySubOrderId(taskForwardingVo.getSubOrderId());
-        if(one!=null && !one.getOldOperatorId().equals(sysUser.getId())){
+        if(one==null){
+            throw  new SystemException("该订单没有做转发操作无法收回");
+        }else if(one!=null && !one.getOldOperatorId().equals(sysUser.getId())){
             throw  new SystemException("该订单的回收人为"+one.getOldOperatorName());
         }
         //插入轨迹表
         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/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/logback-spring.xml

@@ -202,7 +202,7 @@
 
 
     <!--开发环境:打印控制台-->
-    <springProfile name="dev,test,prod">
+    <springProfile name="dev,test,prod,pre">
         <root level="info">
             <appender-ref ref="console"/>
             <appender-ref ref="file_console"/>

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/inv/InvSourceMapper.xml

@@ -245,6 +245,8 @@
         max_receivable,
         revenue_time,
         revenue_name,
+        update_name,
+        update_userid,
         inv_source_type,
         CASE WHEN DATEDIFF(NOW(), signing_time) > 90 THEN 2 ELSE inv_source.clearing_state END as clearing_state,
         insurance_clearing_state

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

@@ -781,7 +781,7 @@
         left JOIN
              ins_orders io  on iac.orderno = io.orderno
         <where>
-             (iac.operator_id is null or  iac.operator_id =#{orderQueryVo.userId})
+             ( (iac.operator_id is null or iac.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>
@@ -833,7 +833,7 @@
             left JOIN
         ins_orders io  on iac.orderno = io.orderno
         <where>
-            (iac.operator_id is null or  iac.operator_id =#{orderQueryVo.userId})
+            ( (iac.operator_id is null or iac.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>