785834757 2 лет назад
Родитель
Сommit
6e0b8c47c0

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

@@ -136,7 +136,7 @@ public class RuleAttrMappingVo {
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("MotorVehicleDamageInsurance", String.valueOf(kindInfoVo.getAmount())));
             //第三者责任险
             if (InsurKind.B.getCode().equals(kindInfoVo.getKindCode()))
-                ruleAttrMappingVoList.add(new RuleAttrMappingVo("ThirdPartyLiabilityInsurance", String.valueOf(kindInfoVo.getAmount())));
+                ruleAttrMappingVoList.add(new RuleAttrMappingVo("ThirdPartyLiabilityInsurance", String.valueOf(Double.valueOf(kindInfoVo.getAmount()).intValue())));
             //司机责任险
             if (InsurKind.D3.getCode().equals(kindInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("DriverLiabilityInsurance", String.valueOf(kindInfoVo.getAmount())));

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

@@ -770,7 +770,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         double v = Double.parseDouble(value);
         //统一处理数值
         if("1".equals(ptlAgreementProductCostsAttrLink.getOperator())){
-            if(Integer.parseInt(ptlAgreementProductCostsAttrLink.getMin()) <= v &&
+            if(Double.parseDouble(ptlAgreementProductCostsAttrLink.getMin()) <= v &&
                     Double.parseDouble(ptlAgreementProductCostsAttrLink.getMax()) >= v){
                 return true;
             }

+ 5 - 0
src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -149,6 +149,11 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
             orderQueryVo.setQuoteEndDateStr(orderQueryVo.getQuoteEndDateStr().toString() + " 23:59:59");
         }
 
+        if(orderQueryVo.getAttachStartDateStr() != null && orderQueryVo.getAttachEndDateStr() != null){
+            orderQueryVo.setAttachStartDateStr(orderQueryVo.getAttachStartDateStr().toString() + " 00:00:00");
+            orderQueryVo.setAttachEndDateStr(orderQueryVo.getAttachEndDateStr().toString() + " 23:59:59");
+        }
+
         Page<InsOrders> pendingAuditOrders = baseMapper.getAuditOrders(page, orderQueryVo);
         pendingAuditOrders.getRecords().forEach(item->{
             if(item.getAuditStatus() == null){