Merge remote-tracking branch 'origin/dev' into dev

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/impl/%DE%ServiceImpl.java.ftl

@@ -1072,9 +1072,9 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
     public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) {
                     <#if item.isEnableAPIStorage()>
                         <#if deaction.getPSSubSysServiceAPIDEMethod()?? >
-                            <#comment>附加数据逻辑-操作前</#comment>
-                            <@buildEntityParam deaction/>
-                            <@addGetActionBoforeLogic deaction/>
+                            <#--<#comment>附加数据逻辑-操作前</#comment>-->
+                            <#--<@buildEntityParam deaction/>-->
+                            <#--<@addGetActionBoforeLogic deaction/>-->
 		${item.getCodeName()} et=${subSysServiceApiDECodeName?uncap_first}FeignClient.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(${keyfield.getCodeName()?lower_case});
         if(et==null){
             et=new ${item.getCodeName()}();
@@ -1106,8 +1106,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
 			</#list>
 		</#if>
         }
-        <#comment>附加数据逻辑-操作后</#comment>
-        <@addAfterLogic deaction/>
+        <#--<#comment>附加数据逻辑-操作后</#comment>-->
+        <#--<@addAfterLogic deaction/>-->
         return  et;
                         <#else>
         return null;
@@ -1300,12 +1300,12 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
                                 </#if>
                         <#if item.isEnableAPIStorage()>
                             <#if deaction.getPSSubSysServiceAPIDEMethod()?? >
-        <#comment>附加数据逻辑-操作前</#comment>
-        <@buildEntityParam deaction/>
-        <@addBoforeLogic deaction/>
+        <#--<#comment>附加数据逻辑-操作前</#comment>-->
+        <#--<@buildEntityParam deaction/>-->
+        <#--<@addBoforeLogic deaction/>-->
         boolean result=${subSysServiceApiDECodeName?uncap_first}FeignClient.remove(${keyfield.getCodeName()?lower_case}) ;
-        <#comment>附加数据逻辑-操作后</#comment>
-        <@addAfterLogic deaction/>
+        <#--<#comment>附加数据逻辑-操作后</#comment>-->
+        <#--<@addAfterLogic deaction/>-->
         return result;
                             <#else>
         return false;
@@ -1498,7 +1498,6 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
 @Service
 public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Service {
 
-
     <#assign keyfield=de.getKeyPSDEField()>
 
     <#comment>引入关联依赖</#comment>
@@ -1554,15 +1553,24 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
     @Override
     @Transactional
     public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
+         <#comment>附加数据逻辑-操作前</#comment>
+         <@addBoforeLogic deaction/>
          ${deaction.getPSDELogic().getCodeName()?lower_case}Logic.execute(et);
+         <#comment>附加数据逻辑-操作后</#comment>
+         <@addAfterLogic deaction/>
          return et ;
     }
 
                     <#elseif deaction.getCodeName()?lower_case == 'get'>
     @Override
-    public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) {
+    public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} key) {
+        <#comment>附加数据逻辑-操作前</#comment>
+        <@buildEntityParam deaction/>
+        <@addGetActionBoforeLogic deaction/>
         ${item.getCodeName()} et = new ${item.getCodeName()}();
         et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(${keyfield.getCodeName()?lower_case});
+        <#comment>附加数据逻辑-操作后</#comment>
+        <@addAfterLogic deaction/>
         return et;
     }
 
@@ -1619,7 +1627,12 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
 
                     <#elseif deaction.getCodeName()?lower_case == "remove">
     @Override
-    public boolean remove(${srfjavatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) {
+    public boolean remove(${srfjavatype(keyfield.stdDataType)} key) {
+        <#comment>附加数据逻辑-操作前</#comment>
+        <@buildEntityParam deaction/>
+        <@addBoforeLogic deaction/>
+        <#comment>附加数据逻辑-操作后</#comment>
+        <@addAfterLogic deaction/>
         return true;
     }
 
@@ -1630,17 +1643,29 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
                     <#elseif deaction.getCodeName()?lower_case == "getdraft">
     @Override
     public ${item.getCodeName()} getDraft(${item.getCodeName()} et) {
+        <#comment>附加数据逻辑-操作前</#comment>
+        <@addBoforeLogic deaction/>
+        <#comment>附加数据逻辑-操作后</#comment>
+        <@addAfterLogic deaction/>
         return et;
     }
 
                     <#elseif deaction.getCodeName()?lower_case == "checkkey">
     @Override
     public boolean checkKey(${item.getCodeName()} et) {
+        <#comment>附加数据逻辑-操作前</#comment>
+        <@addBoforeLogic deaction/>
+        <#comment>附加数据逻辑-操作后</#comment>
+        <@addAfterLogic deaction/>
         return false;
     }
                     <#else>
     @Override
     public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
+        <#comment>附加数据逻辑-操作前</#comment>
+        <@addBoforeLogic deaction/>
+        <#comment>附加数据逻辑-操作后</#comment>
+        <@addAfterLogic deaction/>
         return et;
     }
                     </#if>