diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java index f9fd80b2..ea60eb21 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java @@ -80,7 +80,6 @@ public class XhpcInvoiceController extends BaseController { return AjaxResult.success(fileAddress); } - /** * 给指定用户开发票,开票完成之后将开出的电子发票发送至用户的接收邮箱 * 如果失败,则标记发票为失败发票 diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java index a38a2dd9..b245bc4f 100644 --- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java +++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java @@ -2,6 +2,7 @@ package com.xhpc.workorder.service.impl; import cn.hutool.core.util.StrUtil; import com.xhpc.common.core.exception.CustomException; +import com.xhpc.common.core.utils.StringUtils; import com.xhpc.workorder.domain.XhpcStationDeviceDomain; import com.xhpc.workorder.domain.XhpcWorkStationDomain; import com.xhpc.workorder.mapper.XhpcStationDeviceMapper; @@ -52,15 +53,15 @@ public class WorkStationServiceImpl implements WorkStationService { StringBuilder failureMsg = new StringBuilder(); for (XhpcStationDeviceDomain domain: deviceDomainList){ - if ("".equals(domain.getStationName())){ + if (StringUtils.isEmpty(domain.getStationName())){ failureNum ++; - failureMsg.append("
电站名称: ").append(domain.getStationName()).append(" ,设备编码: ").append(domain.getSerialNumber()).append(" 导入失败; 失败原因: 必填字段为空。"); + failureMsg.append("
电站名称: ").append(domain.getStationName()).append(" ,设备编码: ").append(domain.getSerialNumber()).append(" 导入失败; 失败原因: 场站名称为空。"); continue; } XhpcWorkStationDomain stationDomain = stationMapper.selectByName(domain.getStationName()); if (stationDomain == null){ failureNum ++; - failureMsg.append("
电站名称: ").append(domain.getStationName()).append(" ,设备编码: ").append(domain.getSerialNumber()).append(" 导入失败; 失败原因: 必填字段为空。"); + failureMsg.append("
电站名称: ").append(domain.getStationName()).append(" ,设备编码: ").append(domain.getSerialNumber()).append(" 导入失败; 失败原因: 场站未找到。"); continue; } else { domain.setDeviceId(stationDomain.getWorkStationId());