ibiz4j 发布系统代码

app_Web/package.json

@@ -26,7 +26,7 @@
     "element-ui": "^2.13.0",
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
-    "ibiz-gantt-elastic": "^1.0.16",
+    "ibiz-gantt-elastic": "^1.0.17",
     "ibiz-vue-lib": "^0.1.10",
     "interactjs": "^1.9.4",
     "moment": "^2.24.0",

app_Web/src/components/app-form-group/app-form-group.vue

@@ -28,21 +28,25 @@
                             <dropdown-menu slot='list' v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)">
                                 <dropdown-item v-for="(detail,index) in (uiActionGroup.details)" :key="index" :name="detail.name">
                                     <span class='item' @click="doUIAction($event, detail)">
-                                        <template v-if="detail.icon && !Object.is(detail.icon, '')">
-                                             <i :class="detail.icon" ></i>
-                                        </template>
-                                        <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
-                                            <div v-if="detail.img && !Object.is(detail.img, '')">
-                                                <img :src="detail.img" />
-                                            </div>
+                                        <template v-if="detail.isShowIcon">
+                                            <template v-if="detail.icon && !Object.is(detail.icon, '')">
+                                                <i :class="detail.icon" ></i>
+                                            </template>
+                                            <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
+                                                <div v-if="detail.img && !Object.is(detail.img, '')">
+                                                    <img :src="detail.img" />
+                                                </div>
+                                            </template>
                                         </template>
                                         &nbsp;
                                         <span>
-                                            <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
-                                                {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
-                                            </template>
-                                            <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
-                                                {{detail.caption}}
+                                            <template v-if="detail.isShowCaption">
+                                                <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
+                                                    {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
+                                                </template>
+                                                <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
+                                                    {{detail.caption}}
+                                                </template>
                                             </template>
                                         </span>
                                     </span>
@@ -55,21 +59,25 @@
                                 <template v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)">
                                     <div v-for="(detail,index) in uiActionGroup.details" :key="index">
                                         <span class='item' @click="doUIAction($event, detail)">
-                                        <template v-if="detail.icon && !Object.is(detail.icon, '')">
-                                             <i :class="detail.icon" ></i>
-                                        </template>
-                                        <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
-                                            <div v-if="detail.img && !Object.is(detail.img, '')">
-                                                <img :src="detail.img" />
-                                            </div>
-                                        </template>
+                                            <template v-if="detail.isShowIcon">
+                                                <template v-if="detail.icon && !Object.is(detail.icon, '')">
+                                                    <i :class="detail.icon" ></i>
+                                                </template>
+                                                <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
+                                                    <div v-if="detail.img && !Object.is(detail.img, '')">
+                                                        <img :src="detail.img" />
+                                                    </div>
+                                                </template>
+                                            </template>
                                         &nbsp;
                                         <span>
-                                            <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
-                                                {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
-                                            </template>
-                                            <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
-                                                {{detail.caption}}
+                                            <template v-if="detail.isShowCaption">
+                                                <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
+                                                    {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
+                                                </template>
+                                                <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
+                                                    {{detail.caption}}
+                                                </template>
                                             </template>
                                         </span>
                                     </span>

app_Web/src/components/app-transfer/app-transfer.less

-.ivu-select-dropdown {
-    padding: 0px;
-    .hidden {
-      display: none;
-    }
-  }
+.transfer-select{
+  .ivu-select-dropdown {
+      padding: 0px;
+      .hidden {
+          display: none;
+      }
\ No newline at end of file
+      .el-transfer{
+          min-width: 100% !important;
+          display: flex;
+          justify-content: space-between;
+          .el-transfer-panel{
+              min-width: 25%;
+          }
+          .el-transfer__buttons{
+              align-self: center;
+          }
+      }
+  }
+}
+

app_Web/yarn.lock

@@ -5238,10 +5238,10 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-ibiz-gantt-elastic@^1.0.16:
-  version "1.0.16"
-  resolved "https://registry.npm.taobao.org/ibiz-gantt-elastic/download/ibiz-gantt-elastic-1.0.16.tgz#e2de7e8d4bdb3c292cfbc97c4f970c8ecfe6c43b"
-  integrity sha1-4t5+jUvbPCks+8l8T5cMjs/mxDs=
+ibiz-gantt-elastic@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.17.tgz#447cce5db2e0127d2336c20370fc251992520c6f"
+  integrity sha512-AJOYXZGM020wafn60RJLM2yKmtT2BjCpBKkZ0PONcxdqW/kCyXOqEo3c3/PBtFEkJx/8KGTayB013BOdGI1+uQ==
   dependencies:
     dayjs "^1.8.16"
     resize-observer-polyfill "^1.5.1"

ibzrt-core/src/main/java/cn/ibizlab/core/dict/domain/IBZDict.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -106,6 +107,7 @@ public class IBZDict extends EntityClient implements Serializable {
         this.modify("ibzdictname",dictname);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/dict/domain/IBZDictItem.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -149,6 +150,7 @@ public class IBZDictItem extends EntityClient implements Serializable {
         this.itemname = itemname ;
         this.modify("ibzdictitemname",itemname);
     }
+
     /**
      * 设置 [栏目值]
      */
@@ -156,6 +158,7 @@ public class IBZDictItem extends EntityClient implements Serializable {
         this.itemval = itemval ;
         this.modify("dictitemval",itemval);
     }
+
     /**
      * 设置 [字典标识]
      */
@@ -163,6 +166,7 @@ public class IBZDictItem extends EntityClient implements Serializable {
         this.dictid = dictid ;
         this.modify("dictid",dictid);
     }
+
     /**
      * 设置 [父栏目值]
      */
@@ -170,6 +174,7 @@ public class IBZDictItem extends EntityClient implements Serializable {
         this.pitemval = pitemval ;
         this.modify("pitemval",pitemval);
     }
+
     /**
      * 设置 [过滤项]
      */
@@ -177,6 +182,7 @@ public class IBZDictItem extends EntityClient implements Serializable {
         this.itemfilter = itemfilter ;
         this.modify("itemfilter",itemfilter);
     }
+
     /**
      * 设置 [栏目样式]
      */
@@ -184,6 +190,7 @@ public class IBZDictItem extends EntityClient implements Serializable {
         this.itemcls = itemcls ;
         this.modify("itemcls",itemcls);
     }
+
     /**
      * 设置 [图标]
      */
@@ -191,6 +198,7 @@ public class IBZDictItem extends EntityClient implements Serializable {
         this.itemicon = itemicon ;
         this.modify("itemicon",itemicon);
     }
+
     /**
      * 设置 [排序]
      */
@@ -199,6 +207,7 @@ public class IBZDictItem extends EntityClient implements Serializable {
         this.modify("showorder",showorder);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/extensions.service/IBZEmployeeServiceEx.java

@@ -24,7 +24,7 @@ public class IBZEmployeeServiceEx extends IBZEmployeeServiceImpl {
     @Override
     @Transactional
     public IBZEmployee initPwd(IBZEmployee et) {
-        return et;
+        return super.initPwd(et);
     }
 }
 

ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDepartment.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -174,6 +175,7 @@ public class IBZDepartment extends EntityClient implements Serializable {
         this.deptcode = deptcode ;
         this.modify("deptcode",deptcode);
     }
+
     /**
      * 设置 [部门名称]
      */
@@ -181,6 +183,7 @@ public class IBZDepartment extends EntityClient implements Serializable {
         this.deptname = deptname ;
         this.modify("deptname",deptname);
     }
+
     /**
      * 设置 [上级部门]
      */
@@ -188,6 +191,7 @@ public class IBZDepartment extends EntityClient implements Serializable {
         this.parentdeptid = parentdeptid ;
         this.modify("pdeptid",parentdeptid);
     }
+
     /**
      * 设置 [部门简称]
      */
@@ -195,6 +199,7 @@ public class IBZDepartment extends EntityClient implements Serializable {
         this.shortname = shortname ;
         this.modify("shortname",shortname);
     }
+
     /**
      * 设置 [部门级别]
      */
@@ -202,6 +207,7 @@ public class IBZDepartment extends EntityClient implements Serializable {
         this.deptlevel = deptlevel ;
         this.modify("deptlevel",deptlevel);
     }
+
     /**
      * 设置 [排序]
      */
@@ -209,6 +215,7 @@ public class IBZDepartment extends EntityClient implements Serializable {
         this.showorder = showorder ;
         this.modify("showorder",showorder);
     }
+
     /**
      * 设置 [业务编码]
      */
@@ -216,6 +223,7 @@ public class IBZDepartment extends EntityClient implements Serializable {
         this.bcode = bcode ;
         this.modify("bcode",bcode);
     }
+
     /**
      * 设置 [分管领导标识]
      */
@@ -223,6 +231,7 @@ public class IBZDepartment extends EntityClient implements Serializable {
         this.leaderid = leaderid ;
         this.modify("leaderid",leaderid);
     }
+
     /**
      * 设置 [分管领导]
      */
@@ -231,6 +240,7 @@ public class IBZDepartment extends EntityClient implements Serializable {
         this.modify("leadername",leadername);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDeptMember.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -90,6 +91,7 @@ public class IBZDeptMember extends EntityClient implements Serializable {
         this.deptid = deptid ;
         this.modify("deptid",deptid);
     }
+
     /**
      * 设置 [用户标识]
      */
@@ -98,6 +100,7 @@ public class IBZDeptMember extends EntityClient implements Serializable {
         this.modify("userid",userid);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/IBZEmployee.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -315,6 +316,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.username = username ;
         this.modify("username",username);
     }
+
     /**
      * 设置 [姓名]
      */
@@ -322,6 +324,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.personname = personname ;
         this.modify("personname",personname);
     }
+
     /**
      * 设置 [用户工号]
      */
@@ -329,6 +332,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.usercode = usercode ;
         this.modify("usercode",usercode);
     }
+
     /**
      * 设置 [登录名]
      */
@@ -336,6 +340,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.loginname = loginname ;
         this.modify("loginname",loginname);
     }
+
     /**
      * 设置 [密码]
      */
@@ -343,6 +348,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.password = password ;
         this.modify("password",password);
     }
+
     /**
      * 设置 [区属]
      */
@@ -350,6 +356,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.domains = domains ;
         this.modify("domains",domains);
     }
+
     /**
      * 设置 [主部门]
      */
@@ -357,6 +364,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.mdeptid = mdeptid ;
         this.modify("mdeptid",mdeptid);
     }
+
     /**
      * 设置 [主部门代码]
      */
@@ -364,6 +372,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.mdeptcode = mdeptcode ;
         this.modify("mdeptcode",mdeptcode);
     }
+
     /**
      * 设置 [主部门名称]
      */
@@ -371,6 +380,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.mdeptname = mdeptname ;
         this.modify("mdeptname",mdeptname);
     }
+
     /**
      * 设置 [业务编码]
      */
@@ -378,6 +388,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.bcode = bcode ;
         this.modify("bcode",bcode);
     }
+
     /**
      * 设置 [岗位]
      */
@@ -385,6 +396,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.postid = postid ;
         this.modify("postid",postid);
     }
+
     /**
      * 设置 [岗位代码]
      */
@@ -392,6 +404,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.postcode = postcode ;
         this.modify("postcode",postcode);
     }
+
     /**
      * 设置 [岗位名称]
      */
@@ -399,6 +412,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.postname = postname ;
         this.modify("postname",postname);
     }
+
     /**
      * 设置 [单位代码]
      */
@@ -406,6 +420,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.orgcode = orgcode ;
         this.modify("orgcode",orgcode);
     }
+
     /**
      * 设置 [昵称别名]
      */
@@ -413,6 +428,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.nickname = nickname ;
         this.modify("nickname",nickname);
     }
+
     /**
      * 设置 [性别]
      */
@@ -420,6 +436,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.sex = sex ;
         this.modify("sex",sex);
     }
+
     /**
      * 设置 [证件号码]
      */
@@ -427,6 +444,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.certcode = certcode ;
         this.modify("certcode",certcode);
     }
+
     /**
      * 设置 [联系方式]
      */
@@ -434,6 +452,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.phone = phone ;
         this.modify("phone",phone);
     }
+
     /**
      * 设置 [出生日期]
      */
@@ -441,6 +460,17 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.birthday = birthday ;
         this.modify("birthday",birthday);
     }
+
+    /**
+     * 格式化日期 [出生日期]
+     */
+    public String formatBirthday(){
+        if (this.birthday == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("defieldFormatStr");
+        return sdf.format(birthday);
+    }
     /**
      * 设置 [邮件]
      */
@@ -448,6 +478,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.email = email ;
         this.modify("email",email);
     }
+
     /**
      * 设置 [社交账号]
      */
@@ -455,6 +486,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.avatar = avatar ;
         this.modify("avatar",avatar);
     }
+
     /**
      * 设置 [地址]
      */
@@ -462,6 +494,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.addr = addr ;
         this.modify("addr",addr);
     }
+
     /**
      * 设置 [照片]
      */
@@ -469,6 +502,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.usericon = usericon ;
         this.modify("usericon",usericon);
     }
+
     /**
      * 设置 [ip地址]
      */
@@ -476,6 +510,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.ipaddr = ipaddr ;
         this.modify("ipaddr",ipaddr);
     }
+
     /**
      * 设置 [样式]
      */
@@ -483,6 +518,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.theme = theme ;
         this.modify("theme",theme);
     }
+
     /**
      * 设置 [语言]
      */
@@ -490,6 +526,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.lang = lang ;
         this.modify("lang",lang);
     }
+
     /**
      * 设置 [字号]
      */
@@ -497,6 +534,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.fontsize = fontsize ;
         this.modify("fontsize",fontsize);
     }
+
     /**
      * 设置 [备注]
      */
@@ -504,6 +542,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.memo = memo ;
         this.modify("memo",memo);
     }
+
     /**
      * 设置 [保留]
      */
@@ -511,6 +550,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.reserver = reserver ;
         this.modify("reserver",reserver);
     }
+
     /**
      * 设置 [排序]
      */
@@ -519,6 +559,7 @@ public class IBZEmployee extends EntityClient implements Serializable {
         this.modify("showorder",showorder);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -139,6 +140,7 @@ public class IBZOrganization extends EntityClient implements Serializable {
         this.orgcode = orgcode ;
         this.modify("orgcode",orgcode);
     }
+
     /**
      * 设置 [上级单位]
      */
@@ -146,6 +148,7 @@ public class IBZOrganization extends EntityClient implements Serializable {
         this.parentorgid = parentorgid ;
         this.modify("porgid",parentorgid);
     }
+
     /**
      * 设置 [单位简称]
      */
@@ -153,6 +156,7 @@ public class IBZOrganization extends EntityClient implements Serializable {
         this.shortname = shortname ;
         this.modify("shortname",shortname);
     }
+
     /**
      * 设置 [单位级别]
      */
@@ -160,6 +164,7 @@ public class IBZOrganization extends EntityClient implements Serializable {
         this.orglevel = orglevel ;
         this.modify("orglevel",orglevel);
     }
+
     /**
      * 设置 [排序]
      */
@@ -168,6 +173,7 @@ public class IBZOrganization extends EntityClient implements Serializable {
         this.modify("showorder",showorder);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysAuthLog.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -106,6 +107,7 @@ public class SysAuthLog extends EntityClient implements Serializable {
         this.username = username ;
         this.modify("username",username);
     }
+
     /**
      * 设置 [用户名称]
      */
@@ -113,6 +115,7 @@ public class SysAuthLog extends EntityClient implements Serializable {
         this.personname = personname ;
         this.modify("personname",personname);
     }
+
     /**
      * 设置 [域]
      */
@@ -120,6 +123,7 @@ public class SysAuthLog extends EntityClient implements Serializable {
         this.domain = domain ;
         this.modify("domain",domain);
     }
+
     /**
      * 设置 [IP地址]
      */
@@ -127,6 +131,7 @@ public class SysAuthLog extends EntityClient implements Serializable {
         this.ipaddr = ipaddr ;
         this.modify("ipaddr",ipaddr);
     }
+
     /**
      * 设置 [MAC地址]
      */
@@ -134,6 +139,7 @@ public class SysAuthLog extends EntityClient implements Serializable {
         this.macaddr = macaddr ;
         this.modify("macaddr",macaddr);
     }
+
     /**
      * 设置 [客户端]
      */
@@ -141,6 +147,7 @@ public class SysAuthLog extends EntityClient implements Serializable {
         this.useragent = useragent ;
         this.modify("useragent",useragent);
     }
+
     /**
      * 设置 [认证结果]
      */
@@ -149,6 +156,7 @@ public class SysAuthLog extends EntityClient implements Serializable {
         this.modify("authcode",authcode);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysPSSystem.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -62,6 +63,7 @@ public class SysPSSystem extends EntityClient implements Serializable {
         this.pssystemname = pssystemname ;
         this.modify("pssystemname",pssystemname);
     }
+
     /**
      * 设置 [结构]
      */
@@ -70,6 +72,7 @@ public class SysPSSystem extends EntityClient implements Serializable {
         this.modify("sysstructure",sysstructure);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -96,6 +97,7 @@ public class SysPermission extends EntityClient implements Serializable {
         this.permissionname = permissionname ;
         this.modify("sys_permissionname",permissionname);
     }
+
     /**
      * 设置 [资源类别]
      */
@@ -103,6 +105,7 @@ public class SysPermission extends EntityClient implements Serializable {
         this.permissiontype = permissiontype ;
         this.modify("permissiontype",permissiontype);
     }
+
     /**
      * 设置 [系统]
      */
@@ -111,6 +114,7 @@ public class SysPermission extends EntityClient implements Serializable {
         this.modify("pssystemid",pssystemid);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -81,6 +82,7 @@ public class SysRole extends EntityClient implements Serializable {
         this.rolename = rolename ;
         this.modify("sys_rolename",rolename);
     }
+
     /**
      * 设置 [备注]
      */
@@ -89,6 +91,7 @@ public class SysRole extends EntityClient implements Serializable {
         this.modify("memo",memo);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRolePermission.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -124,6 +125,7 @@ public class SysRolePermission extends EntityClient implements Serializable {
         this.roleid = roleid ;
         this.modify("sys_roleid",roleid);
     }
+
     /**
      * 设置 [权限表标识]
      */
@@ -132,6 +134,7 @@ public class SysRolePermission extends EntityClient implements Serializable {
         this.modify("sys_permissionid",permissionid);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUser.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -69,6 +70,7 @@ public class SysUser extends EntityClient implements Serializable {
         this.username = username ;
         this.modify("username",username);
     }
+
     /**
      * 设置 [用户姓名]
      */
@@ -76,6 +78,7 @@ public class SysUser extends EntityClient implements Serializable {
         this.personname = personname ;
         this.modify("personname",personname);
     }
+
     /**
      * 设置 [密码]
      */
@@ -84,6 +87,7 @@ public class SysUser extends EntityClient implements Serializable {
         this.modify("password",password);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserRole.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -110,6 +111,7 @@ public class SysUserRole extends EntityClient implements Serializable {
         this.roleid = roleid ;
         this.modify("sys_roleid",roleid);
     }
+
     /**
      * 设置 [用户标识]
      */
@@ -118,6 +120,7 @@ public class SysUserRole extends EntityClient implements Serializable {
         this.modify("sys_userid",userid);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFGroup.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -70,6 +71,7 @@ public class WFGroup extends EntityClient implements Serializable {
         this.name = name ;
         this.modify("groupname",name);
     }
+
     /**
      * 设置 [范围]
      */
@@ -78,6 +80,7 @@ public class WFGroup extends EntityClient implements Serializable {
         this.modify("groupscope",groupscope);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFMember.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -97,6 +98,7 @@ public class WFMember extends EntityClient implements Serializable {
         this.membername = membername ;
         this.modify("membername",membername);
     }
+
     /**
      * 设置 [组标识]
      */
@@ -104,6 +106,7 @@ public class WFMember extends EntityClient implements Serializable {
         this.groupid = groupid ;
         this.modify("groupid",groupid);
     }
+
     /**
      * 设置 [用户标识]
      */
@@ -112,6 +115,7 @@ public class WFMember extends EntityClient implements Serializable {
         this.modify("userid",userid);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessDefinition.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -97,6 +98,7 @@ public class WFProcessDefinition extends EntityClient implements Serializable {
         this.definitionname = definitionname ;
         this.modify("definitionname",definitionname);
     }
+
     /**
      * 设置 [模型版本]
      */
@@ -104,6 +106,7 @@ public class WFProcessDefinition extends EntityClient implements Serializable {
         this.modelversion = modelversion ;
         this.modify("modelversion",modelversion);
     }
+
     /**
      * 设置 [模型是否启用]
      */
@@ -111,6 +114,7 @@ public class WFProcessDefinition extends EntityClient implements Serializable {
         this.modelenable = modelenable ;
         this.modify("modelenable",modelenable);
     }
+
     /**
      * 设置 [系统标识]
      */
@@ -118,6 +122,7 @@ public class WFProcessDefinition extends EntityClient implements Serializable {
         this.pssystemid = pssystemid ;
         this.modify("pssystemid",pssystemid);
     }
+
     /**
      * 设置 [校验]
      */
@@ -125,6 +130,7 @@ public class WFProcessDefinition extends EntityClient implements Serializable {
         this.md5check = md5check ;
         this.modify("md5check",md5check);
     }
+
     /**
      * 设置 [BPMN]
      */
@@ -132,6 +138,7 @@ public class WFProcessDefinition extends EntityClient implements Serializable {
         this.bpmnfile = bpmnfile ;
         this.modify("bpmnfile",bpmnfile);
     }
+
     /**
      * 设置 [DeployKey]
      */
@@ -140,6 +147,7 @@ public class WFProcessDefinition extends EntityClient implements Serializable {
         this.modify("deploykey",deploykey);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessInstance.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -94,6 +95,7 @@ public class WFProcessInstance extends EntityClient implements Serializable {
         this.name = name ;
         this.modify("instancename",name);
     }
+
     /**
      * 设置 [DefinitionKey]
      */
@@ -101,6 +103,7 @@ public class WFProcessInstance extends EntityClient implements Serializable {
         this.processdefinitionkey = processdefinitionkey ;
         this.modify("definitionkey",processdefinitionkey);
     }
+
     /**
      * 设置 [流程定义名称]
      */
@@ -108,6 +111,7 @@ public class WFProcessInstance extends EntityClient implements Serializable {
         this.processdefinitionname = processdefinitionname ;
         this.modify("definitionname",processdefinitionname);
     }
+
     /**
      * 设置 [业务键值]
      */
@@ -115,6 +119,7 @@ public class WFProcessInstance extends EntityClient implements Serializable {
         this.businesskey = businesskey ;
         this.modify("businesskey",businesskey);
     }
+
     /**
      * 设置 [启动时间]
      */
@@ -122,6 +127,17 @@ public class WFProcessInstance extends EntityClient implements Serializable {
         this.starttime = starttime ;
         this.modify("starttime",starttime);
     }
+
+    /**
+     * 格式化日期 [启动时间]
+     */
+    public String formatStarttime(){
+        if (this.starttime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("defieldFormatStr");
+        return sdf.format(starttime);
+    }
     /**
      * 设置 [属性]
      */
@@ -130,6 +146,7 @@ public class WFProcessInstance extends EntityClient implements Serializable {
         this.modify("startuserid",startuserid);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessNode.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -72,6 +73,7 @@ public class WFProcessNode extends EntityClient implements Serializable {
         this.usertaskname = usertaskname ;
         this.modify("nodename",usertaskname);
     }
+
     /**
      * 设置 [DefinitionKey]
      */
@@ -79,6 +81,7 @@ public class WFProcessNode extends EntityClient implements Serializable {
         this.processdefinitionkey = processdefinitionkey ;
         this.modify("definitionkey",processdefinitionkey);
     }
+
     /**
      * 设置 [流程定义名称]
      */
@@ -87,6 +90,7 @@ public class WFProcessNode extends EntityClient implements Serializable {
         this.modify("definitionname",processdefinitionname);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFREModel.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -63,6 +64,7 @@ public class WFREModel extends EntityClient implements Serializable {
         this.name = name ;
         this.modify("modelname",name);
     }
+
     /**
      * 设置 [BPMN]
      */
@@ -71,6 +73,7 @@ public class WFREModel extends EntityClient implements Serializable {
         this.modify("bpmnfile",bpmnfile);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFSystem.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -56,6 +57,7 @@ public class WFSystem extends EntityClient implements Serializable {
         this.modify("pssystemname",pssystemname);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTask.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -88,6 +89,7 @@ public class WFTask extends EntityClient implements Serializable {
         this.name = name ;
         this.modify("taskname",name);
     }
+
     /**
      * 设置 [DefinitionKey]
      */
@@ -95,6 +97,7 @@ public class WFTask extends EntityClient implements Serializable {
         this.processdefinitionkey = processdefinitionkey ;
         this.modify("definitionkey",processdefinitionkey);
     }
+
     /**
      * 设置 [实例标识]
      */
@@ -102,6 +105,7 @@ public class WFTask extends EntityClient implements Serializable {
         this.processinstanceid = processinstanceid ;
         this.modify("instanceid",processinstanceid);
     }
+
     /**
      * 设置 [业务键值]
      */
@@ -109,6 +113,7 @@ public class WFTask extends EntityClient implements Serializable {
         this.processinstancebusinesskey = processinstancebusinesskey ;
         this.modify("businesskey",processinstancebusinesskey);
     }
+
     /**
      * 设置 [TaskDefinitionKey]
      */
@@ -117,6 +122,7 @@ public class WFTask extends EntityClient implements Serializable {
         this.modify("taskdefinitionkey",taskprocessdefinitionkey);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTaskWay.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -102,6 +103,7 @@ public class WFTaskWay extends EntityClient implements Serializable {
         this.taskid = taskid ;
         this.modify("taskid",taskid);
     }
+
     /**
      * 设置 [TaskDefinitionKey]
      */
@@ -109,6 +111,7 @@ public class WFTaskWay extends EntityClient implements Serializable {
         this.taskprocessdefinitionkey = taskprocessdefinitionkey ;
         this.modify("taskdefinitionkey",taskprocessdefinitionkey);
     }
+
     /**
      * 设置 [实例标识]
      */
@@ -116,6 +119,7 @@ public class WFTaskWay extends EntityClient implements Serializable {
         this.processinstanceid = processinstanceid ;
         this.modify("instanceid",processinstanceid);
     }
+
     /**
      * 设置 [DefinitionKey]
      */
@@ -123,6 +127,7 @@ public class WFTaskWay extends EntityClient implements Serializable {
         this.processdefinitionkey = processdefinitionkey ;
         this.modify("definitionkey",processdefinitionkey);
     }
+
     /**
      * 设置 [业务键值]
      */
@@ -130,6 +135,7 @@ public class WFTaskWay extends EntityClient implements Serializable {
         this.processinstancebusinesskey = processinstancebusinesskey ;
         this.modify("businesskey",processinstancebusinesskey);
     }
+
     /**
      * 设置 [引用视图]
      */
@@ -137,6 +143,7 @@ public class WFTaskWay extends EntityClient implements Serializable {
         this.refviewkey = refviewkey ;
         this.modify("refviewkey",refviewkey);
     }
+
     /**
      * 设置 [路径标识]
      */
@@ -145,6 +152,7 @@ public class WFTaskWay extends EntityClient implements Serializable {
         this.modify("wayname",sequenceflowname);
     }
 
+
 }
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFUser.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -64,6 +65,7 @@ public class WFUser extends EntityClient implements Serializable {
         this.firstname = firstname ;
         this.modify("username",firstname);
     }
+
     /**
      * 设置 [用户名称]
      */
@@ -72,6 +74,7 @@ public class WFUser extends EntityClient implements Serializable {
         this.modify("personname",displayname);
     }
 
+
 }
 
 

ibzrt-util/src/main/java/cn/ibizlab/util/security/SimpleTokenUtil.java

@@ -19,7 +19,7 @@ import java.util.Optional;
 import java.util.function.Function;
 
 @Component
-@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:UAATokenUtil}'.equals('SimpleTokenUtil')")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.token.util:UAATokenUtil}'.equals('SimpleTokenUtil')")
 public class SimpleTokenUtil implements AuthTokenUtil,Serializable {
 
     private static final long serialVersionUID = -3301605591108950415L;

ibzrt-util/src/main/java/cn/ibizlab/util/security/UAATokenUtil.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.function.Function;
 
 @Component
-@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:UAATokenUtil}'.equals('UAATokenUtil')")
+@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.token.util:UAATokenUtil}'.equals('UAATokenUtil')")
 public class UAATokenUtil implements AuthTokenUtil, Serializable {
 
     private static final long serialVersionUID = -3301605591108950415L;