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

src/main/java/com/ydtech/modules/admin/model/dto/BusinessAgentExcel.java

@@ -39,4 +39,20 @@ public class BusinessAgentExcel {
 
     @ExcelProperty(value = "非车险保费", index = 9)
     private BigDecimal jypremium;
+
+    @ExcelProperty(value = "单交订单数", index = 10)
+    private Integer riskCodeDj;
+
+    @ExcelProperty(value = "单商订单数", index = 11)
+    private Integer riskCodeDs;
+
+
+    @ExcelProperty(value = "单三订单数", index = 12)
+    private Integer riskCodeDsan;
+
+    @ExcelProperty(value = "交三订单数", index = 13)
+    private Integer riskCodeJs;
+
+    @ExcelProperty(value = "交商订单数", index = 14)
+    private Integer riskCodeJshang;
 }

src/main/java/com/ydtech/modules/admin/model/dto/GetChannelExcel.java

@@ -43,18 +43,18 @@ public class GetChannelExcel {
 
 
     @ExcelProperty(value = "单交订单数", index = 10)
-    private String riskCodeDj;
+    private Integer riskCodeDj;
 
     @ExcelProperty(value = "单商订单数", index = 11)
-    private String riskCodeDs;
+    private Integer riskCodeDs;
 
 
     @ExcelProperty(value = "单三订单数", index = 12)
-    private String riskCodeDsan;
+    private Integer riskCodeDsan;
 
     @ExcelProperty(value = "交三订单数", index = 13)
-    private String riskCodeJs;
+    private Integer riskCodeJs;
 
     @ExcelProperty(value = "交商订单数", index = 14)
-    private String riskCodeJshang;
+    private Integer riskCodeJshang;
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -66,19 +67,19 @@ public class BusinessAgentData {
     private String leaderName;
 
     @ApiModelProperty(value = "交三订单数")
-    private String riskCodeJs;
+    private Integer riskCodeJs;
 
     @ApiModelProperty(value = "单交订单数")
-    private String riskCodeDj;
+    private Integer riskCodeDj;
 
     @ApiModelProperty(value = "交商订单数")
-    private String riskCodeJshang;
+    private Integer riskCodeJshang;
 
     @ApiModelProperty(value = "单商订单数")
-    private String riskCodeDs;
+    private Integer riskCodeDs;
 
     @ApiModelProperty(value = "单三订单数")
-    private String riskCodeDsan;
+    private Integer riskCodeDsan;
 
 
     @ApiModelProperty(value = "毛利润")

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

@@ -318,7 +318,13 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
                 e.printStackTrace();
             }
         }
-        String fileName = EasyExcelUtils.downExcel(uploadPath, "小定单明细", QuotationDetailsExcel.class, resultSubOrder);
+        String fileName = EasyExcelUtils.downExcel(
+                uploadPath,
+                "1".equals(companyQutationCountDataQueryDto.getManagementSource()) ? "小订单渠道代理人导出" :
+                        "2".equals(companyQutationCountDataQueryDto.getManagementSource()) ? "小订单代理人明细导出" : "小订单明细",
+                QuotationDetailsExcel.class,
+                resultSubOrder
+        );
         return HttpResult.ok("", uploadUrl + "excel/" + fileName);
     }
 

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

@@ -3087,14 +3087,13 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 //            }
             return inputNumberEqual(ptlAgreementUndwrtRulesAttrLink, value);
         } else if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("input")) {
-            return inputTextEqual(ptlAgreementUndwrtRulesAttrLink, value);
-        } else if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("select")) {
-
             //截取身份证号码
             if (ptlAgreementUndwrtRulesAttr.getAttrCode().equals("CarOwnersIDNumber") || ptlAgreementUndwrtRulesAttr.getAttrCode().equals("ApplicantIDNumber") ||
                     ptlAgreementUndwrtRulesAttr.getAttrCode().equals("InsuredIDNumber")) {
-                value = value.substring(0, ptlAgreementUndwrtRulesAttr.getMin().length());
+                value = value.substring(0, ptlAgreementUndwrtRulesAttrLink.getMin().length());
             }
+            return inputTextEqual(ptlAgreementUndwrtRulesAttrLink, value);
+        } else if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("select")) {
 
             //截取车牌
             if (ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseNo")) {
@@ -3243,21 +3242,36 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
     private boolean inputTextEqual(PtlAgreementUndwrtRulesAttrLink ptlAgreementUndwrtRulesAttrLink, String value) {
         //将值进行分割
         String[] split = ptlAgreementUndwrtRulesAttrLink.getMin().split(",");
-        AtomicBoolean returnBool = new AtomicBoolean(true);
-        if (ptlAgreementUndwrtRulesAttrLink.getAttrCode().equals("NatureOfUse")) {
-            Arrays.stream(split).forEach(x -> {
-                if (!x.equals("") && value.equals(x)) {
-                    returnBool.set(false);
-                }
-            });
-        } else {
-            Arrays.stream(split).forEach(x -> {
-                if (!x.equals("") && value.contains(x)) {
-                    returnBool.set(false);
-                }
-            });
+        AtomicBoolean returnBool = new AtomicBoolean(false);
+
+        List<String> equalsMap = new ArrayList<>();
+        //字符型评分
+        equalsMap.add("CharacterBasedRating");
+        //交强字符型评分
+        equalsMap.add("JqCharacterBasedRating");
+        //商业字符型评分
+        equalsMap.add("SyCharacterBasedRating");
+
+
+
+        //equest 等于判断
+        if(equalsMap.contains(ptlAgreementUndwrtRulesAttrLink.getAttrCode())){
+            boolean b = Arrays.stream(split).anyMatch(value::equals);
+            returnBool.set(b);
+        }else if((ptlAgreementUndwrtRulesAttrLink.getAttrCode().equals("BrandandModel") || ptlAgreementUndwrtRulesAttrLink.getAttrCode().equals("CarOwnerName")
+                || ptlAgreementUndwrtRulesAttrLink.getAttrCode().equals("CarOwnersAddress") || ptlAgreementUndwrtRulesAttrLink.getAttrCode().equals("ApplicantAddress")
+                || ptlAgreementUndwrtRulesAttrLink.getAttrCode().equals("InsuredAddress"))
+                && ptlAgreementUndwrtRulesAttrLink.getOperator().equals("2")){
+            //处理品牌型号  不包含的情况
+            boolean anyMatch = Arrays.stream(split)
+                    .anyMatch(value::contains);
+            returnBool.set(!anyMatch);
+        }else {
+            boolean anyMatch = Arrays.stream(split)
+                    .anyMatch(value::contains);
+            returnBool.set(anyMatch);
         }
-        return returnBool.get();
+        return !returnBool.get();
     }
 
     /**

src/main/java/com/ydtech/modules/lg/PushLgLogUtils.java

@@ -68,7 +68,7 @@ public class PushLgLogUtils {
             return;
         }
         PushLgDataServer lgDataServer = new PushLgDataServer();
-        lgDataServer.setOrderNo(accountingUser.getOrderno());
+        lgDataServer.setOrderNo(accountingUser.getId());
         lgDataServer.setUserName(String.valueOf(accountingUser.getInsureinfo().get("name")));
         lgDataServer.setUserCarNum(String.valueOf(accountingUser.getCarinfo().get("licenseNo")));
         lgDataServer.setUserPhone(String.valueOf(accountingUser.getInsureinfo().get("mobile")));

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

@@ -188,7 +188,8 @@
         IFNULL(sum(a.sypremium),0) as "sypremium",
         IFNULL(sum(a.taxamount),0) as "taxamount",
         IFNULL(sum(a.jypremium),0) as "jypremium",
-        IFNULL(sum(a.exportAllFee),0) as "exportAllFee"
+        IFNULL(sum(a.exportAllFee),0) as "exportAllFee",
+        IFNULL(sum(a.entranceAllFee),0) as "entranceAllFee"
         FROM (
         SELECT
         io.userid AS "userId",