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

src/main/java/com/ydtech/modules/admin/model/vo/AppCustomerManagementQueryVo.java

@@ -28,8 +28,8 @@ public class AppCustomerManagementQueryVo implements Serializable {
     private String authenticationStatus;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

src/main/java/com/ydtech/modules/admin/model/vo/SysAmountAuditingVo.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -74,8 +73,8 @@ public class SysAmountAuditingVo {
     private String bankAccount;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

src/main/java/com/ydtech/modules/admin/model/vo/SysDeptAccountVO.java

@@ -35,8 +35,8 @@ public class SysDeptAccountVO {
     private Date createTime;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

src/main/java/com/ydtech/modules/admin/model/vo/SysUserAccountHistoryVo.java

@@ -54,8 +54,8 @@ public class SysUserAccountHistoryVo {
 
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

src/main/java/com/ydtech/modules/admin/model/vo/SysUserAccountVo.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -87,8 +86,8 @@ public class SysUserAccountVo {
 
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

src/main/java/com/ydtech/modules/admin/model/vo/SysUserBankCardVO.java

@@ -58,8 +58,8 @@ public class SysUserBankCardVO {
     private String delFlag;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

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

@@ -1,13 +1,11 @@
 package com.ydtech.modules.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysUserBankCardMapper;
-import com.ydtech.modules.admin.model.SysDeptAccount;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.po.SysUserBankCardHistory;
 import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
@@ -140,7 +138,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
     public void insertByBankNumber(SysUserBankCardVO sysUserBankCardVO) {
         SysUserBankCard findSysUserBankCard = sysUserBankCardService.getOne(new LambdaQueryWrapper<SysUserBankCard>()
                 .eq(SysUserBankCard::getBankNumber, sysUserBankCardVO.getBankNumber())
-                .eq(SysUserBankCard::getUserId, BaseController.getUser().getId()));
+                .eq(SysUserBankCard::getUserId, sysUserBankCardVO.getUserId()));
         if (findSysUserBankCard != null) {
             findSysUserBankCard.setDelFlag("0");
             findSysUserBankCard.setAuditStatus("0");

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

@@ -568,12 +568,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         // 手机号
         List<SysUser> mobileList = lambdaQuery().eq(SysUser::getMobile, sysUser.getMobile()).list();
         if (!mobileList.isEmpty()) {
-            throw new SystemException("手机号已经注册请跟换手机号。");
+            throw new SystemException("手机号已经注册请更换手机号。");
         }
         // 身份证号
         List<SysUser> identityList = lambdaQuery().eq(SysUser::getIdentity, sysUser.getIdentity()).list();
         if (!identityList.isEmpty()) {
-            throw new SystemException("身份证号已经注册请跟换身份证号。");
+            throw new SystemException("身份证号已经注册请更换身份证号。");
         }
 
         //处理密码

src/main/java/com/ydtech/modules/esm/model/vo/EsmInsPackagePageVo.java

@@ -4,7 +4,6 @@ package com.ydtech.modules.esm.model.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.io.Serializable;
 
@@ -14,8 +13,8 @@ public class EsmInsPackagePageVo implements Serializable {
     private static final long serialVersionUID = -1747432623058279115L;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

src/main/java/com/ydtech/modules/esm/model/vo/EsmInsVehicleInspectionCodePageVo.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.esm.model.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.io.Serializable;
 
@@ -13,8 +12,8 @@ public class EsmInsVehicleInspectionCodePageVo implements Serializable {
     private static final long serialVersionUID = -1747432623058279115L;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -2,7 +2,10 @@ package com.ydtech.modules.fee.service.impl;
 
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.SysUserRole;
+import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.fee.dto.FeeFactorInfoDto;
 import com.ydtech.modules.fee.dto.FeeSchemeReqDto;
 import com.ydtech.modules.fee.dto.FeeSchemeResDto;
@@ -64,6 +67,9 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
     @Resource
     private InsFeeOrderNewService insFeeOrderNewService;
 
+    @Resource
+    private SysUserRoleService sysUserRoleService;
+
     /**
      * 根据跟单信息，以及配置的费用因子，获取合适的跟单费用
      *
@@ -2703,14 +2709,14 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
                  insFeeOrderNew.getJqExportOtherCostsProportion(),
                 insFeeOrderNew.getJqExportSuperviseCostsPremiums(), insFeeOrderNew.getJqExportOtherCostsPremiums());
-        exportFeeList.add(jqExportFee);
+        //exportFeeList.add(jqExportFee);
 
         //交强
         FeeOrderNewVo.ExportFee syExportFee = this.assignExportFee("商业险",
                 insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
                 insFeeOrderNew.getSyExportOtherCostsProportion(),
                 insFeeOrderNew.getSyExportSuperviseCostsPremiums(), insFeeOrderNew.getSyExportOtherCostsPremiums());
-        exportFeeList.add(syExportFee);
+        //exportFeeList.add(syExportFee);
 
 
         //交强
@@ -2718,9 +2724,21 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
 insFeeOrderNew.getNoExportOtherCostsProportion(),
                 insFeeOrderNew.getNoExportSuperviseCostsPremiums(), insFeeOrderNew.getNoExportOtherCostsPremiums());
+       // exportFeeList.add(noExportFee);
+        //add  by  hxl   添加出单员不能查看优惠的限制    2024-07-11
+        String userId = new BaseController().getUserId();
+        SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
+        if(sysUserRole!=null && sysUserRole.getRoleId()==19){
+            jqExportFee.setTotalAmount(BigDecimal.ZERO);
+            jqExportFee.setTotalProportion(BigDecimal.ZERO);
+            syExportFee.setTotalAmount(BigDecimal.ZERO);
+            syExportFee.setTotalProportion(BigDecimal.ZERO);
+            noExportFee.setTotalAmount(BigDecimal.ZERO);
+            noExportFee.setTotalProportion(BigDecimal.ZERO);
+        }
+        exportFeeList.add(jqExportFee);
+        exportFeeList.add(syExportFee);
         exportFeeList.add(noExportFee);
-
-
         //endregion
 
         feeOrderNewVo.setEntranceFee(entranceFeeList);

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

@@ -45,9 +45,9 @@ public class ImportResultVo {
 
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
-    private int pageSize=20;
+    //@Min(value = 20, message = "页数最小为20")
+   //@Max(value = 100, message = "页数最大为100")
+    private int pageSize;
 
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")

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

@@ -90,9 +90,9 @@ public class InsPlyIncomeVo implements Serializable {
     private BigDecimal otherFeevalue;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
-    private int pageSize=20;
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
+    private int pageSize;
 
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")

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

@@ -1,22 +1,12 @@
 package com.ydtech.modules.fnc.vo;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
-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;
 
 /**
  * <p>
@@ -52,9 +42,9 @@ public class InsPlyMainVo implements Serializable {
     private LocalDate endDate;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
-    private int pageSize=20;
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
+    private int pageSize;
 
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")

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

@@ -72,9 +72,9 @@ public class InsPlySettleVo implements Serializable {
     private LocalDate endDate;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
-    private int pageSize=20;
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
+    private int pageSize;
 
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")

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

@@ -1,14 +1,11 @@
 package com.ydtech.modules.fnc.vo;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -66,9 +63,9 @@ public class SettlementDocumentaryFeesSumVo implements Serializable {
     private String completionStatus;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
-    private int pageSize=20;
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
+    private int pageSize;
 
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")

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

@@ -1,12 +1,10 @@
 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;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -31,9 +29,9 @@ public class SettlementDocumentaryLogVo implements Serializable {
     private Date createTime;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
-    private int pageSize=20;
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
+    private int pageSize;
 
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")

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

@@ -46,7 +46,7 @@ public class InvInsCompanyDto {
     @ApiModelProperty(value = "状态")
     private String status;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "付款日期")
     private Date payDate;
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

src/main/java/com/ydtech/modules/order/aop/aspect/QuoteVerificationAspect.java

@@ -7,10 +7,12 @@ import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.agreement.ProductsType;
 import com.ydtech.constants.sys.SystemConstant;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.fee.service.CostsCalcService;
@@ -31,9 +33,11 @@ import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.protocol.constants.TaxSourceStatusConstants;
 import com.ydtech.modules.protocol.dao.PtlTaxSourceNewMapper;
 import com.ydtech.modules.protocol.entity.dto.TaxSourceExcludeDto;
+import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.entity.po.PtlTaxSourceNew;
 import com.ydtech.modules.protocol.service.ITaxSourceExcludeService;
 import com.ydtech.modules.protocol.service.PtlAgreementDeptService;
+import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocol.service.PtlTaxSourceNewService;
 import com.ydtech.modules.protocol.service.impl.TaxSourceServiceImpl;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
@@ -92,6 +96,8 @@ public class QuoteVerificationAspect {
 
     private final PtlTaxSourceNewMapper ptlTaxSourceNewMapper;
 
+    private final PtlAgreementService ptlAgreementService;
+
     @AfterReturning(pointcut = "@annotation(com.ydtech.modules.order.aop.QuoteVerification)", returning = "result")
     public void doAfter(HttpResult<QuoteRespVo> result) {
         //计算费用因子
@@ -108,14 +114,19 @@ public class QuoteVerificationAspect {
                 InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(insAreaCompany.getId());
                 if (insFeeOrderNew != null) {
                     //出口
-                    SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
-
-                    result.getData().setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
-                    result.getData().setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
-                    result.getData().setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
-                    result.getData().setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
-                            .add(subOrderExportFeeVo.getSyExportCosts())
-                            .add(subOrderExportFeeVo.getNoExportCosts()));
+                    //add  by  hxl   添加出单员不能查看优惠的限制    2024-07-11
+                    String userId = new BaseController().getUserId();
+                    SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
+                    if(sysUserRole!=null && sysUserRole.getRoleId()!=19){
+                        //出口
+                        SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
+                        result.getData().setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
+                        result.getData().setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
+                        result.getData().setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
+                        result.getData().setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
+                                .add(subOrderExportFeeVo.getSyExportCosts())
+                                .add(subOrderExportFeeVo.getNoExportCosts()));
+                    }
                 }else{
                     //输出费用匹配失败日志
                     result.getData().setFeeNoDescription(logs.toString());
@@ -157,6 +168,16 @@ public class QuoteVerificationAspect {
                     userId = new BaseController().getUserId();
                 }
                  **/
+                //添加外部订单的限制  add by hxl  2024-07-12
+                List<InsAreaCompany> insAreaList = insAreaCompanyService.getBaseMapper().selectList(new LambdaQueryWrapper<InsAreaCompany>().eq(InsAreaCompany::getOrderno, orderno));
+                if(insAreaList!=null  && insAreaList.size()>0 ){
+                    for(InsAreaCompany subOrder : insAreaList){
+                        PtlAgreement ptlAgreement = ptlAgreementService.getById(subOrder.getAgreementId());
+                        if(ptlAgreement!=null && ptlAgreement.getIsExternal()!=null && ptlAgreement.getIsExternal()==1){
+                            throw new SystemException("外部订单不允许报价，请到外部订单编辑页面进行编辑！！");
+                        }
+                    }
+                }
                 //税源查询
                 BaseQuoteInfoVo quoteInfo = insOrdersComponents.getQuoteInfo(orderno, agreementId);
                  //add by hxl  2024-06-12  改为从主订单表中获取数据用户id和部门id

src/main/java/com/ydtech/modules/order/dao/InsOrdersMapper.java

@@ -23,9 +23,9 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
     InsOrders getByUseridAndLicenseNo(VerifyOrdersVo verifyOrdersVo);
 
     Long queryPageOrderCount(@Param("orderQueryVo") OrderQueryVo orderQueryVo,
-                             @Param("isTeamLeader") Boolean isTeamLeader,@Param("isCdy")Boolean isCdy);
+                             @Param("isTeamLeader") Boolean isTeamLeader,@Param("isCdy")Boolean isCdy,@Param("deptId")String deptId);
     Page<InsOrders> queryPageOrder(@Param("page") Page page,@Param("orderQueryVo") OrderQueryVo orderQueryVo,
-                                   @Param("isTeamLeader") Boolean isTeamLeader,@Param("isCdy")Boolean isCdy);
+                                   @Param("isTeamLeader") Boolean isTeamLeader,@Param("isCdy")Boolean isCdy,@Param("deptId")String deptId);
 
     List<InsOrdersExcel> queryOrderList(InsOrdersExcelVo insOrdersExcelVo);
 

src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -46,8 +46,8 @@ public class OrderQueryVo {
     private LocalDate endDate;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

src/main/java/com/ydtech/modules/order/entity/vo/PolicyInsuranceReportReqVo.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import java.time.LocalDate;
@@ -59,8 +58,8 @@ public class PolicyInsuranceReportReqVo {
     private LocalDate policyEndDate;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

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

@@ -781,10 +781,10 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         this.updateById(insAreaCompany);
 
         //更新轨迹表
-        if(insOrdersEditingVo.getStageFlag()==1){
-            insOrdersTrackService.addingTrajectoriesNew(insAreaCompany);
+       // if(insOrdersEditingVo.getStageFlag()==1){
+            insOrdersTrackService.addingTrajectories(insAreaCompany);
             insOrdersService.updateByOrderStatus(insAreaCompany);
-        }
+       // }
         //查找协议的费用
         AgreementProductQueryVo agreementProductQueryVo = new AgreementProductQueryVo();
         List<String> productId = new ArrayList<>();

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

@@ -281,9 +281,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
         }
         if (isCdy) {
+            //add by  hxl 注释 业务员录单变为团队长的逻辑
             //如果是出单员  获取最终实际业务员
-            SysUser user = sysUserService.getById(realUserId);
-            realUserId = user.getOperatorCode();
+            // SysUser user = sysUserService.getById(realUserId);
+            // realUserId = user.getOperatorCode();
         } else {
             //如果传递的业务归属人且与登录人不一致，则是代客录单业务
             if (StringUtils.isNotEmpty(quoteInfoVo.getUserId()) && !userId.equals(quoteInfoVo.getUserId())) {
@@ -391,8 +392,19 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
          }
          orderQueryVo.setEndDate(orderQueryVo.getEndDatePlusOneDay());
          **/
-        Page<InsOrders> orderVoPage = baseMapper.queryPageOrder(page, orderQueryVo, adminFalg, null);
-        Long total = baseMapper.queryPageOrderCount(orderQueryVo, adminFalg, null);
+        //添加渠道团队长可以查看下级  add by hxl   2024-07-12
+        SysUserRole userRole = sysUserRoleService.selectByUserId(orderQueryVo.getUserId());
+        SysUser user = sysUserService.getById(orderQueryVo.getUserId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
+        String deptId="";
+        boolean isCdy =false;
+        //机构类型为1  角色id=21是渠道团队长
+        if(dept!=null && "1".equals(dept.getManagementSource()) && userRole!=null && userRole.getRoleId()==21){
+            deptId=dept.getId();
+            isCdy = true;
+        }
+        Page<InsOrders> orderVoPage = baseMapper.queryPageOrder(page, orderQueryVo, adminFalg, isCdy,deptId);
+        Long total = baseMapper.queryPageOrderCount(orderQueryVo, adminFalg, isCdy,deptId);
         orderVoPage.setTotal(total);
         return new BasePageResult<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize(), orderVoPage.getTotal(),
                 orderVoPage.getPages()

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

@@ -115,11 +115,11 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
     private final Integer REDIS_YONGCHENG_QUERY_CODE_EXPIRE = 7;
 
-    public static final String JQ_REGEX = "交强险.+?[^保险止期|^终保日期][是：:\\s]?([0-9\\-:]+)";
+    public static final String JQ_REGEX = "交强险.+?(?:保险止期|终保日期)[是：:\\s]*?([0-9\\-:]+)";
 
-    public static final String REGEX_ALONE = "[^保险止期|^终保日期][是：:\\s]?([0-9\\-:]+)";
+    public static final String REGEX_ALONE = "(?:保险止期|终保日期)[是：:\\s]*?([0-9\\-:]+)";
 
-    public static final String SY_REGEX = "商业险.+?[^保险止期|^终保日期][是：:\\s]?([0-9\\-:]+)";
+    public static final String SY_REGEX = "(?:商业险|商业保险).+?(?:保险止期|终保日期)[是：:\\s]*?([0-9\\-:]+)";
 
     public static final String END_TIME = "23:59:59";
 

src/main/java/com/ydtech/modules/report/model/vo/InsPlySettleReportReqVo.java

@@ -4,10 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -32,8 +30,8 @@ public class InsPlySettleReportReqVo {
     private LocalDate quoteEndDate;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

src/main/java/com/ydtech/modules/report/model/vo/PayApplyDeptReportReqVo.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.time.LocalDate;
 import java.util.List;
@@ -32,8 +31,8 @@ public class PayApplyDeptReportReqVo {
     private LocalDate quoteEndDate;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

src/main/java/com/ydtech/modules/report/model/vo/PayApplyUserReportReqVo.java

@@ -4,10 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 /**
  * @Author: CXP
@@ -38,8 +36,8 @@ public class PayApplyUserReportReqVo {
     private LocalDate quoteEndDate;
 
     @ApiModelProperty(value = "每页页数")
-    @Min(value = 20, message = "页数最小为20")
-    @Max(value = 100, message = "页数最大为100")
+    //@Min(value = 20, message = "页数最小为20")
+    //@Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

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

@@ -1155,7 +1155,6 @@
         sum( a.commission_feevalue ) AS "commissionFeevalue",
         sum( a.other_feevalue ) AS "otherFeevalue",
         SUM( IFNULL(a.commission_feevalue,0) + IFNULL (a.other_feevalue,0) ) AS "totalFeevalue",
-        GROUP_CONCAT(a.id) as "ids",
         MAX( a.partner_companies_name) as "partnerCompaniesName",
         MAX(pa.docking_person) as "dockingPerson"
         from ins_ply_income a
@@ -1191,7 +1190,7 @@
                 AND day(a.signdate) =#{day}
             </if>
         </where>
-        GROUP BY a.partner_companies_id
+        GROUP BY  a.partner_companies_id,pa.insurance_company_id,pa.docking_person
     </select>
 
     <select id="queryInvoicing" resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">

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

@@ -320,9 +320,18 @@
                     and io.operatorid = #{orderQueryVo.userId}
               </if>
                -->
-              <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
-                   and io.userid = #{orderQueryVo.userId}
-              </if>
+                <choose>
+                    <when test="isCdy">
+                        <if test="deptId != null and deptId != '' ">
+                            and io.deptid like "${deptId}%"
+                        </if>
+                    </when>
+                    <otherwise>
+                        <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
+                            and io.userid = #{orderQueryVo.userId}
+                        </if>
+                    </otherwise>
+                </choose>
             </where>
             group by io.orderno
         ) as s
@@ -375,9 +384,18 @@
                 and io.operatorid = #{orderQueryVo.userId}
             </if>
              -->
-            <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
-                and io.userid = #{orderQueryVo.userId}
-            </if>
+            <choose>
+                <when test="isCdy">
+                    <if test="deptId != null and deptId != '' ">
+                        and io.deptid like "${deptId}%"
+                    </if>
+                </when>
+                <otherwise>
+                    <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
+                        and io.userid = #{orderQueryVo.userId}
+                    </if>
+                </otherwise>
+            </choose>
         </where>
         group by orderno
         order by io.createtime desc