diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java index 34827abf4..f6a90730a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java @@ -179,7 +179,7 @@ public class OtaBaCxJbxxController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { + public Result importExcel(HttpServletRequest request, HttpServletResponse response) throws Exception { return super.importExcel(request, response, OtaBaCxJbxx.class); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java index a66b9e207..7a4e5e3aa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java @@ -65,7 +65,7 @@ public interface IOtaBaCxJbxxService extends IService { OtaBaCxJbxx queryByOtaId(String otaId, String otaIdT); - void exportTemplate(HttpServletResponse response, HttpServletRequest request); + void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; - OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut); + OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index fbd93af1e..ec7dad81a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.service.impl; import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.OtaBaCxJbxx; import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaCxTxjl; @@ -166,14 +167,14 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl= txzdStrs.length - 1) { + sb.append(sysDictService.queryDictItemByValue("communication_terminal", txzdStrs[i], cut)); + } else { + sb.append(sysDictService.queryDictItemByValue("communication_terminal", txzdStrs[i], cut)).append(","); + } + } + jbxx.setTxzd(sb.toString()); row = s.getRow(11); cell = row.getCell(1); jbxx.setCdotasj(getCellValue(cell, wb)); - } catch (Exception e) { - e.printStackTrace(); } return jbxx; }