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

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

@@ -170,4 +170,8 @@ public class TaskStatisticsDto {
     @ApiModelProperty(value = "时间差")
     private String timeDifference;
 
+
+    @ApiModelProperty(value = "总保司")
+    private String insuranceCompanyNumber;
+
 }

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

@@ -356,7 +356,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                 }
                 if ("input".equals(ptlAgreementUndwrtRulesAttr.getAttrType())) {
                     if(ptlAgreementUndwrtRulesAttr.getAttrCode().equals("BrandandModel")){
-                        String operatorDesc = !Objects.isNull(ptlAgreementUndwrtRulesAttr.getOperator()) && ptlAgreementUndwrtRulesAttr.getOperator().equals("1") ? "包含" : "不包含";
+                        String operatorDesc = !Objects.isNull(v.get(i).getOperator()) && v.get(i).getOperator().equals("1") ? "包含" : "不包含";
                         desc += ptlAgreementUndwrtRulesAttr.getAttrName() + operatorDesc + v.get(i).getMin() + "\n";
                     }else {
                         desc += ptlAgreementUndwrtRulesAttr.getAttrName() + "为" + v.get(i).getMin() + "\n";

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

@@ -175,10 +175,10 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
                 desc += ptlAgreementUndwrtRulesAttr.getAttrName() + "包含" + v.get(i).getMin() + "\n";
             }
             if ("input".equals(ptlAgreementUndwrtRulesAttr.getAttrType())){
-                if(v.get(i).getOperator().equals("2")) {
-                    desc += ptlAgreementUndwrtRulesAttr.getAttrName() + "不包含" + v.get(i).getMin() + "\n";
-                }else{
+                if(v.get(i).getOperator() != null && v.get(i).getOperator().equals("1")) {
                     desc += ptlAgreementUndwrtRulesAttr.getAttrName() + "包含" + v.get(i).getMin() + "\n";
+                }else{
+                    desc += ptlAgreementUndwrtRulesAttr.getAttrName() + "不包含" + v.get(i).getMin() + "\n";
                 }
             }
         }

src/main/java/com/ydtech/modules/scheme/service/impl/PtlOptionalSchemeServiceImpl.java

@@ -257,13 +257,15 @@ public class PtlOptionalSchemeServiceImpl extends ServiceImpl<PtlOptionalSchemeM
     @Override
     public CompanyOptionalSchemeVo getPcSchemeInsuranceInfo(SchemeQueryVo schemeQueryVo) {
         CompanyOptionalSchemeVo companyOptionalSchemeVo = new CompanyOptionalSchemeVo();
+        //处理新能源
+        schemeQueryVo.setEnergyType(EnergyType.isNewEnergy(schemeQueryVo.getEnergyType()) ? "1" : "0");
         List<SchemeKindInfoVo> schemeInsuranceInfo = ptlOptionalSchemeInsuranceService.getSchemeInsuranceInfo(schemeQueryVo);
         schemeInsuranceInfo.sort((o1, o2) -> Integer.compare(Integer.parseInt(o1.getId()), Integer.parseInt(o2.getId())));
         PtlOptionalScheme optionalScheme = this.getOne(new LambdaQueryWrapper<PtlOptionalScheme>()
                 .eq(PtlOptionalScheme::getCompanyId,schemeQueryVo.getCompanyId())
                 .eq(PtlOptionalScheme::getProductId,schemeQueryVo.getProductId())
                 .eq(PtlOptionalScheme::getVehicleType, schemeQueryVo.getVehicleType())
-                .eq(PtlOptionalScheme::getEnergyType, EnergyType.isNewEnergy(schemeQueryVo.getEnergyType()) ? "1" : "0")
+                .eq(PtlOptionalScheme::getEnergyType, schemeQueryVo.getEnergyType())
                 .eq(PtlOptionalScheme::getCarnature, schemeQueryVo.getCarnature()));
 
         //险种信息

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

@@ -1969,7 +1969,7 @@
         SELECT
         IFNULL(count(io.licenseno),0) as "orderNumber",
         IFNULL(sum(TIMESTAMPDIFF(SECOND, iac.createtime, iac.audittime)),0) as "sumSecond",
-        IFNULL(sum(TIMESTAMPDIFF(SECOND, iac.createtime, iac.audittime)),0) / count(io.licenseno)  as "averageSecond"
+        ROUND(IFNULL(sum(TIMESTAMPDIFF(SECOND, iac.createtime, iac.audittime)),0) / count(io.licenseno),2)  as "averageSecond"
         FROM
             ins_fee_audit ifa
             LEFT JOIN ins_orders io ON io.orderno = ifa.orderno
@@ -2342,13 +2342,15 @@
 
     <select id="getCountBusinessData" resultType="com.ydtech.modules.admin.model.dto.TaskStatisticsDto">
         select
-            a.totalPremium as "totalPremium",
-            a.qutationInsureCount as "qutationInsureCount",
-            ROUND(a.averagePremium, 2)  as "averagePremium",
-            a.userNumber as "userNumber",
-            ROUND(a.perCapitaAmount, 2) as "perCapitaAmount"
+            sum(a.totalPremium) as "totalPremium",
+            sum(a.qutationInsureCount) as "qutationInsureCount",
+            sum(ROUND(a.averagePremium, 2))  as "averagePremium",
+            sum(a.userNumber) as "userNumber",
+            count(DISTINCT a.insuranceCompanyName) as "insuranceCompanyNumber",
+            sum(ROUND(a.perCapitaAmount, 2)) as "perCapitaAmount"
         from  (
         SELECT
+        agree.insurance_company AS "insuranceCompanyName",
         IFNULL(sum(iac.jqpremium),0) + IFNULL(sum(iac.sypremium),0) +IFNULL(sum(iac.jypremium),0) as "totalPremium",
         COUNT(0 ) AS "qutationInsureCount",
         (IFNULL(sum(iac.jqpremium),0) + IFNULL(sum(iac.sypremium),0) +IFNULL(sum(iac.jypremium),0)) / COUNT(0 )  AS "averagePremium",
@@ -2395,6 +2397,8 @@
                 #{item}
             </foreach>
         </if>
+        group  by
+        agree.insurance_company
         )  a
 
     </select>