From d867d6e03e4e0c11aa752282424640a272912315 Mon Sep 17 00:00:00 2001 From: yanps Date: Thu, 17 Oct 2024 09:31:45 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E5=BA=93=E5=8C=BA,=E4=BB=93=E5=BA=93,?= =?UTF-8?q?=E4=BB=93=E4=BD=8D=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4,?= =?UTF-8?q?=E4=BA=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/sectattr/service/dao/Sectattr.java | 4 ++-- .../sectattr/service/dto/SectattrDto.java | 4 ++-- .../service/impl/SectattrServiceImpl.java | 12 +++++----- .../master/storattr/service/dao/Storattr.java | 4 ++-- .../storattr/service/dto/StorattrDto.java | 4 ++-- .../service/impl/StorattrServiceImpl.java | 24 +++++++++---------- .../structattr/service/dao/Structattr.java | 4 ++-- .../structattr/service/dto/StructattrDto.java | 4 ++-- .../service/impl/StructattrServiceImpl.java | 16 ++++++------- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java index 4fbeb09..ebe13a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java @@ -97,11 +97,11 @@ public class Sectattr { /** * 修改人 */ - private String update_optid; + private String update_id; /** * 修改人姓名 */ - private String update_optname; + private String update_name; /** * 修改时间 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java index d072e75..fb97435 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java @@ -125,12 +125,12 @@ public class SectattrDto implements Serializable { /** * 修改人 */ - private String update_optid; + private String update_id; /** * 修改人姓名 */ - private String update_optname; + private String update_name; /** * 修改时间 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java index 9422a0f..2b4f0e2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java @@ -124,8 +124,8 @@ public class SectattrServiceImpl extends ServiceImpl i dto.setSect_id(IdUtil.getSnowflake(1, 1).nextId()); dto.setCreate_id(currentUserId); dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); + dto.setUpdate_id(currentUserId); + dto.setUpdate_name(nickName); dto.setUpdate_time(now); dto.setCreate_time(now); StorattrDto storattrDto = storattrService.findById(dto.getStor_id()); @@ -149,8 +149,8 @@ public class SectattrServiceImpl extends ServiceImpl i String now = DateUtil.now(); dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); + dto.setUpdate_id(currentUserId); + dto.setUpdate_name(nickName); StorattrDto storattrDto = storattrService.findById(dto.getStor_id()); dto.setStor_name(storattrDto.getStor_name()); @@ -176,8 +176,8 @@ public class SectattrServiceImpl extends ServiceImpl i sectattr.setSect_id(String.valueOf(sect_id)); sectattr.set_delete(true); sectattr.setUpdate_time(now); - sectattr.setUpdate_optid(currentUserId); - sectattr.setUpdate_optname(nickName); + sectattr.setUpdate_id(currentUserId); + sectattr.setUpdate_name(nickName); sectattrMapper.updateById(sectattr); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/Storattr.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/Storattr.java index d1796dc..ee94fd4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/Storattr.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/Storattr.java @@ -114,9 +114,9 @@ public class Storattr implements Serializable { private String create_time; - private String update_optid; + private String update_id; - private String update_optname; + private String update_name; private String update_time; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java index 1c967c8..3e919a4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java @@ -106,9 +106,9 @@ public class StorattrDto implements Serializable { private String create_time; - private String update_optid; + private String update_id; - private String update_optname; + private String update_name; private String update_time; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/impl/StorattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/impl/StorattrServiceImpl.java index 7066dfe..8416172 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/impl/StorattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/impl/StorattrServiceImpl.java @@ -101,8 +101,8 @@ public class StorattrServiceImpl extends ServiceImpl i dto.setStor_id(IdUtil.getSnowflake(1, 1).nextId()); dto.setCreate_id(currentUserId); dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); + dto.setUpdate_id(currentUserId); + dto.setUpdate_name(nickName); dto.setUpdate_time(now); dto.setCreate_time(now); @@ -133,8 +133,8 @@ public class StorattrServiceImpl extends ServiceImpl i String now = DateUtil.now(); dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); + dto.setUpdate_id(currentUserId); + dto.setUpdate_name(nickName); dto.setSyscompanyid(dto.getSysdeptid()); storattrMapper.updateById(BeanUtil.copyProperties(dto, Storattr.class)); @@ -151,8 +151,8 @@ public class StorattrServiceImpl extends ServiceImpl i Storattr storattr = new Storattr(); storattr.setStor_id(stor_id); storattr.setIs_delete("1"); - storattr.setUpdate_optid(currentUserId); - storattr.setUpdate_optname(nickName); + storattr.setUpdate_id(currentUserId); + storattr.setUpdate_name(nickName); storattr.setUpdate_time(now); storattrMapper.updateById(storattr); } @@ -216,8 +216,8 @@ public class StorattrServiceImpl extends ServiceImpl i is_used = "0"; } storattr.setIs_used(is_used); - storattr.setUpdate_optid(currentUserId); - storattr.setUpdate_optname(nickName); + storattr.setUpdate_id(currentUserId); + storattr.setUpdate_name(nickName); storattr.setUpdate_time(now); storattrMapper.updateById(storattr); @@ -225,16 +225,16 @@ public class StorattrServiceImpl extends ServiceImpl i Long stor_id = storattr.getStor_id(); Structattr structattr = new Structattr(); structattr.setIs_used(is_used); - structattr.setUpdate_optid(currentUserId); - structattr.setUpdate_optname(nickName); + structattr.setUpdate_id(currentUserId); + structattr.setUpdate_name(nickName); structattr.setUpdate_time(now); structattrServiceImpl.update(structattr, Wrappers.lambdaUpdate(Structattr.class).eq(Structattr::getStor_id, stor_id)); Sectattr sectattr = new Sectattr(); sectattr.setIs_used(is_used); - sectattr.setUpdate_optid(currentUserId); - sectattr.setUpdate_optname(nickName); + sectattr.setUpdate_id(currentUserId); + sectattr.setUpdate_name(nickName); sectattr.setUpdate_time(now); sectattrServiceImpl.update(sectattr, Wrappers.lambdaUpdate(Sectattr.class).eq(Sectattr::getStor_id, stor_id)); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/Structattr.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/Structattr.java index 3b3e33d..9a5bbb0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/Structattr.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/Structattr.java @@ -135,12 +135,12 @@ public class Structattr implements Serializable { /** * 修改人 */ - private String update_optid; + private String update_id; /** * 修改人姓名 */ - private String update_optname; + private String update_name; /** * 修改时间 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dto/StructattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dto/StructattrDto.java index aa785ed..98a55eb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dto/StructattrDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dto/StructattrDto.java @@ -135,12 +135,12 @@ public class StructattrDto implements Serializable { /** * 修改人 */ - private String update_optid; + private String update_id; /** * 修改人姓名 */ - private String update_optname; + private String update_name; /** * 修改时间 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/impl/StructattrServiceImpl.java index fb95feb..d022d63 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/impl/StructattrServiceImpl.java @@ -181,8 +181,8 @@ public class StructattrServiceImpl extends ServiceImpl