费用审核机构费用问题处理

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -145,25 +145,29 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             deptFee.setKeepamount(insFeeOrder.getFirstDeptPremiums().doubleValue());
             deptFee.setComlevel("一级");
             insDeptFeeService.insert(deptFee);
-        } else if (insFeeOrder.getSecondDeptPremiums().doubleValue() > 0) {
+        }
+        if (insFeeOrder.getSecondDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(order.getDeptid().substring(0, 4));  //99140302M01D01
-            deptFee.setKeeprate(insFeeOrder.getSecondDeptProportion().doubleValue() * 0.01);
+            deptFee.setKeeprate(insFeeOrder.getSecondDeptProportion().setScale(2).doubleValue() * 0.01);
             deptFee.setKeepamount(insFeeOrder.getSecondDeptPremiums().doubleValue());
             deptFee.setComlevel("二级");
             insDeptFeeService.insert(deptFee);
-        }else if (insFeeOrder.getThirdDeptPremiums().doubleValue() > 0) {
+        }
+        if (insFeeOrder.getThirdDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(order.getDeptid().substring(0, 6));  //99140302M01D01
             deptFee.setKeeprate(insFeeOrder.getThirdDeptProportion().doubleValue() * 0.01);
             deptFee.setKeepamount(insFeeOrder.getThirdDeptPremiums().doubleValue());
             deptFee.setComlevel("三级");
             insDeptFeeService.insert(deptFee);
-        }else if (insFeeOrder.getForthDeptPremiums().doubleValue() > 0) {
+        }
+        if (insFeeOrder.getForthDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(order.getDeptid().substring(0, 8));  //99140302M01D01
             deptFee.setKeeprate(insFeeOrder.getForthDeptProportion().doubleValue() * 0.01);
             deptFee.setKeepamount(insFeeOrder.getForthDeptPremiums().doubleValue());
             deptFee.setComlevel("四级");
             insDeptFeeService.insert(deptFee);
-        }else if (insFeeOrder.getFifthDeptPremiums().doubleValue() > 0) {
+        }
+        if (insFeeOrder.getFifthDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(order.getDeptid().substring(0, 11));  //99140302M01D01
             deptFee.setKeeprate(insFeeOrder.getFifthDeptProportion().doubleValue() * 0.01);
             deptFee.setKeepamount(insFeeOrder.getFifthDeptPremiums().doubleValue());

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

@@ -322,7 +322,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         // 构造查询条件
         LambdaQueryWrapper<InsOrders> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotEmpty(orderQueryVo.getOrderNo()), InsOrders::getOrderno, orderQueryVo.getOrderNo()).likeRight(StringUtils.isNotEmpty(orderQueryVo.getDeptId()) && isTeamLeader, InsOrders::getDeptid, orderQueryVo.getDeptId()).eq(StringUtils.isNotEmpty(orderQueryVo.getOrderStatus()), InsOrders::getOrderstatus, orderQueryVo.getOrderStatus()).likeRight(StringUtils.isNotEmpty(orderQueryVo.getFrameNo()), InsOrders::getFrameno, orderQueryVo.getFrameNo()).likeRight(StringUtils.isNotEmpty(orderQueryVo.getLicenseNo()), InsOrders::getLicenseno, orderQueryVo.getLicenseNo()).likeRight(StringUtils.isNotEmpty(orderQueryVo.getInsuredName()), InsOrders::getInsuredname, orderQueryVo.getInsuredName()).between(!ObjectUtils.isEmpty(orderQueryVo.getStartDate()) && !ObjectUtils.isEmpty(orderQueryVo.getEndDate()), InsOrders::getCreatetime, orderQueryVo.getStartDate(), orderQueryVo.getEndDatePlusOneDay()).orderBy(true, false, InsOrders::getCreatetime);
+        wrapper.eq(StringUtils.isNotEmpty(orderQueryVo.getOrderNo()), InsOrders::getOrderno, orderQueryVo.getOrderNo())
+                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getDeptId()) && isTeamLeader, InsOrders::getDeptid, orderQueryVo.getDeptId())
+                .eq(StringUtils.isNotEmpty(orderQueryVo.getOrderStatus()), InsOrders::getOrderstatus, orderQueryVo.getOrderStatus())
+                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getFrameNo()), InsOrders::getFrameno, orderQueryVo.getFrameNo())
+                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getLicenseNo()), InsOrders::getLicenseno, orderQueryVo.getLicenseNo())
+                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getInsuredName()), InsOrders::getInsuredname, orderQueryVo.getInsuredName())
+                .between(!ObjectUtils.isEmpty(orderQueryVo.getStartDate()) && !ObjectUtils.isEmpty(orderQueryVo.getEndDate()), InsOrders::getCreatetime, orderQueryVo.getStartDate(), orderQueryVo.getEndDatePlusOneDay())
+                .orderBy(true, false, InsOrders::getCreatetime);
 
 
         if (isCdy) {//如果是出单员查询时，只查自己的  与代客录单一致，查operatorid （手机前端userid传过来是出单用户，直接用该字段查询查operatorid）