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

SLN/%PUBPRJ%-core/src/main/resources/rules/%DE%%ITEM%Rule.drl.ftl

@@ -140,27 +140,28 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}"
     iBzSys${de.codeName?lower_case?cap_first}DefaultService.execute(strSql,param);//SQL调用
             </#if>
             <#elseif  deLogicNode.getLogicNodeType()=='RAWSQLANDLOOPCALL'><#comment>直接SQL并循环调用</#comment>
-                //暂不支持
-            <#--<#if deLogicNode.getPSDELogicNodeParams()??><#comment>是否包含参数列表</#comment>-->
-            <#--String strSql=${getCallSQL(deLogicNode)};-->
-            <#--<#else>-->
-            <#--String strSql="${srfjavasqlcode('${deLogicNode.getParam("PARAM4","")}')}";-->
-            <#--</#if>-->
-            <#--java.util.List<Map<String,Object>> entities=iBzSys${de.codeName?lower_case?cap_first}DefaultService.selectRow(strSql);//SQL调用-->
-            <#--if(entities.size()>0){-->
-            <#--<#if deLogicNode.getDstPSDataEntity?? && deLogicNode.getDstPSDataEntity()?? &&deLogicNode.getDstPSDEAction?? && deLogicNode.getDstPSDEAction()??>-->
-            <#--<#assign targetEntity=deLogicNode.getDstPSDataEntity()>-->
-            <#--<#assign targetAction=deLogicNode.getDstPSDEAction()>-->
-            <#--for(Map<String,Object> entity:entities){-->
-            <#--${pub.getPKGCodeName()}.${targetEntity.getPSSystemModule().codeName?lower_case}.domain.${targetEntity.codeName} targetEntity =new ${pub.getPKGCodeName()}.${targetEntity.getPSSystemModule().codeName?lower_case}.domain.${targetEntity.codeName}();-->
-            <#--for (Map.Entry<String,Object> entry : entity.entrySet()) {-->
-            <#--targetEntity.set(entry.getKey(),entry.getValue());-->
-            <#--}-->
-            <#--${targetEntity.codeName?lower_case}service.${targetAction.codeName?lower_case}(targetEntity);-->
-            <#--}-->
-            <#--</#if>-->
-            <#--}-->
-            </#if>
+                <#if deLogicNode.getPSDELogicNodeParams()??>
+                    <#comment>包含参数列表</#comment>
+                    <@getCallSQL2 deLogicNode/>
+                <#else>
+    Map param = null;
+    String strSql="${srfjavasqlcode('${deLogicNode.getParam("PARAM4","")}')}";
+                </#if>
+    java.util.List<JSONObject> entities=iBzSys${de.codeName?lower_case?cap_first}DefaultService.select(strSql,param);//SQL调用
+    if(entities.size()>0){
+                    <#if deLogicNode.getDstPSDataEntity?? && deLogicNode.getDstPSDataEntity()?? &&deLogicNode.getDstPSDEAction?? && deLogicNode.getDstPSDEAction()??>
+                    <#assign targetEntity=deLogicNode.getDstPSDataEntity()>
+                    <#assign targetAction=deLogicNode.getDstPSDEAction()>
+        for(JSONObject entity:entities){
+            ${pub.getPKGCodeName()}.${targetEntity.getPSSystemModule().codeName?lower_case}.domain.${targetEntity.codeName} targetEntity =new ${pub.getPKGCodeName()}.${targetEntity.getPSSystemModule().codeName?lower_case}.domain.${targetEntity.codeName}();
+            for (Map.Entry<String,Object> entry : entity.entrySet()) {
+                targetEntity.set(entry.getKey(),entry.getValue());
+            }
+            ${targetEntity.codeName?lower_case}service.${targetAction.codeName?lower_case}(targetEntity);
+        }
+                    </#if>
+    }
+                </#if>
             <#if delogic.getPSDELogicParams?? && delogic.getPSDELogicParams()??>
                 <#list delogic.getPSDELogicParams() as logicParam>
     update(${logicName+logicParam.codeName?lower_case});//更新fact中变量值