generator before deploy...

generator before deploy registry.cn-shanghai.aliyuncs.com/ibizsys/samplesolution-demosys-api-demoapi:2022.11.28.002

.gitignore

@@ -12,4 +12,4 @@
 **.iml
 *.jar
 *.log
-.DS_Store
+.DS_Store
\ No newline at end of file

demo-boot/src/main/java/cn/ibizlab/BootApplication.java

@@ -51,4 +51,4 @@ public class BootApplication extends WebMvcConfigurerAdapter {
         super.addArgumentResolvers(argumentResolvers);
         argumentResolvers.add(resolver);
     }
-}
+}
\ No newline at end of file

demo-core/pom.xml

@@ -10,8 +10,8 @@
     </parent>
 
     <artifactId>demo-core</artifactId>
-    <name>后台服务 Core</name>
-    <description>后台服务 Core</description>
+    <name>Demo Core</name>
+    <description>后台服务 Core，模板生成代码，再次发布会覆盖，建议不要直接修改，修改请在demo-boot项目中继承或覆盖重写</description>
 
     <dependencies>
 
@@ -20,6 +20,14 @@
 			<artifactId>ibizlab-boot-starter-data</artifactId>
 			<version>2.4.0-SNAPSHOT</version>
 		</dependency>
+
+        <!--  MySQL驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+
 	</dependencies>
 
     <properties>
@@ -93,4 +101,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
\ No newline at end of file

demo-core/src/main/java/cn/ibizlab/core/sample/domain/IBIZSample0021.java

@@ -143,7 +143,7 @@ public class IBIZSample0021 extends EntityMP implements Serializable
      * CURORGID
      */
     @TableField(value = "curorgid")
-    @DEField(name = "curorgid")
+    @DEField(name = "curorgid" , preType = DEPredefinedFieldType.ORGID)
     @JsonProperty("curorgid")
     @JSONField(name = "curorgid")
     @ApiModelProperty(value = "curorgid", notes = "CURORGID")
@@ -153,7 +153,7 @@ public class IBIZSample0021 extends EntityMP implements Serializable
      * CURDEPTID
      */
     @TableField(value = "curdeptid")
-    @DEField(name = "curdeptid")
+    @DEField(name = "curdeptid" , preType = DEPredefinedFieldType.ORGSECTORID)
     @JsonProperty("curdeptid")
     @JSONField(name = "curdeptid")
     @ApiModelProperty(value = "curdeptid", notes = "CURDEPTID")
@@ -229,21 +229,7 @@ public class IBIZSample0021 extends EntityMP implements Serializable
         this.modify("memo", memo);
     }
 
-    /**
-     * 设置 [CURORGID]
-     */
-    public void setCurorgid(String curorgid) {
-        this.curorgid = curorgid;
-        this.modify("curorgid", curorgid);
-    }
 
-    /**
-     * 设置 [CURDEPTID]
-     */
-    public void setCurdeptid(String curdeptid) {
-        this.curdeptid = curdeptid;
-        this.modify("curdeptid", curdeptid);
-    }
 
     /**
      * 设置 [总计]

demo-core/src/main/java/cn/ibizlab/demoapi/dto/IBIZSample0021DTO.java

@@ -159,22 +159,6 @@ public class IBIZSample0021DTO extends DTOBase implements Serializable {
         this.modify("amount", amount);
     }
 
-    /**
-     * 设置 [CURDEPTID]
-     */
-    public void setCurdeptid(String curdeptid) {
-        this.curdeptid = curdeptid;
-        this.modify("curdeptid", curdeptid);
-    }
-
-    /**
-     * 设置 [CURORGID]
-     */
-    public void setCurorgid(String curorgid) {
-        this.curorgid = curorgid;
-        this.modify("curorgid", curorgid);
-    }
-
     /**
      * 设置 [部门领导]
      */

demo-core/src/main/resources/permission/systemResource.json

@@ -3540,6 +3540,30 @@
                     "id": "all",
                     "name": "全部数据"
                 },
+                {
+                    "id": "curorg",
+                    "name": "当前单位"
+                },
+                {
+                    "id": "porg",
+                    "name": "上级单位"
+                },
+                {
+                    "id": "sorg",
+                    "name": "下级单位"
+                },
+                {
+                    "id": "curorgdept",
+                    "name": "当前部门"
+                },
+                {
+                    "id": "porgdept",
+                    "name": "上级部门"
+                },
+                {
+                    "id": "sorgdept",
+                    "name": "下级部门"
+                },
                 {
                     "id": "createman",
                     "name": "创建人"

demo-core/src/main/resources/sysmodel/RuntimeDict.json

-[    
-
-
-
-
-
-
-
-
+[
+    {
+        "name": "年度",
+        "code": "Years",
+        "group": "",
+        "memo": "",
+    }
+]
\ No newline at end of file
-            
-   {
-        "name":"年度",
-        "code":"Years",
-        "group":"",
-        "memo":"",
-        "enable":"",
-   }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]

demo-core/src/main/resources/workflow/ACTv1.bpmn

@@ -22,6 +22,9 @@
             <flowable:field name="majortext_ibizsample0021s">
                 <flowable:string>ibizsample0021name</flowable:string>
             </flowable:field>    
+            <flowable:field name="orgfield_ibizsample0021s">
+                <flowable:string>curorgid</flowable:string>
+            </flowable:field>    
             <flowable:field name="isvalid"><flowable:string>0</flowable:string></flowable:field>
         </extensionElements>
         <startEvent id="sid-Start001" name="开始">

demo-core/src/main/resources/workflow/ACTv2.bpmn

@@ -22,6 +22,9 @@
             <flowable:field name="majortext_ibizsample0021s">
                 <flowable:string>ibizsample0021name</flowable:string>
             </flowable:field>    
+            <flowable:field name="orgfield_ibizsample0021s">
+                <flowable:string>curorgid</flowable:string>
+            </flowable:field>    
             <flowable:field name="isvalid"><flowable:string>1</flowable:string></flowable:field>
         </extensionElements>
         <startEvent id="sid-Start001" name="开始">

pom.xml

@@ -6,8 +6,8 @@
     <artifactId>demo</artifactId>
     <groupId>cn.ibizlab</groupId>
     <version>1.0.0.0</version>
-    <name>后台服务</name>
-    <description></description>
+    <name>Demo</name>
+    <description>后台服务</description>
     <packaging>pom</packaging>
 
     <parent>
@@ -105,7 +105,7 @@
                     <generateBackupPoms>false</generateBackupPoms>
                 </configuration>
             </plugin>
-			<plugin>
+	        <plugin>
 				<groupId>cn.ibizlab</groupId>
 				<artifactId>ibizlab-generator-plugin</artifactId>
 				<version>1.0-SNAPSHOT</version>
@@ -137,4 +137,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file