dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新0725

Browse Source
This commit is contained in:
xyc 2025-07-25 16:12:59 +08:00
parent 692250c4ba
commit 1f1e5b2ae3
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java
View File

@ -182,7 +182,7 @@ public class InspectionMallPartnersController extends BaseController {
Map<String, Object> stringObjectMap = orderInfoService.workOrderData(query);
rows.add(CollUtil.newArrayList("公示价格汇总:", "", String.valueOf(Double.parseDouble(stringObjectMap.get("goodsPriceSum").toString()) / 100d) + "元", "实付金额汇总:", "", String.valueOf(Double.parseDouble(stringObjectMap.get("payMoneySum").toString()) / 100d) + "元"));
rows.add(CollUtil.newArrayList("车牌号", "检测车型", "检测类型", "业务渠道", "客户来源", "经办人", "公示价格", "实收金额", "付款时间", "客户手机号", "支付方式", "开始时间", "结束时间", "检测结果", "出纳是否确认"));
rows.add(CollUtil.newArrayList("车牌号", "检测车型", "检测类型", "业务渠道", "客户来源", "经办人", "承保公司", "交强到期时间", "商业到期时间", "公示价格", "实收金额", "付款时间", "客户手机号", "支付方式", "开始时间", "结束时间", "检测结果", "出纳是否确认"));
List<DictDataDO> sysDictData = dictDataService.getDictDataListByDictType("pay_type");
@ -221,7 +221,7 @@ public class InspectionMallPartnersController extends BaseController {
}
}
rows.add(CollUtil.newArrayList(Optional.ofNullable(item.getCarNum()).orElse(item.getCertificateNum()), Optional.ofNullable(item.getGoodsTitle()).orElse(""), Optional.ofNullable(item.getSkuName()).orElse(""), Optional.ofNullable(item.getBusinessChannel()).orElse(""), Optional.ofNullable(item.getCustomerSource()).orElse(""), Optional.ofNullable(item.getOtherName()).orElse(""), ObjectUtil.isEmpty(item.getGoodsPrice()) ? "" : BigDecimal.valueOf(item.getGoodsPrice())
rows.add(CollUtil.newArrayList(Optional.ofNullable(item.getCarNum()).orElse(item.getCertificateNum()), Optional.ofNullable(item.getGoodsTitle()).orElse(""), Optional.ofNullable(item.getSkuName()).orElse(""), Optional.ofNullable(item.getBusinessChannel()).orElse(""), Optional.ofNullable(item.getCustomerSource()).orElse(""), Optional.ofNullable(item.getOtherName()).orElse(""), Optional.ofNullable(item.getInsuranceCompanyName()).orElse(""), ObjectUtil.isNotEmpty(item.getInsuranceExpiryDate()) ? DateUtil.format(item.getInsuranceExpiryDate(), "yyyy-MM-dd") : "", ObjectUtil.isNotEmpty(item.getVehicleInsuranceExpiryDate()) ? DateUtil.format(item.getVehicleInsuranceExpiryDate(), "yyyy-MM-dd") : "", ObjectUtil.isEmpty(item.getGoodsPrice()) ? "" : BigDecimal.valueOf(item.getGoodsPrice())
.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)
.toString(), ObjectUtil.isEmpty(item.getRealPayMoney()) ? "暂未支付" : BigDecimal.valueOf(item.getRealPayMoney())
.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)
@ -237,12 +237,29 @@ public class InspectionMallPartnersController extends BaseController {
StringBuilder filterBuilder = new StringBuilder();
//时间类型
if (StringUtils.isNotEmpty(query.getDateType())) {
if (query.getDateType().equals("nextInspectionTime")) {
filterBuilder.append("下次年检时间：")
.append("，");
} else if (query.getDateType().equals("jcTime")) {
filterBuilder.append("检测时间：")
.append("，");
} else if (query.getDateType().equals("bxTime")) {
filterBuilder.append("保险到期时间（交强）：")
.append("，");
} else if (query.getDateType().equals("bxVehicleTime")) {
filterBuilder.append("保险到期时间（商业）：")
.append("，");
}
}
// 时间范围
if (query.getInspectionTime() != null && query.getInspectionTime().length == 2) {
if (query.getDatetimeRange() != null && query.getDatetimeRange().length == 2) {
filterBuilder.append("时间：")
.append(query.getInspectionTime()[0])
.append(query.getDatetimeRange()[0])
.append(" - ")
.append(query.getInspectionTime()[1])
.append(query.getDatetimeRange()[1])
.append("，");
}
@ -313,7 +330,7 @@ public class InspectionMallPartnersController extends BaseController {
}
// ====== 合并单元格写标题 ======
writer.merge(14, titleBuilder.toString());
writer.merge(17, titleBuilder.toString());
// ====== 设置标题行高 ======
writer.setRowHeight(0, 30);

6
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionAppointmentServiceImpl.java
View File

@ -351,9 +351,9 @@ public class InspectionAppointmentServiceImpl extends ServiceImpl<InspectionAppo
}
}
//取消预约发送短信
ShopMallPartners partners = partnerService.getById(oldAppointment.getPartnerId());
AdminUserDO sysUser = userService.getUser(partners.getUserId());
// //取消预约发送短信
// ShopMallPartners partners = partnerService.getById(oldAppointment.getPartnerId());
// AdminUserDO sysUser = userService.getUser(partners.getUserId());
//给检测站发送
//给联系人发送
// SendSmsUtil.sendMsgCommon(new String[]{Optional.ofNullable(oldAppointment.getCarNo()).orElse("")},