完善父数据逻辑

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

@@ -6,8 +6,13 @@ TARGET=PSDATAENTITY
 <#assign hasMinorPSDERs=0>
 <#if item.getMinorPSDERs?? && item.getMinorPSDERs()??>
     <#list item.getMinorPSDERs() as MinorPSDER>
-        <#if MinorPSDER.getDERType() =='DER1N'>
+        <#if MinorPSDER.getDERType() =='DER1N'  && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4) >
+            <#list de.getAllPSDEFields() as defield>
+                <#if defield.getPSDER1N?? && defield.getPSDER1N()?? && defield.getPSDER1N().name==MinorPSDER.name && (((defield.getDataType())!'')!='PICKUP')>
                     <#assign hasMinorPSDERs=hasMinorPSDERs+1>
+                    <#break>
+                </#if>
+            </#list>
         </#if>
         <#break>
     </#list>
@@ -69,7 +74,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
                 <#if !P.exists('DER1N',der.getMinorPSDataEntity().getCodeName())>
                     <#if der.getMinorPSDataEntity().getCodeName()==de.codeName>
 
-    private ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service=this;
+    private ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service = this;
                     <#else>
     @Autowired
     @Lazy
@@ -86,7 +91,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
                 <#if !P.exists('DER1N',der.getMajorPSDataEntity().getCodeName())>
                     <#if der.getMajorPSDataEntity().getCodeName()==de.codeName>
 
-    private ${pub.getPKGCodeName()}.core.${der.getMajorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMajorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service=this;
+    private ${pub.getPKGCodeName()}.core.${der.getMajorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMajorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service = this;
                     <#else>
     @Autowired
     @Lazy
@@ -229,6 +234,9 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
 
     @Override
     public void createBatch(List<${item.getCodeName()}> list) {
+        <#if hasMinorPSDERs gt 0>
+        list.forEach(item->fillParentData(item));
+        </#if>
         saveBatch(list,batchSize);
     }
 
@@ -280,6 +288,9 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
 
     @Override
     public void updateBatch(List<${item.getCodeName()}> list) {
+        <#if hasMinorPSDERs gt 0>
+        list.forEach(item->fillParentData(item));
+        </#if>
         updateBatchById(list,batchSize);
     }
 
@@ -310,6 +321,9 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
 
     @Override
     public void saveBatch(List<${item.getCodeName()}> list) {
+        <#if hasMinorPSDERs gt 0>
+        list.forEach(item->fillParentData(item));
+        </#if>
         saveOrUpdateBatch(list,batchSize);
     }
 
@@ -467,7 +481,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
     <#if de.hasPSDEWF()==true>
     <#assign entityName=srfpluralize(item.getCodeName()?lower_case)>
     @Autowired
-    ${pub.getPKGCodeName()}.util.client.IBZWFFeignClient ibzwfFeignClient;
+    private ${pub.getPKGCodeName()}.util.client.IBZWFFeignClient ibzwfFeignClient;
 
     /**
      * 查询工作流待办
@@ -495,8 +509,15 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
      */
     private void fillParentData(${item.getCodeName()} et){
         <#list item.getMinorPSDERs() as MinorPSDER>
-            <#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N'>
-                <#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??>
+            <#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N' && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4)>
+                <#assign hasPickupData=false>
+                <#list de.getAllPSDEFields() as defield>
+                    <#if defield.getPSDER1N?? && defield.getPSDER1N()?? && defield.getPSDER1N().name==MinorPSDER.name && (((defield.getDataType())!'')!='PICKUP')>
+                        <#assign hasPickupData=true>
+                        <#break>
+                    </#if>
+                </#list>
+                <#if hasPickupData==true && MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??>
                     <#assign MajorEntity = MinorPSDER.getMajorPSDataEntity()>
                     <#assign MajorEntityName=srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')>
                     <#assign MajorKeyFieldCodeName =srfcaseformat(MinorPSDER.getPSPickupDEField().codeName,'l_u2lC')?cap_first>
@@ -583,6 +604,23 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
             </#if>
         </#list>
     </#if>
+    <#comment>引入处理逻辑</#comment>
+    <#if de.getAllPSDEActions()??>
+        <#list de.getAllPSDEActions() as deAction>
+            <#comment>实体行为调用处理逻辑</#comment>
+            <#if deAction.getActionType() =='DELOGIC' >
+            <#assign deLogic=deAction.getPSDELogic()>
+                <@importDELogic deLogic />
+            </#if>
+            <#comment>实体行为附加逻辑</#comment>
+            <#if deAction.getPSDEActionLogics()??>
+                <#list deAction.getPSDEActionLogics() as deActionLogic>
+                    <#assign deLogic=deActionLogic.getPSDELogic()>
+                    <@importDELogic deLogic />
+                </#list>
+            </#if>
+        </#list>
+    </#if>
 
     <#comment>输出实体行为</#comment>
     <#if item.getAllPSDEActions()??>
@@ -607,7 +645,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
     @Override
     @Transactional
     public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
-         //${deaction.getPSDELogic().getCodeName()?lower_case}Logic.execute(et);
+         ${deaction.getPSDELogic().getCodeName()?lower_case}Logic.execute(et);
          return et ;
     }
 
@@ -1412,6 +1450,23 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
             </#if>
         </#list>
     </#if>
+    <#comment>引入处理逻辑</#comment>
+    <#if de.getAllPSDEActions()??>
+        <#list de.getAllPSDEActions() as deAction>
+            <#comment>实体行为调用处理逻辑</#comment>
+            <#if deAction.getActionType() =='DELOGIC' >
+            <#assign deLogic=deAction.getPSDELogic()>
+                <@importDELogic deLogic />
+            </#if>
+            <#comment>实体行为附加逻辑</#comment>
+            <#if deAction.getPSDEActionLogics()??>
+                <#list deAction.getPSDEActionLogics() as deActionLogic>
+                    <#assign deLogic=deActionLogic.getPSDELogic()>
+                    <@importDELogic deLogic />
+                </#list>
+            </#if>
+        </#list>
+    </#if>
 
     <#comment>输出实体行为</#comment>
     <#if item.getAllPSDEActions()??>
@@ -1421,14 +1476,31 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
                     ${deaction.getRender().code}
                 <#else>
                     <#if (deaction.getActionType()=='USERCUSTOM')>
+    @Override
+    @Transactional
+    public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
+        <#comment>附加数据逻辑-操作前</#comment>
+        <@addBoforeLogic deaction/>
+        //自定义代码
+        <#comment>附加数据逻辑-操作后</#comment>
+        <@addAfterLogic deaction/>
+        return et;
+    }
 
                     <#elseif deaction.getActionType()=='DELOGIC'>
-
+    @Override
+    @Transactional
+    public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
+         ${deaction.getPSDELogic().getCodeName()?lower_case}Logic.execute(et);
+         return et ;
+    }
 
                     <#elseif deaction.getCodeName()?lower_case == 'get'>
     @Override
     public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) {
-        return null;
+        ${item.getCodeName()} et = new ${item.getCodeName()}();
+        et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(${keyfield.getCodeName()?lower_case});
+        return et;
     }
 
                     <#elseif deaction.getCodeName()?lower_case == "createbatch">
@@ -1438,6 +1510,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
                     <#elseif deaction.getCodeName()?lower_case == "create">
     @Override
     public boolean create(${item.getCodeName()} et) {
+        <#comment>附加数据逻辑-操作前</#comment>
+        <@addBoforeLogic deaction/>
+        //代码实现
+        <#comment>附加数据逻辑-操作后</#comment>
+        <@addAfterLogic deaction/>
         return true;
     }
 
@@ -1448,6 +1525,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
                     <#elseif deaction.getCodeName()?lower_case == "update">
     @Override
     public boolean update(${item.getCodeName()} et) {
+        <#comment>附加数据逻辑-操作前</#comment>
+        <@addBoforeLogic deaction/>
+        //代码实现
+        <#comment>附加数据逻辑-操作后</#comment>
+        <@addAfterLogic deaction/>
         return true;
     }
 
@@ -1459,6 +1541,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
     @Override
     @Transactional
     public boolean save(${item.getCodeName()} et) {
+        <#comment>附加数据逻辑-操作前</#comment>
+        <@addBoforeLogic deaction/>
+        //代码实现
+        <#comment>附加数据逻辑-操作后</#comment>
+        <@addAfterLogic deaction/>
         return true;
     }
 
@@ -1480,7 +1567,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
                     <#elseif deaction.getCodeName()?lower_case == "getdraft">
     @Override
     public ${item.getCodeName()} getDraft(${item.getCodeName()} et) {
-        return null;
+        return et;
     }
 
                     <#elseif deaction.getCodeName()?lower_case == "checkkey">
@@ -1491,7 +1578,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
                     <#else>
     @Override
     public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
-        return null;
+        return et;
     }
                     </#if>
                 </#if>
@@ -1587,7 +1674,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
     public Page<${item.getCodeName()}> search${dedataset.getCodeName()}(${item.getCodeName()}SearchContext context) {
         <#--<#if item.isEnableNoSQLStorage() && item.getAllPSDEDBTables()??>-->
         <#--<#list item.getAllPSDEDBTables() as detable>-->
-        return null;
+        return new PageImpl<${item.getCodeName()}>(new ArrayList(),context.getPageable(),0);
         <#--</#list>-->
         <#--<#else>-->
         <#--return null ;-->