Skip to content

I
ibzwf
提交 6d6cb99a 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 be4d284c
隐藏空白字符变更
内嵌 并排
正在显示 包含 370 行增加 和 297 行删除
app_web/package.json
浏览文件 @ 6d6cb99a
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"element-ui": "^2.13.0", "element-ui": "^2.13.0",
"file-saver": "^2.0.2", "file-saver": "^2.0.2",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"ibiz-gantt-elastic": "^1.0.16", "ibiz-gantt-elastic": "^1.0.17",
"ibiz-vue-lib": "^0.1.10", "ibiz-vue-lib": "^0.1.10",
"interactjs": "^1.9.4", "interactjs": "^1.9.4",
"moment": "^2.24.0", "moment": "^2.24.0",
......
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @ 6d6cb99a
...@@ -28,21 +28,25 @@ ...@@ -28,21 +28,25 @@
<dropdown-menu slot='list' v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)"> <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"> <dropdown-item v-for="(detail,index) in (uiActionGroup.details)" :key="index" :name="detail.name">
<span class='item' @click="doUIAction($event, detail)"> <span class='item' @click="doUIAction($event, detail)">
<template v-if="detail.icon && !Object.is(detail.icon, '')"> <template v-if="detail.isShowIcon">
<i :class="detail.icon" ></i> <template v-if="detail.icon && !Object.is(detail.icon, '')">
</template> <i :class="detail.icon" ></i>
<template v-if="!(detail.icon && !Object.is(detail.icon, ''))"> </template>
<div v-if="detail.img && !Object.is(detail.img, '')"> <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
<img :src="detail.img" /> <div v-if="detail.img && !Object.is(detail.img, '')">
</div> <img :src="detail.img" />
</div>
</template>
</template> </template>
&nbsp; &nbsp;
<span> <span>
<template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')"> <template v-if="detail.isShowCaption">
{{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}} <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
</template> {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
<template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))"> </template>
{{detail.caption}} <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
{{detail.caption}}
</template>
</template> </template>
</span> </span>
</span> </span>
...@@ -55,21 +59,25 @@ ...@@ -55,21 +59,25 @@
<template v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)"> <template v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)">
<div v-for="(detail,index) in uiActionGroup.details" :key="index"> <div v-for="(detail,index) in uiActionGroup.details" :key="index">
<span class='item' @click="doUIAction($event, detail)"> <span class='item' @click="doUIAction($event, detail)">
<template v-if="detail.icon && !Object.is(detail.icon, '')"> <template v-if="detail.isShowIcon">
<i :class="detail.icon" ></i> <template v-if="detail.icon && !Object.is(detail.icon, '')">
</template> <i :class="detail.icon" ></i>
<template v-if="!(detail.icon && !Object.is(detail.icon, ''))"> </template>
<div v-if="detail.img && !Object.is(detail.img, '')"> <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
<img :src="detail.img" /> <div v-if="detail.img && !Object.is(detail.img, '')">
</div> <img :src="detail.img" />
</template> </div>
</template>
</template>
&nbsp; &nbsp;
<span> <span>
<template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')"> <template v-if="detail.isShowCaption">
{{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}} <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
</template> {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
<template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))"> </template>
{{detail.caption}} <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
{{detail.caption}}
</template>
</template> </template>
</span> </span>
</span> </span>
......
app_web/src/components/app-transfer/app-transfer.less
浏览文件 @ 6d6cb99a
.ivu-select-dropdown { .transfer-select{
padding: 0px; .ivu-select-dropdown {
.hidden { padding: 0px;
display: none; .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/src/components/app-transfer/app-transfer.vue
浏览文件 @ 6d6cb99a
<template> <template>
<Select <Select
@on-open-change="transferRefresh" class="transfer-select"
@on-change="dataChange" @on-open-change="transferRefresh"
v-model="dataRight" @on-change="dataChange"
:style="{width:width?width:'586px'}" v-model="dataRight"
multiple :style="{width:width}"
> :disabled="disabled"
<Option class="hidden" :value="item" v-for="(item,i) in dataRight" :key="i">{{findLabel(item)}}</Option> :placeholder="placeholder"
<el-transfer v-model="dataRight" :data="dataLeft" @change="dataChange" :titles="['未选择', '已选择']"></el-transfer> multiple>
</Select> <Option class="hidden" :value="item" v-for="(item,i) in dataRight" :key="i">
{{findLabel(item)}}
</Option>
<el-transfer
v-model="dataRight"
:data="dataLeft"
@change="dataChange"
:titles="['未选择', '已选择']"/>
</Select>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Vue, Component, Watch, Prop, Model } from "vue-property-decorator"; import { Vue, Component, Watch, Prop, Model } from "vue-property-decorator";
import CodeListService from "@service/app/codelist-service"; import CodeListService from "@service/app/codelist-service";
...@@ -17,273 +26,270 @@ import { ElSelect } from "element-ui/types/select"; ...@@ -17,273 +26,270 @@ import { ElSelect } from "element-ui/types/select";
@Component({}) @Component({})
export default class AppTransfer extends Vue { export default class AppTransfer extends Vue {
/**
* 传入表单数据
*
* @type {*}
* @memberof AppTransfer
*/
@Prop() public data:any;
/** /**
* 穿梭框宽度 * 穿梭框宽度
* *
* @type {*} * @type {string}
* @memberof AppTransfer * @memberof AppTransfer
*/ */
@Prop() public width: any; @Prop() public width?: string;
/** /**
* 表单传入字符串值分隔符 * 表单传入字符串值分隔符
* *
* @type {string} * @type {string}
* @memberof AppTransfer * @memberof AppTransfer
*/ */
@Prop() public valueSeparator!: string; @Prop() public valueSeparator?: string;
/** /**
* 当前选中值 * 代码表标识
* @type {any} *
* @memberof AppTransfer * @type {string}
*/ * @memberof AppTransfer
@Model("change") public itemValue!: any; */
@Prop() public tag?: string;
/** /**
* 代码表标识 * 代码表类型
* *
* @type {string} * @type {string}
* @memberof AppTransfer * @memberof AppTransfer
*/ */
@Prop() public tag?: string; @Prop() public codelistType?: string;
/** /**
* 代码表类型 * 局部上下文导航参数
* *
* @type {string} * @type {*}
* @memberof AppTransfer * @memberof AppTransfer
*/ */
@Prop() public codelistType?: string; @Prop() public localContext!: any;
/** /**
* 局部上下文导航参数 * 局部导航参数
* *
* @type {*} * @type {*}
* @memberof AppTransfer * @memberof AppTransfer
*/ */
@Prop() public localContext!: any; @Prop() public localParam!: any;
/** /**
* 局部导航参数 * 视图上下文
* *
* @type {*} * @type {*}
* @memberof AppTransfer * @memberof AppAutocomplete
*/ */
@Prop() public localParam!: any; @Prop() public context!: any;
/** /**
* 视图上下文 * 视图参数
* *
* @type {*} * @type {*}
* @memberof AppAutocomplete * @memberof AppFormDRUIPart
*/ */
@Prop() public context!: any; @Prop() public viewparams!: any;
/** /**
* 视图参数 * 是否禁用
* *
* @type {*} * @type {any}
* @memberof AppFormDRUIPart * @memberof AppTransfer
*/ *
@Prop() public viewparams!: any; */
@Prop() public disabled?: any;
/** /**
* 是否禁用 * 穿梭框提示内容
* *
* @type {any} * @type {string}
* @memberof AppTransfer * @memberof AppTransfer
* */
*/ @Prop() public placeholder?: string;
@Prop() public disabled?: any;
/** /**
* placeholder * 当前选中值
* *
* @type {string} * @type {any}
* @memberof AppTransfer * @memberof AppTransfer
* */
*/ @Model("change") public itemValue!: any;
@Prop() public placeholder?: string;
/** /**
* 左侧框数据 * 左侧框数据
* *
* @type {any[]} * @memberof AppTransfer
* @memberof AppTransfer */
*/ public dataLeft: any[] = [];
public dataLeft: any[] = [];
/** /**
* 右侧框数据 * 右侧框数据
* *
* @type {any[]} * @memberof AppTransfer
* @memberof AppTransfer */
*/ public dataRight: any[] = [];
public dataRight: any[] = [];
/** /**
* 代码表服务对象 * 代码表服务对象
* *
* @type {CodeListService} * @type {CodeListService}
* @memberof AppTransfer * @memberof AppTransfer
*/ */
public codeListService: CodeListService = new CodeListService({
$store: this.$store
});
public codeListService: CodeListService = new CodeListService({$store: this.$store}); /**
* vue 生命周期
* @memberof AppTransfer
*/
public created() {
this.dataHandle();
}
/** /**
* vue 生命周期 * 数据处理
* *
* @memberof AppTransfer * @memberof AppTransfer
*/ */
public created() { public dataHandle() {
this.dataHandle(); if (this.tag && Object.is(this.codelistType, "STATIC")) {
} const codelist = this.$store.getters.getCodeList(this.tag);
if (codelist) {
this.dataLeft = [...JSON.parse(JSON.stringify(codelist.items))];
this.initData()
} else {
console.log(`----${this.tag}----代码表不存在`);
}
} else if (this.tag && Object.is(this.codelistType, "DYNAMIC")) {
// 处理公共参数
let data: any = {};
this.handlePublicParams(data);
// 参数处理
let _context = data.context;
let _param = data.param;
this.codeListService
.getItems(this.tag, _context, _param)
.then((res: any) => {
this.dataLeft = res;
this.initData()
})
.catch((error: any) => {
console.log(`----${this.tag}----代码表不存在`);
});
}
}
/** /**
* 组件change事件,右侧框数据变化时 * 公共参数处理
* *
* @memberof AppTransfer * @param {*} arg
*/ * @returns
dataChange(e: any) { * @memberof AppTransfer
let _valueSeparator: string = this.initValueSeparator(); */
let newVal: string = e.join(`${_valueSeparator}`); public handlePublicParams(arg: any) {
if (newVal) { // 合并表单参数
this.$emit("change", newVal); arg.param = this.viewparams? JSON.parse(JSON.stringify(this.viewparams)): {};
} else { arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
this.$emit("change", null); // 附加参数处理
if (this.localContext && Object.keys(this.localContext).length > 0) {
let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(arg.context, _context);
}
if (this.localParam && Object.keys(this.localParam).length > 0) {
let _param = this.$util.computedNavData(this.data,arg.context,arg.param,this.localParam);
Object.assign(arg.param, _param);
}
} }
}
/** /**
* 初始化valueSeparator * 初始化获取到的选项数据
* *
* @memberof AppTransfer * @memberof AppTransfer
*/ */
public initValueSeparator() { public initData(){
return this.valueSeparator?this.valueSeparator:","; // 初始化左侧框数据
} let left: any[] = [];
Object.assign(left, this.dataLeft);
this.dataLeft = [];
left.forEach((elem: any, i: any) => {
this.dataLeft.push({
key: elem.id,
value: elem.value,
label: elem.text,
disabled: elem.disabled
});
});
/** // 初始化右侧框数据
* 数据处理 let _valueSeparator: any;
* _valueSeparator = this.initValueSeparator();
* @memberof AppTransfer let _data: any = this.itemValue;
*/ if (_data) {
public dataHandle() { let _dataRight: any = [];
if (this.tag && Object.is(this.codelistType, "STATIC")) { let newData: any[] = _data.split(`${_valueSeparator}`);
const codelist = this.$store.getters.getCodeList(this.tag); this.dataLeft.forEach((elem: any) => {
if (codelist) { newData.forEach((item: any) => {
this.dataLeft = [...JSON.parse(JSON.stringify(codelist.items))]; if (item === elem.value) {
this.initLeft(); _dataRight.push(elem.key);
this.initRight(); }
} else { });
console.log(`----${this.tag}----代码表不存在`);
}
} else if (this.tag && Object.is(this.codelistType, "DYNAMIC")) {
// 处理公共参数
let data: any = {};
this.handlePublicParams(data);
// 参数处理
let _context = data.context;
let _param = data.param;
this.codeListService.getItems(this.tag, _context, _param).then((res: any) => {
this.dataLeft = res;
this.initLeft();
this.initRight();
}).catch((error: any) => {
console.log(`----${this.tag}----代码表不存在`);
}); });
this.dataRight = _dataRight;
}
} }
}
/** /**
* 公共参数处理 * 组件change事件,右侧框数据变化时
* * @memberof AppTransfer
* @param {*} arg */
* @returns public dataChange(e: any) {
* @memberof AppTransfer let _valueSeparator: string;
*/ _valueSeparator = this.initValueSeparator();
public handlePublicParams(arg: any) { let newVal: string = e.join(`${_valueSeparator}`);
// 合并表单参数 if (newVal) {
arg.param = this.viewparams? JSON.parse(JSON.stringify(this.viewparams)): {}; this.$emit("change", newVal);
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {}; } else {
// 附加参数处理 this.$emit("change", null);
if (this.localContext && Object.keys(this.localContext).length > 0) { }
let _context = this.$util.computedNavData(this.itemValue,arg.context,arg.param,this.localContext);
Object.assign(arg.context, _context);
} }
if (this.localParam && Object.keys(this.localParam).length > 0) {
let _param = this.$util.computedNavData(this.itemValue,arg.context,arg.param,this.localParam);
Object.assign(arg.param, _param);
}
}
/**
* 初始化左侧框数据
*
* @memberof AppTransfer
*/
public initLeft() {
let left: any[] = [];
Object.assign(left, this.dataLeft);
this.dataLeft = [];
left.forEach((elem: any, i: any) => {
this.dataLeft.push({
key: elem.id,
value: elem.value,
label: elem.text,
disabled: elem.disabled
});
});
}
/** /**
* 初始化右侧框数据 * 初始化valueSeparator
* * @memberof AppTransfer
* @memberof AppTransfer */
*/ public initValueSeparator() {
public initRight() { return this.valueSeparator ? this.valueSeparator : ",";
let _valueSeparator: any;
_valueSeparator = this.initValueSeparator();
let _data: any = this.itemValue;
if (_data) {
let _dataRight: any = [];
let newData: any[] = _data.split(`${_valueSeparator}`);
this.dataLeft.forEach((elem: any) => {
newData.forEach((item: any) => {
if (item === elem.value) {
_dataRight.push(elem.key);
}
});
});
this.dataRight = _dataRight;
} }
}
/** /**
* 穿梭框打开时刷新数据 * 穿梭框打开时刷新数据
* * @memberof AppTransfer
* @memberof AppTransfer */
*/ public transferRefresh(e: boolean) {
public transferRefresh(e: any) { if (e && this.codelistType === "DYNAMIC") {
if (e && this.codelistType === "DYNAMIC") { this.dataLeft = [];
this.dataLeft = []; this.dataHandle();
this.dataHandle(); }
} }
}
/** /**
* 找到dataLeft中key与dataRight中item相等的元素，返回label * 找到dataLeft中key与dataRight中item相等的元素，返回label
* * @memberof AppTransfer
* @memberof AppTransfer */
*/ public findLabel(item: any) {
public findLabel(item: any) { for (const elem of this.dataLeft) {
for (const elem of this.dataLeft) { if (elem.key === item) return elem.label;
if (elem.key === item) return elem.label; }
} }
}
} }
</script> </script>
......
app_web/yarn.lock
浏览文件 @ 6d6cb99a
...@@ -5238,10 +5238,10 @@ human-signals@^1.1.1: ...@@ -5238,10 +5238,10 @@ human-signals@^1.1.1:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
ibiz-gantt-elastic@^1.0.16: ibiz-gantt-elastic@^1.0.17:
version "1.0.16" version "1.0.17"
resolved "https://registry.npm.taobao.org/ibiz-gantt-elastic/download/ibiz-gantt-elastic-1.0.16.tgz#e2de7e8d4bdb3c292cfbc97c4f970c8ecfe6c43b" resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.17.tgz#447cce5db2e0127d2336c20370fc251992520c6f"
integrity sha1-4t5+jUvbPCks+8l8T5cMjs/mxDs= integrity sha512-AJOYXZGM020wafn60RJLM2yKmtT2BjCpBKkZ0PONcxdqW/kCyXOqEo3c3/PBtFEkJx/8KGTayB013BOdGI1+uQ==
dependencies: dependencies:
dayjs "^1.8.16" dayjs "^1.8.16"
resize-observer-polyfill "^1.5.1" resize-observer-polyfill "^1.5.1"
......
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFGroup.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -79,6 +80,7 @@ public class WFGroup extends EntityMP implements Serializable { ...@@ -79,6 +80,7 @@ public class WFGroup extends EntityMP implements Serializable {
this.name = name ; this.name = name ;
this.modify("groupname",name); this.modify("groupname",name);
} }
/** /**
* 设置 [范围] * 设置 [范围]
*/ */
...@@ -87,6 +89,7 @@ public class WFGroup extends EntityMP implements Serializable { ...@@ -87,6 +89,7 @@ public class WFGroup extends EntityMP implements Serializable {
this.modify("groupscope",groupscope); this.modify("groupscope",groupscope);
} }
} }
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFHistory.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient; ...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
/** /**
* [历史] 对象 * [历史] 对象
*/ */
@Builder
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
...@@ -104,7 +104,16 @@ public class WFHistory extends EntityBase implements Serializable { ...@@ -104,7 +104,16 @@ public class WFHistory extends EntityBase implements Serializable {
/**
* 格式化日期 [时间]
*/
public String formatTime(){
if (this.time == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("defieldFormatStr");
return sdf.format(time);
}
} }
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFMember.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -107,6 +108,7 @@ public class WFMember extends EntityMP implements Serializable { ...@@ -107,6 +108,7 @@ public class WFMember extends EntityMP implements Serializable {
this.membername = membername ; this.membername = membername ;
this.modify("membername",membername); this.modify("membername",membername);
} }
/** /**
* 设置 [组标识] * 设置 [组标识]
*/ */
...@@ -114,6 +116,7 @@ public class WFMember extends EntityMP implements Serializable { ...@@ -114,6 +116,7 @@ public class WFMember extends EntityMP implements Serializable {
this.groupid = groupid ; this.groupid = groupid ;
this.modify("groupid",groupid); this.modify("groupid",groupid);
} }
/** /**
* 设置 [用户标识] * 设置 [用户标识]
*/ */
...@@ -122,6 +125,7 @@ public class WFMember extends EntityMP implements Serializable { ...@@ -122,6 +125,7 @@ public class WFMember extends EntityMP implements Serializable {
this.modify("userid",userid); this.modify("userid",userid);
} }
/** /**
* 获取 [组成员标识] * 获取 [组成员标识]
*/ */
......
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessDefinition.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -113,6 +114,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable { ...@@ -113,6 +114,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
this.definitionname = definitionname ; this.definitionname = definitionname ;
this.modify("definitionname",definitionname); this.modify("definitionname",definitionname);
} }
/** /**
* 设置 [模型版本] * 设置 [模型版本]
*/ */
...@@ -120,6 +122,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable { ...@@ -120,6 +122,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
this.modelversion = modelversion ; this.modelversion = modelversion ;
this.modify("modelversion",modelversion); this.modify("modelversion",modelversion);
} }
/** /**
* 设置 [模型是否启用] * 设置 [模型是否启用]
*/ */
...@@ -127,6 +130,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable { ...@@ -127,6 +130,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
this.modelenable = modelenable ; this.modelenable = modelenable ;
this.modify("modelenable",modelenable); this.modify("modelenable",modelenable);
} }
/** /**
* 设置 [系统标识] * 设置 [系统标识]
*/ */
...@@ -134,6 +138,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable { ...@@ -134,6 +138,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
this.pssystemid = pssystemid ; this.pssystemid = pssystemid ;
this.modify("pssystemid",pssystemid); this.modify("pssystemid",pssystemid);
} }
/** /**
* 设置 [TaskDefinitionKey] * 设置 [TaskDefinitionKey]
*/ */
...@@ -141,6 +146,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable { ...@@ -141,6 +146,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
this.taskprocessdefinitionkey = taskprocessdefinitionkey ; this.taskprocessdefinitionkey = taskprocessdefinitionkey ;
this.modify("taskdefinitionkey",taskprocessdefinitionkey); this.modify("taskdefinitionkey",taskprocessdefinitionkey);
} }
/** /**
* 设置 [校验] * 设置 [校验]
*/ */
...@@ -148,6 +154,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable { ...@@ -148,6 +154,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
this.md5check = md5check ; this.md5check = md5check ;
this.modify("md5check",md5check); this.modify("md5check",md5check);
} }
/** /**
* 设置 [BPMN] * 设置 [BPMN]
*/ */
...@@ -155,6 +162,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable { ...@@ -155,6 +162,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
this.bpmnfile = bpmnfile ; this.bpmnfile = bpmnfile ;
this.modify("bpmnfile",bpmnfile); this.modify("bpmnfile",bpmnfile);
} }
/** /**
* 设置 [DeployKey] * 设置 [DeployKey]
*/ */
...@@ -163,6 +171,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable { ...@@ -163,6 +171,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
this.modify("deploykey",deploykey); this.modify("deploykey",deploykey);
} }
} }
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessInstance.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient; ...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
/** /**
* [流程实例] 对象 * [流程实例] 对象
*/ */
@Builder
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
...@@ -103,7 +103,26 @@ public class WFProcessInstance extends EntityBase implements Serializable { ...@@ -103,7 +103,26 @@ public class WFProcessInstance extends EntityBase implements Serializable {
/**
* 格式化日期 [启动时间]
*/
public String formatStarttime(){
if (this.starttime == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("defieldFormatStr");
return sdf.format(starttime);
}
/**
* 格式化日期 [结束时间]
*/
public String formatEndtime(){
if (this.endtime == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("defieldFormatStr");
return sdf.format(endtime);
}
} }
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessNode.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient; ...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
/** /**
* [流程定义节点] 对象 * [流程定义节点] 对象
*/ */
@Builder
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
...@@ -66,7 +66,6 @@ public class WFProcessNode extends EntityBase implements Serializable { ...@@ -66,7 +66,6 @@ public class WFProcessNode extends EntityBase implements Serializable {
} }
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFREModel.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient; ...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
/** /**
* [流程模型] 对象 * [流程模型] 对象
*/ */
@Builder
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
...@@ -57,7 +57,6 @@ public class WFREModel extends EntityBase implements Serializable { ...@@ -57,7 +57,6 @@ public class WFREModel extends EntityBase implements Serializable {
} }
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFSystem.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -64,6 +65,7 @@ public class WFSystem extends EntityMP implements Serializable { ...@@ -64,6 +65,7 @@ public class WFSystem extends EntityMP implements Serializable {
this.modify("pssystemname",pssystemname); this.modify("pssystemname",pssystemname);
} }
} }
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTask.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient; ...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
/** /**
* [工作流任务] 对象 * [工作流任务] 对象
*/ */
@Builder
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
...@@ -82,7 +82,6 @@ public class WFTask extends EntityBase implements Serializable { ...@@ -82,7 +82,6 @@ public class WFTask extends EntityBase implements Serializable {
} }
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTaskWay.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient; ...@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
/** /**
* [操作路径] 对象 * [操作路径] 对象
*/ */
@Builder
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
...@@ -96,7 +96,6 @@ public class WFTaskWay extends EntityBase implements Serializable { ...@@ -96,7 +96,6 @@ public class WFTaskWay extends EntityBase implements Serializable {
} }
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFUser.java
浏览文件 @ 6d6cb99a
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.HashMap; import java.util.HashMap;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -72,6 +73,7 @@ public class WFUser extends EntityMP implements Serializable { ...@@ -72,6 +73,7 @@ public class WFUser extends EntityMP implements Serializable {
this.firstname = firstname ; this.firstname = firstname ;
this.modify("username",firstname); this.modify("username",firstname);
} }
/** /**
* 设置 [用户名称] * 设置 [用户名称]
*/ */
...@@ -80,6 +82,7 @@ public class WFUser extends EntityMP implements Serializable { ...@@ -80,6 +82,7 @@ public class WFUser extends EntityMP implements Serializable {
this.modify("personname",displayname); this.modify("personname",displayname);
} }
} }
ibzwf-util/src/main/java/cn/ibizlab/util/security/SimpleTokenUtil.java
浏览文件 @ 6d6cb99a
...@@ -19,7 +19,7 @@ import java.util.Optional; ...@@ -19,7 +19,7 @@ import java.util.Optional;
import java.util.function.Function; import java.util.function.Function;
@Component @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 { public class SimpleTokenUtil implements AuthTokenUtil,Serializable {
private static final long serialVersionUID = -3301605591108950415L; private static final long serialVersionUID = -3301605591108950415L;
......
ibzwf-util/src/main/java/cn/ibizlab/util/security/UAATokenUtil.java
浏览文件 @ 6d6cb99a
...@@ -30,7 +30,7 @@ import java.util.Map; ...@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
@Component @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 { public class UAATokenUtil implements AuthTokenUtil, Serializable {
private static final long serialVersionUID = -3301605591108950415L; private static final long serialVersionUID = -3301605591108950415L;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或