更新0808
This commit is contained in:
parent
d051cbee66
commit
bca71a07ca
@ -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(""), 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())
|
||||
rows.add(CollUtil.newArrayList(ObjectUtil.isNotEmpty(item.getCarNum()) ? item.getCarNum() : 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)
|
||||
@ -239,17 +239,18 @@ public class InspectionMallPartnersController extends BaseController {
|
||||
|
||||
//时间类型
|
||||
if (StringUtils.isNotEmpty(query.getDateType())) {
|
||||
filterBuilder.append("时间类型:");
|
||||
if (query.getDateType().equals("nextInspectionTime")) {
|
||||
filterBuilder.append("下次年检时间:")
|
||||
filterBuilder.append("下次年检时间")
|
||||
.append(",");
|
||||
} else if (query.getDateType().equals("jcTime")) {
|
||||
filterBuilder.append("检测时间:")
|
||||
filterBuilder.append("检测时间")
|
||||
.append(",");
|
||||
} else if (query.getDateType().equals("bxTime")) {
|
||||
filterBuilder.append("保险到期时间(交强):")
|
||||
filterBuilder.append("保险到期时间(交强)")
|
||||
.append(",");
|
||||
} else if (query.getDateType().equals("bxVehicleTime")) {
|
||||
filterBuilder.append("保险到期时间(商业):")
|
||||
filterBuilder.append("保险到期时间(商业)")
|
||||
.append(",");
|
||||
}
|
||||
}
|
||||
|
@ -1,41 +0,0 @@
|
||||
//package cn.iocoder.yudao.module.job.logger;
|
||||
//
|
||||
//import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
|
||||
//import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
|
||||
//import cn.iocoder.yudao.module.infra.service.logger.ApiAccessLogService;
|
||||
//import lombok.extern.slf4j.Slf4j;
|
||||
//import org.springframework.stereotype.Component;
|
||||
//
|
||||
//import javax.annotation.Resource;
|
||||
//
|
||||
///**
|
||||
// * 物理删除 N 天前的访问日志的 Job
|
||||
// *
|
||||
// * @author j-sentinel
|
||||
// */
|
||||
//@Component
|
||||
//@Slf4j
|
||||
//public class AccessLogCleanJob implements JobHandler {
|
||||
//
|
||||
// @Resource
|
||||
// private ApiAccessLogService apiAccessLogService;
|
||||
//
|
||||
// /**
|
||||
// * 清理超过(14)天的日志
|
||||
// */
|
||||
// private static final Integer JOB_CLEAN_RETAIN_DAY = 14;
|
||||
//
|
||||
// /**
|
||||
// * 每次删除间隔的条数,如果值太高可能会造成数据库的压力过大
|
||||
// */
|
||||
// private static final Integer DELETE_LIMIT = 100;
|
||||
//
|
||||
// @Override
|
||||
// @TenantIgnore
|
||||
// public String execute(String param) {
|
||||
// Integer count = apiAccessLogService.cleanAccessLog(JOB_CLEAN_RETAIN_DAY, DELETE_LIMIT);
|
||||
// log.info("[execute][定时执行清理访问日志数量 ({}) 个]", count);
|
||||
// return String.format("定时执行清理访问日志数量 %s 个", count);
|
||||
// }
|
||||
//
|
||||
//}
|
Loading…
Reference in New Issue
Block a user