From e950574e21a9512c9f29a4ae7a9a262a0ed09a54 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 22 Nov 2023 11:26:05 +0800 Subject: [PATCH 01/15] 1 --- .../enterprisecentre/biz/sealrecord/SealRecordService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java index eb5d38a5..295a4e5e 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java @@ -344,7 +344,6 @@ public class SealRecordService extends MybatisBaseService Date: Wed, 22 Nov 2023 11:29:35 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/Rkzysq/rkzysq.js | 109 ++++++ .../src/layout/components/Sidebar/index.vue | 4 +- .../src/router/modules/codemenu.js | 29 +- .../src/views/Rkzysq/index.vue | 320 ++++++++++++++++ .../src/views/Rkzysq/rkzyAdd.vue | 204 ++++++++++ .../src/views/Rkzysq/rkzyInfo.vue | 151 ++++++++ .../workFlow/rukuzhiyaFlow/rkzyDaiBan.vue | 348 ++++++++++++++++++ .../views/workFlow/rukuzhiyaFlow/rkzyEdit.vue | 208 +++++++++++ .../workFlow/rukuzhiyaFlow/rkzyYiBan.vue | 197 ++++++++++ 9 files changed, 1564 insertions(+), 6 deletions(-) create mode 100644 supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js create mode 100644 supervise-enterprise-ui/src/views/Rkzysq/index.vue create mode 100644 supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue create mode 100644 supervise-enterprise-ui/src/views/Rkzysq/rkzyInfo.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue diff --git a/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js b/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js new file mode 100644 index 00000000..50e2c773 --- /dev/null +++ b/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js @@ -0,0 +1,109 @@ +import request from '@/utils/request' +// 入库导入的记录 /enterprisecentre +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/listPage', + method: 'post', + data: params + }) + }, + // 提交列表 + sealrecordSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/submit ', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 保存列表 + sealrecordSave: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/saveorUpdate', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 根据SID获取一条记录 + fetchDetailsBySid: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/details', + method: 'get', + params: data + }) + }, + // 流程历史流转记录 + flowRecord: function(procInsId, deployId) { + return request({ + url: '/enterprisecentre/v1/sealrecord/task/flowRecord/' + procInsId + '/' + deployId, + method: 'get' + }) + }, + // 根据SID获取一条记录 + delBySids: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/delete', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 办理待办 + complete: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/complete', + method: 'post', + data: data + }) + }, + // 流程审批（驳回） + reject: function(params) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/reject', + method: 'post', + data: params + }) + }, + // 流程审批（终止） + breakProcess: function(params) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/breakProcess', + method: 'post', + data: params + }) + }, + // 流程审批（撤回） + revokeProcess: function(params) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/revokeProcess', + method: 'post', + data: params + }) + }, + // 审批流程（同意）获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/getNextNodesForSubmit', + method: 'post', + params: data + }) + }, + // 审批流程（驳回）获取下一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/getPreviousNodesForReject', + method: 'post', + params: data + }) + } +} diff --git a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue index ca410092..66db376c 100644 --- a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue @@ -41,8 +41,8 @@ icon: "el-icon-menu", title: "入库质押申请", }, - name: "/NewList/warehouse", - path: "/NewList/warehouse" + name: "/Rkzysq/index", + path: "/Rkzysq/index" }, { alwaysShow: true, diff --git a/supervise-enterprise-ui/src/router/modules/codemenu.js b/supervise-enterprise-ui/src/router/modules/codemenu.js index 70bc5357..dafb09e6 100644 --- a/supervise-enterprise-ui/src/router/modules/codemenu.js +++ b/supervise-enterprise-ui/src/router/modules/codemenu.js @@ -53,12 +53,12 @@ const codemenu = [{ } }] },{ - path: '/NewList', + path: '/Rkzysq', component: Layout, - redirect: '/NewList/warehouse', + redirect: '/Rkzysq', children: [{ - path: '/NewList/warehouse', - component: () => import('@/views/NewList/warehouse.vue'), + path: '/Rkzysq/index', + component: () => import('@/views/Rkzysq/index.vue'), name: 'warehouse', meta: { title: '货物入库质押申请', @@ -463,6 +463,27 @@ const codemenu = [{ import('@/views/Yjsq/LookYzsq/index.vue'), name: 'LookYzsq' }, + // 入库质押待办详情 + { + path: '/rukuzhiyaFlow/rkzyDaiBan', + component: () => + import('@/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue'), + name: 'rkzyDaiBan' + }, + // 入库质押已办详情 + { + path: '/rukuzhiyaFlow/rkzyYiBan', + component: () => + import('@/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue'), + name: 'rkzyYiBan' + }, + // 入库质押的编辑 + { + path: '/rukuzhiyaFlow/rkzyEdit', + component: () => + import('@/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue'), + name: 'rkzyEdit' + }, ] export default codemenu diff --git a/supervise-enterprise-ui/src/views/Rkzysq/index.vue b/supervise-enterprise-ui/src/views/Rkzysq/index.vue new file mode 100644 index 00000000..10dea8ae --- /dev/null +++ b/supervise-enterprise-ui/src/views/Rkzysq/index.vue @@ -0,0 +1,320 @@ + + + + diff --git a/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue new file mode 100644 index 00000000..106d590a --- /dev/null +++ b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/Rkzysq/rkzyInfo.vue b/supervise-enterprise-ui/src/views/Rkzysq/rkzyInfo.vue new file mode 100644 index 00000000..3c0c7a28 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Rkzysq/rkzyInfo.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue new file mode 100644 index 00000000..b40703d9 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue @@ -0,0 +1,348 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue new file mode 100644 index 00000000..361bf651 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue new file mode 100644 index 00000000..cd05d00d --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue @@ -0,0 +1,197 @@ + + + + + From 0966e8c40ca6030c8257350cc1e18c137afa12ac Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 11:36:52 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue | 7 ++----- .../src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue index 106d590a..bb6a74ed 100644 --- a/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue +++ b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue @@ -85,10 +85,7 @@ export default { return { title: '', submitdisabled: false, - projectSidList: [{ - entryName: '喜相随贸易保证贷款项目', - sid: '99a0bb0e-539f-4d87-8ec7-1e079b0ecffe' - }], + projectSidList: [], formobj: { userSid: '', createByName: '', @@ -102,7 +99,7 @@ export default { } }, created() { - // this.projectSidList = JSON.parse(window.sessionStorage.getItem('projectSidList')) + this.projectSidList = JSON.parse(window.sessionStorage.getItem('projectSidList')) }, methods: { showAdd() { diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue index 361bf651..e1f40f04 100644 --- a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue @@ -99,6 +99,7 @@ export default { } }, created() { + this.projectSidList = JSON.parse(window.sessionStorage.getItem('projectSidList')) console.log('url:' + window.location.href) var one = window.location.href.indexOf('&data') + 6 const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用 From 538b281bc31a32c3d46ef43b444869f9974b369f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 22 Nov 2023 11:45:57 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=B4=A8=E6=8A=BC?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprisecentre/api/paymentapply/PaymentApplyVo.java | 5 +++++ .../api/qualityrelease/QualityReleaseVo.java | 5 +++++ .../api/warehousingpledge/WarehousingPledgeVo.java | 5 +++++ .../biz/paymentapply/PaymentApplyMappper.xml | 4 +++- .../biz/qualityrelease/QualityReleaseMapper.xml | 4 +++- .../biz/warehousingpledge/WarehousingPledgeMapper.xml | 4 +++- 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/paymentapply/PaymentApplyVo.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/paymentapply/PaymentApplyVo.java index fac3247a..49c17604 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/paymentapply/PaymentApplyVo.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/paymentapply/PaymentApplyVo.java @@ -34,4 +34,9 @@ public class PaymentApplyVo { @ApiModelProperty("用款金额") private String money; + + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("流程实例id") + private String procInstId; } diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/qualityrelease/QualityReleaseVo.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/qualityrelease/QualityReleaseVo.java index 7a4aba15..1824bed5 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/qualityrelease/QualityReleaseVo.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/qualityrelease/QualityReleaseVo.java @@ -28,4 +28,9 @@ public class QualityReleaseVo { @ApiModelProperty("创建时间") private String createTime; + + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("流程实例id") + private String procInstId; } diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/warehousingpledge/WarehousingPledgeVo.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/warehousingpledge/WarehousingPledgeVo.java index ebccaee1..755795f9 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/warehousingpledge/WarehousingPledgeVo.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/warehousingpledge/WarehousingPledgeVo.java @@ -31,5 +31,10 @@ public class WarehousingPledgeVo implements Vo { @ApiModelProperty("创建时间") private String createTime; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("流程实例id") + private String procInstId; + } diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.xml b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.xml index f0dc6b05..77ec4234 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.xml +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.xml @@ -9,7 +9,9 @@ applyUse, money, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, - if(length(nodeState) > 0, nodeState, '待提交') as nodeState + if(length(nodeState) > 0, nodeState, '待提交') as nodeState, + procDefId, + procInstId from payment_apply ${ew.sqlSegment} diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/qualityrelease/QualityReleaseMapper.xml b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/qualityrelease/QualityReleaseMapper.xml index f69c9242..e2484f59 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/qualityrelease/QualityReleaseMapper.xml +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/qualityrelease/QualityReleaseMapper.xml @@ -7,7 +7,9 @@ projectName, createByName, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, - if(length(nodeState) > 0, nodeState, '待提交') as nodeState + if(length(nodeState) > 0, nodeState, '待提交') as nodeState, + procDefId, + procInstId from quality_release ${ew.sqlSegment} diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeMapper.xml b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeMapper.xml index 853689cd..8c59c076 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeMapper.xml +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeMapper.xml @@ -7,7 +7,9 @@ projectName, createByName, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, - if(length(nodeState) > 0, nodeState, '待提交') as nodeState + if(length(nodeState) > 0, nodeState, '待提交') as nodeState, + procDefId, + procInstId from warehousing_pledge ${ew.sqlSegment} From de5aa648d07d30f93c69ba3d00b2f86265bf5b7a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 14:05:13 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E3=80=81=E5=B7=B2?= =?UTF-8?q?=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-portal-ui/src/views/flow/doneList.vue | 3 ++- supervise-portal-ui/src/views/flow/todoList.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/supervise-portal-ui/src/views/flow/doneList.vue b/supervise-portal-ui/src/views/flow/doneList.vue index b62da4fd..7eb2d1a1 100644 --- a/supervise-portal-ui/src/views/flow/doneList.vue +++ b/supervise-portal-ui/src/views/flow/doneList.vue @@ -273,8 +273,9 @@ import flowRecords from '@/components/flow/flowRecord' selectUrl(this.selectUrl_list).then((response) => { if (response.success && response.data.url !== '') { // this.url = 'http://127.0.0.1:9531' + '/production/#/paichanguanli/haveDone' + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) - this.url = ''+ response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + this.url = 'http://jg.yyundong.com/' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + console.log(this.url) } else if (response.success && response.data.url === '') { this.$notify({ title: '提示', diff --git a/supervise-portal-ui/src/views/flow/todoList.vue b/supervise-portal-ui/src/views/flow/todoList.vue index b9c439dc..47d2fb1d 100644 --- a/supervise-portal-ui/src/views/flow/todoList.vue +++ b/supervise-portal-ui/src/views/flow/todoList.vue @@ -312,7 +312,7 @@ export default { selectUrl(this.selectUrl_list).then((response) => { if (response.success && response.data.url !== '') { // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) - this.url = '' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + this.url = 'http://jg.yyundong.com/' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) console.log('已办拼接url:', this.url) } else if (response.success && response.data.url === '') { From 51b33a491375f86c8b836a10164247e25ca16389 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 14:15:40 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-enterprise-ui/src/views/Rkzysq/index.vue | 12 ++++++------ .../src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue | 6 ++++++ .../src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue | 6 ++++++ .../src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue | 6 ++++++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/supervise-enterprise-ui/src/views/Rkzysq/index.vue b/supervise-enterprise-ui/src/views/Rkzysq/index.vue index 10dea8ae..b2b7d087 100644 --- a/supervise-enterprise-ui/src/views/Rkzysq/index.vue +++ b/supervise-enterprise-ui/src/views/Rkzysq/index.vue @@ -234,8 +234,8 @@ export default { /** 流程流转记录 */ handleFlowRecord(row) { this.getModelDetail(row.procDefId) - this.getFlowViewer(row.procInsId) - this.getFlowRecordList(row.procInsId, row.procDefId) + this.getFlowViewer(row.procInstId) + this.getFlowRecordList(row.procInstId, row.procDefId) this.editDialog = true }, /** xml 文件 */ @@ -247,15 +247,15 @@ export default { }) }, // 已办环节的节点 - getFlowViewer(procInsId) { + getFlowViewer(procInstId) { var token = getStorage() - getFlowViewer(procInsId, token).then(res => { + getFlowViewer(procInstId, token).then(res => { this.taskList = res.data }) }, /** 流程流转记录 */ - getFlowRecordList(procInsId, procDefId) { - req.flowRecord(procInsId, procDefId).then(res => { + getFlowRecordList(procInstId, procDefId) { + req.flowRecord(procInstId, procDefId).then(res => { this.flowRecordList = res.data.flowList // 流程过程中不存在初始化表单 直接读取的流程变量中存储的表单值 // if (res.data.formData) { diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue index b40703d9..2ab88513 100644 --- a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue @@ -345,4 +345,10 @@ export default { .rowClass{ border-top: 1px solid #E0E3EB; } + +.titwu { + font-size: 28px; + text-align: center; + padding: 30px 0 20px 0; +} diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue index e1f40f04..4911c72c 100644 --- a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue @@ -206,4 +206,10 @@ export default { font-size: 15px; font-weight: 400; } + +.titwu { + font-size: 28px; + text-align: center; + padding: 30px 0 20px 0; +} diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue index cd05d00d..19d72891 100644 --- a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue @@ -194,4 +194,10 @@ export default { font-size: 15px; font-weight: 400; } + +.titwu { + font-size: 28px; + text-align: center; + padding: 30px 0 20px 0; +} From ea8c9355b3dc2ef392bca1c016e5baefa51d4b52 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 14:27:50 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js b/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js index 50e2c773..d5e83e87 100644 --- a/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js +++ b/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js @@ -94,7 +94,7 @@ export default { getNextNodesForSubmit: function(data) { return request({ url: '/enterprisecentre/v1/WarehousingPledge/getNextNodesForSubmit', - method: 'post', + method: 'get', params: data }) }, @@ -102,7 +102,7 @@ export default { getPreviousNodesForReject: function(data) { return request({ url: '/enterprisecentre/v1/WarehousingPledge/getPreviousNodesForReject', - method: 'post', + method: 'get', params: data }) } From 26a47636ee04fa596d0f42b620668209d356f221 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 22 Nov 2023 14:28:49 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprisecentre/biz/paymentapply/PaymentApplyRest.java | 6 +++--- .../biz/qualityrelease/QualityReleaseRest.java | 6 +++--- .../biz/warehousingpledge/WarehousingPledgeRest.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyRest.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyRest.java index 3292cf0d..71b7e7bc 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyRest.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyRest.java @@ -84,19 +84,19 @@ public class PaymentApplyRest { @ApiOperation("驳回") @PostMapping(value = "/taskReject") - public ResultBean taskReject(PaymentApplyTaskQuery query) { + public ResultBean taskReject(@RequestBody PaymentApplyTaskQuery query) { return paymentApplyService.taskReject(query); } @ApiOperation("撤回") @PostMapping(value = "/revokeProcess") - public ResultBean revokeProcess(PaymentApplyTaskQuery query) { + public ResultBean revokeProcess(@RequestBody PaymentApplyTaskQuery query) { return paymentApplyService.revokeProcess(query); } @ApiOperation("终止") @PostMapping(value = "/breakProcess") - public ResultBean breakProcess(PaymentApplyTaskQuery query) { + public ResultBean breakProcess(@RequestBody PaymentApplyTaskQuery query) { return paymentApplyService.breakProcess(query); } diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/qualityrelease/QualityReleaseRest.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/qualityrelease/QualityReleaseRest.java index dd392e92..35a3b74b 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/qualityrelease/QualityReleaseRest.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/qualityrelease/QualityReleaseRest.java @@ -87,19 +87,19 @@ public class QualityReleaseRest { @ApiOperation("驳回") @PostMapping(value = "/taskReject") - public ResultBean taskReject(ReleaseTaskQuery query) { + public ResultBean taskReject(@RequestBody ReleaseTaskQuery query) { return qualityReleaseService.taskReject(query); } @ApiOperation("撤回") @PostMapping(value = "/revokeProcess") - public ResultBean revokeProcess(ReleaseTaskQuery query) { + public ResultBean revokeProcess(@RequestBody ReleaseTaskQuery query) { return qualityReleaseService.revokeProcess(query); } @ApiOperation("终止") @PostMapping(value = "/breakProcess") - public ResultBean breakProcess(ReleaseTaskQuery query) { + public ResultBean breakProcess(@RequestBody ReleaseTaskQuery query) { return qualityReleaseService.breakProcess(query); } diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeRest.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeRest.java index ff03eda4..31f3eded 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeRest.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeRest.java @@ -87,19 +87,19 @@ public class WarehousingPledgeRest { @ApiOperation("驳回") @PostMapping(value = "/taskReject") - public ResultBean taskReject(PledgeTaskQuery query) { + public ResultBean taskReject(@RequestBody PledgeTaskQuery query) { return warehousingPledgeService.taskReject(query); } @ApiOperation("撤回") @PostMapping(value = "/revokeProcess") - public ResultBean revokeProcess(PledgeTaskQuery query) { + public ResultBean revokeProcess(@RequestBody PledgeTaskQuery query) { return warehousingPledgeService.revokeProcess(query); } @ApiOperation("终止") @PostMapping(value = "/breakProcess") - public ResultBean breakProcess(PledgeTaskQuery query) { + public ResultBean breakProcess(@RequestBody PledgeTaskQuery query) { return warehousingPledgeService.breakProcess(query); } From 18d4d0fcc62d9505b39c934ba5f45accc0ac3538 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 14:30:11 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js b/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js index d5e83e87..4a7b274d 100644 --- a/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js +++ b/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js @@ -63,7 +63,8 @@ export default { return request({ url: '/enterprisecentre/v1/WarehousingPledge/complete', method: 'post', - data: data + data: data, + headers: { 'Content-Type': 'application/json' } }) }, // 流程审批（驳回） @@ -71,7 +72,8 @@ export default { return request({ url: '/enterprisecentre/v1/WarehousingPledge/reject', method: 'post', - data: params + data: params, + headers: { 'Content-Type': 'application/json' } }) }, // 流程审批（终止） @@ -79,7 +81,8 @@ export default { return request({ url: '/enterprisecentre/v1/WarehousingPledge/breakProcess', method: 'post', - data: params + data: params, + headers: { 'Content-Type': 'application/json' } }) }, // 流程审批（撤回） @@ -87,7 +90,8 @@ export default { return request({ url: '/enterprisecentre/v1/WarehousingPledge/revokeProcess', method: 'post', - data: params + data: params, + headers: { 'Content-Type': 'application/json' } }) }, // 审批流程（同意）获取下一环节 From 400c36f732c10fd4b958dbd8bdf1a1182202c575 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 15:31:27 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=A7=A3=E8=B4=A8?= =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/Jzcksq/jzcksq.js | 113 ++++++ .../src/layout/components/Sidebar/index.vue | 4 +- .../src/router/modules/codemenu.js | 29 +- .../src/views/Jzcksq/index.vue | 320 ++++++++++++++++ .../src/views/Jzcksq/jzckAdd.vue | 201 ++++++++++ .../src/views/Jzcksq/jzckInfo.vue | 151 ++++++++ .../src/views/Rkzysq/rkzyAdd.vue | 4 +- .../workFlow/jiezhichukuFlow/jzckDaiBan.vue | 354 ++++++++++++++++++ .../workFlow/jiezhichukuFlow/jzckEdit.vue | 215 +++++++++++ .../workFlow/jiezhichukuFlow/jzckYiBan.vue | 203 ++++++++++ .../views/workFlow/rukuzhiyaFlow/rkzyEdit.vue | 2 +- 11 files changed, 1587 insertions(+), 9 deletions(-) create mode 100644 supervise-enterprise-ui/src/api/Jzcksq/jzcksq.js create mode 100644 supervise-enterprise-ui/src/views/Jzcksq/index.vue create mode 100644 supervise-enterprise-ui/src/views/Jzcksq/jzckAdd.vue create mode 100644 supervise-enterprise-ui/src/views/Jzcksq/jzckInfo.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckDaiBan.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckEdit.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckYiBan.vue diff --git a/supervise-enterprise-ui/src/api/Jzcksq/jzcksq.js b/supervise-enterprise-ui/src/api/Jzcksq/jzcksq.js new file mode 100644 index 00000000..e3301329 --- /dev/null +++ b/supervise-enterprise-ui/src/api/Jzcksq/jzcksq.js @@ -0,0 +1,113 @@ +import request from '@/utils/request' +// 入库导入的记录 /enterprisecentre +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/listPage', + method: 'post', + data: params + }) + }, + // 提交列表 + sealrecordSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/submit ', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 保存列表 + sealrecordSave: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/saveorUpdate', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 根据SID获取一条记录 + fetchDetailsBySid: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/details', + method: 'get', + params: data + }) + }, + // 流程历史流转记录 + flowRecord: function(procInsId, deployId) { + return request({ + url: '/enterprisecentre/v1/sealrecord/task/flowRecord/' + procInsId + '/' + deployId, + method: 'get' + }) + }, + // 根据SID获取一条记录 + delBySids: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/delete', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 办理待办 + complete: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/complete', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（驳回） + reject: function(params) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（终止） + breakProcess: function(params) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（撤回） + revokeProcess: function(params) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程（同意）获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程（驳回）获取下一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue index 66db376c..5052305d 100644 --- a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue @@ -51,8 +51,8 @@ icon: "el-icon-menu", title: "解质出库申请", }, - name: "/NewList/outbound", - path: "/NewList/outbound" + name: "/Jzcksq/index", + path: "/Jzcksq/index" }, { alwaysShow: true, diff --git a/supervise-enterprise-ui/src/router/modules/codemenu.js b/supervise-enterprise-ui/src/router/modules/codemenu.js index dafb09e6..dee6d7f2 100644 --- a/supervise-enterprise-ui/src/router/modules/codemenu.js +++ b/supervise-enterprise-ui/src/router/modules/codemenu.js @@ -92,12 +92,12 @@ const codemenu = [{ } }] },{ - path: '/NewList', + path: '/Jzcksq', component: Layout, - redirect: '/NewList/outbound', + redirect: '/Jzcksq', children: [{ - path: '/NewList/outbound', - component: () => import('@/views/NewList/outbound.vue'), + path: '/Jzcksq/index', + component: () => import('@/views/Jzcksq/index.vue'), name: 'outbound', meta: { title: '货物解除质押出库申请', @@ -484,6 +484,27 @@ const codemenu = [{ import('@/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue'), name: 'rkzyEdit' }, + // 解质出库待办详情 + { + path: '/jiezhichukuFlow/jzckDaiBan', + component: () => + import('@/views/workFlow/jiezhichukuFlow/jzckDaiBan.vue'), + name: 'jzckDaiBan' + }, + // 解质出库已办详情 + { + path: '/jiezhichukuFlow/jzckYiBan', + component: () => + import('@/views/workFlow/jiezhichukuFlow/jzckYiBan.vue'), + name: 'jzckYiBan' + }, + // 解质出库的编辑 + { + path: '/jiezhichukuFlow/jzckEdit', + component: () => + import('@/views/workFlow/jiezhichukuFlow/jzckEdit.vue'), + name: 'jzckEdit' + }, ] export default codemenu diff --git a/supervise-enterprise-ui/src/views/Jzcksq/index.vue b/supervise-enterprise-ui/src/views/Jzcksq/index.vue new file mode 100644 index 00000000..14357321 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Jzcksq/index.vue @@ -0,0 +1,320 @@ + + + + diff --git a/supervise-enterprise-ui/src/views/Jzcksq/jzckAdd.vue b/supervise-enterprise-ui/src/views/Jzcksq/jzckAdd.vue new file mode 100644 index 00000000..d4c7e3b5 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Jzcksq/jzckAdd.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/Jzcksq/jzckInfo.vue b/supervise-enterprise-ui/src/views/Jzcksq/jzckInfo.vue new file mode 100644 index 00000000..dc12b874 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Jzcksq/jzckInfo.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue index bb6a74ed..fa700c76 100644 --- a/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue +++ b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue @@ -105,14 +105,14 @@ export default { showAdd() { this.title = '【新增】货物入库质押' this.$nextTick(() => { - this.$refs['form_obj'].clearValidate() + this.$refs['dataForm'].clearValidate() }) this.formobj.userSid = window.sessionStorage.getItem('userSid') }, showEdit(row) { this.title = '【编辑】货物入库质押' this.$nextTick(() => { - this.$refs['form_obj'].clearValidate() + this.$refs['dataForm'].clearValidate() }) req.fetchDetailsBySid({ sid: row.sid }).then((resp) => { if (resp.success) { diff --git a/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckDaiBan.vue b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckDaiBan.vue new file mode 100644 index 00000000..136e4ad5 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckDaiBan.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckEdit.vue b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckEdit.vue new file mode 100644 index 00000000..6da512b9 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckEdit.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckYiBan.vue b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckYiBan.vue new file mode 100644 index 00000000..597543d4 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckYiBan.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue index 4911c72c..483b9a93 100644 --- a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue @@ -120,7 +120,7 @@ export default { showInfo(sid) { this.title = '【编辑】货物入库质押' this.$nextTick(() => { - this.$refs['form_obj'].clearValidate() + this.$refs['dataForm'].clearValidate() }) req.fetchDetailsBySid({ sid: sid }).then((resp) => { if (resp.success) { From 9677be59f7006bc0d86143a292fe1445c5ab3323 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 22 Nov 2023 16:41:16 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprisecentre/api/paymentapply/PaymentApplyDto.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/paymentapply/PaymentApplyDto.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/paymentapply/PaymentApplyDto.java index 5c15f513..5cba7cce 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/paymentapply/PaymentApplyDto.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/paymentapply/PaymentApplyDto.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** @@ -32,5 +33,5 @@ public class PaymentApplyDto { @ApiModelProperty("用款金额") private String money; @ApiModelProperty("回款凭证") - private List voucherUrlList; + private List voucherUrlList = new ArrayList<>(); } From f3631a6caa0c94afe457e62cdf4b1d3fa9709b3f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 17:28:55 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-enterprise-ui/src/api/Yksq/yksq.js | 113 ++++++ .../src/layout/components/Sidebar/index.vue | 4 +- .../src/router/modules/codemenu.js | 31 +- .../src/views/Yksq/index.vue | 320 +++++++++++++++ .../src/views/Yksq/ykAdd.vue | 215 ++++++++++ .../src/views/Yksq/ykInfo.vue | 163 ++++++++ .../views/workFlow/yongkuanFlow/ykDaiBan.vue | 366 ++++++++++++++++++ .../views/workFlow/yongkuanFlow/ykEdit.vue | 229 +++++++++++ .../views/workFlow/yongkuanFlow/ykYiBan.vue | 215 ++++++++++ 9 files changed, 1649 insertions(+), 7 deletions(-) create mode 100644 supervise-enterprise-ui/src/api/Yksq/yksq.js create mode 100644 supervise-enterprise-ui/src/views/Yksq/index.vue create mode 100644 supervise-enterprise-ui/src/views/Yksq/ykAdd.vue create mode 100644 supervise-enterprise-ui/src/views/Yksq/ykInfo.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykDaiBan.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykEdit.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykYiBan.vue diff --git a/supervise-enterprise-ui/src/api/Yksq/yksq.js b/supervise-enterprise-ui/src/api/Yksq/yksq.js new file mode 100644 index 00000000..2877b335 --- /dev/null +++ b/supervise-enterprise-ui/src/api/Yksq/yksq.js @@ -0,0 +1,113 @@ +import request from '@/utils/request' +// 入库导入的记录 /enterprisecentre +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/listPage', + method: 'post', + data: params + }) + }, + // 提交列表 + sealrecordSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/submit ', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 保存列表 + sealrecordSave: function(data) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/saveorUpdate', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 根据SID获取一条记录 + fetchDetailsBySid: function(data) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/details', + method: 'get', + params: data + }) + }, + // 流程历史流转记录 + flowRecord: function(procInsId, deployId) { + return request({ + url: '/enterprisecentre/v1/sealrecord/task/flowRecord/' + procInsId + '/' + deployId, + method: 'get' + }) + }, + // 根据SID获取一条记录 + delBySids: function(data) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/delete', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 办理待办 + complete: function(data) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/complete', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（驳回） + reject: function(params) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（终止） + breakProcess: function(params) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（撤回） + revokeProcess: function(params) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程（同意）获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程（驳回）获取下一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/enterprisecentre/v1/PaymentApply/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue index 5052305d..b22a8e25 100644 --- a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue @@ -61,8 +61,8 @@ icon: "el-icon-menu", title: "用款申请", }, - name: "/NewList/needMoney", - path: "/NewList/needMoney" + name: "/Yksq/index", + path: "/Yksq/index" }, { alwaysShow: true, diff --git a/supervise-enterprise-ui/src/router/modules/codemenu.js b/supervise-enterprise-ui/src/router/modules/codemenu.js index dee6d7f2..bd3268cf 100644 --- a/supervise-enterprise-ui/src/router/modules/codemenu.js +++ b/supervise-enterprise-ui/src/router/modules/codemenu.js @@ -105,15 +105,15 @@ const codemenu = [{ } }] }, { - path: '/NewList', + path: '/Yksq', component: Layout, - redirect: '/NewList/needMoney', + redirect: '/Yksq', children: [{ - path: '/NewList/needMoney', - component: () => import('@/views/NewList/needMoney.vue'), + path: '/Yksq/index', + component: () => import('@/views/Yksq/index.vue'), name: 'needMoney', meta: { - title: '用款申请提交', + title: '用款申请', noCache: true } }] @@ -505,6 +505,27 @@ const codemenu = [{ import('@/views/workFlow/jiezhichukuFlow/jzckEdit.vue'), name: 'jzckEdit' }, + // 用款申请待办详情 + { + path: '/yongkuanFlow/ykDaiBan', + component: () => + import('@/views/workFlow/yongkuanFlow/ykDaiBan.vue'), + name: 'ykDaiBan' + }, + // 用款申请已办详情 + { + path: '/yongkuanFlow/ykYiBan', + component: () => + import('@/views/workFlow/yongkuanFlow/ykYiBan.vue'), + name: 'ykYiBan' + }, + // 用款申请的编辑 + { + path: '/yongkuanFlow/ykEdit', + component: () => + import('@/views/workFlow/yongkuanFlow/ykEdit.vue'), + name: 'ykEdit' + }, ] export default codemenu diff --git a/supervise-enterprise-ui/src/views/Yksq/index.vue b/supervise-enterprise-ui/src/views/Yksq/index.vue new file mode 100644 index 00000000..4a6b000f --- /dev/null +++ b/supervise-enterprise-ui/src/views/Yksq/index.vue @@ -0,0 +1,320 @@ + + + + diff --git a/supervise-enterprise-ui/src/views/Yksq/ykAdd.vue b/supervise-enterprise-ui/src/views/Yksq/ykAdd.vue new file mode 100644 index 00000000..537c1974 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Yksq/ykAdd.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/Yksq/ykInfo.vue b/supervise-enterprise-ui/src/views/Yksq/ykInfo.vue new file mode 100644 index 00000000..67e03d53 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Yksq/ykInfo.vue @@ -0,0 +1,163 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykDaiBan.vue b/supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykDaiBan.vue new file mode 100644 index 00000000..edd6e44a --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykDaiBan.vue @@ -0,0 +1,366 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykEdit.vue b/supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykEdit.vue new file mode 100644 index 00000000..1df86202 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykEdit.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykYiBan.vue b/supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykYiBan.vue new file mode 100644 index 00000000..d3a8aaf1 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/yongkuanFlow/ykYiBan.vue @@ -0,0 +1,215 @@ + + + + + From 5dc4f1d97a6123884657787241cbda7b77665c1b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 22 Nov 2023 17:40:25 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{PaymentApplyMappper.java => PaymentApplyMapper.java} | 2 +- .../{PaymentApplyMappper.xml => PaymentApplyMapper.xml} | 2 +- .../enterprisecentre/biz/paymentapply/PaymentApplyService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/{PaymentApplyMappper.java => PaymentApplyMapper.java} (93%) rename yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/{PaymentApplyMappper.xml => PaymentApplyMapper.xml} (98%) diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMapper.java similarity index 93% rename from yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.java rename to yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMapper.java index bdf9479e..6ee7ded7 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMapper.java @@ -18,7 +18,7 @@ import java.util.Map; * @date: 2023/11/22 **/ @Mapper -public interface PaymentApplyMappper extends BaseMapper { +public interface PaymentApplyMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); PaymentApplyDetailsVo details(String sid); diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.xml b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMapper.xml similarity index 98% rename from yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.xml rename to yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMapper.xml index 77ec4234..5fbafa35 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.xml +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMapper.xml @@ -1,6 +1,6 @@ - + + - SELECT * FROM process_comment ${ew.sqlSegment} - SELECT * FROM process_comment ${ew.sqlSegment} - select * from process_comment where processId=#{processId} - + insert into `process_comment` ( `sid`, `reviewer`, `reviewerSid`, `time`, `content`, `processId`, `processInstSid`) values(#{sid},#{reviewer},#{reviewerSid},#{time},#{content},#{processId},#{processInstSid}); diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentRest.java similarity index 97% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentRest.java index cb660f5d..97bd4e28 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentRest.java @@ -23,12 +23,13 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.biz.processcomment; +package com.yxt.supervise.flowable.biz.processcomment; import com.yxt.anrui.flowable.api.processcomment.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.flowable.api.processcomment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +37,6 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.List; -import java.util.UUID; /** * Project: processcomment(流程评论)
diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentService.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentService.java index 7527bdc5..b31bbee4 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentService.java @@ -23,15 +23,15 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.biz.processcomment; +package com.yxt.supervise.flowable.biz.processcomment; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.flowable.api.flowtask.AppUserVo; -import com.yxt.anrui.flowable.api.flowtask.TaskUserInfo; +import com.yxt.supervise.flowable.api.flowtask.AppUserVo; import com.yxt.anrui.flowable.api.processcomment.*; import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.supervise.flowable.api.processcomment.*; import com.yxt.supervise.system.sysuser.SysUserFeign; import com.yxt.supervise.system.sysuser.SysUserVo; import org.apache.commons.lang3.StringUtils; @@ -44,7 +44,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/service/impl/FlowTaskServiceImpl.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/service/impl/FlowTaskServiceImpl.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/service/impl/FlowTaskServiceImpl.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/service/impl/FlowTaskServiceImpl.java index acec5b60..7869fcd5 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/service/impl/FlowTaskServiceImpl.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/service/impl/FlowTaskServiceImpl.java @@ -1,16 +1,16 @@ -package com.yxt.anrui.flowable.biz.service.impl; +package com.yxt.supervise.flowable.biz.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; -import com.yxt.anrui.flowable.api.flowcomment.FlowCommentDto; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskDto; -import com.yxt.anrui.flowable.api.flowtask.CompleteTaskQuery; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskQuery; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskQueryOne; -import com.yxt.anrui.flowable.api.flowcomment.FlowComment; -import com.yxt.anrui.flowable.factory.FlowServiceFactory; -import com.yxt.anrui.flowable.test.StartProcessInstanceQuery; -import com.yxt.anrui.flowable.utils.FlowableUtils; +import com.yxt.supervise.flowable.api.flowcomment.FlowCommentDto; +import com.yxt.supervise.flowable.api.flowtask.FlowTaskDto; +import com.yxt.supervise.flowable.api.flowtask.CompleteTaskQuery; +import com.yxt.supervise.flowable.api.flowtask.FlowTaskQuery; +import com.yxt.supervise.flowable.api.flowtask.FlowTaskQueryOne; +import com.yxt.supervise.flowable.api.flowcomment.FlowComment; +import com.yxt.supervise.flowable.factory.FlowServiceFactory; +import com.yxt.supervise.flowable.test.StartProcessInstanceQuery; +import com.yxt.supervise.flowable.utils.FlowableUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.system.sysuser.SysUserFeign; @@ -44,7 +44,7 @@ import java.util.*; * @description */ @Service -public class FlowTaskServiceImpl extends FlowServiceFactory { +public class FlowTaskServiceImpl extends FlowServiceFactory { @Autowired private SysUserFeign sysUserFeign; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.java similarity index 90% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.java index 4a4a0db9..6dc469ff 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.sysdeployform; +package com.yxt.supervise.flowable.biz.sysdeployform; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysdeployform.SysDeployForm; +import com.yxt.supervise.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysdeployform.SysDeployForm; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.xml similarity index 79% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.xml index b4748b5c..2ebc7a93 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, form_id, deploy_id from sys_deploy_form - and form_id = #{formId} @@ -27,12 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - select t1.form_content as formContent,t1.form_name as formName,t1.id as id from sys_form t1 left join sys_deploy_form t2 on t1.id = t2.form_id where t2.deploy_id = #{deployId} - + insert into sys_deploy_form form_id, @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_deploy_form form_id = #{formId}, diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormService.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormService.java index ce7b85fb..1f1a3266 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormService.java @@ -1,7 +1,7 @@ -package com.yxt.anrui.flowable.biz.sysdeployform; +package com.yxt.supervise.flowable.biz.sysdeployform; -import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysdeployform.SysDeployForm; +import com.yxt.supervise.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysdeployform.SysDeployForm; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormController.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormController.java similarity index 87% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormController.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormController.java index a9fa16b6..cdc0741c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormController.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormController.java @@ -1,13 +1,13 @@ -package com.yxt.anrui.flowable.biz.sysform; +package com.yxt.supervise.flowable.biz.sysform; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.flowable.api.sysform.SysFormFeign; -import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysform.SysFormQuery; -import com.yxt.anrui.flowable.api.sysdeployform.SysDeployForm; -import com.yxt.anrui.flowable.api.sysform.SysFormVo; -import com.yxt.anrui.flowable.biz.sysdeployform.SysDeployFormService; +import com.yxt.supervise.flowable.api.sysform.SysFormFeign; +import com.yxt.supervise.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysform.SysFormQuery; +import com.yxt.supervise.flowable.api.sysdeployform.SysDeployForm; +import com.yxt.supervise.flowable.api.sysform.SysFormVo; +import com.yxt.supervise.flowable.biz.sysdeployform.SysDeployFormService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.java index 7a33ad96..d28557bf 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.java @@ -1,12 +1,12 @@ -package com.yxt.anrui.flowable.biz.sysform; +package com.yxt.supervise.flowable.biz.sysform; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysform.SysFormVo; +import com.yxt.supervise.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysform.SysFormVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.xml similarity index 77% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.xml index cce1e070..a935520e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.xml @@ -1,7 +1,7 @@ - - select id as formId, form_name as formName, form_content as formContent from sys_form @@ -10,7 +10,7 @@ select count(*) as total from sys_form - + insert into sys_form form_name, @@ -27,7 +27,7 @@ #{formId} - select id as formId, form_name as formName, form_content as formContent, remark as remarks from sys_form where id = #{formId} diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormService.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormService.java index a16ee00a..fde2487e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormService.java @@ -1,11 +1,11 @@ -package com.yxt.anrui.flowable.biz.sysform; +package com.yxt.supervise.flowable.biz.sysform; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysform.SysFormQuery; -import com.yxt.anrui.flowable.api.sysform.SysFormVo; +import com.yxt.supervise.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysform.SysFormQuery; +import com.yxt.supervise.flowable.api.sysform.SysFormVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import org.apache.commons.lang3.StringUtils; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.java similarity index 85% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.java index 59c3a25c..4a8b466e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.sysformlink; +package com.yxt.supervise.flowable.biz.sysformlink; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLink; -import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; +import com.yxt.supervise.flowable.api.sysformlink.SysFormLink; +import com.yxt.supervise.flowable.api.sysformlink.SysFormStateVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.xml similarity index 78% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.xml index 96301335..87f5cad2 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.xml @@ -1,7 +1,7 @@ - - + + insert into sys_form_link(sid, businessSid, procInsId, taskDefKey, nodeState, flowState, formType) values (#{sid},#{businessSid},#{procInsId},#{taskDefKey},#{nodeState},#{flowState},#{formType}) diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkRest.java similarity index 86% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkRest.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkRest.java index 765cfa75..9a51d7ac 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkRest.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkRest.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.sysformlink; +package com.yxt.supervise.flowable.biz.sysformlink; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; -import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; +import com.yxt.supervise.flowable.api.sysformlink.SysFormLinkDto; +import com.yxt.supervise.flowable.api.sysformlink.SysFormLinkFeign; +import com.yxt.supervise.flowable.api.sysformlink.SysFormStateVo; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkService.java similarity index 90% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkService.java index 7aeff439..93483e22 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkService.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.sysformlink; +package com.yxt.supervise.flowable.biz.sysformlink; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLink; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; -import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; +import com.yxt.supervise.flowable.api.sysformlink.SysFormLink; +import com.yxt.supervise.flowable.api.sysformlink.SysFormLinkDto; +import com.yxt.supervise.flowable.api.sysformlink.SysFormStateVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlController.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlController.java index 839eb5b5..fce99932 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlController.java @@ -1,14 +1,15 @@ -package com.yxt.anrui.flowable.biz.sysprourl; +package com.yxt.supervise.flowable.biz.sysprourl; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.flowable.api.sysdeployform.SysDeployForm; -import com.yxt.anrui.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysdeployform.SysDeployForm; +import com.yxt.supervise.flowable.api.sysform.SysForm; import com.yxt.anrui.flowable.api.sysprourl.*; -import com.yxt.anrui.flowable.biz.sysdeployform.SysDeployFormService; +import com.yxt.supervise.flowable.biz.sysdeployform.SysDeployFormService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.flowable.api.sysprourl.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.java similarity index 91% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.java index 8574a668..e12f7f49 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.java @@ -1,13 +1,13 @@ -package com.yxt.anrui.flowable.biz.sysprourl; +package com.yxt.supervise.flowable.biz.sysprourl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrl; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrlQuery; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; +import com.yxt.supervise.flowable.api.sysprourl.SysProUrl; +import com.yxt.supervise.flowable.api.sysprourl.SysProUrlQuery; +import com.yxt.supervise.flowable.api.sysprourl.SysProUrlVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.xml similarity index 83% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.xml index 4e14b1d8..744165ea 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.xml @@ -1,7 +1,7 @@ - - select id as id, url as url, type as type, terminal as terminal, formId as formId, title as title from sys_pro_url @@ -9,7 +9,7 @@ select count(*) as total from sys_pro_url - insert into sys_pro_url @@ -81,13 +81,13 @@ - SELECT url, type, terminal, @@ -102,8 +102,8 @@ ORDER BY terminal DESC, id ASC - SELECT url, modulePluginName FROM sys_pro_url WHERE proc_def_id = #{proc_def_id} @@ -112,7 +112,7 @@ AND taskDefKey = #{taskDefKey} - select * from sys_pro_url where proc_def_id = #{procDefId} diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlService.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlService.java index d87517e9..88d60645 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlService.java @@ -1,7 +1,6 @@ -package com.yxt.anrui.flowable.biz.sysprourl; +package com.yxt.supervise.flowable.biz.sysprourl; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -9,10 +8,10 @@ import com.yxt.anrui.flowable.api.sysprourl.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.flowable.api.sysprourl.*; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.List; /** diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.java index a52a4224..5ce04376 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.systaskform; +package com.yxt.supervise.flowable.biz.systaskform; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yxt.anrui.flowable.api.sysform.SysTaskForm; +import com.yxt.supervise.flowable.api.sysform.SysTaskForm; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.xml similarity index 77% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.xml index 0302700c..f4569271 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, form_id, task_id from sys_task_form - and form_id = #{formId} @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into sys_task_form form_id, @@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_task_form form_id = #{formId}, diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/EnumResultBean.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/EnumResultBean.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/EnumResultBean.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/EnumResultBean.java index c9e75f63..882464d8 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/EnumResultBean.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/EnumResultBean.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.common; +package com.yxt.supervise.flowable.common; import com.yxt.common.core.constant.HttpStatus; import com.yxt.common.core.result.ResultBean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/ProcessConstants.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/ProcessConstants.java similarity index 97% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/ProcessConstants.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/ProcessConstants.java index a541c73b..756ed499 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/ProcessConstants.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/ProcessConstants.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.common; +package com.yxt.supervise.flowable.common; /** * @author dimengzhe diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramCanvasExt.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramCanvasExt.java similarity index 99% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramCanvasExt.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramCanvasExt.java index 79552fdb..10788046 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramCanvasExt.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramCanvasExt.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import org.flowable.bpmn.model.AssociationDirection; import org.flowable.bpmn.model.GraphicInfo; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramGeneratorExt.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramGeneratorExt.java similarity index 99% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramGeneratorExt.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramGeneratorExt.java index da79a3ea..2c78c809 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramGeneratorExt.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramGeneratorExt.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import org.flowable.bpmn.model.*; import org.flowable.bpmn.model.Process; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DiRemoteAccountResource.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DiRemoteAccountResource.java similarity index 97% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DiRemoteAccountResource.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DiRemoteAccountResource.java index 2f3d4910..91a0376a 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DiRemoteAccountResource.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DiRemoteAccountResource.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import org.flowable.idm.engine.impl.persistence.entity.UserEntityImpl; import org.flowable.ui.common.model.UserRepresentation; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableConfig.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/FlowableConfig.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableConfig.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/FlowableConfig.java index 54215cdd..ed7f381a 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableConfig.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/FlowableConfig.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import org.flowable.spring.SpringProcessEngineConfiguration; import org.flowable.spring.boot.EngineConfigurationConfigurer; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/P6spySqlFormatConfig.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/P6spySqlFormatConfig.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/P6spySqlFormatConfig.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/P6spySqlFormatConfig.java index bae30c1c..b332ce80 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/P6spySqlFormatConfig.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/P6spySqlFormatConfig.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import com.p6spy.engine.spy.appender.MessageFormattingStrategy; import com.yxt.common.base.utils.DateUtils; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/ProcessEngineConfig.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/ProcessEngineConfig.java similarity index 99% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/ProcessEngineConfig.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/ProcessEngineConfig.java index 49ca8bdb..e3d4ca03 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/ProcessEngineConfig.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/ProcessEngineConfig.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import liquibase.Liquibase; import liquibase.database.Database; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/Swagger2Config.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/Swagger2Config.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/Swagger2Config.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/Swagger2Config.java index b9d42153..2fac462c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/Swagger2Config.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/Swagger2Config.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import org.springframework.context.annotation.Bean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/exception/CustomException.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/exception/CustomException.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/exception/CustomException.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/exception/CustomException.java index 3ca7810a..d0fe616d 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/exception/CustomException.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/exception/CustomException.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.exception; +package com.yxt.supervise.flowable.exception; /** * 自定义异常 diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/factory/FlowServiceFactory.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/factory/FlowServiceFactory.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/factory/FlowServiceFactory.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/factory/FlowServiceFactory.java index 7bfc8a4c..291a5b80 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/factory/FlowServiceFactory.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/factory/FlowServiceFactory.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.factory; +package com.yxt.supervise.flowable.factory; import org.flowable.engine.*; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/BaseVehicleExecutionListener.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/BaseVehicleExecutionListener.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/BaseVehicleExecutionListener.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/BaseVehicleExecutionListener.java index 9d7494a2..2e4747d6 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/BaseVehicleExecutionListener.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/BaseVehicleExecutionListener.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.listener; +package com.yxt.supervise.flowable.listener; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerEndExecutionListener.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerEndExecutionListener.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerEndExecutionListener.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerEndExecutionListener.java index b8d567bc..4eee0729 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerEndExecutionListener.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerEndExecutionListener.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.listener; +package com.yxt.supervise.flowable.listener; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerTaskListener.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerTaskListener.java similarity index 89% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerTaskListener.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerTaskListener.java index 21426e9e..d367ac42 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerTaskListener.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerTaskListener.java @@ -1,22 +1,14 @@ -package com.yxt.anrui.flowable.listener; +package com.yxt.supervise.flowable.listener; import com.alibaba.fastjson.JSONObject; -import com.yxt.common.base.utils.JPushServer; -import com.yxt.common.core.result.ResultBean; //import com.yxt.supervise.system.sysuserrole.SysUserRoleFeign; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.identitylink.api.IdentityLink; import org.flowable.task.service.delegate.DelegateTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.kafka.core.KafkaTemplate; -import org.springframework.kafka.support.SendResult; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; -import org.springframework.util.concurrent.ListenableFuture; -import org.springframework.util.concurrent.ListenableFutureCallback; import javax.annotation.PostConstruct; import java.util.List; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskParam.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskParam.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskParam.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskParam.java index 0d8e1a1f..37eb1341 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskParam.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskParam.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.sqloperationsymbol; +package com.yxt.supervise.flowable.sqloperationsymbol; import lombok.Data; /** diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskQuery.java similarity index 91% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskQuery.java index 95b717cf..775030de 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.sqloperationsymbol; +package com.yxt.supervise.flowable.sqloperationsymbol; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessVariables.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessVariables.java index 811bb993..2650de6d 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessVariables.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.sqloperationsymbol; +package com.yxt.supervise.flowable.sqloperationsymbol; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/SQLOperationSymbol.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/SQLOperationSymbol.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/SQLOperationSymbol.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/SQLOperationSymbol.java index 05b3275d..5da9e5db 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/SQLOperationSymbol.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/SQLOperationSymbol.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.sqloperationsymbol; +package com.yxt.supervise.flowable.sqloperationsymbol; /** * sql语句运算符号，“=”，“like”,"in",">","<" diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/FlowCommentVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/FlowCommentVo.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/FlowCommentVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/FlowCommentVo.java index 7c4494f9..efe296a4 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/FlowCommentVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/FlowCommentVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.test; +package com.yxt.supervise.flowable.test; import com.yxt.common.core.vo.Vo; import lombok.Builder; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayTestApi.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayTestApi.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayTestApi.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayTestApi.java index b56c9396..e0ea6ca8 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayTestApi.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayTestApi.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.test; +package com.yxt.supervise.flowable.test; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayVo.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayVo.java index e0fc4f0b..96236687 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.test; +package com.yxt.supervise.flowable.test; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/StartProcessInstanceQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/StartProcessInstanceQuery.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/StartProcessInstanceQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/StartProcessInstanceQuery.java index 55cc4d84..0b54bc89 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/StartProcessInstanceQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/StartProcessInstanceQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.test; +package com.yxt.supervise.flowable.test; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/HolidayTestController.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/HolidayTestController.java similarity index 86% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/HolidayTestController.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/HolidayTestController.java index de92b4bc..98f7756e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/HolidayTestController.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/HolidayTestController.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.test.controller; +package com.yxt.supervise.flowable.test.controller; -import com.yxt.anrui.flowable.test.HolidayTestApi; -import com.yxt.anrui.flowable.test.HolidayVo; -import com.yxt.anrui.flowable.test.service.IHolidayTestService; +import com.yxt.supervise.flowable.test.HolidayTestApi; +import com.yxt.supervise.flowable.test.HolidayVo; +import com.yxt.supervise.flowable.test.service.IHolidayTestService; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/TestController.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/TestController.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/TestController.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/TestController.java index d068cea3..5e50f876 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/TestController.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/TestController.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.test.controller; +package com.yxt.supervise.flowable.test.controller; import org.flowable.engine.ProcessEngine; import org.flowable.engine.ProcessEngineConfiguration; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/IHolidayTestService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/IHolidayTestService.java similarity index 87% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/IHolidayTestService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/IHolidayTestService.java index 22586bf5..4445d8cb 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/IHolidayTestService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/IHolidayTestService.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.test.service; +package com.yxt.supervise.flowable.test.service; -import com.yxt.anrui.flowable.test.HolidayVo; +import com.yxt.supervise.flowable.test.HolidayVo; import javax.servlet.http.HttpServletResponse; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/impl/HolidayTestService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/impl/HolidayTestService.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/impl/HolidayTestService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/impl/HolidayTestService.java index 6fb6aef6..e6c6f502 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/impl/HolidayTestService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/impl/HolidayTestService.java @@ -1,10 +1,10 @@ -package com.yxt.anrui.flowable.test.service.impl; +package com.yxt.supervise.flowable.test.service.impl; -import com.yxt.anrui.flowable.CodeMsgEnum; -import com.yxt.anrui.flowable.config.DefaultProcessDiagramGeneratorExt; -import com.yxt.anrui.flowable.factory.FlowServiceFactory; -import com.yxt.anrui.flowable.test.HolidayVo; -import com.yxt.anrui.flowable.test.service.IHolidayTestService; +import com.yxt.supervise.flowable.CodeMsgEnum; +import com.yxt.supervise.flowable.config.DefaultProcessDiagramGeneratorExt; +import com.yxt.supervise.flowable.factory.FlowServiceFactory; +import com.yxt.supervise.flowable.test.HolidayVo; +import com.yxt.supervise.flowable.test.service.IHolidayTestService; import com.yxt.common.core.result.ResultBean; import org.apache.commons.io.IOUtils; import org.flowable.bpmn.model.BpmnModel; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/utils/FlowableUtils.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/utils/FlowableUtils.java similarity index 99% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/utils/FlowableUtils.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/utils/FlowableUtils.java index f8feca25..e9434882 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/utils/FlowableUtils.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/utils/FlowableUtils.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.utils; +package com.yxt.supervise.flowable.utils; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.*; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/spy.properties b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/spy.properties index c6b06891..410b499c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/spy.properties +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/spy.properties @@ -1,7 +1,7 @@ # 自带的日志格式 (default is com.p6spy.engine.spy.appender.FileLogger) appender=com.p6spy.engine.spy.appender.Slf4JLogger # 自定义日志打印 -logMessageFormat=com.yxt.anrui.flowable.config.P6spySqlFormatConfig +logMessageFormat=com.yxt.supervise.flowable.config.P6spySqlFormatConfig # 是否开启慢SQL记录 outagedetection=true # 慢SQL记录标准 秒