|
|
@@ -853,7 +853,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
|
|
|
}
|
|
|
BigDecimal jqSuperviseCostsProportion, sySuperviseCostsProportion, noSuperviseCostsProportion;
|
|
|
jqSuperviseCostsProportion = BigDecimalUtils.transferToBigDecmail(costsNews.get(0).getJqCarCostsProportion());
|
|
|
- sySuperviseCostsProportion =BigDecimalUtils.transferToBigDecmail(costsNews.get(0).getSyCarCostsProportion());
|
|
|
+ sySuperviseCostsProportion = BigDecimalUtils.transferToBigDecmail(costsNews.get(0).getSyCarCostsProportion());
|
|
|
noSuperviseCostsProportion = BigDecimalUtils.transferToBigDecmail(costsNews.get(0).getNoCarCostsProportion());
|
|
|
|
|
|
InsAreaCompanyExternalFee insAreaCompanyExternalFee = new InsAreaCompanyExternalFee();
|
|
|
@@ -910,15 +910,15 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
|
|
|
InsFeeAudit insFeeAudit = insFeeAuditService.getOne(new LambdaQueryWrapper<InsFeeAudit>()
|
|
|
.eq(InsFeeAudit::getOrderno, insAreaCompany.getOrderno())
|
|
|
.eq(InsFeeAudit::getInsOrderNo, insAreaCompany.getId()));
|
|
|
- if(insFeeAudit!=null){
|
|
|
- String status="";
|
|
|
+ if (insFeeAudit != null) {
|
|
|
+ String status = "";
|
|
|
if (insOrdersEditingVo.getStageFlag() == 0) {
|
|
|
- status= OrderFeeAuditHistroy.OFH_61.getCode();
|
|
|
+ status = OrderFeeAuditHistroy.OFH_61.getCode();
|
|
|
} else {
|
|
|
- status=OrderFeeAuditHistroy.OFH_62.getCode();
|
|
|
+ status = OrderFeeAuditHistroy.OFH_62.getCode();
|
|
|
}
|
|
|
//说明是驳回的数据,插入审核驳回表
|
|
|
- InsFeeAuditHistory his=new InsFeeAuditHistory(insAreaCompany,status,new BaseController().getUser().getName());
|
|
|
+ InsFeeAuditHistory his = new InsFeeAuditHistory(insAreaCompany, status, new BaseController().getUser().getName());
|
|
|
// 保存审核轨迹
|
|
|
insFeeAuditHistoryService.save(his);
|
|
|
}
|
|
|
@@ -1075,15 +1075,16 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
|
|
|
List<SubOrderCountDTO> subOrderCountDTO = baseMapper.getSubOrderCountDTO(orderNo);
|
|
|
return subOrderCountDTO.stream().collect(Collectors.toMap(x -> x.getOrderNo() + x.getOrderStatus(), SubOrderCountDTO::getCount));
|
|
|
}
|
|
|
- /**
|
|
|
- * @version
|
|
|
- * @author: hxl
|
|
|
- * @Date: 2024/9/30 8:54
|
|
|
- * @Description: 查询驳回的订单信息
|
|
|
- */
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @version
|
|
|
+ * @author: hxl
|
|
|
+ * @Date: 2024/9/30 8:54
|
|
|
+ * @Description: 查询驳回的订单信息
|
|
|
+ */
|
|
|
@Override
|
|
|
public Page<InsAreaCompany> getAllRejectOrders(Page page, RejectPageQueryVo rejectPageQueryVo) {
|
|
|
- return baseMapper.getAllRejectOrders(page,rejectPageQueryVo);
|
|
|
+ return baseMapper.getAllRejectOrders(page, rejectPageQueryVo);
|
|
|
}
|
|
|
|
|
|
}
|