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

src/main/java/com/ydtech/constants/enums/dict/ser/AnnualAuditOrderEnum.java

@@ -10,11 +10,11 @@ import lombok.Getter;
 @DictEnum(key = "annualAuditOrderStatus", desc = "年检代办订单状态")
 public enum AnnualAuditOrderEnum implements IBaseEnum {
 
-    UNPAID("101","待支付",0,1),
+    UNPAID("1","待支付",0,1),
 
-    AWAIT_ANNUAL("102","待年检",0,1),
+    AWAIT_ANNUAL("2","待年检",0,1),
 
-    FINISHED("103","订单完成",0,1);
+    FINISHED("3","订单完成",0,1);
 
     // 编号
     private final String code;

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

@@ -99,12 +99,20 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 //        if(agreementProductCosts == null || agreementProductCosts.size() == 0){
 //            throw new SystemException("协议费用因子为空");
 //        }
+        for(int i=0;i<agreementProductCosts.size();i++)
+        {
+            if(agreementProductCosts.get(i).getPriorityLevel()==null){
+                agreementProductCosts.get(i).setPriorityLevel(1);
+            }
+        }
         if(agreementProductCosts.size() > 0) {
             //按优先级进行排序
             Collections.sort(agreementProductCosts, Comparator.comparingInt(AgreementProductCosts::getPriorityLevel).reversed());
             //遍历费用因子
             String costsId = verificationCosts(agreementProductCosts, insAreaCompany, insOrders);
-            calcCosts(costsId, insAreaCompany);
+            if(costsId != null) {
+                calcCosts(costsId, insAreaCompany);
+            }
         }
     }
 
@@ -460,7 +468,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 }
             }
         }
-        throw new SystemException("费用因子匹配失败");
+        return null;
+//        throw new SystemException("费用因子匹配失败");
     }
 
 

src/main/java/com/ydtech/modules/ins/model/pingan/respose/PingAnQuoteRespVo.java

@@ -0,0 +1,16 @@
+package com.ydtech.modules.ins.model.pingan.respose;
+
+
+import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.entity.api.pingan.response.QuoteResponse;
+import lombok.Data;
+
+@Data
+public class PingAnQuoteRespVo extends QuoteRespVo {
+
+    // 财意险保费
+    QuoteResponse.AhsUpcActualPremiumDTO ahsUpcActualPremium =new QuoteResponse.AhsUpcActualPremiumDTO();
+    // 小微险保费
+    QuoteResponse.XwActualPremiumDTO xwActualPremium = new QuoteResponse.XwActualPremiumDTO();
+
+}

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

@@ -7,11 +7,13 @@ import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
+import com.ydtech.modules.order.entity.api.pingan.response.UnAutoProductDetailResponse;
 import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.bohai.BoHaiQuoteAccidentVo;
+import com.ydtech.modules.order.entity.vo.bohai.ProductDetailsQueryVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductQueryVo;
+import com.ydtech.modules.order.entity.vo.pingan.PingAnQuoteVo;
 import com.ydtech.modules.order.service.PingAnOrderApiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,7 +42,7 @@ public class PingAnOrderApiController {
     @QuoteVerification("报价授权")
     @PostMapping("/quote")
     @ApiOperation("报价")
-    public HttpResult<QuoteRespVo> quote(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
+    public HttpResult<QuoteRespVo> quote(@RequestBody PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
         BaseQuoteInfoVo quoteInfo = this.insOrdersComponents.getQuoteInfo(quoteVo.getOrderNo(), quoteVo.getAgreementId());
         return this.pingAnOrderApiService.quote(quoteInfo, quoteVo);
     }
@@ -84,7 +86,7 @@ public class PingAnOrderApiController {
 
     @PostMapping("/renewalConfirm")
     @ApiOperation("续保")
-    public HttpResult<Object> renewalConfirm(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) throws Exception {
+    public HttpResult<Object> renewalConfirm(@RequestBody PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) throws Exception {
         return this.pingAnOrderApiService.renewalConfirm(quoteVo,quoteInfo);
     }
 
@@ -96,19 +98,25 @@ public class PingAnOrderApiController {
 
     @PostMapping("/getDocumentStatusList")
     @ApiOperation("单证状态查询")
-    public HttpResult<Object> getDocumentStatusList(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
+    public HttpResult<Object> getDocumentStatusList(@RequestBody PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
         return this.pingAnOrderApiService.getDocumentStatusList(quoteVo);
     }
 
     @PostMapping("/repealDocument")
     @ApiOperation("撤销单证")
-    public HttpResult<Object> repealDocument(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
+    public HttpResult<Object> repealDocument(@RequestBody PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
         return this.pingAnOrderApiService.repealDocument(quoteVo);
     }
 
     @PostMapping("/getDmvehicleInfo")
     @ApiOperation("获取交管车辆验证码")
-    public HttpResult<Object> getDmvehicleInfo(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) throws Exception {
+    public HttpResult<Object> getDmvehicleInfo(@RequestBody PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) throws Exception {
         return this.pingAnOrderApiService.getDmvehicleInfo(quoteVo,quoteInfo);
     }
+
+    @PostMapping("/productDetailsQuery")
+    @ApiOperation("获取财意险险种套餐责任信息")
+    public HttpResult<List<UnAutoProductDetailResponse.UnAutoProductDetailsDTO>> productDetailsQuery(@RequestBody ProductDetailsQueryVo productDetailsQueryVo) throws Exception {
+        return this.pingAnOrderApiService.productDetailsQuery(productDetailsQueryVo);
+    }
 }

src/main/java/com/ydtech/modules/order/entity/api/pingan/request/QuoteRequest.java

@@ -779,6 +779,12 @@ public class QuoteRequest extends PingAnBaseRequest {
          */
         private String loanVehicleFlag;
 
+        public BizQuoteDTO() {
+        }
+
+        public BizQuoteDTO(String beginDate) {
+            this.beginDate = beginDate;
+        }
     }
     /***
      * 交强险信息

src/main/java/com/ydtech/modules/order/entity/vo/pingan/PingAnQuoteVo.java

@@ -0,0 +1,56 @@
+package com.ydtech.modules.order.entity.vo.pingan;
+
+import com.ydtech.modules.order.entity.api.pingan.request.QuoteRequest;
+import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "平安报价实体")
+public class PingAnQuoteVo<T> extends BaseQuoteVo<T> {
+
+    @ApiModelProperty("是否通融报价")
+    //add by hxl  2024-04-03
+    private String accommodationFlag;
+
+    @ApiModelProperty("是否投保财意险")
+    //add by hxl  2024-04-03
+    private String applyUnAuto;
+
+    @ApiModelProperty("是否投保小微险")
+    //add by hxl  2024-04-03
+    private String applyXiaoWei;
+    /***
+     * 财意险列表
+     */
+    @ApiModelProperty("财意险列表")
+    //add by hxl  2024-04-03
+    private List<QuoteRequest.UnAutoListInfoDTO> unAutoListInfo=new ArrayList<QuoteRequest.UnAutoListInfoDTO>();
+    /***
+     * 小微险列表
+     */
+    @ApiModelProperty("小微险列表")
+    //add by hxl  2024-04-03
+    private List<QuoteRequest.UnAutoListInfoDTO> xiaoWeiListInfo=new ArrayList<QuoteRequest.UnAutoListInfoDTO>();
+
+    /***
+     *  投保附加自用充电桩损失保险
+     * 【自用充电桩设备信息列表，最多3个桩】
+     */
+    @ApiModelProperty("投保附加自用充电桩损失保险")
+    //add by hxl  2024-04-03
+    private List<QuoteRequest.Amount22XNYChargingPostListDTO> amount22XNYChargingPostList=new ArrayList<QuoteRequest.Amount22XNYChargingPostListDTO>();
+
+    /***
+     *  投保附加自用充电桩损失保险
+     * 【自用充电桩设备信息列表，最多3个桩】
+     */
+    @ApiModelProperty("投保附加自用充电桩损失保险")
+    //add by hxl  2024-04-03
+    private List<QuoteRequest.Amount23XNYChargingPostListDTO> amount23XNYChargingPostList=new ArrayList<QuoteRequest.Amount23XNYChargingPostListDTO>();
+
+}

src/main/java/com/ydtech/modules/order/service/PingAnOrderApiService.java

@@ -5,10 +5,10 @@ import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.order.entity.api.pingan.response.UnAutoProductDetailResponse;
 import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.bohai.BoHaiQuoteAccidentVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductDetailsQueryVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductQueryVo;
+import com.ydtech.modules.order.entity.vo.pingan.PingAnQuoteVo;
 
 import java.util.List;
 import java.util.Map;
@@ -35,7 +35,7 @@ public interface PingAnOrderApiService {
      * @param quoteVo
      * @return
      */
-    HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfo, BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception;
+    HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfo, PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception;
 
     /**
      * 提交影像
@@ -94,7 +94,7 @@ public interface PingAnOrderApiService {
     * @Exception   
     * 
     */
-    HttpResult<Object> getDmvehicleInfo(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo);
+    HttpResult<Object> getDmvehicleInfo(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo);
 
 
     /**
@@ -106,7 +106,7 @@ public interface PingAnOrderApiService {
      * @Exception
      *
      */
-    HttpResult<Object> renewalConfirm(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo);
+    HttpResult<Object> renewalConfirm(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo);
 
 
     /**
@@ -130,7 +130,7 @@ public interface PingAnOrderApiService {
      * @Exception
      *
      */
-    HttpResult<Object> getDocumentStatusList(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo);
+    HttpResult<Object> getDocumentStatusList(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo);
 
 
     /**
@@ -142,5 +142,5 @@ public interface PingAnOrderApiService {
      * @Exception
      *
      */
-    HttpResult<Object> repealDocument(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo);
+    HttpResult<Object> repealDocument(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo);
 }

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

@@ -5,6 +5,7 @@ import com.ydtech.config.properties.PingAnApiConfigurationProperties;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.ins.model.pingan.respose.PingAnQuoteRespVo;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.pingan.PinganRequestApiComponents;
@@ -27,10 +28,13 @@ import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
+import com.ydtech.modules.order.entity.vo.InsOrdersEditingVo;
 import com.ydtech.modules.order.entity.vo.bohai.BoHaiQuoteAccidentVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductDetailsQueryVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductQueryVo;
+import com.ydtech.modules.order.entity.vo.pingan.PingAnQuoteVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
+import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsTaskImagesService;
 import com.ydtech.modules.order.service.PingAnOrderApiService;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
@@ -65,6 +69,8 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
 
     private final InsTaskImagesService insTaskImagesService;
 
+    private final InsOrdersService  insOrdersService;
+
 
     private final PingAnApiConfigurationProperties properties;
     /**
@@ -142,7 +148,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
      *
      */
     @Override
-    public HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfo, BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
+    public HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfo, PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
         // 协议id获取配置实体
         String agreementId = quoteVo.getAgreementId();
         // 账号信息
@@ -172,7 +178,10 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
              CarConfirmResponse carConfirmResponse = pinganRequestApiComponents.carConfirm(carConfirmRequest);
 
              //4.报价  使用车辆确认返回的流程id
-             QuoteRequest quoteRequest = new QuoteRequest(parameters, quoteInfo,  modelsDto, carConfirmResponse.getFlowid(),"applyBiz",new QuoteRequest.BizQuoteDTO(),"applyForce","accommodationFlag", "applyUnAuto","applyXiaoWei",new ArrayList<QuoteRequest.UnAutoListInfoDTO>(),new ArrayList<QuoteRequest.UnAutoListInfoDTO>(),new ArrayList<QuoteRequest.Amount22XNYChargingPostListDTO>(), new ArrayList<QuoteRequest.Amount23XNYChargingPostListDTO>());
+             CarConfirmResponse.BizQuoteDTO bizQuote = carConfirmResponse.getBizQuote();
+             QuoteRequest.BizQuoteDTO bizQuoteDTO = new QuoteRequest.BizQuoteDTO(bizQuote.getBeginDate());
+
+             QuoteRequest quoteRequest = new QuoteRequest(parameters, quoteInfo,  modelsDto, carConfirmResponse.getFlowid(),carConfirmResponse.getIsBizElectronicPolicy(),bizQuoteDTO,carConfirmResponse.getIsForceElectronicPolicy(),quoteVo.getAccommodationFlag(), quoteVo.getApplyUnAuto(),quoteVo.getApplyXiaoWei(),quoteVo.getUnAutoListInfo(),quoteVo.getXiaoWeiListInfo(),quoteVo.getAmount22XNYChargingPostList(), quoteVo.getAmount23XNYChargingPostList());
              QuoteResponse quoteResponse=null;
              try{
                  quoteResponse= pinganRequestApiComponents.quote(quoteRequest);
@@ -194,7 +203,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                                                   PtlAgreementAttribution ptlAgreementAttribution,
                                                   SearchPAVehicleListResponse.ModelsDto modelsDto) {
 
-        QuoteRespVo quoteRespVo = new QuoteRespVo();
+        PingAnQuoteRespVo quoteRespVo = new PingAnQuoteRespVo();
         // 交强险保费信息
         QuoteResponse.ForceQuoteResultDTO forceQuoteResult = response.getForceQuoteResult();
         //交强险保费
@@ -258,6 +267,9 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
         // 小微险保费
         QuoteResponse.XwActualPremiumDTO xwActualPremium = response.getXwActualPremium();
          //小微险保费
+        quoteRespVo.setAhsUpcActualPremium(ahsUpcActualPremium);
+
+        quoteRespVo.setXwActualPremium(xwActualPremium);
 
         List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
         // 非车险
@@ -415,8 +427,14 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
         PingAnConfigureParameters parameters = configureParametersComponents.toEntity(PingAnConfigureParameters.class,
                 ptlAgreementAttribution);
         BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo=new BaseQuoteVo<>();
+
+        //通过订单号查询车辆信息和车主信息
+        InsOrdersEditingVo insOrders = insOrdersService.revise(subOrderNo);
+        //车主信息
+        CustomerInfoVo ownerInfo = insOrders.getOwnerinfo().toJavaObject(CustomerInfoVo.class);
+        CarInfoVo carInfoVo = insOrders.getCarinfo().toJavaObject(CarInfoVo.class);
         //调用  电子保单pdf  001
-        PolicyPdfRequest policyPdfRequest = new PolicyPdfRequest(parameters,quoteVo,"checkNo","licenseNo","frameNo");
+        PolicyPdfRequest policyPdfRequest = new PolicyPdfRequest(parameters,quoteVo,ownerInfo.getIdentifyNumber(),carInfoVo.getLicenseNo(),carInfoVo.getFrameNo());
         PolicyPdfResponse policyPdfResponse=null;
         try{
             policyPdfResponse= pinganRequestApiComponents.getPolicyPdf(policyPdfRequest);
@@ -595,7 +613,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> getDmvehicleInfo(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) {
+    public HttpResult<Object> getDmvehicleInfo(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) {
         // 协议id获取配置实体
         String agreementId = quoteVo.getAgreementId();
         // 账号信息
@@ -638,7 +656,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> renewalConfirm(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) {
+    public HttpResult<Object> renewalConfirm(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) {
         // 协议id获取配置实体
         String agreementId = quoteVo.getAgreementId();
         // 账号信息
@@ -710,7 +728,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> getDocumentStatusList(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) {
+    public HttpResult<Object> getDocumentStatusList(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) {
 
         try{
             //调用
@@ -747,7 +765,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> repealDocument(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) {
+    public HttpResult<Object> repealDocument(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) {
         try{
             //调用
             // 协议id获取配置实体

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

@@ -283,6 +283,11 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         PtlAgreementProductCostsNew ptlAgreementProductCostsNew = new PtlAgreementProductCostsNew();
         BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNew);
         ptlAgreementProductCostsNew.setId(null);
+        //设置默认优先级为1
+        if(ptlAgreementProductCostsNew.getPriorityLevel() == null)
+        {
+            ptlAgreementProductCostsNew.setPriorityLevel(1);
+        }
         ptlAgreementProductCostsNew.blank();
         int insert = baseMapper.insert(ptlAgreementProductCostsNew);
 

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

@@ -209,9 +209,6 @@
         RIGHT JOIN ins_area_company iac ON iac.orderno = io.orderno
         WHERE
         iac.orderstatus in (1,2,3)
-        <if test="quTeamNumDto.deptId != null and quTeamNumDto.deptId != ''">
-            and io.deptid = #{quTeamNumDto.deptId}
-        </if>
         <if test="quTeamNumDto.createTimeStart != null">
             and io.createtime &gt;= #{quTeamNumDto.createTimeStart}
         </if>
@@ -293,9 +290,6 @@
         RIGHT JOIN ins_area_company iac ON iac.orderno = io.orderno
         WHERE
         iac.orderstatus in (1,2,3)
-        <if test="quTeamNumDto.deptId != null and quTeamNumDto.deptId != ''">
-            and io.deptid = #{quTeamNumDto.deptId}
-        </if>
         <if test="quTeamNumDto.createTimeStart != null">
             and io.createtime &gt;= #{quTeamNumDto.createTimeStart}
         </if>