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 808090940..8cdc31add 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 @@ -63,17 +63,17 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl xxList = this.list(); for (OtaBaCxJbxx xx : xxList) { - if (ggpc.equals(xx.getGgpc())) { - throw new JeroBootException("公告批次重复"); + if (djbh.equals(xx.getDjbh())) { + throw new JeroBootException("产品登记编号重复"); } } } @@ -87,11 +87,11 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl xxList = this.list(); for (OtaBaCxJbxx xx : xxList) { - if (!xx.getOtaId().equals(otaBaCxJbxx.getOtaId()) && ggpc.equals(xx.getGgpc())) { - throw new JeroBootException("公告批次重复"); + if (!xx.getOtaId().equals(otaBaCxJbxx.getOtaId()) && djbh.equals(xx.getDjbh())) { + throw new JeroBootException("产品登记编号重复"); } } } @@ -241,26 +241,25 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl 500) { throw new JeroBootException("产品登记编号字数超过500"); } - jbxx.setDjbh(cpbh); - - row = s.getRow(4); - cell = row.getCell(1); - String ggpc = ImportFileUtil.getCellValue(cell, wb); - if (StringUtils.isNotEmpty(ggpc)) { + if (StringUtils.isNotEmpty(cpbh)) { List xxList = this.list(); for (OtaBaCxJbxx xx : xxList) { - if (ggpc.equals(xx.getGgpc())) { - throw new JeroBootException("公告批次重复"); + if (cpbh.equals(xx.getDjbh())) { + throw new JeroBootException("产品登记编号重复"); } } } - jbxx.setGgpc(ggpc); + jbxx.setDjbh(cpbh); + row = s.getRow(1); cell = row.getCell(1); jbxx.setQymc(ImportFileUtil.getCellValue(cell, wb)); row = s.getRow(3); cell = row.getCell(1); jbxx.setCplb(ImportFileUtil.getCellValueDict(cell, wb, "product_category", sysDictService, cut)); + row = s.getRow(4); + cell = row.getCell(1); + jbxx.setGgpc(ImportFileUtil.getCellValue(cell, wb)); row = s.getRow(5); cell = row.getCell(1); jbxx.setCpsb(ImportFileUtil.getCellValue(cell, wb));