行为附加逻辑优化

SLN/%PUBPRJ%-core/src/main/resources/rules/%DE%/%ITEM%/after.bpmn.ftl

@@ -49,12 +49,12 @@ TARGET=PSDEACTION
                     <#if afterlogic.isInternalLogic() && afterlogic.getPSDELogic().isEnableBackend()>
                         <#assign delogic = afterlogic.getPSDELogic()>
                         <#assign target =afterlogic.getId()>
-           <callActivity activiti:exclusive="true" calledElement="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.service.logic.${de.codeName?lower_case}${delogic.getCodeName()?lower_case}" id="${target}" name="${delogic.codeName}"/>
+           <callActivity activiti:exclusive="true" calledElement="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.service.logic.${de.codeName?lower_case}${delogic.getCodeName()?lower_case}" id="${target}" name="${(de.codeName + delogic.codeName)?lower_case}"/>
                     <#elseif afterlogic.getDstPSDEAction()??  &&  afterlogic.getDstPSDEAction().isEnableBackend()>
                         <#assign dataentity = afterlogic.getDstPSDE()>
                         <#assign deaction = afterlogic.getDstPSDEAction()>
-                        <#assign target =afterlogic.getId()>
-           <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="${afterlogic.getId()}" id="${afterlogic.getId()}" implementation="http://www.jboss.org/drools/rule" name="${afterlogic.name}"/>
+                        <#assign target = afterlogic.getId()>
+           <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="${target}" id="${target}" implementation="http://www.jboss.org/drools/rule" name="${(dataentity.codeName + deaction.codeName)?lower_case}"/>
                     </#if>
            <sequenceFlow id="${source}_${target}" sourceRef="${source}" targetRef="${target}"/>
                     <#assign source = target>

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

@@ -94,6 +94,6 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower
     <#if de.getKeyPSDEField().getStdDataType()==actionLogicDE.getKeyPSDEField().getStdDataType()>
         <#assign privateCodeName = srfcaseformat(de.getKeyPSDEField().getCodeName(),'l_u2lC') >
         <#assign publicCodeName = privateCodeName?cap_first >
-        ${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.remove(et.get${publicCodeName}());
+    ${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.remove(et.get${publicCodeName}());
     </#if>
 </#macro>
\ No newline at end of file

SLN/%PUBPRJ%-core/src/main/resources/rules/%DE%/%ITEM%/before.bpmn.ftl

@@ -48,13 +48,13 @@ TARGET=PSDEACTION
                 <#comment>实体行为附加逻辑</#comment>
                 <#if beforelogic.isInternalLogic() && beforelogic.getPSDELogic().isEnableBackend()>
                     <#assign delogic = beforelogic.getPSDELogic()>
-                    <#assign target = (de.codeName + delogic.codeName)?lower_case>
-           <callActivity activiti:exclusive="true" calledElement="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.service.logic.${de.codeName?lower_case}${delogic.getCodeName()?lower_case}" id="${target}" name="${delogic.codeName}"/>
+                    <#assign target =beforelogic.getId()>
+           <callActivity activiti:exclusive="true" calledElement="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.service.logic.${de.codeName?lower_case}${delogic.getCodeName()?lower_case}" id="${target}" name="${(de.codeName + delogic.codeName)?lower_case}"/>
                 <#elseif beforelogic.getDstPSDEAction()??  &&  beforelogic.getDstPSDEAction().isEnableBackend()>
                     <#assign dataentity = beforelogic.getDstPSDE()>
                     <#assign deaction = beforelogic.getDstPSDEAction()>
-                    <#assign target = (dataentity.codeName + deaction.codeName)?lower_case>
-           <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="${target}" id="${target}" implementation="http://www.jboss.org/drools/rule" name="${deaction.codeName}"/>
+                    <#assign target = beforelogic.getId()>
+           <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="${target}" id="${target}" implementation="http://www.jboss.org/drools/rule" name="${(dataentity.codeName + deaction.codeName)?lower_case}"/>
                 </#if>
            <sequenceFlow id="${source}_${target}" sourceRef="${source}" targetRef="${target}"/>
                 <#assign source = target>

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

@@ -93,6 +93,6 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower
     <#if de.getKeyPSDEField().getStdDataType()==actionLogicDE.getKeyPSDEField().getStdDataType()>
         <#assign privateCodeName = srfcaseformat(de.getKeyPSDEField().getCodeName(),'l_u2lC') >
         <#assign publicCodeName = privateCodeName?cap_first >
-        ${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.remove(et.get${publicCodeName}());
+    ${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.remove(et.get${publicCodeName}());
     </#if>
 </#macro>
\ No newline at end of file