审计调整

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

@@ -89,22 +89,28 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
         </#if>
         <#comment>审计</#comment>
         <#if defield.isEnableAudit()==true && de.getAuditMode()!=0>
-            <#if defieldano?? && defieldano!=''>
-                <#assign defieldano = defieldano+" , ">
-                <#assign defStdType=srfjavatype(defield.stdDataType)>
-                <#if defield.getPSCodeList?? && defield.getPSCodeList()??>
-                    <#if ((defield.getPredefinedType())!'')!='LOGICVALID'>
-                        <#assign defieldano=defieldano+",dict=\""+ sys.codeName+"_"+defield.getPSCodeList().codeName+"CodeList"+"\""> //拼接代码表
+            <#assign defieldano = defieldano+" , ">
+            <#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=\""+ sys.codeName+"_"+defield.getPSCodeList().codeName+"CodeList"+"\""> //拼接代码表
+                </#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>
         </#if>