提交 71726786 编写于 作者: ibizdev's avatar ibizdev

zhouweidong 发布系统代码 [后台服务,演示应用]

上级 446b2a9e
...@@ -712,7 +712,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -712,7 +712,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}): void { public load(opt: any = {}): void {
if(!this.loadAction){ if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public async loadDraft(opt: any = {},mode?:string): Promise<any> { public async loadDraft(opt: any = {},mode?:string): Promise<any> {
if(!this.loaddraftAction){ if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
...@@ -1344,7 +1344,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface ...@@ -1344,7 +1344,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
*/ */
public async load(opt: any = {}): Promise<any> { public async load(opt: any = {}): Promise<any> {
if(!this.loadAction){ if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -1391,7 +1391,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface ...@@ -1391,7 +1391,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
*/ */
public async loadDraft(opt: any = {}): Promise<any> { public async loadDraft(opt: any = {}): Promise<any> {
if (!this.loaddraftAction) { if (!this.loaddraftAction) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
...@@ -1461,7 +1461,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface ...@@ -1461,7 +1461,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction; const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){ if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction"; let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
return; return;
} }
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
...@@ -1569,7 +1569,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface ...@@ -1569,7 +1569,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction; const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){ if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction"; let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
return; return;
} }
Object.assign(arg, { viewparams: this.viewparams }); Object.assign(arg, { viewparams: this.viewparams });
...@@ -1661,7 +1661,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface ...@@ -1661,7 +1661,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> { public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
if(!this.removeAction){ if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
return; return;
} }
const arg: any = opt[0]; const arg: any = opt[0];
......
...@@ -1447,7 +1447,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1447,7 +1447,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
*/ */
public async load(opt: any = {}): Promise<any> { public async load(opt: any = {}): Promise<any> {
if(!this.loadAction){ if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -1494,7 +1494,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1494,7 +1494,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
*/ */
public async loadDraft(opt: any = {}): Promise<any> { public async loadDraft(opt: any = {}): Promise<any> {
if (!this.loaddraftAction) { if (!this.loaddraftAction) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
...@@ -1564,7 +1564,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1564,7 +1564,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction; const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){ if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction"; let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
return; return;
} }
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
...@@ -1672,7 +1672,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1672,7 +1672,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction; const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){ if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction"; let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
return; return;
} }
Object.assign(arg, { viewparams: this.viewparams }); Object.assign(arg, { viewparams: this.viewparams });
...@@ -1764,7 +1764,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { ...@@ -1764,7 +1764,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> { public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
if(!this.removeAction){ if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
return; return;
} }
const arg: any = opt[0]; const arg: any = opt[0];
......
...@@ -55,23 +55,6 @@ ...@@ -55,23 +55,6 @@
git clone -b master $para2 demosys/ git clone -b master $para2 demosys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd demosys/ cd demosys/
cd demo-boot
mvn ibizlabcli:code
cd ..
set +e
git config user.name "ibizdev"
git add .
git commit -m "generator before deploy $para5"
git push origin master
git config user.name "root"
set -e
mvn package -Pboot
cd demo-boot
sed -i "s#dstimage#$para5#g" pom.xml
sed -i "s#dstimage#$para5#g" src/main/docker/demo-boot-demoapi.yaml
mvn -Pboot docker:build
mvn -Pboot docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/demo-boot-demoapi.yaml iBizDemo --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /demo-boot.jar java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /demo-boot.jar
EXPOSE 52000 EXPOSE 8081
ADD demo-boot.jar /demo-boot.jar ADD demo-boot.jar /demo-boot.jar
...@@ -11,51 +11,51 @@ ...@@ -11,51 +11,51 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
}, },
"getPSDETreeColumns" : [ { "getPSDETreeColumns" : [ {
"caption" : "归还日期", "caption" : "作者",
"codeName" : "returntime", "codeName" : "author",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "returntime", "dataItemName" : "author",
"name" : "returntime", "name" : "author",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "出版社", "caption" : "图书名称",
"codeName" : "press", "codeName" : "ibizbookname",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "press", "dataItemName" : "ibizbookname",
"name" : "press", "name" : "ibizbookname",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "借出日期", "caption" : "归还日期",
"codeName" : "lendouttime", "codeName" : "returntime",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "lendouttime", "dataItemName" : "returntime",
"name" : "lendouttime", "name" : "returntime",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "作者", "caption" : "出版社",
"codeName" : "author", "codeName" : "press",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "author", "dataItemName" : "press",
"name" : "author", "name" : "press",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "图书名称", "caption" : "借出日期",
"codeName" : "ibizbookname", "codeName" : "lendouttime",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "ibizbookname", "dataItemName" : "lendouttime",
"name" : "ibizbookname", "name" : "lendouttime",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
......
...@@ -19,6 +19,16 @@ ...@@ -19,6 +19,16 @@
} }
} ], } ],
"getPSDETreeColumns" : [ { "getPSDETreeColumns" : [ {
"caption" : "图书描述",
"codeName" : "subtext",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "subtext",
"name" : "subtext",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "图书名称", "caption" : "图书名称",
"codeName" : "ibizbookname", "codeName" : "ibizbookname",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
...@@ -38,16 +48,6 @@ ...@@ -38,16 +48,6 @@
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, {
"caption" : "图书描述",
"codeName" : "subtext",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "subtext",
"name" : "subtext",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
} ], } ],
"getPSDETreeNodeRSs" : [ { "getPSDETreeNodeRSs" : [ {
"getChildPSDETreeNode" : { "getChildPSDETreeNode" : {
......
...@@ -34,51 +34,51 @@ ...@@ -34,51 +34,51 @@
"id" : "GANTT" "id" : "GANTT"
}, },
"getPSDETreeColumns" : [ { "getPSDETreeColumns" : [ {
"caption" : "归还日期", "caption" : "作者",
"codeName" : "returntime", "codeName" : "author",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "returntime", "dataItemName" : "author",
"name" : "returntime", "name" : "author",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "出版社", "caption" : "图书名称",
"codeName" : "press", "codeName" : "ibizbookname",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "press", "dataItemName" : "ibizbookname",
"name" : "press", "name" : "ibizbookname",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "借出日期", "caption" : "归还日期",
"codeName" : "lendouttime", "codeName" : "returntime",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "lendouttime", "dataItemName" : "returntime",
"name" : "lendouttime", "name" : "returntime",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "作者", "caption" : "出版社",
"codeName" : "author", "codeName" : "press",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "author", "dataItemName" : "press",
"name" : "author", "name" : "press",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, { }, {
"caption" : "图书名称", "caption" : "借出日期",
"codeName" : "ibizbookname", "codeName" : "lendouttime",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "ibizbookname", "dataItemName" : "lendouttime",
"name" : "ibizbookname", "name" : "lendouttime",
"width" : 200, "width" : 200,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
......
...@@ -75,6 +75,16 @@ ...@@ -75,6 +75,16 @@
"id" : "TREEGRIDEX" "id" : "TREEGRIDEX"
}, },
"getPSDETreeColumns" : [ { "getPSDETreeColumns" : [ {
"caption" : "图书描述",
"codeName" : "subtext",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "subtext",
"name" : "subtext",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
}, {
"caption" : "图书名称", "caption" : "图书名称",
"codeName" : "ibizbookname", "codeName" : "ibizbookname",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
...@@ -94,16 +104,6 @@ ...@@ -94,16 +104,6 @@
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false "enableSort" : false
}, {
"caption" : "图书描述",
"codeName" : "subtext",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "subtext",
"name" : "subtext",
"width" : 50,
"widthUnit" : "px",
"enableExpand" : false,
"enableSort" : false
} ], } ],
"getPSDETreeNodeRSs" : [ { "getPSDETreeNodeRSs" : [ {
"getChildPSDETreeNode" : { "getChildPSDETreeNode" : {
......
...@@ -16,54 +16,25 @@ ...@@ -16,54 +16,25 @@
}, { }, {
"getFromPSWFProcess" : { "getFromPSWFProcess" : {
"modelref" : true, "modelref" : true,
"id" : "Interactive005" "id" : "Interactive002"
},
"logicName" : "取消",
"name" : "C96",
"nextCondition" : "ANY",
"getToPSWFProcess" : {
"modelref" : true,
"id" : "End002"
},
"wFLinkType" : "IAACTION"
}, {
"formCodeName" : "approvedForm",
"getFromPSWFProcess" : {
"modelref" : true,
"id" : "Interactive005"
}, },
"logicName" : "重新提交", "name" : "TIMEOUT",
"name" : "C49",
"nextCondition" : "ANY",
"getToPSWFProcess" : { "getToPSWFProcess" : {
"modelref" : true, "modelref" : true,
"id" : "Interactive001" "id" : "Interactive001"
}, },
"wFLinkType" : "IAACTION" "wFLinkType" : "TIMEOUT"
}, {
"getFromPSWFProcess" : {
"modelref" : true,
"id" : "Interactive003"
},
"logicName" : "不同意",
"name" : "C69",
"nextCondition" : "ANY",
"getToPSWFProcess" : {
"modelref" : true,
"id" : "Interactive005"
},
"wFLinkType" : "IAACTION"
}, { }, {
"getFromPSWFProcess" : { "getFromPSWFProcess" : {
"modelref" : true, "modelref" : true,
"id" : "Interactive003" "id" : "Interactive002"
}, },
"logicName" : "同意", "logicName" : "同意",
"name" : "C40", "name" : "C52",
"nextCondition" : "ANY", "nextCondition" : "ANY",
"getToPSWFProcess" : { "getToPSWFProcess" : {
"modelref" : true, "modelref" : true,
"id" : "Interactive004" "id" : "Exclusivegateway001"
}, },
"wFLinkType" : "IAACTION" "wFLinkType" : "IAACTION"
}, { }, {
...@@ -122,19 +93,6 @@ ...@@ -122,19 +93,6 @@
}, },
"viewCodeName" : "WFDynaActionView", "viewCodeName" : "WFDynaActionView",
"wFLinkType" : "IAACTION" "wFLinkType" : "IAACTION"
}, {
"getFromPSWFProcess" : {
"modelref" : true,
"id" : "Interactive002"
},
"logicName" : "同意",
"name" : "C52",
"nextCondition" : "ANY",
"getToPSWFProcess" : {
"modelref" : true,
"id" : "Exclusivegateway001"
},
"wFLinkType" : "IAACTION"
}, { }, {
"getFromPSWFProcess" : { "getFromPSWFProcess" : {
"modelref" : true, "modelref" : true,
...@@ -183,6 +141,59 @@ ...@@ -183,6 +141,59 @@
"id" : "Interactive003" "id" : "Interactive003"
}, },
"wFLinkType" : "ROUTE" "wFLinkType" : "ROUTE"
}, {
"getFromPSWFProcess" : {
"modelref" : true,
"id" : "Interactive003"
},
"logicName" : "不同意",
"name" : "C69",
"nextCondition" : "ANY",
"getToPSWFProcess" : {
"modelref" : true,
"id" : "Interactive005"
},
"wFLinkType" : "IAACTION"
}, {
"getFromPSWFProcess" : {
"modelref" : true,
"id" : "Interactive003"
},
"logicName" : "同意",
"name" : "C40",
"nextCondition" : "ANY",
"getToPSWFProcess" : {
"modelref" : true,
"id" : "Interactive004"
},
"wFLinkType" : "IAACTION"
}, {
"getFromPSWFProcess" : {
"modelref" : true,
"id" : "Interactive005"
},
"logicName" : "取消",
"name" : "C96",
"nextCondition" : "ANY",
"getToPSWFProcess" : {
"modelref" : true,
"id" : "End002"
},
"wFLinkType" : "IAACTION"
}, {
"formCodeName" : "approvedForm",
"getFromPSWFProcess" : {
"modelref" : true,
"id" : "Interactive005"
},
"logicName" : "重新提交",
"name" : "C49",
"nextCondition" : "ANY",
"getToPSWFProcess" : {
"modelref" : true,
"id" : "Interactive001"
},
"wFLinkType" : "IAACTION"
} ], } ],
"getPSWFProcesses" : [ { "getPSWFProcesses" : [ {
"codeName" : "Start001", "codeName" : "Start001",
...@@ -202,34 +213,6 @@ ...@@ -202,34 +213,6 @@
"asynchronousProcess" : false, "asynchronousProcess" : false,
"enableTimeout" : false, "enableTimeout" : false,
"startProcess" : true "startProcess" : true
}, {
"codeName" : "Interactive005",
"height" : 80,
"leftPos" : 150,
"logicName" : "发起人调整",
"msgType" : 0,
"multiInstMode" : "NONE",
"name" : "发起人调整",
"getPSWFLinks" : [ {
"modelref" : true,
"id" : "C96"
}, {
"modelref" : true,
"id" : "C49"
} ],
"getPSWFProcessRoles" : [ {
"name" : "[当前数据属性]",
"uDField" : "CREATEMAN",
"wFProcessRoleType" : "UDACTOR"
} ],
"timeout" : -1,
"topPos" : 195,
"wFProcessType" : "INTERACTIVE",
"wFStepValue" : "1",
"width" : 100,
"asynchronousProcess" : false,
"enableTimeout" : false,
"sendInform" : false
}, { }, {
"codeName" : "End002", "codeName" : "End002",
"height" : 30, "height" : 30,
...@@ -244,38 +227,56 @@ ...@@ -244,38 +227,56 @@
"enableTimeout" : false, "enableTimeout" : false,
"terminalProcess" : true "terminalProcess" : true
}, { }, {
"codeName" : "Interactive003", "codeName" : "Interactive002",
"height" : 80, "height" : 80,
"leftPos" : 555, "leftPos" : 420,
"logicName" : "经理审核", "logicName" : "财务经理审核",
"msgType" : 0, "msgType" : 0,
"multiInstMode" : "NONE", "multiInstMode" : "NONE",
"name" : "经理审核", "name" : "财务经理审核",
"getPSWFLinks" : [ { "getPSWFLinks" : [ {
"modelref" : true, "modelref" : true,
"id" : "C69" "id" : "TIMEOUT"
}, { }, {
"modelref" : true, "modelref" : true,
"id" : "C40" "id" : "C52"
} ], } ],
"getPSWFProcessRoles" : [ { "getPSWFProcessRoles" : [ {
"name" : "经理", "name" : "财务经理",
"getPSWFRole" : { "getPSWFRole" : {
"modelref" : true, "modelref" : true,
"path" : "PSWFROLES/GeneralManager.json" "path" : "PSWFROLES/FinancialManager.json"
}, },
"userData" : "org", "userData" : "org",
"userData2" : "CURORGID", "userData2" : "CURORGID",
"wFProcessRoleType" : "WFROLE" "wFProcessRoleType" : "WFROLE"
}, {
"name" : "[当前操作者]",
"wFProcessRoleType" : "CURACTOR"
} ], } ],
"timeout" : -1, "predefinedActions" : [ "SENDBACK" ],
"topPos" : 195, "timeout" : 5,
"timeoutType" : "MINUTE",
"topPos" : 30,
"wFProcessType" : "INTERACTIVE", "wFProcessType" : "INTERACTIVE",
"wFStepValue" : "20", "wFStepValue" : "10",
"width" : 100, "width" : 100,
"asynchronousProcess" : false, "asynchronousProcess" : false,
"enableTimeout" : false, "enableTimeout" : true,
"sendInform" : false "sendInform" : false
}, {
"codeName" : "End001",
"height" : 30,
"leftPos" : 780,
"logicName" : "结束",
"name" : "结束",
"timeout" : -1,
"topPos" : 221,
"wFProcessType" : "END",
"width" : 30,
"asynchronousProcess" : false,
"enableTimeout" : false,
"terminalProcess" : true
}, { }, {
"codeName" : "Interactive004", "codeName" : "Interactive004",
"height" : 80, "height" : 80,
...@@ -344,71 +345,85 @@ ...@@ -344,71 +345,85 @@
"enableTimeout" : false, "enableTimeout" : false,
"sendInform" : false "sendInform" : false
}, { }, {
"codeName" : "End001", "codeName" : "Exclusivegateway001",
"height" : 30, "height" : 40,
"leftPos" : 780, "leftPos" : 585,
"logicName" : "结束", "logicName" : "订单金额判断",
"name" : "结束", "name" : "订单金额判断",
"getPSWFLinks" : [ {
"modelref" : true,
"id" : "小于1W"
}, {
"modelref" : true,
"id" : "大于1W"
} ],
"timeout" : -1, "timeout" : -1,
"topPos" : 221, "topPos" : 50,
"wFProcessType" : "END", "wFProcessType" : "EXCLUSIVEGATEWAY",
"width" : 30, "width" : 40,
"asynchronousProcess" : false, "asynchronousProcess" : false,
"enableTimeout" : false, "enableTimeout" : false
"terminalProcess" : true
}, { }, {
"codeName" : "Interactive002", "codeName" : "Interactive003",
"height" : 80, "height" : 80,
"leftPos" : 420, "leftPos" : 555,
"logicName" : "财务经理审核", "logicName" : "经理审核",
"msgType" : 0, "msgType" : 0,
"multiInstMode" : "NONE", "multiInstMode" : "NONE",
"name" : "财务经理审核", "name" : "经理审核",
"getPSWFLinks" : [ { "getPSWFLinks" : [ {
"modelref" : true, "modelref" : true,
"id" : "C52" "id" : "C69"
}, {
"modelref" : true,
"id" : "C40"
} ], } ],
"getPSWFProcessRoles" : [ { "getPSWFProcessRoles" : [ {
"name" : "[当前操作者]", "name" : "总经理",
"wFProcessRoleType" : "CURACTOR"
}, {
"name" : "财务经理",
"getPSWFRole" : { "getPSWFRole" : {
"modelref" : true, "modelref" : true,
"path" : "PSWFROLES/FinancialManager.json" "path" : "PSWFROLES/GeneralManager.json"
}, },
"userData" : "org", "userData" : "org",
"userData2" : "CURORGID", "userData2" : "CURORGID",
"wFProcessRoleType" : "WFROLE" "wFProcessRoleType" : "WFROLE"
} ], } ],
"predefinedActions" : [ "SENDBACK" ],
"timeout" : -1, "timeout" : -1,
"topPos" : 30, "topPos" : 195,
"wFProcessType" : "INTERACTIVE", "wFProcessType" : "INTERACTIVE",
"wFStepValue" : "10", "wFStepValue" : "20",
"width" : 100, "width" : 100,
"asynchronousProcess" : false, "asynchronousProcess" : false,
"enableTimeout" : false, "enableTimeout" : false,
"sendInform" : false "sendInform" : false
}, { }, {
"codeName" : "Exclusivegateway001", "codeName" : "Interactive005",
"height" : 40, "height" : 80,
"leftPos" : 585, "leftPos" : 150,
"logicName" : "订单金额判断", "logicName" : "发起人调整",
"name" : "订单金额判断", "msgType" : 0,
"multiInstMode" : "NONE",
"name" : "发起人调整",
"getPSWFLinks" : [ { "getPSWFLinks" : [ {
"modelref" : true, "modelref" : true,
"id" : "小于1W" "id" : "C96"
}, { }, {
"modelref" : true, "modelref" : true,
"id" : "大于1W" "id" : "C49"
} ],
"getPSWFProcessRoles" : [ {
"name" : "[当前数据属性]",
"uDField" : "CREATEMAN",
"wFProcessRoleType" : "UDACTOR"
} ], } ],
"timeout" : -1, "timeout" : -1,
"topPos" : 50, "topPos" : 195,
"wFProcessType" : "EXCLUSIVEGATEWAY", "wFProcessType" : "INTERACTIVE",
"width" : 40, "wFStepValue" : "1",
"width" : 100,
"asynchronousProcess" : false, "asynchronousProcess" : false,
"enableTimeout" : false "enableTimeout" : false,
"sendInform" : false
} ], } ],
"getStartPSWFProcess" : { "getStartPSWFProcess" : {
"modelref" : true, "modelref" : true,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<extensionElements> <extensionElements>
<flowable:eventListener delegateExpression="${processInstanceListener}" /> <flowable:eventListener delegateExpression="${processInstanceListener}" />
<flowable:field name="refgroups"> <flowable:field name="refgroups">
<flowable:string>GeneralManager|总经理|USERGROUP,FinancialDirector|财务总监|USERGROUP,FinancialManager|财务经理|USERGROUP</flowable:string> <flowable:string>FinancialManager|财务经理|USERGROUP,FinancialDirector|财务总监|USERGROUP,GeneralManager|总经理|USERGROUP</flowable:string>
</flowable:field> </flowable:field>
<flowable:field name="bookings"> <flowable:field name="bookings">
<flowable:string>ibizsample0021</flowable:string> <flowable:string>ibizsample0021</flowable:string>
...@@ -40,14 +40,21 @@ ...@@ -40,14 +40,21 @@
<flowable:form process-form="Start001" wfversion="2"/> <flowable:form process-form="Start001" wfversion="2"/>
</extensionElements> </extensionElements>
</startEvent> </startEvent>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-1-6dc784ef240f35883923cabac210590c" name="发起人调整" >
<documentation>${majortext}</documentation>
</userTask>
<endEvent id="sid-0b976fca9f1aa7981b1c0c7fc628e6cd" name="结束"> <endEvent id="sid-0b976fca9f1aa7981b1c0c7fc628e6cd" name="结束">
</endEvent> </endEvent>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('GeneralManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-79d7bde95dd67ca0f58d5f8961664af9" name="总经理审核" > <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-b2100e0a472c7e23cd936fbb272eaa67" name="财务经理审核" >
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
<extensionElements>
<flowable:form procfunc="sendback" />
</extensionElements>
</userTask> </userTask>
<boundaryEvent id="bid-10-b2100e0a472c7e23cd936fbb272eaa67" name="timeout-财务经理审核" attachedToRef="tid-10-b2100e0a472c7e23cd936fbb272eaa67" cancelActivity="true">
<timerEventDefinition>
<timeDate>PT5M</timeDate>
</timerEventDefinition>
</boundaryEvent>
<endEvent id="sid-ebd510afdeda7eba09cf1a56679ca382" name="结束">
</endEvent>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialDirector|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-30-f33ca3120694e870ea7e1b5eed392750" name="财务总监审批" > <userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialDirector|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-30-f33ca3120694e870ea7e1b5eed392750" name="财务总监审批" >
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
</userTask> </userTask>
...@@ -57,91 +64,91 @@ ...@@ -57,91 +64,91 @@
<flowable:form procfunc="addstepbefore;reassign" process-form="operationForm" process-utilform="beforeSign" process-util3form="transfer" process-utilformname="加签" process-util3formname="工作转移" /> <flowable:form procfunc="addstepbefore;reassign" process-form="operationForm" process-utilform="beforeSign" process-util3form="transfer" process-utilformname="加签" process-util3formname="工作转移" />
</extensionElements> </extensionElements>
</userTask> </userTask>
<endEvent id="sid-ebd510afdeda7eba09cf1a56679ca382" name="结束"> <exclusiveGateway id="sid-21588a1284c496701e00f32c79702e57"></exclusiveGateway>
</endEvent> <userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('GeneralManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-79d7bde95dd67ca0f58d5f8961664af9" name="总经理审核" >
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-b2100e0a472c7e23cd936fbb272eaa67" name="财务经理审核" >
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
<extensionElements>
<flowable:form procfunc="sendback" />
</extensionElements>
</userTask> </userTask>
<exclusiveGateway id="sid-21588a1284c496701e00f32c79702e57"></exclusiveGateway> <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-1-6dc784ef240f35883923cabac210590c" name="发起人调整" >
<sequenceFlow id="rid-45a2dfb0d28880b85f4303e852610ee6" sourceRef="sid-137c359f364406040df60ee70baba8a0" targetRef="tid-5-b43328c7712bd3739742121269b6c386" name=""> <documentation>${majortext}</documentation>
</userTask>
<sequenceFlow id="rid-e248fe421c73e1c635c05166fbab48c0" sourceRef="sid-137c359f364406040df60ee70baba8a0" targetRef="tid-5-b43328c7712bd3739742121269b6c386" name="">
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C96-0ed9d54b14e21825785c61c1f032308f" sourceRef="tid-1-6dc784ef240f35883923cabac210590c" targetRef="sid-0b976fca9f1aa7981b1c0c7fc628e6cd" name="取消"> <sequenceFlow id="lid-TIMEOUT-7e6750f296feaa0a9a1c31c3ce52433f" sourceRef="bid-10-b2100e0a472c7e23cd936fbb272eaa67" targetRef="tid-5-b43328c7712bd3739742121269b6c386" name="">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C96-0ed9d54b14e21825785c61c1f032308f"}]]></conditionExpression> </sequenceFlow>
<sequenceFlow id="lid-C52-2a0a567263c6a3670c92d9c7cfcf2e63" sourceRef="tid-10-b2100e0a472c7e23cd936fbb272eaa67" targetRef="sid-21588a1284c496701e00f32c79702e57" name="同意">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C52-2a0a567263c6a3670c92d9c7cfcf2e63"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form nextCondition="ANY" /> <flowable:form nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C49-7f93330421b3477bdb2f9a33bb0402a5" sourceRef="tid-1-6dc784ef240f35883923cabac210590c" targetRef="tid-5-b43328c7712bd3739742121269b6c386" name="重新提交"> <sequenceFlow id="lid-C22-a1878e293f1b60a06e1c0b9767fa4a1a" sourceRef="tid-30-f33ca3120694e870ea7e1b5eed392750" targetRef="tid-1-6dc784ef240f35883923cabac210590c" name="不同意">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C49-7f93330421b3477bdb2f9a33bb0402a5"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C22-a1878e293f1b60a06e1c0b9767fa4a1a"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form sequenceFlowForm="approvedForm" nextCondition="ANY" /> <flowable:form nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C69-9c7f9fd1b6fbf5665cf552853eaa605a" sourceRef="tid-20-79d7bde95dd67ca0f58d5f8961664af9" targetRef="tid-1-6dc784ef240f35883923cabac210590c" name="不同意"> <sequenceFlow id="lid-C41-d29bbd730e3b7a04c1d1ea473e3861ae" sourceRef="tid-30-f33ca3120694e870ea7e1b5eed392750" targetRef="sid-ebd510afdeda7eba09cf1a56679ca382" name="完成">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C69-9c7f9fd1b6fbf5665cf552853eaa605a"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C41-d29bbd730e3b7a04c1d1ea473e3861ae"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form nextCondition="ANY" /> <flowable:form nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C40-6b4a35ddd2b42e12b7b88403a939bbf9" sourceRef="tid-20-79d7bde95dd67ca0f58d5f8961664af9" targetRef="tid-30-f33ca3120694e870ea7e1b5eed392750" name="同意"> <sequenceFlow id="lid-C61-e17cba761d4a3625b3c7a38651652610" sourceRef="tid-5-b43328c7712bd3739742121269b6c386" targetRef="tid-10-b2100e0a472c7e23cd936fbb272eaa67" name="同意">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C40-6b4a35ddd2b42e12b7b88403a939bbf9"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C61-e17cba761d4a3625b3c7a38651652610"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form nextCondition="ANY" /> <flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C22-ceb7c01233c0f671a9a31740eb9d4d20" sourceRef="tid-30-f33ca3120694e870ea7e1b5eed392750" targetRef="tid-1-6dc784ef240f35883923cabac210590c" name="不同意"> <sequenceFlow id="lid-C70-42834b980150c5a58dc9b1b90c693f63" sourceRef="tid-5-b43328c7712bd3739742121269b6c386" targetRef="tid-1-6dc784ef240f35883923cabac210590c" name="不同意">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C22-ceb7c01233c0f671a9a31740eb9d4d20"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C70-42834b980150c5a58dc9b1b90c693f63"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form nextCondition="ANY" /> <flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C41-b43057d8d466517ab790a2214f5b090d" sourceRef="tid-30-f33ca3120694e870ea7e1b5eed392750" targetRef="sid-ebd510afdeda7eba09cf1a56679ca382" name="完成"> <sequenceFlow id="rid-4ceb4554697fc4c6787c9ffb6ba195bf" sourceRef="sid-21588a1284c496701e00f32c79702e57" targetRef="sid-ebd510afdeda7eba09cf1a56679ca382" name="">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C41-b43057d8d466517ab790a2214f5b090d"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${((wfCoreService.test(activedata.amount, 'LT', '10000')))} ]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="rid-ec100a77761d94d4225deced215e7810" sourceRef="sid-21588a1284c496701e00f32c79702e57" targetRef="tid-20-79d7bde95dd67ca0f58d5f8961664af9" name="">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${((wfCoreService.test(activedata.amount, 'GTANDEQ', '10000')))} ]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="lid-C69-7b9b9d2ddf35b9f7c823cde4ac9e621b" sourceRef="tid-20-79d7bde95dd67ca0f58d5f8961664af9" targetRef="tid-1-6dc784ef240f35883923cabac210590c" name="不同意">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C69-7b9b9d2ddf35b9f7c823cde4ac9e621b"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form nextCondition="ANY" /> <flowable:form nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C61-f378c9c83c03a708e974e5350eff76e0" sourceRef="tid-5-b43328c7712bd3739742121269b6c386" targetRef="tid-10-b2100e0a472c7e23cd936fbb272eaa67" name="同意"> <sequenceFlow id="lid-C40-542ab6cc05baf1616f3284281c50f8a9" sourceRef="tid-20-79d7bde95dd67ca0f58d5f8961664af9" targetRef="tid-30-f33ca3120694e870ea7e1b5eed392750" name="同意">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C61-f378c9c83c03a708e974e5350eff76e0"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C40-542ab6cc05baf1616f3284281c50f8a9"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY" /> <flowable:form nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C70-3bdc80d9b547861af03a80566235aca8" sourceRef="tid-5-b43328c7712bd3739742121269b6c386" targetRef="tid-1-6dc784ef240f35883923cabac210590c" name="不同意"> <sequenceFlow id="lid-C96-23889921a23233ac4c890252f2062b4c" sourceRef="tid-1-6dc784ef240f35883923cabac210590c" targetRef="sid-0b976fca9f1aa7981b1c0c7fc628e6cd" name="取消">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C70-3bdc80d9b547861af03a80566235aca8"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C96-23889921a23233ac4c890252f2062b4c"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY" /> <flowable:form nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C52-e8bad74ca10ceea6734a435e1a0bd237" sourceRef="tid-10-b2100e0a472c7e23cd936fbb272eaa67" targetRef="sid-21588a1284c496701e00f32c79702e57" name="同意"> <sequenceFlow id="lid-C49-75e9f01617f85fe3dabcb34316460f0a" sourceRef="tid-1-6dc784ef240f35883923cabac210590c" targetRef="tid-5-b43328c7712bd3739742121269b6c386" name="重新提交">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C52-e8bad74ca10ceea6734a435e1a0bd237"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C49-75e9f01617f85fe3dabcb34316460f0a"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form nextCondition="ANY" /> <flowable:form sequenceFlowForm="approvedForm" nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="rid-ee19b8e1718a6de046cb9c69348188ae" sourceRef="sid-21588a1284c496701e00f32c79702e57" targetRef="sid-ebd510afdeda7eba09cf1a56679ca382" name="">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${((wfCoreService.test(activedata.amount, 'LT', '10000')))} ]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="rid-9c0b7aefaeb5c8d890706f690e18739d" sourceRef="sid-21588a1284c496701e00f32c79702e57" targetRef="tid-20-79d7bde95dd67ca0f58d5f8961664af9" name="">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${((wfCoreService.test(activedata.amount, 'GTANDEQ', '10000')))} ]]></conditionExpression>
</sequenceFlow>
</process> </process>
<bpmndi:BPMNDiagram id="BPMNDiagram_demosys-actv2"> <bpmndi:BPMNDiagram id="BPMNDiagram_demosys-actv2">
<bpmndi:BPMNPlane id="BPMNPlane_demosys-actv2" bpmnElement="demosys-actv2"> <bpmndi:BPMNPlane id="BPMNPlane_demosys-actv2" bpmnElement="demosys-actv2">
<bpmndi:BPMNShape id="BPMNShape-137c359f364406040df60ee70baba8a0" bpmnElement="sid-137c359f364406040df60ee70baba8a0"> <bpmndi:BPMNShape id="BPMNShape-137c359f364406040df60ee70baba8a0" bpmnElement="sid-137c359f364406040df60ee70baba8a0">
<omgdi:Bounds x="15" y="55" width="30" height="30" /> <omgdi:Bounds x="15" y="55" width="30" height="30" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-6dc784ef240f35883923cabac210590c" bpmnElement="tid-1-6dc784ef240f35883923cabac210590c">
<omgdi:Bounds x="150" y="195" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-0b976fca9f1aa7981b1c0c7fc628e6cd" bpmnElement="sid-0b976fca9f1aa7981b1c0c7fc628e6cd"> <bpmndi:BPMNShape id="BPMNShape-0b976fca9f1aa7981b1c0c7fc628e6cd" bpmnElement="sid-0b976fca9f1aa7981b1c0c7fc628e6cd">
<omgdi:Bounds x="186" y="389" width="30" height="30" /> <omgdi:Bounds x="186" y="389" width="30" height="30" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-79d7bde95dd67ca0f58d5f8961664af9" bpmnElement="tid-20-79d7bde95dd67ca0f58d5f8961664af9"> <bpmndi:BPMNShape id="BPMNShape-b2100e0a472c7e23cd936fbb272eaa67" bpmnElement="tid-10-b2100e0a472c7e23cd936fbb272eaa67">
<omgdi:Bounds x="555" y="195" width="100" height="80" /> <omgdi:Bounds x="420" y="30" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-ebd510afdeda7eba09cf1a56679ca382" bpmnElement="sid-ebd510afdeda7eba09cf1a56679ca382">
<omgdi:Bounds x="780" y="221" width="30" height="30" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-f33ca3120694e870ea7e1b5eed392750" bpmnElement="tid-30-f33ca3120694e870ea7e1b5eed392750"> <bpmndi:BPMNShape id="BPMNShape-f33ca3120694e870ea7e1b5eed392750" bpmnElement="tid-30-f33ca3120694e870ea7e1b5eed392750">
<omgdi:Bounds x="555" y="360" width="100" height="80" /> <omgdi:Bounds x="555" y="360" width="100" height="80" />
...@@ -149,60 +156,64 @@ ...@@ -149,60 +156,64 @@
<bpmndi:BPMNShape id="BPMNShape-b43328c7712bd3739742121269b6c386" bpmnElement="tid-5-b43328c7712bd3739742121269b6c386"> <bpmndi:BPMNShape id="BPMNShape-b43328c7712bd3739742121269b6c386" bpmnElement="tid-5-b43328c7712bd3739742121269b6c386">
<omgdi:Bounds x="150" y="30" width="100" height="80" /> <omgdi:Bounds x="150" y="30" width="100" height="80" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-ebd510afdeda7eba09cf1a56679ca382" bpmnElement="sid-ebd510afdeda7eba09cf1a56679ca382">
<omgdi:Bounds x="780" y="221" width="30" height="30" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-b2100e0a472c7e23cd936fbb272eaa67" bpmnElement="tid-10-b2100e0a472c7e23cd936fbb272eaa67">
<omgdi:Bounds x="420" y="30" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-21588a1284c496701e00f32c79702e57" bpmnElement="sid-21588a1284c496701e00f32c79702e57"> <bpmndi:BPMNShape id="BPMNShape-21588a1284c496701e00f32c79702e57" bpmnElement="sid-21588a1284c496701e00f32c79702e57">
<omgdi:Bounds x="585" y="50" width="40" height="40" /> <omgdi:Bounds x="585" y="50" width="40" height="40" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge-rid-45a2dfb0d28880b85f4303e852610ee6" bpmnElement="rid-45a2dfb0d28880b85f4303e852610ee6"> <bpmndi:BPMNShape id="BPMNShape-79d7bde95dd67ca0f58d5f8961664af9" bpmnElement="tid-20-79d7bde95dd67ca0f58d5f8961664af9">
<omgdi:Bounds x="555" y="195" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-6dc784ef240f35883923cabac210590c" bpmnElement="tid-1-6dc784ef240f35883923cabac210590c">
<omgdi:Bounds x="150" y="195" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge-rid-e248fe421c73e1c635c05166fbab48c0" bpmnElement="rid-e248fe421c73e1c635c05166fbab48c0">
<omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-TIMEOUT-7e6750f296feaa0a9a1c31c3ce52433f" bpmnElement="lid-TIMEOUT-7e6750f296feaa0a9a1c31c3ce52433f">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-C96-0ed9d54b14e21825785c61c1f032308f" bpmnElement="lid-C96-0ed9d54b14e21825785c61c1f032308f"> <bpmndi:BPMNEdge id="BPMNEdge-lid-C52-2a0a567263c6a3670c92d9c7cfcf2e63" bpmnElement="lid-C52-2a0a567263c6a3670c92d9c7cfcf2e63">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-C49-7f93330421b3477bdb2f9a33bb0402a5" bpmnElement="lid-C49-7f93330421b3477bdb2f9a33bb0402a5"> <bpmndi:BPMNEdge id="BPMNEdge-lid-C22-a1878e293f1b60a06e1c0b9767fa4a1a" bpmnElement="lid-C22-a1878e293f1b60a06e1c0b9767fa4a1a">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-C69-9c7f9fd1b6fbf5665cf552853eaa605a" bpmnElement="lid-C69-9c7f9fd1b6fbf5665cf552853eaa605a"> <bpmndi:BPMNEdge id="BPMNEdge-lid-C41-d29bbd730e3b7a04c1d1ea473e3861ae" bpmnElement="lid-C41-d29bbd730e3b7a04c1d1ea473e3861ae">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-C40-6b4a35ddd2b42e12b7b88403a939bbf9" bpmnElement="lid-C40-6b4a35ddd2b42e12b7b88403a939bbf9"> <bpmndi:BPMNEdge id="BPMNEdge-lid-C61-e17cba761d4a3625b3c7a38651652610" bpmnElement="lid-C61-e17cba761d4a3625b3c7a38651652610">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-C22-ceb7c01233c0f671a9a31740eb9d4d20" bpmnElement="lid-C22-ceb7c01233c0f671a9a31740eb9d4d20"> <bpmndi:BPMNEdge id="BPMNEdge-lid-C70-42834b980150c5a58dc9b1b90c693f63" bpmnElement="lid-C70-42834b980150c5a58dc9b1b90c693f63">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-C41-b43057d8d466517ab790a2214f5b090d" bpmnElement="lid-C41-b43057d8d466517ab790a2214f5b090d"> <bpmndi:BPMNEdge id="BPMNEdge-rid-4ceb4554697fc4c6787c9ffb6ba195bf" bpmnElement="rid-4ceb4554697fc4c6787c9ffb6ba195bf">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-C61-f378c9c83c03a708e974e5350eff76e0" bpmnElement="lid-C61-f378c9c83c03a708e974e5350eff76e0"> <bpmndi:BPMNEdge id="BPMNEdge-rid-ec100a77761d94d4225deced215e7810" bpmnElement="rid-ec100a77761d94d4225deced215e7810">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-C70-3bdc80d9b547861af03a80566235aca8" bpmnElement="lid-C70-3bdc80d9b547861af03a80566235aca8"> <bpmndi:BPMNEdge id="BPMNEdge-lid-C69-7b9b9d2ddf35b9f7c823cde4ac9e621b" bpmnElement="lid-C69-7b9b9d2ddf35b9f7c823cde4ac9e621b">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-C52-e8bad74ca10ceea6734a435e1a0bd237" bpmnElement="lid-C52-e8bad74ca10ceea6734a435e1a0bd237"> <bpmndi:BPMNEdge id="BPMNEdge-lid-C40-542ab6cc05baf1616f3284281c50f8a9" bpmnElement="lid-C40-542ab6cc05baf1616f3284281c50f8a9">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-rid-ee19b8e1718a6de046cb9c69348188ae" bpmnElement="rid-ee19b8e1718a6de046cb9c69348188ae"> <bpmndi:BPMNEdge id="BPMNEdge-lid-C96-23889921a23233ac4c890252f2062b4c" bpmnElement="lid-C96-23889921a23233ac4c890252f2062b4c">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-rid-9c0b7aefaeb5c8d890706f690e18739d" bpmnElement="rid-9c0b7aefaeb5c8d890706f690e18739d"> <bpmndi:BPMNEdge id="BPMNEdge-lid-C49-75e9f01617f85fe3dabcb34316460f0a" bpmnElement="lid-C49-75e9f01617f85fe3dabcb34316460f0a">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
</parent> </parent>
<artifactId>demo-core</artifactId> <artifactId>demo-core</artifactId>
<name>Demo Core</name> <name>后台服务 Core</name>
<description>后台服务 Core,模板生成代码,再次发布会覆盖,建议不要直接修改,修改请在demo-boot项目中继承或覆盖重写</description> <description>后台服务 Core</description>
<dependencies> <dependencies>
...@@ -20,14 +20,6 @@ ...@@ -20,14 +20,6 @@
<artifactId>ibizlab-boot-starter-data</artifactId> <artifactId>ibizlab-boot-starter-data</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- MySQL驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
......
[ [
{ {
"name": "年度", "name":"年度",
"code": "Years", "code":"Years",
"group": "", "group":"",
"memo": "", "memo":"",
"enable":"",
} }
] ]
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<artifactId>demo</artifactId> <artifactId>demo</artifactId>
<groupId>cn.ibizlab</groupId> <groupId>cn.ibizlab</groupId>
<version>1.0.0.0</version> <version>1.0.0.0</version>
<name>Demo</name> <name>后台服务</name>
<description>后台服务</description> <description></description>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册