审计

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/domain/%DE%.java.ftl

@@ -90,32 +90,26 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
         <#comment>审计</#comment>
         <#if defield.isEnableAudit()==true && de.getAuditMode()!=0>
             <#assign defStdType=srfjavatype(defield.stdDataType)>
-            <#if defield.getPSCodeList?? && defield.getPSCodeList()??>
-                <#if ((defield.getPredefinedType())!'')!='LOGICVALID'>
             <#if defieldano?? && defieldano!='' >
                 <#assign defieldano = defieldano+" , ">
             </#if>
-                    <#assign defieldano=defieldano+"dict=\""+defield.getPSCodeList().codeName+"\"">
+            <#assign defieldano = "value = \""+jsonfield+"\"">
+            <#if defield.getPSCodeList?? && defield.getPSCodeList()??>
+                <#if ((defield.getPredefinedType())!'')!='LOGICVALID'>
+                    <#assign defieldano=defieldano+",dict=\""+defield.getPSCodeList().codeName+"\"">
                 </#if>
             </#if>
             <#if defDataType == "DATETIME"|| defDataType == "DATE" || defDataType == "TIME" || defDataType=='PICKUPDATA'&& defStdType=='Timestamp'>
-                <#if defieldano?? && defieldano!='' >
-                    <#assign defieldano = defieldano+" , ">
-                </#if>
                 <#if defDataType == "DATETIME">
-                    <#assign defieldano=defieldano+" fieldType=\"DATETIME\",format=\"yyyy-MM-dd HH:mm:ss\"">
+                    <#assign defieldano=defieldano+",fieldType=\"DATETIME\",format=\"yyyy-MM-dd HH:mm:ss\"">
                 <#elseif defDataType == "DATE">
-                    <#assign defieldano=defieldano+" fieldType=\"DATE\",format=\"yyyy-MM-dd\"">
+                    <#assign defieldano=defieldano+",fieldType=\"DATE\",format=\"yyyy-MM-dd\"">
                 <#elseif defDataType == "TIME">
-                    <#assign defieldano=defieldano+" fieldType=\"TIME\",format=\"HH:mm\"">
+                    <#assign defieldano=defieldano+",fieldType=\"TIME\",format=\"HH:mm\"">
                 <#elseif defDataType=='PICKUPDATA'&& defStdType=='Timestamp'><#comment>外键值附加数据，数据类型为时间</#comment>
-                    <#assign defieldano=defieldano+" fieldType=\"DATETIME\",format=\"yyyy-MM-dd HH:mm:ss\"">
+                    <#assign defieldano=defieldano+",fieldType=\"DATETIME\",format=\"yyyy-MM-dd HH:mm:ss\"">
                 </#if>
             </#if>
-            <#comment>为空时发name，让defield注解能正常发出</#comment>
-            <#if defieldano?? && defieldano=='' >
-                <#assign defieldano = "name = \""+columnname+"\"">
-            </#if>
         </#if>
     /**
      * ${defield.getLogicName()}

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/annotation/DEField.java.ftl

@@ -19,6 +19,11 @@ public @interface DEField
 	 * @return
 	 */
 	String name() default "";
+	/**
+	 * 属性名称
+	 * @return
+	 */
+	String value() default "";
 	/**
 	 * 是否为数据主键
 	 * @return
@@ -29,43 +34,36 @@ public @interface DEField
 	 * @return
 	 */
 	String defaultValue() default "";
-
 	/**
 	 * 属性类型
 	 * @return
 	 */
 	String fieldType() default"";
-
 	/**
 	 * 默认值类型
 	 * @return
 	 */
 	DEFieldDefaultValueType defaultValueType() default DEFieldDefaultValueType.NONE;
-
 	/**
 	 * 预置属性类型
 	 * @return
 	 */
 	DEPredefinedFieldType preType() default DEPredefinedFieldType.NONE;
-
 	/**
 	 * 逻辑删除有效值
 	 * @return
 	 */
 	String logicval() default "";
-
 	/**
 	 * 逻辑删除无效值
 	 * @return
 	 */
 	String logicdelval() default "";
-
 	/**
 	 * 代码表
 	 * @return
 	 */
 	String dict() default "";
-
 	/**
 	 * 日期格式化
 	 * @return

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/service/SimpleAuditService.java.ftl

@@ -157,7 +157,7 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
             Object value=dataTransfer(entity.get(fieldName),deField.fieldType(),deField.format());
             if(!StringUtils.isEmpty(value)){
                 JSONObject auditFieldObj=new JSONObject();
-                auditFieldObj.put("field",fieldName);
+                auditFieldObj.put("field",deField.value());
                 auditFieldObj.put("value",value);
                 if(!StringUtils.isEmpty(deField.dict())){
                     auditFieldObj.put("dict",deField.dict());
@@ -203,7 +203,7 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
                 oldValue=dataTransfer(oldValue,deField.fieldType(),deField.format());//属性值转换
                 newValue=dataTransfer(newValue,deField.fieldType(),deField.format());//属性值转换
                 JSONObject auditFieldObj=new JSONObject();
-                auditFieldObj.put("field",fieldName);
+                auditFieldObj.put("field",deField.value());
                 auditFieldObj.put("beforevalue",oldValue);
                 auditFieldObj.put("value",newValue);
                 if(!StringUtils.isEmpty(deField.dict())){