修改bug

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -277,7 +277,7 @@ public class RuleAttrMappingVo {
         // 商业出险次数
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("SyNumberOfClaims", insAreaCompany.getSyClaims() == null ? "0" : insAreaCompany.getSyClaims()));
         // 车牌地区
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("LicenseArea", insAreaCompany.getLicenseno().substring(0,1)));
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("LicenseArea", insOrders.getLicenseno().substring(0,1)));
         // 系数
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("Coefficient", getCoefficient(carInfo,insAreaCompany).toString()));
         return ruleAttrMappingVoList;

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

@@ -1,6 +1,7 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
@@ -144,7 +145,14 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         if (t.getAccidentalDrivingVo() != null && t.getCompanyId().equals("TPIC1000000")) {
             JSONObject jsonObject = JSON.parseObject(t.getAccidentalDrivingVo().toString());
             insAreaCompanyAccidentalDriving.setRideRiskCode(jsonObject.get("id").toString());
+        }else if(t.getAccidentalDrivingVo() != null && t.getCompanyId().equals("TKIC1000000")){
+            JSONObject jsonObject = JSON.parseObject(t.getAccidentalDrivingVo().toString());
+            insAreaCompanyAccidentalDriving.setRideRiskCode(jsonObject.getString("planCode"));
+            insAreaCompanyAccidentalDriving.setRideRiskName(jsonObject.getString("planName"));
+            insAreaCompanyAccidentalDriving.setCompanyId("TKIC1000000");
+            insAreaCompanyAccidentalDriving.setQuantity(1);
         }
+
         //处理订单信息
         QuoteRespVo responseVo = responseOrder(response, quoteRespVo, ptlAgreementAttribution, insAreaCompanyAccidentalDriving);
 

src/main/java/com/ydtech/modules/protocol/controller/PtlAgreementController.java

@@ -79,6 +79,12 @@ public class PtlAgreementController extends BaseController {
         return ptlAgreementService.listAgreement(ptlAgreementPageVo);
     }
 
+    @PostMapping("/listInternal")
+    @ApiOperation("根据保险公司查询协议列表")
+    public HttpResult<List<PtlAgreement>> listInternal(@RequestBody PtlAgreementPageVo ptlAgreementPageVo) {
+        return ptlAgreementService.listAgreementInternal(ptlAgreementPageVo);
+    }
+
     @PutMapping("/{agreementId}")
     @ApiOperation("修改协议")
     public HttpResult<Object> revise(@PathVariable String agreementId, @RequestBody PtlAgreementSaveVo agreement) {

src/main/java/com/ydtech/modules/protocol/service/PtlAgreementService.java

@@ -136,6 +136,8 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
      */
     HttpResult<List<PtlAgreement>> listAgreement(PtlAgreementPageVo ptlAgreementPageVo);
 
+    HttpResult<List<PtlAgreement>> listAgreementInternal(PtlAgreementPageVo ptlAgreementPageVo);
+
     /**
      * 通过协议id查询
      *

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

@@ -515,6 +515,33 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         return HttpResult.ok(agreementPage);
     }
 
+
+    @Override
+    public HttpResult<List<PtlAgreement>> listAgreementInternal(PtlAgreementPageVo ptlAgreementPageVo) {
+        LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
+        // 获取供应商本级id 及其 下级id
+        List<String> lowerId = esmInsCompanyService.getByLowerId(ptlAgreementPageVo.getPartnerCompaniesId());
+        // 审核状态
+        wrapper.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAuditStatus()), PtlAgreement::getAuditStatus,
+                        ptlAgreementPageVo.getAuditStatus())
+                //是否有效
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus,
+                        ptlAgreementPageVo.getValidStatus())
+                .eq(PtlAgreement::getIsExternal,"0")
+                // 供应商类型
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType,
+                        ptlAgreementPageVo.getCompaniesType())
+                // 合作公司
+                .in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()) && !lowerId.isEmpty(),
+                        PtlAgreement::getPartnerCompaniesId, lowerId)
+                // 录入时间
+                .between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate())
+                        , PtlAgreement::getCreateTime, ptlAgreementPageVo.getStartDate(), ptlAgreementPageVo.getEndDate());
+
+        List<PtlAgreement> agreementPage = list(wrapper);
+        return HttpResult.ok(agreementPage);
+    }
+
     @Override
     public HttpResult<PtlAgreementQueryVo> getByAgreementId(String agreementId) {
         PtlAgreement ptlAgreement = proxyObject.ifExistsById(agreementId);