From 4a760c70d5bb19aac072f832631e4de1181d4947 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Thu, 25 Sep 2025 19:36:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC=203.?= =?UTF-8?q?0.38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../zt-module-contract-order-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d1619b3..c0fdd26 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ https://github.com/YunaiV/ruoyi-vue-pro - 3.0.37 + 3.0.38 17 ${java.version} diff --git a/zt-module-contract-order/zt-module-contract-order-server/pom.xml b/zt-module-contract-order/zt-module-contract-order-server/pom.xml index 2179c7b..d8d5a63 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/pom.xml +++ b/zt-module-contract-order/zt-module-contract-order-server/pom.xml @@ -129,7 +129,7 @@ com.zt.plat zt-module-base-server - 3.0.37 + 3.0.38 compile From 8f677c0b4c553e9ebea73d030b57226cfc1424a8 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Fri, 26 Sep 2025 10:04:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/dal/mysql/base/FactoryMapper.java | 1 + .../base/service/base/FactoryServiceImpl.java | 17 ++++++++++++++--- .../resources/mapper/base/FactoryMapper.xml | 3 +++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java index 4cf825f..53883ae 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java @@ -27,4 +27,5 @@ public interface FactoryMapper extends BaseMapperX { .orderByDesc(FactoryDO::getId)); } + String selectMaxCode(); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java index cb3567d..a2d21b3 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java @@ -36,6 +36,17 @@ public class FactoryServiceImpl implements FactoryService { public FactoryRespVO createFactory(FactorySaveReqVO createReqVO) { // 插入 FactoryDO factory = BeanUtils.toBean(createReqVO, FactoryDO.class); + // 工厂编码自动生成，格式 GC-0001,依次新增 + String maxCode = factoryMapper.selectMaxCode(); + if (maxCode == null) { + factory.setNumber("GC-0001"); + } else { + String prefix = "GC-"; + String numberPart = maxCode.substring(prefix.length()); + int nextNumber = Integer.parseInt(numberPart) + 1; + String nextCode = prefix + String.format("%04d", nextNumber); + factory.setNumber(nextCode); + } factoryMapper.insert(factory); // 返回 return BeanUtils.toBean(factory, FactoryRespVO.class); @@ -59,12 +70,12 @@ public class FactoryServiceImpl implements FactoryService { } @Override - public void deleteFactoryListByIds(List ids) { + public void deleteFactoryListByIds(List ids) { // 校验存在 validateFactoryExists(ids); // 删除 factoryMapper.deleteByIds(ids); - } + } private void validateFactoryExists(List ids) { List list = factoryMapper.selectByIds(ids); @@ -92,7 +103,7 @@ public class FactoryServiceImpl implements FactoryService { @Override public void enableFactoryList(List saveReqVOS) { List updateObj = BeanUtils.toBean(saveReqVOS, FactoryDO.class); - List count = factoryMapper.updateById(updateObj); + List count = factoryMapper.updateById(updateObj); if (CollUtil.isEmpty(count)) { throw exception(FACTORY_NOT_EXISTS); } diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml index 131c560..a212af0 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml @@ -9,4 +9,7 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> + \ No newline at end of file From ecd27a351093ea057208abd43108db9562046b12 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Fri, 26 Sep 2025 10:06:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/base/FactoryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml index a212af0..8f33036 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml @@ -10,6 +10,6 @@ --> \ No newline at end of file