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

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

@@ -99,7 +99,7 @@ public class SysAmountAuditingVo {
     private String auditingUserName;
 
 
-    @ApiModelProperty("时间条件")
+    @ApiModelProperty("支付时间时间条件")
     private String  timeFiltering;
 
     @ApiModelProperty("时间条件")
@@ -143,4 +143,11 @@ public class SysAmountAuditingVo {
      */
     @ApiModelProperty(value = "内部账户id")
     private String accountId;
+
+
+    @ApiModelProperty("支付开始时间")
+    private String  startAuditingTime;
+
+    @ApiModelProperty("支付结束时间")
+    private String  endAuditingTime;
 }

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

@@ -183,6 +183,13 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
                 params.put("leaderName",sysAmountAuditingVo.getLeaderName());
             }
 
+            if(StringUtils.isNotEmpty(sysAmountAuditingVo.getStartAuditingTime())){
+                params.put("startAuditingTime",sysAmountAuditingVo.getStartAuditingTime());
+            }
+            if(StringUtils.isNotEmpty(sysAmountAuditingVo.getEndAuditingTime())){
+                params.put("endAuditingTime",sysAmountAuditingVo.getEndAuditingTime());
+            }
+
             List<SysAmountAuditingEntity> list = baseMapper.queryPageOrderNew(params);
             pageHelper=new PageInfo(list);
             BasePageResult<SysAmountAuditingEntity> pageResult=new BasePageResult<SysAmountAuditingEntity>(sysAmountAuditingVo.getPageNum(), sysAmountAuditingVo.getPageSize(), pageHelper.getTotal(), pageHelper.getPages(), list);

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

@@ -247,6 +247,13 @@ public class InsPlyIncomeController extends BaseController {
         HashMap<String, Object> result = insPlyIncomeService.bxImportOther(multipartFile, isNotCar);
         return HttpResult.ok(result);
     }
+
+    @PutMapping("/bxImportOtherConfirm")
+    @ApiOperation(value = "批量跟单修改比例确认")
+    public HttpResult<HashMap<String, Object>> bxImportOtherConfirm(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {
+        insPlyIncomeService.bxImportOtherConfirm(insPlyIncomeVo);
+        return HttpResult.ok();
+    }
     @PostMapping("/ptImportOther")
     @ApiOperation(value = "平台批量修改比例（excel）")
     @ApiImplicitParams({
@@ -267,6 +274,13 @@ public class InsPlyIncomeController extends BaseController {
         return HttpResult.ok(result);
     }
 
+    @PutMapping("/noBxImportOtherConfirm")
+    @ApiOperation(value = "非车跟单批量修改比例确认")
+    public HttpResult<HashMap<String, Object>> noBxImportOtherConfirm(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {
+        insPlyIncomeService.noBxImportOtherConfirm(insPlyIncomeVo);
+        return HttpResult.ok();
+    }
+
 
     @PostMapping("/bxOtherImportData")
     @ApiOperation(value = "跟单对账导入（excel）")

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

@@ -173,4 +173,9 @@ public interface InsPlyIncomeService extends IService<InsPlyIncome> {
      * @return
      */
     HashMap<String, Object> ptImportOther(MultipartFile multipartFile);
+
+    void bxImportOtherConfirm(InsPlyIncomeVo insPlyIncomeVo);
+
+    void noBxImportOtherConfirm(InsPlyIncomeVo insPlyIncomeVo);
+
 }

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

@@ -2691,12 +2691,12 @@ handlingProportion,
                 if (ObjectUtils.isNotEmpty(byBxLicenseno) && (byBxLicenseno.getJqOtherCostsProportion().compareTo(item.getJqOtherCostsProportion()) != 0 || byBxLicenseno.getSyOtherCostsProportion().compareTo(item.getSyOtherCostsProportion()) != 0)) {
 
 
-                    InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
-                    BeanUtils.copyProperties(byBxLicenseno,insPlyIncomeLog);
-                    insPlyIncomeLog.setOperationStatus("2");
-                    insPlyIncomeLog.setId(null);
-                    insPlyIncomeLog.setIncomeId(byBxLicenseno.getId());
-                    insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+//                    InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+//                    BeanUtils.copyProperties(byBxLicenseno,insPlyIncomeLog);
+//                    insPlyIncomeLog.setOperationStatus("2");
+//                    insPlyIncomeLog.setId(null);
+//                    insPlyIncomeLog.setIncomeId(byBxLicenseno.getId());
+//                    insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
 
 
 
@@ -2708,16 +2708,16 @@ handlingProportion,
                     BigDecimal jqOtherAmount  =  getBigDecimal( byBxLicenseno.getJqPremium(),item.getJqOtherCostsProportion());
                     BigDecimal syOtherAmount =  getBigDecimal( byBxLicenseno.getSyPremium(),item.getSyOtherCostsProportion());
 
-                    byBxLicenseno.setJqOtherCostsPremium(jqOtherAmount);
-                    byBxLicenseno.setSyOtherCostsPremium(syOtherAmount);
-                    byBxLicenseno.setJqOtherCostsProportion(jqOtherCostsProportion);
-                    byBxLicenseno.setSyOtherCostsProportion(syOtherCostsProportion);
-                    byBxLicenseno.setOtherFeevalue(this.calculateTotal(jqOtherAmount, syOtherAmount, null));
-                    byBxLicenseno.setOtherFeerate(this.calculateTotal(jqOtherCostsProportion, syOtherCostsProportion, null));
-                    byBxLicenseno.setAllFeeValue(this.calculateTotal(jqOtherAmount, syOtherAmount, null));
-                    byBxLicenseno.setUpdateUserId(BaseController.getUser().getId());
-                    byBxLicenseno.setUpdateUserName(BaseController.getUser().getName());
-                    baseMapper.updateById(byBxLicenseno);
+//                    byBxLicenseno.setJqOtherCostsPremium(jqOtherAmount);
+//                    byBxLicenseno.setSyOtherCostsPremium(syOtherAmount);
+//                    byBxLicenseno.setJqOtherCostsProportion(jqOtherCostsProportion);
+//                    byBxLicenseno.setSyOtherCostsProportion(syOtherCostsProportion);
+//                    byBxLicenseno.setOtherFeevalue(this.calculateTotal(jqOtherAmount, syOtherAmount, null));
+//                    byBxLicenseno.setOtherFeerate(this.calculateTotal(jqOtherCostsProportion, syOtherCostsProportion, null));
+//                    byBxLicenseno.setAllFeeValue(this.calculateTotal(jqOtherAmount, syOtherAmount, null));
+//                    byBxLicenseno.setUpdateUserId(BaseController.getUser().getId());
+//                    byBxLicenseno.setUpdateUserName(BaseController.getUser().getName());
+//                    baseMapper.updateById(byBxLicenseno);
 
 
                     HashMap<String, Object> map = new HashMap<>();
@@ -2731,6 +2731,7 @@ handlingProportion,
 
                     map.put("otherFeevalue", byBxLicenseno.getOtherFeevalue());
                     map.put("otherFeerate", byBxLicenseno.getOtherFeerate());
+                    map.put("id", byBxLicenseno.getId());
                     resultList.add(map);
                     allAmount = allAmount.add(jqOtherAmount).add(syOtherAmount);
                 }
@@ -2744,6 +2745,33 @@ handlingProportion,
         return resultMap;
     }
 
+    @Override
+    @Transactional
+    public void bxImportOtherConfirm(InsPlyIncomeVo insPlyIncomeVo) {
+        if (ObjectUtils.isEmpty(insPlyIncomeVo)) {
+            throw new SystemException("请导入文件");
+        }
+        if (!CollectionUtils.isEmpty(insPlyIncomeVo.getResultList())) {
+            for (InsPlyIncome item : insPlyIncomeVo.getResultList()) {
+                InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+                BeanUtils.copyProperties(item,insPlyIncomeLog);
+                insPlyIncomeLog.setOperationStatus("2");
+                insPlyIncomeLog.setId(null);
+                insPlyIncomeLog.setIncomeId(item.getId());
+                insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+
+//                item.setOtherFeevalue(this.calculateTotal(item.getJqOtherCostsPremium(), item.getSyOtherCostsPremium(), null));
+//                item.setOtherFeerate(this.calculateTotal(item.getJqOtherCostsProportion(), item.getSyOtherCostsProportion(), null));
+                item.setAllFeeValue(this.calculateTotal(item.getJqOtherCostsPremium(), item.getSyOtherCostsPremium(), null));
+                item.setUpdateUserId(BaseController.getUser().getId());
+                item.setUpdateUserName(BaseController.getUser().getName());
+                baseMapper.updateById(item);
+            }
+        }
+    }
+
+
+
     @Override
     public HashMap<String, Object> ptImportOther(MultipartFile multipartFile) {
         HashMap<String, Object> resultMap = new HashMap<>();
@@ -2919,20 +2947,22 @@ handlingProportion,
 
                     BigDecimal noOtherAmount =  getBigDecimal( noNoTaxPremium,item.getNoOtherCostsProportion());
 
-                    byBxLicenseno.setNoOtherCostsPremium(noOtherAmount);
-                    byBxLicenseno.setNoOtherCostsProportion(item.getNoOtherCostsProportion());
-                    byBxLicenseno.setAllFeeValue(this.calculateTotal(noOtherAmount, null, null));
-
-                    byBxLicenseno.setOtherFeevalue(this.calculateTotal(noOtherAmount, null, null));
-                    byBxLicenseno.setOtherFeerate(this.calculateTotal(noOtherCostsProportion, null, null));
-                    baseMapper.updateById(byBxLicenseno);
+//                    byBxLicenseno.setNoOtherCostsPremium(noOtherAmount);
+//                    byBxLicenseno.setNoOtherCostsProportion(item.getNoOtherCostsProportion());
+//                    byBxLicenseno.setAllFeeValue(this.calculateTotal(noOtherAmount, null, null));
+//
+//                    byBxLicenseno.setOtherFeevalue(this.calculateTotal(noOtherAmount, null, null));
+//                    byBxLicenseno.setOtherFeerate(this.calculateTotal(noOtherCostsProportion, null, null));
+//                    baseMapper.updateById(byBxLicenseno);
 
                     newMap.put("licenseno", item.getLicenseno());
                     newMap.put("noPolicyno", item.getNoPolicyno());
                     newMap.put("noOtherCostsPremium", noOtherAmount);
+                    newMap.put("noOtherCostsProportion", item.getNoOtherCostsProportion());
 
                     newMap.put("otherFeevalue", byBxLicenseno.getOtherFeevalue());
                     newMap.put("otherFeerate", byBxLicenseno.getOtherFeerate());
+                    newMap.put("id", byBxLicenseno.getId());
                     resultList.add(newMap);
                     allAmount = allAmount.add(noOtherAmount);
                 }
@@ -2945,6 +2975,28 @@ handlingProportion,
         return resultMap;
     }
 
+    @Override
+    @Transactional
+    public void noBxImportOtherConfirm(InsPlyIncomeVo insPlyIncomeVo) {
+        if (ObjectUtils.isEmpty(insPlyIncomeVo)) {
+            throw new SystemException("请导入文件");
+        }
+        if (!CollectionUtils.isEmpty(insPlyIncomeVo.getResultList())) {
+            for (InsPlyIncome item : insPlyIncomeVo.getResultList()) {
+                InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+                insPlyIncomeLog.setIncomeId(item.getId());
+                BeanUtils.copyProperties(item,insPlyIncomeLog);
+                insPlyIncomeLog.setOperationStatus("2");
+                insPlyIncomeLog.setId(null);
+                insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+                item.setAllFeeValue(this.calculateTotal(item.getNoOtherCostsPremium(), null, null));
+                item.setOtherFeevalue(this.calculateTotal(item.getNoOtherCostsPremium(), null, null));
+                item.setOtherFeerate(this.calculateTotal(item.getNoOtherCostsProportion(), null, null));
+                baseMapper.updateById(item);
+            }
+        }
+    }
+
     @Override
     public void batchUpdateVoucher(InsPlyIncomeVo insPlyIncomeVo) {
         String s = insPlyIncomeVo.getSelectIds().get(0);

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

@@ -5,6 +5,7 @@ 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 com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.order.entity.po.InsUploadFiles;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -410,4 +411,8 @@ public class InsPlyIncomeVo implements Serializable {
 
     @ApiModelProperty("创建时间查询结束")
     private String createTimeEnd;
+
+
+    @ApiModelProperty("批量修改结果")
+    private List<InsPlyIncome> resultList;
 }

src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerLoginRequest.java

@@ -26,6 +26,9 @@ public class CrawlerLoginRequest implements Serializable {
     @JsonProperty(value = "pwd")
     private String password;
 
+    @JsonProperty(value = "check")
+    private String check;
+
     /**
      * 归属信息
      */
@@ -35,6 +38,8 @@ public class CrawlerLoginRequest implements Serializable {
     public CrawlerLoginRequest(PtlAgreementAttributionDto attribution) {
         this.username = attribution.getUsername();
         this.password = attribution.getPassword();
+        // 环境 新增变量
+        this.check = attribution.getCheck();
         this.other = attribution.getFields().stream().collect(LinkedHashMap::new, (m, v) -> m.put(v.getField(), v.getValue()), LinkedHashMap::putAll);
     }
 

src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerQuoteRequest.java

@@ -34,5 +34,9 @@ public class CrawlerQuoteRequest extends BaseQuoteInfoVo {
      */
     private String plyappno;
 
+    /**
+     * 环境配置
+     */
+    private String pythonCheck;
 
 }

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

@@ -145,6 +145,15 @@ public class OrderQueryVo {
     @ApiModelProperty(value = "是否疑问订单")
     private String problemOrder;
 
+    @ApiModelProperty(value = "交强保单号")
+    private String jqPolicyNo;
+
+    @ApiModelProperty(value = "商业保单号")
+    private String syPolicyNo;
+
+    @ApiModelProperty(value = "非车保单号")
+    private String noPolicyNo;
+
     public LocalDate getEndDatePlusOneDay() {
         if(ObjectUtils.isEmpty(endDate)){
             return endDate;

src/main/java/com/ydtech/modules/protocol/entity/dto/PtlAgreementAttributionDto.java

@@ -12,7 +12,6 @@ import java.util.List;
 
 @Data
 @ToString
-@EqualsAndHashCode
 @ApiModel("协议归属")
 public class PtlAgreementAttributionDto implements Serializable {
 
@@ -49,5 +48,6 @@ public class PtlAgreementAttributionDto implements Serializable {
     @ApiModelProperty("保险公司密码")
     private String password;
 
-
+    @ApiModelProperty("环境?")
+    private String check;
 }

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

@@ -34,6 +34,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -81,6 +82,9 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     private final PtlAgreementMapper ptlAgreementMapper;
 
+    @Value("${python.check}")
+    private String pythonCheck;
+
     public PtlAgreementServiceImpl(PtlAgreementProductCostsService ptlAgreementProductCostsService,
                                    PtlAgreementAttributionService ptlAgreementAttributionService,
                                    PtlAgreementDeptService ptlAgreementDeptService,
@@ -161,6 +165,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     public HttpResult<Object> saveAgreement(PtlAgreementSaveVo agreement, String userName) {
         PtlAgreementSaveDto agreementSaveDto = agreement.getAgreement();
         PtlAgreementAttributionDto attribution = agreement.getAttribution();
+        attribution.setCheck(pythonCheck);
         PtlAgreement ptlAgreement = new PtlAgreement();
         BeanUtils.copyProperties(agreementSaveDto, ptlAgreement);
 
@@ -562,6 +567,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     public HttpResult<Object> reviseAgreement(String userName, String agreementId, PtlAgreementSaveVo agreement) {
         PtlAgreementSaveDto agreementSaveDto = agreement.getAgreement();
         PtlAgreementAttributionDto attribution = agreement.getAttribution();
+        attribution.setCheck(pythonCheck);
         PtlAgreement ptlAgreement = proxyObject.ifExistsById(agreementId);
         BeanUtils.copyProperties(agreementSaveDto, ptlAgreement);
         EsmInsCompany esmInsCompany = proxyObject.verifyLogin(ptlAgreement, agreementSaveDto, attribution,

src/main/java/com/ydtech/modules/protocols/controller/PtlNewAgreementController.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.protocols.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
@@ -208,4 +209,16 @@ public class PtlNewAgreementController extends BaseController {
     public HttpResult getTrajectory(String costsId){
         return HttpResult.ok(ptlAgreementProductCostsTrajectoryService.getTrajectory(costsId));
     }
+
+    @ApiOperation("获取现询费用")
+    @PostMapping("getInquiryNowFee")
+    public HttpResult getInquiryNowFee(@RequestBody InquiryNowFeeQueryVo inquiryNowFeeQueryVo) {
+        return HttpResult.ok(ptlAgreementProductCostsNewService.getInquiryNowFee(inquiryNowFeeQueryVo));
+    }
+
+    @ApiOperation("获取产品id")
+    @PostMapping("getProductId")
+    public HttpResult getProductId(@RequestBody ProductQueryVo productQueryVo){
+        return HttpResult.ok("",InsuranceRisk.determineInsuranceInformation(productQueryVo.getKindList(), productQueryVo.getRiskList()).getCode());
+    }
 }

src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementProductCostsNew.java

@@ -143,6 +143,10 @@ public class PtlAgreementProductCostsNew {
     @TableField(value = "audit_time")
     private LocalDateTime auditTime;
 
+    @ApiModelProperty(value = "是否是现询")
+    @TableField(value = "is_inquiry_now")
+    private String isInquiryNow;
+
     @ApiModelProperty(value = "生成的描述")
     @TableField(exist = false)
     private String desc;

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

@@ -141,6 +141,9 @@ public class AgreementProductCosts implements Serializable {
     @ApiModelProperty(value = "非车出口加投比例")
     private BigDecimal noCarExportInvestmentRadio;
 
+    @ApiModelProperty(value = "是否现询")
+    private String isInquiryNow;
+
 
     @ApiModelProperty(value = "费用属性")
     private List<PtlAgreementProductCostsAttrLink> costsAttrLinks;

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

@@ -142,7 +142,8 @@ public class AgreementProductCostsSave {
     private String noCostsExportProportion;
 
 
-
+    @ApiModelProperty(value = "是否现寻")
+    private String isInquiryNow;
 
 
     @ApiModelProperty(value = "费用属性")

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

@@ -0,0 +1,19 @@
+package com.ydtech.modules.protocols.entity.vo;
+
+
+import lombok.Data;
+
+@Data
+public class InquiryNowFeeQueryVo {
+
+    /**
+     * 协议id
+     */
+    private String agreementId;
+
+    /**
+     * 产品id
+     */
+    private String productId;
+
+}

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

@@ -0,0 +1,16 @@
+package com.ydtech.modules.protocols.entity.vo;
+
+import com.alipay.api.domain.RiskInfo;
+import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.RiskInfoVo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProductQueryVo {
+
+    private List<RiskInfoVo> riskList;
+
+    private List<KindInfoVo> kindList;
+}

src/main/java/com/ydtech/modules/protocols/service/PtlAgreementProductCostsNewService.java

@@ -106,4 +106,11 @@ public interface PtlAgreementProductCostsNewService extends IService<PtlAgreemen
     FeeOrderNewVo costsAdjust(FeeOrderNewRecordVo feeOrderNewRecordVo);
 
     Page<PtlAgreementProductCostsNew> getCostsAuditList(Page page, AgreementProductQueryVo agreementProductQueryVo);
+
+    /**
+     * 获取现询费用
+     * @param inquiryNowFeeQueryVo
+     * @return
+     */
+    List<PtlAgreementProductCostsNew> getInquiryNowFee(InquiryNowFeeQueryVo inquiryNowFeeQueryVo);
 }

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

@@ -484,7 +484,8 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 //        }
         for (int i = 0; i < agreementProductCosts.getProductId().size(); i++) {
             PtlAgreement ptlAgreement = ptlAgreementService.getById(agreementProductCosts.getAgreementId());
-            if(ptlAgreement.getIsExternal() == 1) {
+            //是外部订单 并且 是现询的费用 只有一个
+            if(ptlAgreement.getIsExternal() == 1  && agreementProductCosts.getIsInquiryNow().equals("1")) {
                 // 外部订单的检测  每个产品只可有一个费用
                 List<PtlAgreementProductCostsNew> list = ptlAgreementProductCostsNewService.list(new LambdaQueryWrapper<PtlAgreementProductCostsNew>()
                         .eq(PtlAgreementProductCostsNew::getProductId, agreementProductCosts.getProductId().get(i))
@@ -1711,7 +1712,9 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         //保存新的比例
         insFeeOrderNewService.updateById(insFeeOrderNew);
 
-
+        //添加轨迹
+//        InsFeeAuditHistory insFeeAuditHistory = new InsFeeAuditHistory(insAreaCompany,"2",BaseController.getUser().getName());
+//        insFeeAuditHistoryService.save(insFeeAuditHistory);
 
         return resultFeeOrderNewVo;
 
@@ -1862,4 +1865,20 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         });
         return pages;
     }
+
+    /**
+     * 获取现询费用
+     * @param inquiryNowFeeQueryVo
+     * @return
+     */
+    @Override
+    public List<PtlAgreementProductCostsNew> getInquiryNowFee(InquiryNowFeeQueryVo inquiryNowFeeQueryVo) {
+        LambdaQueryWrapper<PtlAgreementProductCostsNew> queryWrapper = new LambdaQueryWrapper<>();
+
+        queryWrapper.eq(PtlAgreementProductCostsNew::getAgreementId,inquiryNowFeeQueryVo.getAgreementId());
+        if(inquiryNowFeeQueryVo.getProductId() != null) {
+            queryWrapper.eq(PtlAgreementProductCostsNew::getProductId, inquiryNowFeeQueryVo.getProductId());
+        }
+        return baseMapper.selectList(queryWrapper);
+    }
 }

src/main/resources/application-prod.yml

@@ -354,3 +354,6 @@ anti:
   redis:
     redisson:
       file: classpath:redisson-prod.yml
+
+python:
+  check: zs

src/main/resources/application-test.yml

@@ -437,3 +437,6 @@ anti:
   redis:
     redisson:
       file: classpath:redisson-test.yml
+
+python:
+  check: ceshi

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

@@ -161,7 +161,9 @@
             <if test="userId !=null  and userId != ''">
                 and a.user_id=#{userId}
             </if>
-
+            <if test="startAuditingTime !=null and startAuditingTime != '' and endAuditingTime !=null and endAuditingTime != ''">
+                AND   DATE_FORMAT( a.auditing_time, '%Y-%m-%d')   BETWEEN #{startAuditingTime} AND #{endAuditingTime}
+            </if>
             <if test="startDate !=null and startDate != ''  and  endDate !=null  and  endDate!= '' ">
                 and DATE_FORMAT( a.create_time, '%Y-%m-%d')  between DATE_FORMAT(#{startDate}, '%Y-%m-%d') and DATE_FORMAT(#{endDate}, '%Y-%m-%d')
             </if>
@@ -281,6 +283,9 @@
             <if test="vo.userName !=null  and vo.userName != ''">
                 and su.name=#{vo.userName}
             </if>
+            <if test="vo.startAuditingTime !=null and vo.startAuditingTime != '' and vo.endAuditingTime !=null and vo.endAuditingTime != ''">
+                AND   DATE_FORMAT( a.auditing_time, '%Y-%m-%d')   BETWEEN #{vo.startAuditingTime} AND #{vo.endAuditingTime}
+            </if>
             <if test="vo.userId !=null  and vo.userId != ''">
                 and a.user_id=#{vo.userId}
             </if>

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

@@ -268,6 +268,15 @@
         <if test="params.isExternal != null and params.isExternal != ''">
             and io.is_external = #{params.isExternal}
         </if>
+        <if test="params.jqPolicyNo != null and params.jqPolicyNo != ''">
+            and iac.jqpolicyno = #{params.jqPolicyNo}
+        </if>
+        <if test="params.syPolicyNo != null and params.syPolicyNo != ''">
+            and iac.sypolicyno = #{params.syPolicyNo}
+        </if>
+        <if test="params.noPolicyNo != null and params.noPolicyNo != ''">
+            and iac.cross_insurance like concat('%', #{params.noPolicyNo}, '%')
+        </if>
         order by iac.createtime desc
     </select>