From 2e9d8116e62842e07a8cd20168732913f46a0da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 7 Jun 2023 09:12:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E6=89=B9=E5=8F=B7?=
 =?UTF-8?q?=E9=AA=8C=E9=87=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OtaBaCxJbxxServiceImpl.java  | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

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<OtaBaCxJbxxMapper, OtaBa
      * @return
      */
     public OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx) throws Exception {
-        String ggpc = otaBaCxJbxx.getGgpc();
+        String djbh = otaBaCxJbxx.getDjbh();
         //对比填写记录用的
         OtaBaCxJbxx otaBaCxJbxxOld = new OtaBaCxJbxx();
         Date now = new Date();
         OtaBaCxList otaBaCxList;
         if (StringUtils.isEmpty(otaBaCxJbxx.getOtaId())) {
-            if (StringUtils.isNotEmpty(ggpc)) {
+            if (StringUtils.isNotEmpty(djbh)) {
                 List<OtaBaCxJbxx> 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<OtaBaCxJbxxMapper, OtaBa
             otaBaCxJbxx.setCreateTime(now);
         } else {
             otaBaCxJbxxOld = this.getByOtaId(otaBaCxJbxx.getOtaId());
-            if (StringUtils.isNotEmpty(ggpc)) {
+            if (StringUtils.isNotEmpty(djbh)) {
                 List<OtaBaCxJbxx> 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<OtaBaCxJbxxMapper, OtaBa
         if (cpbh.length() > 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<OtaBaCxJbxx> 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));