Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/vo/RuleAttrMappingVo.java

@@ -327,7 +327,7 @@ public class RuleAttrMappingVo {
         // 车牌地区
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("LicenseArea", insOrdersCarInfo.getLicenseNo().substring(0, 1)));
         // 系数
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("Coefficient", getCoefficient(insOrdersCarInfo, insOrdersCosts).toString()));
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("CoefficientFactor", getCoefficient(insOrdersCarInfo, insOrdersCosts).toString()));
         // 商业是否有费用
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("CiMessage", (insOrdersOther.getCiMessage() == null || "".equals(insOrdersOther.getCiMessage())) ? "0" : "1"));
 

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/build/ChengTaiAPIQuoteResultsVoBuild.java

@@ -132,7 +132,7 @@ public final class ChengTaiAPIQuoteResultsVoBuild {
                     .orElse(null);
             scoreJson.add(new JSONObject()
                     .fluentPut("scoreName", "自主定价系数")
-                    .fluentPut("scoreKey","coefficient")
+                    .fluentPut("scoreKey","pricingCoefficient")
                     .fluentPut("score", coefficientVal));
             scoreJson.add(new JSONObject()
                     .fluentPut("scoreName", "一账通评分")

tenant/organization/src/main/java/com/jzg/organization/controller/AreaController.java

@@ -10,7 +10,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 区划管理接口
@@ -43,6 +45,9 @@ public class AreaController {
         SysArea sysArea = new SysArea();
         sysArea.setLevel(3);
         sysArea.setUpperCode(countyCode);
-        return HttpResult.ok(sysAreaService.queryAllParent(sysArea));
+        if(Objects.nonNull(countyCode)) {
+            return HttpResult.ok(sysAreaService.queryAllParent(sysArea));
+        }
+        return HttpResult.ok(new ArrayList<>());
     }
 }

tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -423,6 +423,12 @@
             <if test="costParam.auditTimeEnd != null and costParam.auditTimeEnd != ''">
                 and pc.audit_time &lt; #{costParam.auditTimeEnd}
             </if>
+            <if test="costParam.agreement != null and costParam.agreement != ''">
+            AND (pa.agreement_title  like concat('%',#{costParam.agreement},'%') or
+            pa.agreement_code  like concat('%',#{costParam.agreement},'%') or
+            pa.agreement_abbreviation  like concat('%',#{costParam.agreement},'%') or
+            pa.id = #{costParam.agreement})
+            </if>
             <if test="costParam.companyIdList != null and costParam.companyIdList.size() >0">
                 and pa.partner_company_id in
                 <foreach collection="costParam.companyIdList" item="partnerCompnayId" open="(" close=")" separator=",">