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

generator before deploy...

generator before deploy registry.cn-shanghai.aliyuncs.com/ibizsys/samplesolution-demosys-api-demoapi:2022.11.16.001
上级 fbdd0eb7
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
**.iml **.iml
*.jar *.jar
*.log *.log
.DS_Store .DS_Store
\ No newline at end of file
...@@ -51,4 +51,4 @@ public class BootApplication extends WebMvcConfigurerAdapter { ...@@ -51,4 +51,4 @@ public class BootApplication extends WebMvcConfigurerAdapter {
super.addArgumentResolvers(argumentResolvers); super.addArgumentResolvers(argumentResolvers);
argumentResolvers.add(resolver); argumentResolvers.add(resolver);
} }
} }
\ No newline at end of file
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
</parent> </parent>
<artifactId>demo-core</artifactId> <artifactId>demo-core</artifactId>
<name>后台服务 Core</name> <name>Demo Core</name>
<description>后台服务 Core</description> <description>后台服务 Core,模板生成代码,再次发布会覆盖,建议不要直接修改,修改请在demo-boot项目中继承或覆盖重写</description>
<dependencies> <dependencies>
...@@ -20,6 +20,14 @@ ...@@ -20,6 +20,14 @@
<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>
...@@ -93,4 +101,4 @@ ...@@ -93,4 +101,4 @@
</profile> </profile>
</profiles> </profiles>
</project> </project>
\ No newline at end of file
...@@ -169,6 +169,26 @@ public class IBIZSample0021 extends EntityMP implements Serializable ...@@ -169,6 +169,26 @@ public class IBIZSample0021 extends EntityMP implements Serializable
@ApiModelProperty(value = "amount", notes = "总计") @ApiModelProperty(value = "amount", notes = "总计")
private BigDecimal amount; private BigDecimal amount;
/**
* 部门领导
*/
@TableField(value = "deptheads" , exist = false)
@DEField(name = "deptheads")
@JsonProperty("deptheads")
@JSONField(name = "deptheads")
@ApiModelProperty(value = "deptheads", notes = "部门领导")
private String deptHeads;
/**
* 部门领导
*/
@TableField(value = "deptheadsid" , exist = false)
@DEField(name = "deptheadsid")
@JsonProperty("deptheadsid")
@JSONField(name = "deptheadsid")
@ApiModelProperty(value = "deptheadsid", notes = "部门领导")
private String deptHeadsId;
...@@ -233,6 +253,22 @@ public class IBIZSample0021 extends EntityMP implements Serializable ...@@ -233,6 +253,22 @@ public class IBIZSample0021 extends EntityMP implements Serializable
this.modify("amount", amount); this.modify("amount", amount);
} }
/**
* 设置 [部门领导]
*/
public void setDeptHeads(String deptHeads) {
this.deptHeads = deptHeads;
this.modify("deptheads", deptHeads);
}
/**
* 设置 [部门领导]
*/
public void setDeptHeadsId(String deptHeadsId) {
this.deptHeadsId = deptHeadsId;
this.modify("deptheadsid", deptHeadsId);
}
......
...@@ -76,6 +76,22 @@ public class IBIZSample0021DTO extends DTOBase implements Serializable { ...@@ -76,6 +76,22 @@ public class IBIZSample0021DTO extends DTOBase implements Serializable {
@ApiModelProperty("CURORGID") @ApiModelProperty("CURORGID")
private String curorgid; private String curorgid;
/**
* 部门领导
*/
@JsonProperty("deptheads")
@JSONField(name = "deptheads")
@ApiModelProperty("部门领导")
private String deptHeads;
/**
* 部门领导
*/
@JsonProperty("deptheadsid")
@JSONField(name = "deptheadsid")
@ApiModelProperty("部门领导")
private String deptHeadsId;
/** /**
* 订单标识 * 订单标识
*/ */
...@@ -159,6 +175,22 @@ public class IBIZSample0021DTO extends DTOBase implements Serializable { ...@@ -159,6 +175,22 @@ public class IBIZSample0021DTO extends DTOBase implements Serializable {
this.modify("curorgid", curorgid); this.modify("curorgid", curorgid);
} }
/**
* 设置 [部门领导]
*/
public void setDeptHeads(String deptHeads) {
this.deptHeads = deptHeads;
this.modify("deptheads", deptHeads);
}
/**
* 设置 [部门领导]
*/
public void setDeptHeadsId(String deptHeadsId) {
this.deptHeadsId = deptHeadsId;
this.modify("deptheadsid", deptHeadsId);
}
/** /**
* 设置 [订单名称] * 设置 [订单名称]
*/ */
......
[ [
{
"name": "年度",
"code": "Years",
"group": "",
"memo": "",
}
]
\ No newline at end of file
{
"name":"年度",
"code":"Years",
"group":"",
"memo":"",
"enable":"",
}
]
...@@ -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>DepartmentHeads|部门领导|USERGROUP,GeneralManager|总经理|USERGROUP,FinancialManager|财务经理|USERGROUP,FinancialDirector|财务总监|USERGROUP</flowable:string> <flowable:string>GeneralManager|总经理|USERGROUP,FinancialManager|财务经理|USERGROUP,FinancialDirector|财务总监|USERGROUP</flowable:string>
</flowable:field> </flowable:field>
<flowable:field name="bookings"> <flowable:field name="bookings">
<flowable:string>ibizsample0021s</flowable:string> <flowable:string>ibizsample0021s</flowable:string>
...@@ -26,28 +26,20 @@ ...@@ -26,28 +26,20 @@
</extensionElements> </extensionElements>
<startEvent id="sid-Start001" name="开始"> <startEvent id="sid-Start001" name="开始">
<extensionElements> <extensionElements>
<flowable:form process-form="refuseForm" /> <flowable:form process-form="Start001" />
</extensionElements> </extensionElements>
</startEvent> </startEvent>
<serviceTask id="sid-Process001" name="填充参数" flowable:expression="${wfCoreService.execute(execution, activedata)}" >
<extensionElements>
<flowable:field name="service-entity"><flowable:string>ibizsample0021s</flowable:string></flowable:field>
<flowable:field name="service-deaction"><flowable:string>update</flowable:string></flowable:field>
<flowable:field name="params-memo"><flowable:string>test</flowable:string></flowable:field>
<flowable:field name="params-amount"><flowable:string>100</flowable:string></flowable:field>
</extensionElements>
</serviceTask>
<endEvent id="sid-End001" name="结束"> <endEvent id="sid-End001" name="结束">
</endEvent> </endEvent>
<endEvent id="sid-End002" name="结束"> <endEvent id="sid-End002" name="结束">
</endEvent> </endEvent>
<exclusiveGateway id="sid-Exclusivegateway001"/> <exclusiveGateway id="sid-Exclusivegateway001"/>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('DepartmentHeads|dept|CURDEPTID',execution)}" flowable:exclusive="true" <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.deptheadsid}" flowable:exclusive="true"
id="tid-5-Interactive001" id="tid-5-Interactive001"
name="部门经理审核" > name="部门经理审核" >
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
<extensionElements> <extensionElements>
<flowable:form procfunc="addstepbefore;addstepafter;reassign" process-form="operationForm" process-utilform="Main" process-utilformname="主编辑表单" process-util2form="Main2" process-util2formname="主编辑表单2" process-util3form="refuseForm" process-util3formname="部门领导审批不通过操作表单" process-mobutilform="Main2" process-mobutilformname="主编辑表单2" process-mobutil2form="Main" process-mobutil2formname="主编辑表单" process-mobutil3form="approvedForm" process-mobutil3formname="部门领导审批通过操作表单" /> <flowable:form procfunc="addstepbefore;reassign" process-form="operationForm" process-utilform="beforeSign" process-utilformname="加签" process-util3form="transfer" process-util3formname="工作转移" />
</extensionElements> </extensionElements>
</userTask> </userTask>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman}" flowable:exclusive="true" <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman}" flowable:exclusive="true"
...@@ -65,7 +57,7 @@ ...@@ -65,7 +57,7 @@
name="财务经理审核" > name="财务经理审核" >
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
<extensionElements> <extensionElements>
<flowable:form procfunc="sendback;reassign" /> <flowable:form procfunc="sendback" />
</extensionElements> </extensionElements>
</userTask> </userTask>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialDirector|org|CURORGID',execution)}" flowable:exclusive="true" <userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialDirector|org|CURORGID',execution)}" flowable:exclusive="true"
...@@ -76,9 +68,7 @@ ...@@ -76,9 +68,7 @@
<sequenceFlow id="rid-43a8de1b889469d5a93d32e61034242a" sourceRef="sid-Start001" targetRef="tid-5-Interactive001" name=""> <sequenceFlow id="rid-43a8de1b889469d5a93d32e61034242a" sourceRef="sid-Start001" targetRef="tid-5-Interactive001" name="">
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="rid-8f26b646bf0e4caeb57ecaad8b34c7d2" sourceRef="sid-Process001" targetRef="tid-10-Interactive002" name=""> <sequenceFlow id="lid-C61-c3aa2b65061d7d7a336da8f1abf60321" sourceRef="tid-5-Interactive001" targetRef="tid-10-Interactive002" name="同意3">
</sequenceFlow>
<sequenceFlow id="lid-C61-c3aa2b65061d7d7a336da8f1abf60321" sourceRef="tid-5-Interactive001" targetRef="sid-Process001" name="同意2">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C61-c3aa2b65061d7d7a336da8f1abf60321"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C61-c3aa2b65061d7d7a336da8f1abf60321"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY" /> <flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY" />
...@@ -151,9 +141,6 @@ ...@@ -151,9 +141,6 @@
<bpmndi:BPMNShape id="BPMNShape-sid-Start001" bpmnElement="sid-Start001"> <bpmndi:BPMNShape id="BPMNShape-sid-Start001" bpmnElement="sid-Start001">
<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-sid-Process001" bpmnElement="sid-Process001">
<omgdi:Bounds x="270" y="60" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-tid-5-Interactive001" bpmnElement="tid-5-Interactive001"> <bpmndi:BPMNShape id="BPMNShape-tid-5-Interactive001" bpmnElement="tid-5-Interactive001">
<omgdi:Bounds x="150" y="30" width="100" height="80" /> <omgdi:Bounds x="150" y="30" width="100" height="80" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
...@@ -182,10 +169,6 @@ ...@@ -182,10 +169,6 @@
<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-8f26b646bf0e4caeb57ecaad8b34c7d2" bpmnElement="rid-8f26b646bf0e4caeb57ecaad8b34c7d2">
<omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-C61-c3aa2b65061d7d7a336da8f1abf60321" bpmnElement="lid-C61-c3aa2b65061d7d7a336da8f1abf60321"> <bpmndi:BPMNEdge id="BPMNEdge-lid-C61-c3aa2b65061d7d7a336da8f1abf60321" bpmnElement="lid-C61-c3aa2b65061d7d7a336da8f1abf60321">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
......
...@@ -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>后台服务</name> <name>Demo</name>
<description></description> <description>后台服务</description>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<generateBackupPoms>false</generateBackupPoms> <generateBackupPoms>false</generateBackupPoms>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>cn.ibizlab</groupId> <groupId>cn.ibizlab</groupId>
<artifactId>ibizlab-generator-plugin</artifactId> <artifactId>ibizlab-generator-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
...@@ -137,4 +137,4 @@ ...@@ -137,4 +137,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册