From dcb7f9012f66ab7ec2dc8fce1179976e608942a7 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 23 Oct 2024 11:00:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?=
=?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9--=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=B0=83=E6=95=B4=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bicyclerebatecheckAdd.vue | 24 +++++++++++++++++--
.../bicyclerebatecheckInfo.vue | 16 +++++++++++--
.../bicyclerebatemanagementInfo.vue | 15 ++++++++++--
.../danchefanliheduiDaiBanInfo.vue | 16 +++++++++++--
.../danchefanliheduiEdit.vue | 24 +++++++++++++++++--
.../danchefanliheduiYiBanInfo.vue | 16 +++++++++++--
6 files changed, 99 insertions(+), 12 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
index 70d6f7985c..56e0e1656d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
@@ -42,7 +42,8 @@
-
+
+
查看
@@ -59,7 +60,8 @@
-
+
+
查看
@@ -214,6 +216,7 @@ export default {
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+ this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid)
v = 1
break
@@ -233,6 +236,7 @@ export default {
stayDetermineMoney: e.stayDetermineMoney,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
+ fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@@ -251,6 +255,7 @@ export default {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+ this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid)
k = 1
break
@@ -268,6 +273,7 @@ export default {
stayDetermineMoney: s.stayDetermineMoney,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
+ fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''
@@ -307,6 +313,7 @@ export default {
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+ this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid)
v = 1
break
@@ -326,6 +333,7 @@ export default {
stayDetermineMoney: e.stayDetermineMoney,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
+ fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@@ -344,6 +352,7 @@ export default {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+ this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid)
k = 1
break
@@ -361,6 +370,7 @@ export default {
stayDetermineMoney: s.stayDetermineMoney,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
+ fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''
@@ -489,6 +499,16 @@ export default {
}
}, 0)
sums[index] += ''
+ } else if (column.property === 'fyAdjustmentMoney') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] += ''
}
})
return sums
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
index 7a4b493496..205af89268 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
@@ -31,7 +31,8 @@
-
+
+
查看
@@ -48,7 +49,8 @@
-
+
+
查看
@@ -194,6 +196,16 @@ export default {
}
}, 0)
sums[index] += ''
+ } else if (column.property === 'fyAdjustmentMoney') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] += ''
}
})
return sums
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
index 1ef44f130c..7d364ed578 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
@@ -156,7 +156,7 @@
调整说明
- 差异金额
+ 返利差异金额
{{ formobj.diffAmount }}
@@ -164,10 +164,21 @@
{{ formobj.isAdjustment }}
- 调整金额
+ 返利调整金额
{{ formobj.adjustmentMoney }}
+
+
+ 待支付费用调整金额
+ {{ formobj.treatAdjustmentMoney }}
+
+
+ 抵顶费用调整金额
+ {{ formobj.suppAdjustmentMoney }}
+
+
+
调整说明
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
index ad8c243c88..1dd0098b89 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
@@ -33,7 +33,8 @@
-
+
+
查看
@@ -50,7 +51,8 @@
-
+
+
查看
@@ -267,6 +269,16 @@ export default {
}
}, 0)
sums[index] += ''
+ } else if (column.property === 'fyAdjustmentMoney') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] += ''
}
})
return sums
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
index 6fe2cbeb8f..f32263c5d3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
@@ -41,7 +41,8 @@
-
+
+
查看
@@ -58,7 +59,8 @@
-
+
+
查看
@@ -209,6 +211,7 @@ export default {
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+ this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid)
v = 1
break
@@ -228,6 +231,7 @@ export default {
stayDetermineMoney: e.stayDetermineMoney,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
+ fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@@ -246,6 +250,7 @@ export default {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+ this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid)
k = 1
break
@@ -263,6 +268,7 @@ export default {
stayDetermineMoney: s.stayDetermineMoney,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
+ fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''
@@ -302,6 +308,7 @@ export default {
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+ this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid)
v = 1
break
@@ -321,6 +328,7 @@ export default {
stayDetermineMoney: e.stayDetermineMoney,
adjustmentMoney: e.adjustmentMoney,
money: e.money,
+ fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
vehRebateSids: [e.sid],
sid: '',
mainSid: ''
@@ -339,6 +347,7 @@ export default {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+ this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid)
k = 1
break
@@ -356,6 +365,7 @@ export default {
stayDetermineMoney: s.stayDetermineMoney,
adjustmentMoney: s.adjustmentMoney,
money: s.money,
+ fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
vehRebateSids: [s.sid],
sid: '',
mainSid: ''
@@ -447,6 +457,16 @@ export default {
}
}, 0)
sums[index] += ''
+ } else if (column.property === 'fyAdjustmentMoney') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] += ''
}
})
return sums
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
index c10ccf6224..e145ee90cc 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
@@ -31,7 +31,8 @@
-
+
+
查看
@@ -48,7 +49,8 @@
-
+
+
查看
@@ -230,6 +232,16 @@ export default {
}
}, 0)
sums[index] += ''
+ } else if (column.property === 'fyAdjustmentMoney') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] += ''
}
})
return sums
From 494e74f04815952aacb7ef4593e3291f8100465f Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 23 Oct 2024 17:55:20 +0800
Subject: [PATCH 2/2] 1
---
.../ScmStandRecordApplyFeign.java | 77 ---
.../ScmStandRecordApplyMapper.xml | 11 -
.../ScmStandRecordApplyRest.java | 92 ---
.../ScmStandRecordApplyService.java | 210 ------
.../AsStandRecordApply.java | 14 +-
.../AsStandRecordApplyDetailsVo.java | 20 +-
.../AsStandRecordApplyDto.java | 20 +-
.../AsStandRecordApplyQuery.java | 7 +-
.../AsStandRecordApplyUrl.java | 9 +-
.../AsStandRecordApplyVo.java | 10 +-
.../flowable/CompleteStandRecordApplyDto.java | 35 +
.../StandRecordApplyDelegateQuery.java | 23 +
.../flowable/StandRecordApplyNodeQuery.java | 18 +
.../flowable/StandRecordApplyNodeVo.java | 24 +
.../flowable/StandRecordApplyTaskQuery.java | 43 ++
.../flowable/SubmitStandRecordApplyDto.java | 19 +
.../as/biz/asappendix/AsAppendixMapper.java | 3 +
.../as/biz/asappendix/AsAppendixService.java | 70 +-
.../AsStandRecordApplyMapper.java | 34 +-
.../AsStandRecordApplyMapper.xml | 44 ++
.../AsStandRecordApplyRest.java | 139 ++++
.../AsStandRecordApplyService.java | 653 ++++++++++++++++++
.../yxt/anrui/as/feign/file/AsFileEnum.java | 3 +
.../as/feign/flowable/flow/ProcDefEnum.java | 1 +
24 files changed, 1088 insertions(+), 491 deletions(-)
delete mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyFeign.java
delete mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyMapper.xml
delete mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyRest.java
delete mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyService.java
rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApply.java => yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApply.java (96%)
rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyDetailsVo.java => yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDetailsVo.java (93%)
rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyDto.java => yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDto.java (91%)
rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyQuery.java => yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyQuery.java (94%)
rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyUrl.java => yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyUrl.java (85%)
rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyVo.java => yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyVo.java (97%)
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/CompleteStandRecordApplyDto.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyDelegateQuery.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyNodeQuery.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyNodeVo.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyTaskQuery.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/SubmitStandRecordApplyDto.java
rename anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyMapper.java => yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyMapper.java (66%)
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyMapper.xml
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyRest.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyService.java
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyFeign.java
deleted file mode 100644
index 23c0290aa4..0000000000
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyFeign.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.anrui.scm.api.scmstandrecordapply;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * Project: anrui-scm(合作二级站备案申请)
- * File: ScmStandRecordApplyFeign.java
- * Class: com.yxt.anrui.scm.api.scmstandrecordapply.ScmStandRecordApplyFeign
- * Description: 合作二级站备案申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-10-22 16:05:59
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
-@Api(tags = "合作二级站备案申请")
-@FeignClient(
- contextId = "anrui-scm-ScmStandRecordApply",
- name = "anrui-scm",
- path = "v1/scmstandrecordapply")
-public interface ScmStandRecordApplyFeign {
-
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- @ResponseBody
- public ResultBean> listPage(@RequestBody PagerQuery pq);
-
- @ApiOperation("新增或修改")
- @PostMapping("/save")
- @ResponseBody
- public ResultBean save(@RequestBody ScmStandRecordApplyDto dto);
-
- @ApiOperation("根据sid删除记录")
- @DeleteMapping("/delBySids")
- @ResponseBody
- public ResultBean delBySids(@RequestBody String[] sids);
-
- @ApiOperation("根据SID获取一条记录")
- @GetMapping("/fetchDetailsBySid/{sid}")
- @ResponseBody
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
-}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyMapper.xml
deleted file mode 100644
index b509761546..0000000000
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyMapper.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyRest.java
deleted file mode 100644
index ef5e91487e..0000000000
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyRest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.anrui.scm.biz.scmstandrecordapply;
-
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import com.yxt.anrui.scm.api.scmstandrecordapply.ScmStandRecordApply;
-import com.yxt.anrui.scm.api.scmstandrecordapply.ScmStandRecordApplyQuery;
-import com.yxt.anrui.scm.api.scmstandrecordapply.ScmStandRecordApplyVo;
-import com.yxt.anrui.scm.api.scmstandrecordapply.ScmStandRecordApplyDetailsVo;
-import com.yxt.anrui.scm.api.scmstandrecordapply.ScmStandRecordApplyDto;
-import com.yxt.anrui.scm.api.scmstandrecordapply.ScmStandRecordApplyFeign;
-
-/**
- * Project: anrui-scm(合作二级站备案申请)
- * File: ScmStandRecordApplyFeignFallback.java
- * Class: com.yxt.anrui.scm.biz.scmstandrecordapply.ScmStandRecordApplyRest
- * Description: 合作二级站备案申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-10-22 16:05:59
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
-@Api(tags = "合作二级站备案申请")
-@RestController
-@RequestMapping("v1/scmstandrecordapply")
-public class ScmStandRecordApplyRest implements ScmStandRecordApplyFeign {
-
- @Autowired
- private ScmStandRecordApplyService scmStandRecordApplyService;
-
- @Override
- public ResultBean> listPage(@RequestBody PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- PagerVo pv = scmStandRecordApplyService.listPageVo(pq);
- return rb.success().setData(pv);
- }
-
- @Override
- public ResultBean save(@RequestBody ScmStandRecordApplyDto dto){
- ResultBean rb = ResultBean.fireFail();
- scmStandRecordApplyService.saveOrUpdateDto(dto);
- return rb.success();
- }
-
- @Override
- public ResultBean delBySids(@RequestBody String[] sids){
- ResultBean rb = ResultBean.fireFail();
- scmStandRecordApplyService.delBySids(sids);
- return rb.success();
- }
-
- @Override
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- ScmStandRecordApplyDetailsVo vo = scmStandRecordApplyService.fetchDetailsVoBySid(sid);
- return rb.success().setData(vo);
- }
-}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyService.java
deleted file mode 100644
index e4ef46fafa..0000000000
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyService.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.anrui.scm.biz.scmstandrecordapply;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.common.utils.Rule;
-import com.yxt.anrui.flowable.api.flow.FlowableFeign;
-import com.yxt.anrui.flowable.api.flow2.FlowFeign;
-import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.scm.api.scmstandrecordapply.*;
-import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo;
-import org.apache.commons.lang3.StringUtils;
-import com.yxt.common.base.service.MybatisBaseService;
-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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * Project: anrui-scm(合作二级站备案申请)
- * File: ScmStandRecordApplyService.java
- * Class: com.yxt.anrui.scm.biz.scmstandrecordapply.ScmStandRecordApplyService
- * Description: 合作二级站备案申请 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-10-22 16:05:59
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
-@Service
-public class ScmStandRecordApplyService extends MybatisBaseService {
-
- @Autowired
- private FlowableFeign flowableFeign;
- @Autowired
- private FlowTaskFeign flowTaskFeign;
- @Autowired
- private SysUserFeign sysUserFeign;
- @Autowired
- private FlowFeign flowFeign;
- @Autowired
- private SysOrganizationFeign sysOrganizationFeign;
-
- public PagerVo listPageVo(PagerQuery pq) {
- ScmStandRecordApplyQuery query = pq.getParams();
- QueryWrapper qw = new QueryWrapper<>();
- //========================================数据授权开始
- if (StringUtils.isNotBlank(query.getMenuUrl())) {
- PrivilegeQuery privilegeQuery = new PrivilegeQuery();
- privilegeQuery.setOrgPath(query.getOrgPath());
- privilegeQuery.setMenuUrl(query.getMenuUrl());
- privilegeQuery.setMenuSid(query.getMenuSid());
- privilegeQuery.setUserSid(query.getUserSid());
- ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
- if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
- //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
- String orgSidPath = query.getOrgPath();
- orgSidPath = orgSidPath + "/";
- int i1 = orgSidPath.indexOf("/");
- int i2 = orgSidPath.indexOf("/", i1 + 1);
- int i3 = orgSidPath.indexOf("/", i2 + 1);
- int i4 = orgSidPath.indexOf("/", i3 + 1);
- String orgLevelKey = defaultIdReltBean.getData();
- if ("1".equals(orgLevelKey)) {
- orgSidPath = orgSidPath.substring(0, i1);
- qw.like("so.orgSidPath", orgSidPath);
- } else if ("2".equals(orgLevelKey)) {
- orgSidPath = orgSidPath.substring(0, i2);
- qw.like("so.orgSidPath", orgSidPath);
- } else if ("3".equals(orgLevelKey)) {
- orgSidPath = orgSidPath.substring(0, i3);
- qw.like("so.orgSidPath", orgSidPath);
- } else if ("4".equals(orgLevelKey)) {
- orgSidPath = orgSidPath.substring(0, i4);
- qw.like("so.orgSidPath", orgSidPath);
- } else if ("5".equals(orgLevelKey)) {
- qw.eq("sa.createBySid", query.getUserSid());
- } else {
- PagerVo p = new PagerVo<>();
- return p;
- }
- } else {
- PagerVo p = new PagerVo<>();
- return p;
- }
- }
- if (StringUtils.isNotBlank(query.getUseOrgName())) {
- qw.eq("sa.useOrgName", query.getUseOrgName());
- }
- if (StringUtils.isNotBlank(query.getDeptName())) {
- qw.like("sa.deptName", query.getDeptName());
- }
- if (StringUtils.isNotBlank(query.getCreateByName())) {
- qw.like("sa.createByName", query.getCreateByName());
- }
- if (StringUtils.isNotBlank(query.getSiteName())) {
- qw.like("sa.siteName", query.getSiteName());
- }
- if (StringUtils.isNotBlank(query.getLegalPerson())) {
- qw.like("sa.legalPerson", query.getLegalPerson());
- }
- String createStartTime = query.getCreateTimeStart();
- String createEndTime = query.getCreateTimeEnd();
- qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (sa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
- apply(StringUtils.isNotBlank(createEndTime), "date_format (sa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
- );
- String finishTimeStart = query.getFinishTimeStart();
- String finishTimeEnd = query.getFinishTimeEnd();
- qw.apply(StringUtils.isNotBlank(finishTimeStart), "date_format (sa.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
- apply(StringUtils.isNotBlank(finishTimeEnd), "date_format (sa.finishTim,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
- );
- String limitedTermStart = query.getLimitedTermStart();
- String limitedTermEnd = query.getLimitedTermEnd();
- qw.apply(StringUtils.isNotBlank(limitedTermStart), "sa.limitedTerm >=" + "'" + limitedTermStart + "'").
- apply(StringUtils.isNotBlank(limitedTermEnd), "sa.limitedTerm <=" + "'" + limitedTermEnd + "'");
- IPage page = PagerUtil.queryToPage(pq);
- IPage pagging = baseMapper.selectPageVo(page, qw);
- PagerVo p = PagerUtil.pageToVo(pagging, null);
- return p;
- }
-
- public void saveOrUpdateDto(ScmStandRecordApplyDto dto){
- String dtoSid = dto.getSid();
- SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
- List businessLicenseFile = dto.getBusinessLicenseFile();
- List agreementFile = dto.getAgreementFile();
- List otherFile = dto.getOtherFile();
- if (StringUtils.isBlank(dtoSid)) {
- //生成单据编号
- String billNo = "";
- String date = DateUtil.format(DateUtil.date(), "yyyyMM");
- billNo = "WXJSBA" + organizationVo.getOrgCode() + date;
- /*String i = baseMapper.selectNum(billNo);
- if (StringUtils.isNotBlank(i)) {
- billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
- } else {
- billNo = Rule.getBillNo(billNo, 0);
- }*/
- dto.setBillNo(billNo);
- String sid = this.insertByDto(dto);
- for (ScmStandRecordApplyUrl scmStandRecordApplyUrl : businessLicenseFile) {
-
- }
- return;
- }
- this.updateByDto(dto);
- }
-
- public String insertByDto(ScmStandRecordApplyDto dto){
- ScmStandRecordApply entity = new ScmStandRecordApply();
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- entity.setNodeState("待提交");
- baseMapper.insert(entity);
- return entity.getSid();
- }
-
- public void updateByDto(ScmStandRecordApplyDto dto){
- String dtoSid = dto.getSid();
- if (StringUtils.isBlank(dtoSid)) {
- return;
- }
- ScmStandRecordApply entity = fetchBySid(dtoSid);
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.updateById(entity);
- }
-
- public ScmStandRecordApplyDetailsVo fetchDetailsVoBySid(String sid){
- ScmStandRecordApply entity = fetchBySid(sid);
- ScmStandRecordApplyDetailsVo vo = new ScmStandRecordApplyDetailsVo();
- BeanUtil.copyProperties(entity, vo);
- return vo;
- }
-}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApply.java
similarity index 96%
rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApply.java
rename to yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApply.java
index 0f6474525a..085dcfdb0d 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApply.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApply.java
@@ -23,18 +23,18 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.scm.api.scmstandrecordapply;
+package com.yxt.anrui.as.api.asstandrecordapply;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
+import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
/**
* Project: anrui-scm(合作二级站备案申请)
* File: ScmStandRecordApply.java
@@ -50,8 +50,8 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "合作二级站备案申请", description = "合作二级站备案申请")
-@TableName("scm_stand_record_apply")
-public class ScmStandRecordApply extends BaseEntity {
+@TableName("as_stand_record_apply")
+public class AsStandRecordApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人姓名")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDetailsVo.java
similarity index 93%
rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyDetailsVo.java
rename to yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDetailsVo.java
index 8a577645f5..a1f0d25f2f 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDetailsVo.java
@@ -23,22 +23,20 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.scm.api.scmstandrecordapply;
+package com.yxt.anrui.as.api.asstandrecordapply;
-import com.yxt.common.core.vo.Vo;
-
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
/**
* Project: anrui-scm(合作二级站备案申请)
* File: ScmStandRecordApplyVo.java
@@ -54,7 +52,7 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "合作二级站备案申请 视图数据详情", description = "合作二级站备案申请 视图数据详情")
-public class ScmStandRecordApplyDetailsVo implements Vo {
+public class AsStandRecordApplyDetailsVo implements Vo {
private String sid; // sid
@@ -108,9 +106,9 @@ public class ScmStandRecordApplyDetailsVo implements Vo {
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("营业执照")
- private List businessLicenseFile = new ArrayList<>();
+ private List businessLicenseFile = new ArrayList<>();
@ApiModelProperty("合作协议")
- private List agreementFile = new ArrayList<>();
+ private List agreementFile = new ArrayList<>();
@ApiModelProperty("其他资料")
- private List otherFile = new ArrayList<>();
+ private List otherFile = new ArrayList<>();
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDto.java
similarity index 91%
rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyDto.java
rename to yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDto.java
index 78ac8d0b9c..b7e382dc62 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDto.java
@@ -23,22 +23,18 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.scm.api.scmstandrecordapply;
+package com.yxt.anrui.as.api.asstandrecordapply;
import com.yxt.common.core.dto.Dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
/**
* Project: anrui-scm(合作二级站备案申请)
* File: ScmStandRecordApplyDto.java
@@ -54,7 +50,7 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "合作二级站备案申请 数据传输对象", description = "合作二级站备案申请 数据传输对象")
-public class ScmStandRecordApplyDto implements Dto {
+public class AsStandRecordApplyDto implements Dto {
private String sid; // sid
@@ -105,9 +101,9 @@ public class ScmStandRecordApplyDto implements Dto {
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("营业执照")
- private List businessLicenseFile = new ArrayList<>();
+ private List businessLicenseFile = new ArrayList<>();
@ApiModelProperty("合作协议")
- private List agreementFile = new ArrayList<>();
+ private List agreementFile = new ArrayList<>();
@ApiModelProperty("其他资料")
- private List otherFile = new ArrayList<>();
+ private List otherFile = new ArrayList<>();
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyQuery.java
similarity index 94%
rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyQuery.java
rename to yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyQuery.java
index c90fc2bffb..d022633d64 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyQuery.java
@@ -23,13 +23,10 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.scm.api.scmstandrecordapply;
+package com.yxt.anrui.as.api.asstandrecordapply;
import com.yxt.common.core.query.Query;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -49,7 +46,7 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "合作二级站备案申请 查询条件", description = "合作二级站备案申请 查询条件")
-public class ScmStandRecordApplyQuery implements Query {
+public class AsStandRecordApplyQuery implements Query {
@ApiModelProperty("分公司名称")
private String useOrgName;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyUrl.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyUrl.java
similarity index 85%
rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyUrl.java
rename to yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyUrl.java
index 80d189803e..1b7e1155e8 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyUrl.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyUrl.java
@@ -23,18 +23,13 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.scm.api.scmstandrecordapply;
+package com.yxt.anrui.as.api.asstandrecordapply;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
-
@Data
-public class ScmStandRecordApplyUrl implements Vo {
+public class AsStandRecordApplyUrl implements Vo {
private String url;
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyVo.java
similarity index 97%
rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyVo.java
rename to yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyVo.java
index c309e46363..1f59521d80 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmstandrecordapply/ScmStandRecordApplyVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyVo.java
@@ -23,17 +23,17 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.scm.api.scmstandrecordapply;
+package com.yxt.anrui.as.api.asstandrecordapply;
-import com.yxt.common.core.vo.Vo;
-
import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.Date;
+import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* Project: anrui-scm(合作二级站备案申请)
* File: ScmStandRecordApplyVo.java
@@ -49,7 +49,7 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "合作二级站备案申请 视图数据对象", description = "合作二级站备案申请 视图数据对象")
-public class ScmStandRecordApplyVo implements Vo {
+public class AsStandRecordApplyVo implements Vo {
private String sid; // sid
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/CompleteStandRecordApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/CompleteStandRecordApplyDto.java
new file mode 100644
index 0000000000..c34a40ed47
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/CompleteStandRecordApplyDto.java
@@ -0,0 +1,35 @@
+package com.yxt.anrui.as.api.asstandrecordapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class CompleteStandRecordApplyDto {
+
+ @ApiModelProperty(value = "用户sid")
+ @NotBlank(message = "参数错误：userSid")
+ private String userSid;
+ @ApiModelProperty(value = "用户全路径sid")
+ private String orgSidPath;
+ @ApiModelProperty(value = "节点id")
+ @NotBlank(message = "参数错误：taskDefKey")
+ private String taskDefKey;
+ @ApiModelProperty(value = "任务id")
+ @NotBlank(message = "参数错误：taskId")
+ private String taskId;
+ @ApiModelProperty(value = "流程id")
+ @NotBlank(message = "参数错误：instanceId")
+ private String instanceId;
+ @ApiModelProperty(value = "意见")
+ private String comment;
+ @ApiModelProperty(value = "业务sid")
+ @NotBlank(message = "参数错误：businessSid")
+ private String businessSid;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyDelegateQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyDelegateQuery.java
new file mode 100644
index 0000000000..d84f0137cb
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyDelegateQuery.java
@@ -0,0 +1,23 @@
+package com.yxt.anrui.as.api.asstandrecordapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class StandRecordApplyDelegateQuery {
+
+ private String userSid;
+ @ApiModelProperty("流程实例id")
+ private String instanceId;
+ @ApiModelProperty("任务Id")
+ private String taskId;
+ @ApiModelProperty("审批人sid")
+ private String assignee;
+ @ApiModelProperty("填写意见")
+ private String views;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyNodeQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyNodeQuery.java
new file mode 100644
index 0000000000..5200a8ad98
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyNodeQuery.java
@@ -0,0 +1,18 @@
+package com.yxt.anrui.as.api.asstandrecordapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class StandRecordApplyNodeQuery {
+
+ @ApiModelProperty(value = "环节定义id")
+ private String taskDefKey;
+ @ApiModelProperty(value = "业务sid")
+ private String businessSid;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyNodeVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyNodeVo.java
new file mode 100644
index 0000000000..f96d69557a
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyNodeVo.java
@@ -0,0 +1,24 @@
+package com.yxt.anrui.as.api.asstandrecordapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class StandRecordApplyNodeVo {
+
+ @ApiModelProperty(value = "节点名称")
+ private String name;
+ @ApiModelProperty(value = "节点id")
+ private String id;
+ @ApiModelProperty(value = "审批组")
+ private List candidateGroups;
+ @ApiModelProperty(value = "是否是最后环节")
+ private String endTask;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyTaskQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyTaskQuery.java
new file mode 100644
index 0000000000..19e0f4f728
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/StandRecordApplyTaskQuery.java
@@ -0,0 +1,43 @@
+package com.yxt.anrui.as.api.asstandrecordapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class StandRecordApplyTaskQuery {
+
+ /**
+ * 终止、驳回、撤回
+ */
+ @ApiModelProperty("任务Id")
+ @NotBlank(message = "参数错误：taskId")
+ private String taskId;
+ /**
+ * 终止、驳回、撤回
+ */
+ @ApiModelProperty("业务sid")
+ @NotBlank(message = "参数错误：businessSid")
+ private String businessSid;
+ /**
+ * 终止、驳回
+ */
+ @ApiModelProperty("任务意见")
+ private String comment;
+ /**
+ * 终止、撤回、驳回
+ */
+ @ApiModelProperty("用户Sid")
+ private String userSid;
+ /**
+ * 终止
+ */
+ @ApiModelProperty("流程实例Id")
+ private String instanceId;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/SubmitStandRecordApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/SubmitStandRecordApplyDto.java
new file mode 100644
index 0000000000..f7c275a71f
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/flowable/SubmitStandRecordApplyDto.java
@@ -0,0 +1,19 @@
+package com.yxt.anrui.as.api.asstandrecordapply.flowable;
+
+import com.yxt.anrui.as.api.asstandrecordapply.AsStandRecordApplyDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class SubmitStandRecordApplyDto extends AsStandRecordApplyDto {
+
+ @ApiModelProperty("流程实例id")
+ private String instanceId;
+ @ApiModelProperty("任务id")
+ private String taskId;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asappendix/AsAppendixMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asappendix/AsAppendixMapper.java
index 1f4267758c..66eb127528 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asappendix/AsAppendixMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asappendix/AsAppendixMapper.java
@@ -58,4 +58,7 @@ public interface AsAppendixMapper extends BaseMapper {
@Select("select * from as_appendix where linkSid = #{linkSid}")
List fetchByLinkSid(String linkSid);
+
+ @Select("select * from as_appendix where linkSid = #{linkSid} and attachType = #{attachType}")
+ List fetchByLinkSidAndType(@Param("linkSid") String linkSid,@Param("attachType") String attachType);
}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asappendix/AsAppendixService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asappendix/AsAppendixService.java
index 94e20812ff..96c707d2ea 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asappendix/AsAppendixService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asappendix/AsAppendixService.java
@@ -56,44 +56,48 @@ import java.util.List;
*/
@Service
public class AsAppendixService extends MybatisBaseService {
-
- public void saveOrUpdateDto(AsAppendixDto dto){
+
+ public void saveOrUpdateDto(AsAppendixDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
- return;
- }
- this.updateByDto(dto);
- }
-
- public void insertByDto(AsAppendixDto dto){
- AsAppendix entity = new AsAppendix();
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.insert(entity);
- }
-
- public void updateByDto(AsAppendixDto dto){
- String dtoSid = dto.getSid();
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(AsAppendixDto dto) {
+ AsAppendix entity = new AsAppendix();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(AsAppendixDto dto) {
+ String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
- }
- AsAppendix entity = fetchBySid(dtoSid);
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.updateById(entity);
- }
-
- public AsAppendixDetailsVo fetchDetailsVoBySid(String sid){
- AsAppendix entity = fetchBySid(sid);
- AsAppendixDetailsVo vo = new AsAppendixDetailsVo();
- BeanUtil.copyProperties(entity, vo);
- return vo;
- }
+ }
+ AsAppendix entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public AsAppendixDetailsVo fetchDetailsVoBySid(String sid) {
+ AsAppendix entity = fetchBySid(sid);
+ AsAppendixDetailsVo vo = new AsAppendixDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public void delByLinkSid(String dtoSid) {
+ baseMapper.delByLinkSid(dtoSid);
+ }
- public void delByLinkSid(String dtoSid) {
- baseMapper.delByLinkSid(dtoSid);
- }
+ public List fetchByLinkSid(String linkSid) {
+ return baseMapper.fetchByLinkSid(linkSid);
+ }
- public List fetchByLinkSid(String linkSid) {
- return baseMapper.fetchByLinkSid(linkSid);
- }
+ public List fetchByLinkSidAndType(String linkSid, String attachType) {
+ return baseMapper.fetchByLinkSidAndType(linkSid, attachType);
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyMapper.java
similarity index 66%
rename from anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyMapper.java
rename to yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyMapper.java
index deb2fbf7c7..8ef1e06907 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmstandrecordapply/ScmStandRecordApplyMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyMapper.java
@@ -23,35 +23,27 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.scm.biz.scmstandrecordapply;
+package com.yxt.anrui.as.biz.asstandrecordapply;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
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.as.api.asstandrecordapply.AsStandRecordApply;
+import com.yxt.anrui.as.api.asstandrecordapply.AsStandRecordApplyVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.scm.api.scmstandrecordapply.ScmStandRecordApply;
-import com.yxt.anrui.scm.api.scmstandrecordapply.ScmStandRecordApplyVo;
-import java.util.List;
+import java.util.Map;
-/**
- * Project: anrui-scm(合作二级站备案申请)
- * File: ScmStandRecordApplyMapper.java
- * Class: com.yxt.anrui.scm.biz.scmstandrecordapply.ScmStandRecordApplyMapper
- * Description: 合作二级站备案申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-10-22 16:05:59
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Mapper
-public interface ScmStandRecordApplyMapper extends BaseMapper {
+public interface AsStandRecordApplyMapper extends BaseMapper {
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ String selectNum(String billNo);
+
+ int selectBySid(String join);
- IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+ int updateFlowFiled(Map beanToMap);
}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyMapper.xml
new file mode 100644
index 0000000000..d4411ee928
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ UPDATE as_stand_record_apply
+ SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+
+ , finishTime = NOW()
+
+
+ , procDefId=#{procDefId}
+
+
+ , procInstId=#{procInsId}
+
+
+ , taskId=#{taskId}
+
+ WHERE sid=#{sid}
+
+
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyRest.java
new file mode 100644
index 0000000000..9be94ed0e5
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyRest.java
@@ -0,0 +1,139 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asstandrecordapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.as.api.asstandrecordapply.AsStandRecordApplyDetailsVo;
+import com.yxt.anrui.as.api.asstandrecordapply.AsStandRecordApplyDto;
+import com.yxt.anrui.as.api.asstandrecordapply.AsStandRecordApplyQuery;
+import com.yxt.anrui.as.api.asstandrecordapply.AsStandRecordApplyVo;
+import com.yxt.anrui.as.api.asstandrecordapply.flowable.*;
+import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Api(tags = "合作二级站备案申请")
+@RestController
+@RequestMapping("v1/secondaryCooperativeStation")
+public class AsStandRecordApplyRest {
+
+ @Autowired
+ private AsStandRecordApplyService asStandRecordApplyService;
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = asStandRecordApplyService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody AsStandRecordApplyDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ asStandRecordApplyService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids){
+ return asStandRecordApplyService.delByAll(sids);
+ }
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ AsStandRecordApplyDetailsVo vo = asStandRecordApplyService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("提交")
+ @PostMapping("/submit")
+ public ResultBean submit(@Valid @RequestBody SubmitStandRecordApplyDto dto) {
+ return asStandRecordApplyService.submit(dto);
+ }
+
+ @ApiOperation(value = "办理（同意）")
+ @PostMapping("/complete")
+ public ResultBean complete(@Valid @RequestBody CompleteStandRecordApplyDto query) {
+ BusinessVariables bv = new BusinessVariables();
+ BeanUtil.copyProperties(query, bv);
+ bv.setModelId("");
+ return asStandRecordApplyService.complete(bv);
+ }
+
+ @ApiOperation(value = "驳回任务")
+ @PostMapping(value = "/reject")
+ public ResultBean taskReject(@Valid @RequestBody StandRecordApplyTaskQuery query) {
+ return asStandRecordApplyService.taskReject(query);
+ }
+
+ @ApiOperation(value = "撤回流程")
+ @PostMapping(value = "/revokeProcess")
+ public ResultBean revokeProcess(@Valid @RequestBody StandRecordApplyTaskQuery query) {
+ return asStandRecordApplyService.revokeProcess(query);
+ }
+
+ @ApiOperation(value = "终止任务")
+ @PostMapping(value = "/breakProcess")
+ public ResultBean breakProcess(@Valid @RequestBody StandRecordApplyTaskQuery query) {
+ return asStandRecordApplyService.breakProcess(query);
+ }
+
+ @ApiOperation(value = "获取上一个环节")
+ @GetMapping(value = "/getPreviousNodesForReject")
+ public ResultBean> getNextNodesForSubmit(StandRecordApplyNodeQuery query) {
+ return asStandRecordApplyService.getNextNodesForSubmit(query);
+ }
+
+ @ApiOperation(value = "获取下一个环节")
+ @GetMapping(value = "/getNextNodesForSubmit")
+ public ResultBean> getPreviousNodesForReject(StandRecordApplyNodeQuery query) {
+ return asStandRecordApplyService.getPreviousNodesForReject(query);
+ }
+
+ @ApiOperation(value = "加签")
+ @PostMapping(value = "/delegate")
+ @ResponseBody
+ public ResultBean delegate(@RequestBody StandRecordApplyDelegateQuery query) {
+ return asStandRecordApplyService.delegate(query);
+ }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyService.java
new file mode 100644
index 0000000000..cc6d0fab65
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyService.java
@@ -0,0 +1,653 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asstandrecordapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.as.api.asappendix.AsAppendix;
+import com.yxt.anrui.as.api.asstandrecordapply.*;
+import com.yxt.anrui.as.api.asstandrecordapply.flowable.*;
+import com.yxt.anrui.as.biz.asappendix.AsAppendixService;
+import com.yxt.anrui.as.biz.astechtitle.AsTechTitleService;
+import com.yxt.anrui.as.biz.astechtitledetail.AsTechTitleDetailService;
+import com.yxt.anrui.as.feign.base.billno.Rule;
+import com.yxt.anrui.as.feign.file.AsFileEnum;
+import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
+import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign;
+import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum;
+import com.yxt.anrui.as.feign.flowable.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery;
+import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign;
+import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskFeign;
+import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskVo;
+import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo;
+import com.yxt.anrui.as.feign.message.MessageFeign;
+import com.yxt.anrui.as.feign.message.MessageFlowVo;
+import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
+import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
+import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.service.MybatisBaseService;
+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 org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+@Service
+public class AsStandRecordApplyService extends MybatisBaseService {
+
+ @Autowired
+ private FileUploadComponent fileUploadComponent;
+ @Autowired
+ private SysOrganizationFeign sysOrganizationFeign;
+ @Autowired
+ private SysStaffOrgFeign sysStaffOrgFeign;
+ @Autowired
+ private SysUserFeign sysUserFeign;
+ @Autowired
+ private FlowableFeign flowableFeign;
+ @Autowired
+ private FlowTaskFeign flowTaskFeign;
+ @Autowired
+ private FlowFeign flowFeign;
+ @Autowired
+ private MessageFeign messageFeign;
+ @Autowired
+ private AsTechTitleDetailService asTechTitleDetailService;
+ @Autowired
+ private AsTechTitleService asTechTitleService;
+ @Autowired
+ private AsAppendixService asAppendixService;
+ @Autowired
+ private SysUserRoleFeign sysUserRoleFeign;
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ AsStandRecordApplyQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ //========================================数据授权开始
+ if (StringUtils.isNotBlank(query.getMenuUrl())) {
+ PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+ privilegeQuery.setOrgPath(query.getOrgPath());
+ privilegeQuery.setMenuUrl(query.getMenuUrl());
+ privilegeQuery.setMenuSid(query.getMenuSid());
+ privilegeQuery.setUserSid(query.getUserSid());
+ ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+ if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+ //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+ String orgSidPath = query.getOrgPath();
+ orgSidPath = orgSidPath + "/";
+ int i1 = orgSidPath.indexOf("/");
+ int i2 = orgSidPath.indexOf("/", i1 + 1);
+ int i3 = orgSidPath.indexOf("/", i2 + 1);
+ int i4 = orgSidPath.indexOf("/", i3 + 1);
+ String orgLevelKey = defaultIdReltBean.getData();
+ if ("1".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i1);
+ qw.like("so.orgSidPath", orgSidPath);
+ } else if ("2".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i2);
+ qw.like("so.orgSidPath", orgSidPath);
+ } else if ("3".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i3);
+ qw.like("so.orgSidPath", orgSidPath);
+ } else if ("4".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i4);
+ qw.like("so.orgSidPath", orgSidPath);
+ } else if ("5".equals(orgLevelKey)) {
+ qw.eq("sa.createBySid", query.getUserSid());
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ }
+ if (StringUtils.isNotBlank(query.getUseOrgName())) {
+ qw.eq("sa.useOrgName", query.getUseOrgName());
+ }
+ if (StringUtils.isNotBlank(query.getDeptName())) {
+ qw.like("sa.deptName", query.getDeptName());
+ }
+ if (StringUtils.isNotBlank(query.getCreateByName())) {
+ qw.like("sa.createByName", query.getCreateByName());
+ }
+ if (StringUtils.isNotBlank(query.getSiteName())) {
+ qw.like("sa.siteName", query.getSiteName());
+ }
+ if (StringUtils.isNotBlank(query.getLegalPerson())) {
+ qw.like("sa.legalPerson", query.getLegalPerson());
+ }
+ String createStartTime = query.getCreateTimeStart();
+ String createEndTime = query.getCreateTimeEnd();
+ qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (sa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+ apply(StringUtils.isNotBlank(createEndTime), "date_format (sa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+ );
+ String finishTimeStart = query.getFinishTimeStart();
+ String finishTimeEnd = query.getFinishTimeEnd();
+ qw.apply(StringUtils.isNotBlank(finishTimeStart), "date_format (sa.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
+ apply(StringUtils.isNotBlank(finishTimeEnd), "date_format (sa.finishTim,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
+ );
+ String limitedTermStart = query.getLimitedTermStart();
+ String limitedTermEnd = query.getLimitedTermEnd();
+ qw.apply(StringUtils.isNotBlank(limitedTermStart), "sa.limitedTerm >=" + "'" + limitedTermStart + "'").
+ apply(StringUtils.isNotBlank(limitedTermEnd), "sa.limitedTerm <=" + "'" + limitedTermEnd + "'");
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public String saveOrUpdateDto(AsStandRecordApplyDto dto){
+ String dtoSid = dto.getSid();
+ SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+ List businessLicenseFile = dto.getBusinessLicenseFile();
+ List agreementFile = dto.getAgreementFile();
+ List otherFile = dto.getOtherFile();
+ if (StringUtils.isBlank(dtoSid)) {
+ //生成单据编号
+ String billNo = "";
+ String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+ billNo = "HZEJZBA" + organizationVo.getOrgCode() + date;
+ String i = baseMapper.selectNum(billNo);
+ if (StringUtils.isNotBlank(i)) {
+ billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+ } else {
+ billNo = Rule.getBillNo(billNo, 0);
+ }
+ dto.setBillNo(billNo);
+ String sid = this.insertByDto(dto);
+ for (AsStandRecordApplyUrl AsStandRecordApplyUrl : businessLicenseFile) {
+ String filePath = AsStandRecordApplyUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+ AsAppendix asAppendix = new AsAppendix();
+ asAppendix.setLinkSid(sid);
+ asAppendix.setAttachType(AsFileEnum.YYZZ.getAttachType());
+ asAppendix.setFilePath(filePath);
+ asAppendixService.save(asAppendix);
+ }
+ for (AsStandRecordApplyUrl AsStandRecordApplyUrl : agreementFile) {
+ String filePath = AsStandRecordApplyUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+ AsAppendix asAppendix = new AsAppendix();
+ asAppendix.setLinkSid(sid);
+ asAppendix.setAttachType(AsFileEnum.HZXY.getAttachType());
+ asAppendix.setFilePath(filePath);
+ asAppendixService.save(asAppendix);
+ }
+ for (AsStandRecordApplyUrl AsStandRecordApplyUrl : otherFile) {
+ String filePath = AsStandRecordApplyUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+ AsAppendix asAppendix = new AsAppendix();
+ asAppendix.setLinkSid(sid);
+ asAppendix.setAttachType(AsFileEnum.QTZL.getAttachType());
+ asAppendix.setFilePath(filePath);
+ asAppendixService.save(asAppendix);
+ }
+ return sid;
+ }
+ this.updateByDto(dto);
+ asAppendixService.delByLinkSid(dtoSid);
+ for (AsStandRecordApplyUrl AsStandRecordApplyUrl : businessLicenseFile) {
+ String filePath = AsStandRecordApplyUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+ AsAppendix asAppendix = new AsAppendix();
+ asAppendix.setLinkSid(dtoSid);
+ asAppendix.setAttachType(AsFileEnum.YYZZ.getAttachType());
+ asAppendix.setFilePath(filePath);
+ asAppendixService.save(asAppendix);
+ }
+ for (AsStandRecordApplyUrl AsStandRecordApplyUrl : agreementFile) {
+ String filePath = AsStandRecordApplyUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+ AsAppendix asAppendix = new AsAppendix();
+ asAppendix.setLinkSid(dtoSid);
+ asAppendix.setAttachType(AsFileEnum.HZXY.getAttachType());
+ asAppendix.setFilePath(filePath);
+ asAppendixService.save(asAppendix);
+ }
+ for (AsStandRecordApplyUrl AsStandRecordApplyUrl : otherFile) {
+ String filePath = AsStandRecordApplyUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+ AsAppendix asAppendix = new AsAppendix();
+ asAppendix.setLinkSid(dtoSid);
+ asAppendix.setAttachType(AsFileEnum.QTZL.getAttachType());
+ asAppendix.setFilePath(filePath);
+ asAppendixService.save(asAppendix);
+ }
+ return dtoSid;
+ }
+
+ public String insertByDto(AsStandRecordApplyDto dto){
+ AsStandRecordApply entity = new AsStandRecordApply();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ entity.setNodeState("待提交");
+ baseMapper.insert(entity);
+ return entity.getSid();
+ }
+
+ public void updateByDto(AsStandRecordApplyDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ AsStandRecordApply entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public AsStandRecordApplyDetailsVo fetchDetailsVoBySid(String sid){
+ AsStandRecordApply entity = fetchBySid(sid);
+ AsStandRecordApplyDetailsVo vo = new AsStandRecordApplyDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ List b = asAppendixService.fetchByLinkSidAndType(sid, AsFileEnum.YYZZ.getAttachType());
+ List a = asAppendixService.fetchByLinkSidAndType(sid, AsFileEnum.HZXY.getAttachType());
+ List o = asAppendixService.fetchByLinkSidAndType(sid, AsFileEnum.QTZL.getAttachType());
+ List businessLicenseFile = new ArrayList<>();
+ List agreementFile = new ArrayList<>();
+ List otherFile = new ArrayList<>();
+ for (AsAppendix AsFile : b) {
+ AsStandRecordApplyUrl AsStandRecordApplyUrl = new AsStandRecordApplyUrl();
+ String url = fileUploadComponent.getUrlPrefix() + AsFile.getFilePath();
+ AsStandRecordApplyUrl.setUrl(url);
+ businessLicenseFile.add(AsStandRecordApplyUrl);
+ }
+ for (AsAppendix AsFile : a) {
+ AsStandRecordApplyUrl AsStandRecordApplyUrl = new AsStandRecordApplyUrl();
+ String url = fileUploadComponent.getUrlPrefix() + AsFile.getFilePath();
+ AsStandRecordApplyUrl.setUrl(url);
+ agreementFile.add(AsStandRecordApplyUrl);
+ }
+ for (AsAppendix AsFile : o) {
+ AsStandRecordApplyUrl AsStandRecordApplyUrl = new AsStandRecordApplyUrl();
+ String url = fileUploadComponent.getUrlPrefix() + AsFile.getFilePath();
+ AsStandRecordApplyUrl.setUrl(url);
+ otherFile.add(AsStandRecordApplyUrl);
+ }
+ vo.setBusinessLicenseFile(businessLicenseFile);
+ vo.setAgreementFile(agreementFile);
+ vo.setOtherFile(otherFile);
+ return vo;
+ }
+
+ public ResultBean delByAll(String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ //查询该sid中是否有流程不是待提交的
+ int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+ if (count > 0) {
+ return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+ }
+ delBySids(sids);
+ for (String sid : sids) {
+ asAppendixService.delByLinkSid(sid);
+ }
+ return rb.success();
+ }
+
+ public ResultBean submit(SubmitStandRecordApplyDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ AsStandRecordApply AsStandRecordApply = fetchBySid(dto.getSid());
+ int r = submitBusinessData(dto, AsStandRecordApply);
+ if (r == 3) {
+ return rb.setMsg("该申请不存在");
+ }
+ if (r == 0) {
+ return rb.setMsg("操作失败!提交的数据不一致");
+ }
+ String businessSid = saveOrUpdateDto(dto);
+ AsStandRecordApply = fetchBySid(businessSid);
+ //创建BusinessVariables实体对象
+ BusinessVariables bv = new BusinessVariables();
+ //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+ Map variables = new HashMap<>();
+ Map appMap = new HashMap<>();
+ appMap.put("sid", businessSid);
+ variables.put("app", appMap);
+ //判断发起人是否为前台主管
+ String createBySid = AsStandRecordApply.getCreateBySid();
+ List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
+ variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
+ //用户的部门全路径sid
+ SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(AsStandRecordApply.getDeptSid()).getData();
+ if (sysOrganization != null) {
+ bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+ }
+ bv.setBusinessSid(businessSid);
+ bv.setUserSid(dto.getCreateBySid());
+ bv.setFormVariables(variables);
+ if (r == 1) {
+ //ToDo:流程定义id
+ bv.setModelId(ProcDefEnum.ASSTANDRECORDAPPLY.getProDefId());
+ ResultBean voResultBean = flowFeign.startProcess(bv);
+ if (!voResultBean.getSuccess()) {
+ return rb.setMsg(voResultBean.getMsg());
+ }
+ UpdateFlowFieldVo ufVo = voResultBean.getData();
+ updateFlowFiled(BeanUtil.beanToMap(ufVo));
+ AsStandRecordApply = fetchBySid(businessSid);
+ //==================================添加线程
+ try {
+ ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+ .setNameFormat("demo-pool-%d").build();
+ ExecutorService pool = new ThreadPoolExecutor(2, 100,
+ 0L, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+ AsStandRecordApply finalAsStandRecordApply = AsStandRecordApply;
+ Future future1 = pool.submit(() -> {
+ //极光推送
+ MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+ MessageFlowVo messageFlowVo = new MessageFlowVo();
+ BeanUtil.copyProperties(ufVo, messageFlowVo);
+ messageFlowableQuery.setUfVo(messageFlowVo);
+ messageFlowableQuery.setAppMap(appMap);
+ messageFlowableQuery.setBusinessSid(businessSid);
+ messageFlowableQuery.setModuleName("合作二级站备案申请");
+ messageFlowableQuery.setMsgContent(finalAsStandRecordApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+ messageFlowableQuery.setMsgTitle("合作二级站备案申请");
+ ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ //==================================添加线程
+ return voResultBean;
+ }
+ if (r == 2) {
+ // ToDo:驳回到发起人后再次提交
+ if (StringUtils.isBlank(dto.getInstanceId())) {
+ return rb.setMsg("参数错误：instanceId");
+ }
+ bv.setTaskId(AsStandRecordApply.getTaskId());
+ bv.setTaskDefKey(AsStandRecordApply.getNodeSid());
+ bv.setComment("重新提交");
+ bv.setInstanceId(dto.getInstanceId());
+ return complete(bv);
+ }
+ return rb;
+ }
+
+ private int updateFlowFiled(Map beanToMap) {
+ return baseMapper.updateFlowFiled(beanToMap);
+ }
+
+
+ private int submitBusinessData(SubmitStandRecordApplyDto dto, AsStandRecordApply AsStandRecordApply) {
+ int r = 0;
+ if (StringUtils.isBlank(dto.getSid())) {
+ r = 1;
+ } else {
+ if (AsStandRecordApply != null) {
+ String businessTaskId = AsStandRecordApply.getTaskId();
+ if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+ //新提交
+ r = 1;
+ } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+ //二次提交//只有数据一致的时候才能进行下一步
+ r = 2;
+ }
+ } else {
+ r = 3;
+ }
+ }
+ return r;
+ }
+
+ public ResultBean complete(BusinessVariables bv) {
+ ResultBean rb = ResultBean.fireFail();
+ String businessSid = bv.getBusinessSid();
+ AsStandRecordApply AsStandRecordApply = fetchBySid(businessSid);
+ Map variables = new HashMap<>();
+ //判断发起人是否为前台主管
+ String createBySid = AsStandRecordApply.getCreateBySid();
+ List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
+ variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
+ Map appMap = new HashMap<>();
+ appMap.put("sid", businessSid);
+ variables.put("app", appMap);
+ bv.setFormVariables(variables);
+ SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(AsStandRecordApply.getDeptSid()).getData();
+ if (sysOrganization != null) {
+ bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+ }
+ bv.setModelId(AsStandRecordApply.getProcDefId());
+ if (bv.getTaskId().equals(AsStandRecordApply.getTaskId())) {
+ ResultBean resultBean = flowFeign.handleProsess(bv);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ UpdateFlowFieldVo ufVo = resultBean.getData();
+ updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+ if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+ } else {
+ //极光推送
+ AsStandRecordApply = fetchBySid(businessSid);
+ MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+ MessageFlowVo messageFlowVo = new MessageFlowVo();
+ BeanUtil.copyProperties(ufVo, messageFlowVo);
+ messageFlowVo.setProcDefId(AsStandRecordApply.getProcDefId());
+ messageFlowVo.setProcInsId(AsStandRecordApply.getProcInstId());
+ messageFlowableQuery.setUfVo(messageFlowVo);
+ messageFlowableQuery.setAppMap(appMap);
+ messageFlowableQuery.setBusinessSid(businessSid);
+ messageFlowableQuery.setModuleName("合作二级站备案申请");
+ messageFlowableQuery.setMsgContent(AsStandRecordApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+ messageFlowableQuery.setMsgTitle("合作二级站备案申请");
+ ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+ }
+ return rb.success().setData(resultBean.getData());
+ } else {
+ return rb.setMsg("操作失败!提交的数据不一致");
+ }
+ }
+
+ public ResultBean> getPreviousNodesForReject(StandRecordApplyNodeQuery query) {
+ ResultBean> rb = ResultBean.fireFail();
+ BusinessVariables bv = new BusinessVariables();
+ BeanUtil.copyProperties(query, bv);
+ //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+ Map variables = new HashMap<>();
+ //查询业务信息
+ AsStandRecordApply AsStandRecordApply = fetchBySid(query.getBusinessSid());
+ //判断发起人是否为前台主管
+ String createBySid = AsStandRecordApply.getCreateBySid();
+ List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
+ variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
+ bv.setModelId(AsStandRecordApply.getProcDefId());
+ bv.setFormVariables(variables);
+ //=======================================
+ ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+ //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+ List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), StandRecordApplyNodeVo.class)).collect(Collectors.toList());
+ return rb.success().setData(voList);
+ }
+
+ public ResultBean> getNextNodesForSubmit(StandRecordApplyNodeQuery query) {
+ ResultBean> rb = ResultBean.fireFail();
+ BusinessVariables bv = new BusinessVariables();
+ BeanUtil.copyProperties(query, bv);
+ //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+ Map variables = new HashMap<>();
+ //查询业务信息
+ AsStandRecordApply AsStandRecordApply = fetchBySid(query.getBusinessSid());
+ //判断发起人是否为前台主管
+ String createBySid = AsStandRecordApply.getCreateBySid();
+ List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
+ variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
+ bv.setModelId(AsStandRecordApply.getProcDefId());
+ bv.setFormVariables(variables);
+ //=======================================
+ ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+ //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+ List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), StandRecordApplyNodeVo.class)).collect(Collectors.toList());
+ return rb.success().setData(voList);
+ }
+
+ public ResultBean taskReject(StandRecordApplyTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ String businessSid = query.getBusinessSid();
+ AsStandRecordApply AsStandRecordApply = fetchBySid(businessSid);
+ if (AsStandRecordApply == null) {
+ return rb.setMsg("该申请不存在");
+ }
+ String businessTaskId = AsStandRecordApply.getTaskId();
+ if (StringUtils.isNotBlank(businessTaskId)) {
+ if (businessTaskId.equals(query.getTaskId())) {
+ if (StringUtils.isBlank(query.getComment())) {
+ return rb.setMsg("请填写意见");
+ }
+ if (StringUtils.isBlank(query.getUserSid())) {
+ return rb.setMsg("参数错误：userSid");
+ }
+ FlowTaskVo flowTaskVo = new FlowTaskVo();
+ BeanUtil.copyProperties(query, flowTaskVo);
+ Map variables = new HashMap<>();
+ Map appMap = new HashMap<>();
+ appMap.put("sid", businessSid);
+ variables.put("app", appMap);
+ //判断发起人是否为前台主管
+ String createBySid = AsStandRecordApply.getCreateBySid();
+ List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
+ variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
+ flowTaskVo.setValues(variables);
+ ResultBean resultBean = flowableFeign.taskReject(flowTaskVo);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ UpdateFlowFieldVo ufVo = resultBean.getData();
+ Map map = BeanUtil.beanToMap(ufVo);
+ //更新业务中的流程相关的参数
+ updateFlowFiled(map);
+ //极光推送
+ AsStandRecordApply = fetchBySid(businessSid);
+ MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+ MessageFlowVo messageFlowVo = new MessageFlowVo();
+ BeanUtil.copyProperties(ufVo, messageFlowVo);
+ String procId = AsStandRecordApply.getProcInstId();
+ messageFlowVo.setProcInsId(procId);
+ messageFlowVo.setProcDefId(AsStandRecordApply.getProcDefId());
+ messageFlowableQuery.setUfVo(messageFlowVo);
+ messageFlowableQuery.setAppMap(appMap);
+ messageFlowableQuery.setBusinessSid(businessSid);
+ messageFlowableQuery.setModuleName("合作二级站备案申请");
+ ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId);
+ String nextName = listResultBean.getData().get(0).getName_();
+ String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+ if ("发起申请".equals(nextName)) {
+ messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+ } else {
+ messageFlowableQuery.setMsgContent(AsStandRecordApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+ }
+
+ messageFlowableQuery.setMsgTitle("合作二级站备案申请");
+ ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+ return rb.success();
+ }
+ }
+ return rb.setMsg("操作失败!提交的数据不一致!");
+ }
+
+ public ResultBean revokeProcess(StandRecordApplyTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ if (StringUtils.isBlank(query.getUserSid())) {
+ return rb.setMsg("参数错误：userSid");
+ }
+ AsStandRecordApply AsStandRecordApply = fetchBySid(query.getBusinessSid());
+ String businessTaskId = query.getTaskId();
+ if (StringUtils.isNotBlank(businessTaskId)) {
+ if (businessTaskId.equals(query.getTaskId())) {
+ FlowTaskVo flowTaskVo = new FlowTaskVo();
+ BeanUtil.copyProperties(query, flowTaskVo);
+ ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+ return rb.success().setData(resultBean.getData());
+ }
+ }
+ return rb.setMsg("操作失败，提交的数据不一致!");
+ }
+
+ public ResultBean breakProcess(StandRecordApplyTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ if (StringUtils.isBlank(query.getInstanceId())) {
+ return rb.setMsg("参数错误：instanceId");
+ }
+ if (StringUtils.isBlank(query.getUserSid())) {
+ return rb.setMsg("参数错误：userSid");
+ }
+ if (StringUtils.isBlank(query.getComment())) {
+ return rb.setMsg("请填写意见");
+ }
+ AsStandRecordApply AsStandRecordApply = fetchBySid(query.getBusinessSid());
+ String businessTaskId = AsStandRecordApply.getTaskId();
+ if (StringUtils.isNotBlank(businessTaskId)) {
+ if (query.getUserSid().equals(AsStandRecordApply.getCreateBySid())) {
+ FlowTaskVo flowTaskVo = new FlowTaskVo();
+ BeanUtil.copyProperties(query, flowTaskVo);
+ ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ Map map = BeanUtil.beanToMap(resultBean.getData());
+ updateFlowFiled(map);
+ return rb.success().setData(resultBean.getData());
+ } else {
+ if (businessTaskId.equals(query.getTaskId())) {
+ FlowTaskVo flowTaskVo = new FlowTaskVo();
+ BeanUtil.copyProperties(query, flowTaskVo);
+ ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ Map map = BeanUtil.beanToMap(resultBean.getData());
+ updateFlowFiled(map);
+ return rb.success().setData(resultBean.getData());
+ }
+ }
+ }
+ return rb.setMsg("操作失败!提交的数据不一致!");
+ }
+
+ public ResultBean delegate(StandRecordApplyDelegateQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+ BeanUtil.copyProperties(query, delegateQuery);
+ flowFeign.delegate(delegateQuery);
+ return rb.success();
+ }
+}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java
index 44729cf832..21069ad598 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java
@@ -15,6 +15,9 @@ public enum AsFileEnum {
ASTECHTITLEAPPLY("006", "维修技师职称备案附件"),
ASOLDPARTRETURNCONFIRM("007", "旧件返厂确认附件"),
ASSERVICEACCOMMAPPLY("008", "配件销售提成备案附件"),
+ YYZZ("009", "合作二级站备案申请-营业执照附件"),
+ HZXY("010", "合作二级站备案申请-合作协议附件"),
+ QTZL("011", "合作二级站备案申请-其他资料附件"),
;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java
index 31827cbf4d..ff0fa02c13 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java
@@ -20,6 +20,7 @@ public enum ProcDefEnum {
ASHOSESUPPAPPLY("工时提成抵顶配件费用申请", "process_z2d1n43e:1:14197592"),
ASSERVICEITEMAPPLY("维修项目备案申请", "process_mbiz75zg:1:14197572"),
ASSERVICEACCOMMAPPLY("配件销售提成备案申请", "process_89i56wrn:1:14197576"),
+ ASSTANDRECORDAPPLY("合作二级站备案申请", "process_e5yugvlx:2:14197596"),
;