From 97e61d2db384f22e2c259b5efae566eb13a6e5da Mon Sep 17 00:00:00 2001 From: gongquanlin <1025081659@qq.com> Date: Mon, 27 Mar 2023 14:51:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=AE=E6=94=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=BA=E7=9A=84=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommodityModifiyLogKeyNameEnum.java | 75 +++++++++++++++++++ .../model/CommodityCodeModifyLog.java | 10 +++ .../CommodityCodeModifyLogServiceImpl.java | 4 + 3 files changed, 89 insertions(+) create mode 100644 order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/constant/CommodityModifiyLogKeyNameEnum.java diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/constant/CommodityModifiyLogKeyNameEnum.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/constant/CommodityModifiyLogKeyNameEnum.java new file mode 100644 index 00000000..370fe03a --- /dev/null +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/constant/CommodityModifiyLogKeyNameEnum.java @@ -0,0 +1,75 @@ +package com.dxhy.order.baseservice.module.commodity.constant; + +import lombok.Getter; + +/** + * @Description + * @Author 巩权林 + * @Date 2023/3/27 14:29 + **/ +@Getter +public enum CommodityModifiyLogKeyNameEnum { + ID("id", "主键id"), + COMMODITYID("commodityId", "商品id"), + SORTID("sortId", "序号"), + XHFNSRSBH("xhfNsrsbh", "纳税人识别号"), + XMMC("xmmc", "项目名称"), + ZXBM("zxbm", "自行编码"), + SPSM("spsm", "商品税目"), + SPJM("spjm", "简码"), + SL("sl", "税率"), + GGXH("ggxh", "规格型号"), + XMDW("xmdw", "项目单位"), + XMDJ("xmdj", "项目单价"), + HSBZ("hsbz", "含税标志"), + YCBZ("ycbz", "隐藏标志"), + YHZCBS("yhzcbs", "优惠政策标识"), + SPBM("spbm", "税收分类编码"), + SSFLMC("ssflMc", "税收分类名称"), + LSLBS("lslbs", "零税率标识"), + ZZSTSGL("zzstsgl", "增值税特殊管理"), + USERID("userId", "当前登录人id"), + CREATETIME("createTime", "数据创建时间"), + MODIFYTIME("modifyTime", "更新时间"), + MODIFYUSERID("modifyUserId", "更新人"), + GROUPID("groupId", "分组id"), + GROUPNAME("groupName", "分组名称"), + GROUPCODE("groupCode", "分组编码"), + DATASOURCE("dataSource", "数据来源"), + DATASTATE("dataState", "数据状态标识"), + MATCHINGSTATE("matchingState", "匹配状态"), + XHFMC("xhfMc", "税收分类名称"), + SPJC("spjc", "税收分类简称"), + BZ("bz", "备注"), + COLLECTIDENT("collectIdent", "采集标识"), + CPY("cpy", "成品油"), + BMBBBH("bmbBbh", "编码表版本号"), + CZLX("czlx", "操作类型"), + JDC("jdc", "是否机动车"), + WLFLBM("wlflbm", "物料分类编码"), + WLFLMC("wlflmc", "物料分类名称"), + ENTID("entId", "数据权限id"), + TSWL("tswl", "特殊物料标识"), + UUID("UUID", "UUID"), + SUCCESS("success", "mdm修改成功标志"); + + private String key; + private String keyName; + + + CommodityModifiyLogKeyNameEnum(String key, String keyName) { + this.key = key; + this.keyName = keyName; + } + + + public static String getKeyNameByKey(String key) { + for (CommodityModifiyLogKeyNameEnum myEnum : values()) { + if (myEnum.getKey().equals(key)) { + return myEnum.keyName; + } + } + + return null; + } +} diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeModifyLog.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeModifyLog.java index c3e032c9..f5fcf5e6 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeModifyLog.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeModifyLog.java @@ -29,6 +29,8 @@ public class CommodityCodeModifyLog implements Serializable { * 修改的字段属性，key */ private String key; + private String keyName; + /** * 原值 */ @@ -111,4 +113,12 @@ public class CommodityCodeModifyLog implements Serializable { public void setModifyUserName(String modifyUserName) { this.modifyUserName = modifyUserName; } + + public String getKeyName() { + return keyName; + } + + public void setKeyName(String keyName) { + this.keyName = keyName; + } } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java index b76358e3..142f8bdd 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dxhy.order.baseservice.config.UserCenterConfig; import com.dxhy.order.baseservice.module.base.service.BaseService; +import com.dxhy.order.baseservice.module.commodity.constant.CommodityModifiyLogKeyNameEnum; import com.dxhy.order.baseservice.module.commodity.dao.CommodityCodeModifyLogDao; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeModifyLog; @@ -141,6 +142,9 @@ public class CommodityCodeModifyLogServiceImpl implements CommodityCodeModifyLog .filter(j -> StringUtils.equals(Long.toString(j.getUserid()), i.getModifyUserId())) .findFirst().orElse(null); i.setModifyUserName(userInfoDTO.getName()); + + // 处理keyName + i.setKeyName(CommodityModifiyLogKeyNameEnum.getKeyNameByKey(i.getKey())); }); }