From b8b81511b754d709b07b5eb825d8557082a2b7ef Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 24 Apr 2025 14:19:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/asoldparthandle/AsOldparthandle.java | 35 +++++++------------ .../AsOldparthandleDetailsVo.java | 32 ++++++----------- .../asoldparthandle/AsOldparthandleDto.java | 32 ++++++----------- .../AsOldpartreturnApplyService.java | 4 +++ .../WmsInventoryHandleSelectList.java | 4 +++ .../wmsinventory/WmsInventoryMapper.xml | 10 ++++-- 6 files changed, 51 insertions(+), 66 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java index 9a0fd513c1..85a9dd90ee 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java @@ -33,30 +33,17 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandle.java
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandle
- * Description: 处理旧件列表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "处理旧件列表", description = "处理旧件列表") @TableName("as_oldparthandle") public class AsOldparthandle extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("主表sid") + @ApiModelProperty("主表sid") private String mainSid; // 主表sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("商品ID") + @ApiModelProperty("商品ID") private String goodsID; // 商品ID @ApiModelProperty("商品spuSid") private String goodsSpuSid; @@ -74,21 +61,25 @@ public class AsOldparthandle extends BaseEntity { private String manufacturerSid; @ApiModelProperty("厂家名称") private String manufacturerName; - @ApiModelProperty("单位") + @ApiModelProperty("单位") private String unit; // 单位 @ApiModelProperty("供应商sid") private String supplierSid; @ApiModelProperty("供应商名称") private String supplierName; - @ApiModelProperty("仓库sid") + @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") + @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库位sid") + @ApiModelProperty("库区sid") + private String warehouseAreaSid; + @ApiModelProperty("库区名称") + private String warehouseAreaName; + @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid - @ApiModelProperty("库位编码") + @ApiModelProperty("库位编码") private String warehouseRackCode; // 库位编码 - @ApiModelProperty("数量") + @ApiModelProperty("数量") private BigDecimal count; // 数量 @ApiModelProperty("收益金额") private BigDecimal profit; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java index 24b64bfd29..dac9f3e33c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.as.api.asoldparthandle; - import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -34,28 +33,15 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleVo.java
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo
- * Description: 处理旧件列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "处理旧件列表 视图数据详情", description = "处理旧件列表 视图数据详情") public class AsOldparthandleDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("主表sid") + @ApiModelProperty("主表sid") private String mainSid; // 主表sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("商品ID") private String goodsID; // 商品ID @@ -81,15 +67,19 @@ public class AsOldparthandleDetailsVo implements Vo { private String supplierSid; @ApiModelProperty("供应商名称") private String supplierName; - @ApiModelProperty("仓库sid") + @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") + @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库位sid") + @ApiModelProperty("库区sid") + private String warehouseAreaSid; + @ApiModelProperty("库区名称") + private String warehouseAreaName; + @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid - @ApiModelProperty("库位编码") + @ApiModelProperty("库位编码") private String warehouseRackCode; // 库位编码 - @ApiModelProperty("数量") + @ApiModelProperty("数量") private BigDecimal count; // 数量 @ApiModelProperty("收益金额") private BigDecimal profit; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java index 64910eb183..ed6d0dae02 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.as.api.asoldparthandle; - import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; @@ -34,28 +33,15 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleDto.java
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto
- * Description: 处理旧件列表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "处理旧件列表 数据传输对象", description = "处理旧件列表 数据传输对象") public class AsOldparthandleDto implements Dto { private String sid; // sid - @ApiModelProperty("主表sid") + @ApiModelProperty("主表sid") private String mainSid; // 主表sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("商品ID") private String goodsID; // 商品ID @@ -81,15 +67,19 @@ public class AsOldparthandleDto implements Dto { private String supplierSid; @ApiModelProperty("供应商名称") private String supplierName; - @ApiModelProperty("仓库sid") + @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") + @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库位sid") + @ApiModelProperty("库区sid") + private String warehouseAreaSid; + @ApiModelProperty("库区名称") + private String warehouseAreaName; + @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid - @ApiModelProperty("库位编码") + @ApiModelProperty("库位编码") private String warehouseRackCode; // 库位编码 - @ApiModelProperty("数量") + @ApiModelProperty("数量") private BigDecimal count; // 数量 @ApiModelProperty("收益金额") private BigDecimal profit; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java index bebc963bbd..82d96faff8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java @@ -688,6 +688,10 @@ public class AsOldpartreturnApplyService extends MybatisBaseService Date: Thu, 24 Apr 2025 15:06:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A7=E4=BB=B6?= =?UTF-8?q?=E8=BF=94=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/storage/oldPartsFactory/index.vue | 717 ++++++++---------- .../manufacturerconfirmInfo.vue | 172 ----- .../oldPartsFactory/oldPartsFactoryAdd.vue | 497 +++++------- .../oldPartsFactory/oldPartsFactoryInfo.vue | 178 ++--- .../oldPartsFactoryDaiBan.vue | 642 ++++++++-------- .../oldPartsFactoryEdit.vue | 282 ++++--- .../oldPartsFactoryYiBan.vue | 293 ++++--- 7 files changed, 1114 insertions(+), 1667 deletions(-) delete mode 100644 yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue index b4fe07e478..8bd1399d8a 100644 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue +++ b/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + - - + -
-
+
- +
- - - + + + - + - - - - - - - - 返件数量确认 - - - - - - 一致 - 不一致 - - - - - - - - 备注 - - - - - {{orderInfo.remarks}} - - - - - - - 附件 - - - - - - - - - - - - - + - diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue deleted file mode 100644 index 63618b913e..0000000000 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue index bb180d45f3..433127bfdb 100644 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue +++ b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue @@ -1,28 +1,18 @@ @@ -293,29 +211,25 @@ listLoading: false, submitdisabled: false, formobj: { - "sid": "", - "remarks": "", - "createBySid": window.sessionStorage.getItem('userSid'), - "createByName": window.sessionStorage.getItem('name'), - "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage - .getItem('defaultOrgPath').lastIndexOf('/') + 1), - "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window - .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), - "createTime": getCurrentDate(), - "billNo": "", - "filePaths": [], - "useOrgSid": '', - "useOrgName": '', - "orgSidPath": window.sessionStorage.getItem('orgSidPath'), - "procDefId": "", - "nodeId": "", - "procInstId": "", - "nodeState": "", - "taskId": "", - "finishTime": "", - "asOldpartreturnList": [ - - ] + sid: '', + remarks: '', + createBySid: window.sessionStorage.getItem('userSid'), + createByName: window.sessionStorage.getItem('name'), + deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1), + deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), + createTime: getCurrentDate(), + billNo: '', + filePaths: [], + useOrgSid: '', + useOrgName: '', + orgSidPath: window.sessionStorage.getItem('orgSidPath'), + procDefId: '', + nodeId: '', + procInstId: '', + nodeState: '', + taskId: '', + finishTime: '', + asOldpartreturnList: [] }, imgList: [], dataList: [], @@ -328,23 +242,14 @@ size: 10, total: 0, params: { - "vinNo": "", - "goodsSkuCode": "", - "sourceBillNo": "", - "orgPath": "", + vinNo: '', + goodsSkuCode: '', + sourceBillNo: '', + orgPath: '' } }, rules: { - createTime: [{ - required: true, - message: '申请日期不能为空', - trigger: 'change' - }], - filePaths: [{ - required: true, - message: '附件不能为空', - trigger: 'blur' - }], + filePaths: [{ required: true, message: '附件不能为空', trigger: 'blur' }] } } }, @@ -366,8 +271,6 @@ this.dialogVisible = true }, saveOrUpdate() { - console.log('>>>>>>>>>saveOrUpdate', this.formobj) - this.$refs['form_obj'].validate((valid) => { if (valid) { this.submitdisabled = true @@ -389,7 +292,6 @@ }) }, submit() { - this.$refs['form_obj'].validate((valid) => { if (valid) { this.submitdisabled = true @@ -409,74 +311,57 @@ }) } }) - }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') this.imgList = [] this.formobj = { - "sid": "", - "remarks": "", - "createBySid": window.sessionStorage.getItem('userSid'), - "createByName": window.sessionStorage.getItem('name'), - "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage - .getItem('defaultOrgPath').lastIndexOf('/') + 1), - "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window - .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), - "createTime": getCurrentDate(), - "billNo": "", - "filePaths": [], - "useOrgSid": '', - "useOrgName": '', - "orgSidPath": window.sessionStorage.getItem('orgSidPath'), - "procDefId": "", - "nodeId": "", - "procInstId": "", - "nodeState": "", - "taskId": "", - "finishTime": "", - "asOldpartreturnList": [ - - ] + sid: '', + remarks: '', + createBySid: window.sessionStorage.getItem('userSid'), + createByName: window.sessionStorage.getItem('name'), + deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1), + deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), + createTime: getCurrentDate(), + billNo: '', + filePaths: [], + useOrgSid: '', + useOrgName: '', + orgSidPath: window.sessionStorage.getItem('orgSidPath'), + procDefId: '', + nodeId: '', + procInstId: '', + nodeState: '', + taskId: '', + finishTime: '', + asOldpartreturnList: [] } this.submitdisabled = false - this.isUpdata = false this.$emit('doback') }, - showAdd() { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) - this.title = "【新增】" - this.isUpdata = false + this.title = '【新增】' }, showEdit(row) { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) - this.title = "【修改】" - this.isUpdata = true - // var params = { - // sid: row.sid - // } - - req.init(row.sid) - .then(resp => { - if (resp.success) { - this.formobj = resp.data - - for (var i = 0; i < resp.data.filePaths.length; i++) { - this.imgList.push({ - url: resp.data.filePaths[i].url - }) - } - + this.title = '【修改】' + req.init(row.sid).then(resp => { + if (resp.success) { + this.formobj = resp.data + for (var i = 0; i < resp.data.filePaths.length; i++) { + this.imgList.push({ + url: resp.data.filePaths[i].url + }) } - }) - .catch(e => { - this.formobj = {} - }) + } + }).catch(e => { + this.formobj = {} + }) }, downLoadDetail() { const loading = this.$loading({ @@ -493,7 +378,7 @@ const fileName = '待出库旧件明细' + '.xls' const elink = document.createElement('a') elink.download = fileName - elink.style.display = 'nonde' + elink.style.display = 'none' elink.href = URL.createObjectURL(blob) document.body.appendChild(elink) elink.click() @@ -535,15 +420,11 @@ const _this = this _this.uploadResultMesssage = resp.msg _this.uploadSuccess = resp.success - if (resp.success) { - for (var i = 0; i < resp.data.length; i++) { this.formobj.asOldpartreturnList.push(resp.data[i]) } - } - }, handleConfirm() { if (!this.uploadSuccess) { @@ -560,178 +441,148 @@ console.log('backData》》》》', value) console.log('imgList', this.imgList) this.imgList = value - for (var i = 0; i < this.imgList.length; i++) { this.formobj.filePaths.push(this.imgList[i].url) } - - }, seleGoods(row) { this.itemInfo = row this.queryParams.params = { - "vinNo": row.vinNo, - "goodsSkuCode": row.goodsSkuCode, - "sourceBillNo": row.sourceBillNo, - "orgPath": window.sessionStorage.getItem('defaultOrgPath'), + vinNo: row.vinNo, + goodsSkuCode: row.goodsSkuCode, + sourceBillNo: row.sourceBillNo, + orgPath: window.sessionStorage.getItem('defaultOrgPath') } - req.getGoodsListPage(this.queryParams).then(resp => { - if (resp.success) { - const data = resp.data - this.queryParams.total = data.total - this.dataList = data.records - this.dialogVisible2 = true - } else { - // 根据resp.code进行异常情况处理 - this.dataList = [] - this.queryParams.total = 0 - } - - }) - .catch(e => {}) - - + if (resp.success) { + const data = resp.data + this.queryParams.total = data.total + this.dataList = data.records + this.dialogVisible2 = true + } else { + // 根据resp.code进行异常情况处理 + this.dataList = [] + this.queryParams.total = 0 + } + }).catch(e => { + }) }, delGoods(index) { - this.formobj.asOldpartreturnList.splice(index, 1) - }, selectionLineChangeHandle(val) { this.selectionList = val }, - addDialogList() { this.dialogVisible2 = false - if (this.selectionList.length > 0) { - const choose = this.formobj.asOldpartreturnList.filter((item) => item == this.itemInfo) - console.log('>>>>>>>>>addDialogList', choose) - var num = 0 if (choose != null && choose.length > 0) { - for (var i = 0; i < this.selectionList.length; i++) { - var item = this.selectionList[i] - num += Number(item.count) } choose[0].actualReturnCount = num - } - } - }, handleClose2() { this.dialogVisible2 = false }, seleGoods3() { this.queryParams.params = { - "vinNo": '', - "goodsSkuCode": '', - "sourceBillNo": '', - "orgPath": window.sessionStorage.getItem('defaultOrgPath'), + vinNo: '', + goodsSkuCode: '', + sourceBillNo: '', + orgPath: window.sessionStorage.getItem('defaultOrgPath') } req.getGoodsListPage(this.queryParams).then(resp => { - if (resp.success) { - const data = resp.data - this.queryParams.total = data.total - this.dataList = data.records - this.dialogVisible3 = true - } else { - // 根据resp.code进行异常情况处理 - this.dataList = [] - this.queryParams.total = 0 - } - - }) - .catch(e => {}) - - + if (resp.success) { + const data = resp.data + this.queryParams.total = data.total + this.dataList = data.records + this.dialogVisible3 = true + } else { + // 根据resp.code进行异常情况处理 + this.dataList = [] + this.queryParams.total = 0 + } + }).catch(e => { + }) }, selectionLineChangeHandle3(val) { this.selectionList3 = val }, - addDialogList3() { this.dialogVisible3 = false - for (var i = 0; i < this.selectionList3.length; i++) { - var item = this.selectionList3[i] - this.formobj.asOldpartreturnList.push({ - "sid": '', - "remarks": '', - "mainSid": '', - "vinNo": item.vinNo, - "goodsSpuSid": item.goodsSpuSid, - "goodsSpuName": item.goodsSpuName, - "goodsSkuSid": item.goodsSkuSid, - "goodsSkuTitle": item.goodsSkuTitle, - "goodsSkuCode": item.goodsSkuCode, - "goodsSkuOwnSpec": item.goodsSkuOwnSpec, - "manufacturerSid": item.manufacturerSid, - "manufacturerName": item.manufacturerName, - "warehouseSid": item.warehouseSid, - "warehouseName": item.warehouseName, - "warehouseAreaSid": item.warehouseAreaSid, - "warehouseAreaName": item.warehouseAreaName, - "warehouseRackSid": item.warehouseRackSid, - "warehouseRackName": item.warehouseRackName, - "unit": item.unit, - "sourceBillNo": item.sourceBillNo, - "claimBillNo": '', - "isCf": "是", - "needReturnCount": item.count, - "actualReturnCount": item.count + sid: '', + remarks: '', + mainSid: '', + vinNo: item.vinNo, + goodsSpuSid: item.goodsSpuSid, + goodsSpuName: item.goodsSpuName, + goodsSkuSid: item.goodsSkuSid, + goodsSkuTitle: item.goodsSkuTitle, + goodsSkuCode: item.goodsSkuCode, + goodsSkuOwnSpec: item.goodsSkuOwnSpec, + manufacturerSid: item.manufacturerSid, + manufacturerName: item.manufacturerName, + warehouseSid: item.warehouseSid, + warehouseName: item.warehouseName, + warehouseAreaSid: item.warehouseAreaSid, + warehouseAreaName: item.warehouseAreaName, + warehouseRackSid: item.warehouseRackSid, + warehouseRackName: item.warehouseRackName, + unit: item.unit, + sourceBillNo: item.sourceBillNo, + claimBillNo: '', + isCf: '是', + needReturnCount: item.count, + actualReturnCount: item.count }) } - - }, handleClose3() { this.dialogVisible3 = false - }, - + } } } diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue index db5cef2f15..f3a66f9ad8 100644 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue +++ b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue @@ -1,29 +1,14 @@ diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue index 19931755e0..774b1a5c81 100644 --- a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue @@ -31,35 +31,28 @@
备注
{{ formobj.remarks }} -
附件
- + -
-
商品列表
-
- - - - - - - - - - +
商品列表
+ + + + + + + + + + - @@ -92,8 +85,9 @@ 意见: - + + +
@@ -106,339 +100,335 @@ diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue index 4a1c1b1b74..2f92dbe6a9 100644 --- a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue +++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue @@ -29,35 +29,27 @@
备注
{{ formobj.remarks }} -
附件
- - + -
-
商品列表
-
- - - - - - - - - - +
商品列表
+ + + + + + + + + + -
@@ -65,145 +57,137 @@ diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue index 84a184044e..8752ecc0d9 100644 --- a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue @@ -28,35 +28,28 @@
备注
{{ formobj.remarks }} -
附件
- + -
-
商品列表
-
- - - - - - - - - - +
>商品列表
+ + + + + + + + + + - @@ -64,151 +57,143 @@ From 50ff62f426b070deb70d97111b6b0d8fd07d3008 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 24 Apr 2025 15:13:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsOldpartreturnApplyQuery.java | 18 +----- .../AsOldpartreturnConfirmQuery.java | 14 ----- .../AsOldpartreturnConfirmVo.java | 14 ----- .../AsOldpartreturnApplyMapper.java | 27 +++------ .../AsOldpartreturnApplyMapper.xml | 2 +- .../AsOldpartreturnApplyService.java | 3 + .../AsOldpartreturnConfirmMapper.java | 13 ----- .../AsOldpartreturnConfirmMapper.xml | 2 +- .../AsOldpartreturnConfirmRest.java | 57 +++++++------------ .../AsOldpartreturnConfirmService.java | 17 ++---- 10 files changed, 41 insertions(+), 126 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java index be0e743fd8..fc27b2ef6d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java @@ -25,28 +25,16 @@ *********************************************************/ package com.yxt.anrui.as.api.asoldpartreturnapply; - 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; -/** - * Project: anrui-as(旧件返厂)
- * File: AsOldpartreturnApplyQuery.java
- * Class: com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery
- * Description: 旧件返厂申请 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-17 10:29:49
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "旧件返厂申请 查询条件", description = "旧件返厂申请 查询条件") public class AsOldpartreturnApplyQuery implements Query { @@ -57,7 +45,7 @@ public class AsOldpartreturnApplyQuery implements Query { private String deptName; @ApiModelProperty("申请人") private String createByName; - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("申请开始日期") private String createStartTime; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java index fafdc238fd..4007901a1d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java @@ -25,26 +25,12 @@ *********************************************************/ package com.yxt.anrui.as.api.asoldpartreturnconfirm; - import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-as(旧件返厂厂家确认)
- * File: AsOldpartreturnConfirmQuery.java
- * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmQuery
- * Description: 旧件返厂厂家确认 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-26 15:52:00
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "旧件返厂厂家确认 查询条件", description = "旧件返厂厂家确认 查询条件") public class AsOldpartreturnConfirmQuery implements Query { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java index e9082b9b3c..6370404a2a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.as.api.asoldpartreturnconfirm; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; @@ -37,19 +36,6 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -/** - * Project: yxt-as(旧件返厂厂家确认)
- * File: AsOldpartreturnConfirmVo.java
- * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo
- * Description: 旧件返厂厂家确认 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-26 15:52:00
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "旧件返厂厂家确认 视图数据对象", description = "旧件返厂厂家确认 视图数据对象") public class AsOldpartreturnConfirmVo implements Vo { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java index 127d12997c..a34f2c9a3c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java @@ -39,35 +39,22 @@ import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Map; -/** - * Project: anrui-as(旧件返厂)
- * File: AsOldpartreturnApplyMapper.java
- * Class: com.yxt.anrui.as.biz.asoldpartreturnapply.AsOldpartreturnApplyMapper
- * Description: 旧件返厂申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-17 10:29:50
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface AsOldpartreturnApplyMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - int updateFlowFiled(Map map); + int updateFlowFiled(Map map); int selectBySid(String join); - String selectNum(String billNo); + String selectNum(String billNo); List downloadTobeOutExcel(String sid); - @Update("update as_oldpartreturn_apply set state = #{state} where sid = #{sid}") - void updateState(@Param("sid") String sid,@Param("state") String state); + @Update("update as_oldpartreturn_apply set state = #{state} where sid = #{sid}") + void updateState(@Param("sid") String sid, @Param("state") String state); - @Update("update as_oldpartreturn_apply set state = #{state} where billNo = #{billNo}") - void updateStateByBillNo(@Param("billNo") String billNo,@Param("state") String state); + @Update("update as_oldpartreturn_apply set state = #{state} where billNo = #{billNo}") + void updateStateByBillNo(@Param("billNo") String billNo, @Param("state") String state); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml index 23758c3511..90bfa3d306 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml @@ -12,7 +12,7 @@ FROM as_oldpartreturn_apply aoa LEFT JOIN as_oldpartreturn AS ao - ON aoa.`sid` = ao.`mainSid` + ON aoa.sid = ao.mainSid LEFT JOIN as_oldpartreturn_confirm ac ON aoa.billNo = ac.billNo LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java index 82d96faff8..8b5e8a70f5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java @@ -205,6 +205,9 @@ public class AsOldpartreturnApplyService extends MybatisBaseService - * File: AsOldpartreturnConfirmMapper.java
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmMapper
- * Description: 旧件返厂厂家确认.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-26 15:52:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface AsOldpartreturnConfirmMapper extends BaseMapper { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml index 294b301cc8..5c932d34f1 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml @@ -12,7 +12,7 @@ FROM as_oldpartreturn_confirm aoc LEFT JOIN as_oldpartreturn_confirm_detail AS aod - ON aoc.`sid` = aod.`mainSid` + ON aoc.sid = aod.mainSid LEFT JOIN anrui_portal.sys_organization AS s ON aoc.deptSid = s.sid ${ew.sqlSegment} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java index 87778895be..bddbe0a888 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java @@ -38,48 +38,35 @@ import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo; import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDetailsVo; import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDto; -/** - * Project: yxt-as(旧件返厂厂家确认)
- * File: AsOldpartreturnConfirmFeignFallback.java
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmRest
- * Description: 旧件返厂厂家确认.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-26 15:52:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "旧件返厂厂家确认") @RestController @RequestMapping("v1/asoldpartreturnconfirm") public class AsOldpartreturnConfirmRest { - @Autowired - private AsOldpartreturnConfirmService asOldpartreturnConfirmService; + @Autowired + private AsOldpartreturnConfirmService asOldpartreturnConfirmService; - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = asOldpartreturnConfirmService.listPageVo(pq); - return rb.success().setData(pv); - } + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = asOldpartreturnConfirmService.listPageVo(pq); + return rb.success().setData(pv); + } - @ApiOperation("确认") - @PostMapping("/confirm") - public ResultBean confirm(@RequestBody AsOldpartreturnConfirmDto dto){ - ResultBean rb = ResultBean.fireFail(); - asOldpartreturnConfirmService.saveOrUpdateDto(dto); - return rb.success(); - } + @ApiOperation("确认") + @PostMapping("/confirm") + public ResultBean confirm(@RequestBody AsOldpartreturnConfirmDto dto) { + ResultBean rb = ResultBean.fireFail(); + asOldpartreturnConfirmService.saveOrUpdateDto(dto); + return rb.success(); + } - @ApiOperation("根据SID获取一条记录") + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java index 6f4fb598ad..9dbdb1c14a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java @@ -56,19 +56,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -/** - * Project: yxt-as(旧件返厂厂家确认)
- * File: AsOldpartreturnConfirmService.java
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmService
- * Description: 旧件返厂厂家确认 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-26 15:52:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class AsOldpartreturnConfirmService extends MybatisBaseService { @@ -138,6 +125,9 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService Date: Thu, 24 Apr 2025 15:22:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A7=E4=BB=B6?= =?UTF-8?q?=E8=BF=94=E5=8E=82=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage/manufacturerconfirm/index.vue | 663 ++++++------------ .../manufacturerconfirmAdd.vue | 317 ++++----- .../manufacturerconfirmInfo.vue | 175 ++--- 3 files changed, 398 insertions(+), 757 deletions(-) diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue index 8cae1408af..352b2c5580 100644 --- a/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue +++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue @@ -1,7 +1,7 @@ diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue index da9afcb2fc..d9e5972f0a 100644 --- a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue +++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue @@ -1,30 +1,15 @@ diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue index 25e49a6d6d..e712eda997 100644 --- a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue +++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue @@ -1,29 +1,14 @@ From be838ac432d9413b0ee1f3364af03705708215d3 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 24 Apr 2025 15:33:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsOldparthandleApply.java | 51 +- .../AsOldparthandleApplyDetailsVo.java | 46 +- .../AsOldparthandleApplyDto.java | 46 +- .../AsOldparthandleApplyQuery.java | 14 - .../AsOldparthandleApplyVo.java | 20 +- .../AsOldparthandleApplyMapper.java | 32 +- .../AsOldparthandleApplyRest.java | 173 ++-- .../AsOldparthandleApplyService.java | 953 +++++++++--------- 8 files changed, 611 insertions(+), 724 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java index 741d54e00a..27fc212a13 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java @@ -28,64 +28,53 @@ package com.yxt.anrui.as.api.asoldparthandleapply; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleApply.java
- * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApply
- * Description: 旧件处理申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "旧件处理申请", description = "旧件处理申请") @TableName("as_oldparthandle_apply") public class AsOldparthandleApply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("发起部门sid") + @ApiModelProperty("发起部门sid") private String deptSid; // 发起部门sid - @ApiModelProperty("发起部门名称") + @ApiModelProperty("发起部门名称") private String deptName; // 发起部门名称 - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") + @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") private String filePath; // 附件路径(多个附件之间英文逗号隔开) - @ApiModelProperty("处理原因key") + @ApiModelProperty("处理原因key") private String handleReasonKey; // 处理原因key - @ApiModelProperty("处理原因value") + @ApiModelProperty("处理原因value") private String handleReasonValue; // 处理原因value - @ApiModelProperty("处理方式key") + @ApiModelProperty("处理方式key") private String handleModeKey; // 处理方式key - @ApiModelProperty("处理方式value") + @ApiModelProperty("处理方式value") private String handleModeValue; // 处理方式value - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeId; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; // 任务id - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("办结时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java index 65966513c8..f3c8bfeda9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.as.api.asoldparthandleapply; - import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; import com.yxt.common.core.vo.Vo; @@ -40,19 +39,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleApplyVo.java
- * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo
- * Description: 旧件处理申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "旧件处理申请 视图数据详情", description = "旧件处理申请 视图数据详情") public class AsOldparthandleApplyDetailsVo implements Vo { @@ -63,7 +49,7 @@ public class AsOldparthandleApplyDetailsVo implements Vo { private String remarks; @ApiModelProperty("制单人sid") private String createBySid; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 @ApiModelProperty("发起部门sid") private String deptSid; // 发起部门sid @@ -72,34 +58,34 @@ public class AsOldparthandleApplyDetailsVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("申请日期") private Date createTime; - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") + @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") private List filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开) - @ApiModelProperty("处理原因key") + @ApiModelProperty("处理原因key") private String handleReasonKey; // 处理原因key - @ApiModelProperty("处理原因value") + @ApiModelProperty("处理原因value") private String handleReasonValue; // 处理原因value - @ApiModelProperty("处理方式key") + @ApiModelProperty("处理方式key") private String handleModeKey; // 处理方式key - @ApiModelProperty("处理方式value") + @ApiModelProperty("处理方式value") private String handleModeValue; // 处理方式value - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeId; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; // 任务id - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("办结时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 @ApiModelProperty("待处理旧件列表") private List asOldparthandleList; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java index 37ff46df34..ca0533205a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.as.api.asoldparthandleapply; - import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; import com.yxt.common.core.dto.Dto; @@ -39,19 +38,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleApplyDto.java
- * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto
- * Description: 旧件处理申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "旧件处理申请 数据传输对象", description = "旧件处理申请 数据传输对象") public class AsOldparthandleApplyDto implements Dto { @@ -62,7 +48,7 @@ public class AsOldparthandleApplyDto implements Dto { private String remarks; @ApiModelProperty("制单人sid") private String createBySid; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 @ApiModelProperty("发起部门sid") private String deptSid; // 发起部门sid @@ -71,34 +57,34 @@ public class AsOldparthandleApplyDto implements Dto { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("申请日期") private Date createTime; - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") + @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") private List filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开) - @ApiModelProperty("处理原因key") + @ApiModelProperty("处理原因key") private String handleReasonKey; // 处理原因key - @ApiModelProperty("处理原因value") + @ApiModelProperty("处理原因value") private String handleReasonValue; // 处理原因value - @ApiModelProperty("处理方式key") + @ApiModelProperty("处理方式key") private String handleModeKey; // 处理方式key - @ApiModelProperty("处理方式value") + @ApiModelProperty("处理方式value") private String handleModeValue; // 处理方式value - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeId; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; // 任务id - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("办结时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 @ApiModelProperty("待处理旧件列表") private List asOldparthandleList = new ArrayList<>(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java index ef548b6b3a..0bea51dc52 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.as.api.asoldparthandleapply; - import com.yxt.common.core.query.Query; import com.fasterxml.jackson.annotation.JsonFormat; @@ -34,19 +33,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleApplyQuery.java
- * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyQuery
- * Description: 旧件处理申请 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "旧件处理申请 查询条件", description = "旧件处理申请 查询条件") public class AsOldparthandleApplyQuery implements Query { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java index 5516d14662..57a639db50 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java @@ -25,28 +25,16 @@ *********************************************************/ package com.yxt.anrui.as.api.asoldparthandleapply; - import com.yxt.common.core.vo.Vo; import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleApplyVo.java
- * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo
- * Description: 旧件处理申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "旧件处理申请 视图数据对象", description = "旧件处理申请 视图数据对象") public class AsOldparthandleApplyVo implements Vo { @@ -75,8 +63,8 @@ public class AsOldparthandleApplyVo implements Vo { private String handleModeValue; @ApiModelProperty("收益总额") private String profitTotal; - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java index 3bc4683178..042998d688 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java @@ -38,35 +38,19 @@ import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo; import java.util.List; import java.util.Map; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleApplyMapper.java
- * Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyMapper
- * Description: 旧件处理申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface AsOldparthandleApplyMapper extends BaseMapper { - //@Update("update as_oldparthandle_apply set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from as_oldparthandle_apply") - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - int selectBySid(String join); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - int updateFlowFiled(Map map); + @Select("select * from as_oldparthandle_apply") + List selectListVo(); + + int selectBySid(String join); + + int updateFlowFiled(Map map); String selectNum(String billNo); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyRest.java index dcf7ccb17b..7d8428c619 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyRest.java @@ -47,105 +47,92 @@ import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto; import javax.validation.Valid; import java.util.List; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleApplyFeignFallback.java
- * Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyRest
- * Description: 旧件处理申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "旧件处理申请") @RestController @RequestMapping("v1/asoldparthandleapply") public class AsOldparthandleApplyRest { - @Autowired - private AsOldparthandleApplyService asOldparthandleApplyService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = asOldparthandleApplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody AsOldparthandleApplyDto dto){ - ResultBean rb = ResultBean.fireFail(); - asOldparthandleApplyService.saveOrUpdateDto(dto); - return rb.success(); - } - - @ApiOperation("根据sid批量删除") + @Autowired + private AsOldparthandleApplyService asOldparthandleApplyService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = asOldparthandleApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AsOldparthandleApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + asOldparthandleApplyService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return asOldparthandleApplyService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return asOldparthandleApplyService.delAll(sids); + } - @ApiOperation("根据SID获取一条记录") + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - AsOldparthandleApplyDetailsVo vo = asOldparthandleApplyService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @ApiOperation("提交审批流程") - @PostMapping("/submit") - public ResultBean submit(@RequestBody @Valid SubmitAsOldparthandleApplyDto dto) { - return asOldparthandleApplyService.submit(dto); - } - - @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") - public ResultBean complete(@Valid @RequestBody AsOldparthandleApplyCompleteDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); - return asOldparthandleApplyService.complete(bv); - } - - @ApiOperation(value = "获取上一个环节") - @GetMapping(value = "/getPreviousNodesForReject") - public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) { - return asOldparthandleApplyService.getPreviousNodesForReject(query); - } - - @ApiOperation(value = "获取下一个环节") - @GetMapping(value = "/getNextNodesForSubmit") - public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) { - return asOldparthandleApplyService.getNextNodesForSubmit(query); - } - - @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject") - public ResultBean reject(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { - return asOldparthandleApplyService.reject(query); - } - - @ApiOperation(value = "撤回流程") - @PostMapping(value = "/revokeProcess") - public ResultBean revokeProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { - return asOldparthandleApplyService.revokeProcess(query); - } - - @ApiOperation(value = "终止任务") - @PostMapping(value = "/breakProcess") - public ResultBean breakProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { - return asOldparthandleApplyService.breakProcess(query); - } - - @ApiOperation(value = "加签") - @PostMapping(value = "/delegate") - public ResultBean delegate(@RequestBody AsOldparthandleApplyDelegateQuery query) { - return asOldparthandleApplyService.delegate(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + AsOldparthandleApplyDetailsVo vo = asOldparthandleApplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @ApiOperation("提交审批流程") + @PostMapping("/submit") + public ResultBean submit(@RequestBody @Valid SubmitAsOldparthandleApplyDto dto) { + return asOldparthandleApplyService.submit(dto); + } + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody AsOldparthandleApplyCompleteDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); + return asOldparthandleApplyService.complete(bv); + } + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) { + return asOldparthandleApplyService.getPreviousNodesForReject(query); + } + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) { + return asOldparthandleApplyService.getNextNodesForSubmit(query); + } + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean reject(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { + return asOldparthandleApplyService.reject(query); + } + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { + return asOldparthandleApplyService.revokeProcess(query); + } + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { + return asOldparthandleApplyService.breakProcess(query); + } + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(@RequestBody AsOldparthandleApplyDelegateQuery query) { + return asOldparthandleApplyService.delegate(query); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java index 964b94c828..d60f5390d4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java @@ -33,12 +33,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; import com.yxt.anrui.as.api.asoldparthandleapply.flowable.*; -import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo; -import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto; -import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApply; -import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery; -import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyVo; -import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*; import com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleService; import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.flowable.flow.*; @@ -74,505 +68,492 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; -/** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleApplyService.java
- * Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyService
- * Description: 旧件处理申请 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class AsOldparthandleApplyService 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 AsOldparthandleService asOldparthandleService; + @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 AsOldparthandleService asOldparthandleService; - public PagerVo listPageVo(PagerQuery pq) { - AsOldparthandleApplyQuery 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("s.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("s.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("s.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("s.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("aoa.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } - if (StringUtils.isNotBlank(query.getUseOrgName())){ - qw.like("aoa.useOrgName",query.getUseOrgName()); - } - if (StringUtils.isNotBlank(query.getCreateDeptName())){ - qw.like("aoa.deptName",query.getCreateDeptName()); - } - if (StringUtils.isNotBlank(query.getCreateByName())){ - qw.like("aoa.createByName",query.getCreateByName()); - } - if (StringUtils.isNotBlank(query.getBillNo())){ - qw.like("aoa.billNo",query.getBillNo()); - } - if (StringUtils.isNotBlank(query.getHandleReasonKey())){ - qw.like("aoa.handleReasonKey",query.getHandleReasonKey()); - } - if (StringUtils.isNotBlank(query.getHandleModeKey())){ - qw.like("aoa.handleModeKey",query.getHandleModeKey()); - } - String createStartTime = query.getCreateStartTime(); - String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" - ); - String finishStartTime = query.getFinishStartTime(); - String finishEndTime = query.getFinishEndTime(); - qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (aoa.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" - ); - qw.groupBy("aoa.sid"); - qw.orderByDesc("aoa.createTime"); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public String saveOrUpdateDto(AsOldparthandleApplyDto dto){ + public PagerVo listPageVo(PagerQuery pq) { + AsOldparthandleApplyQuery 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("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("aoa.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("aoa.useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getCreateDeptName())) { + qw.like("aoa.deptName", query.getCreateDeptName()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("aoa.createByName", query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("aoa.billNo", query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getHandleReasonKey())) { + qw.like("aoa.handleReasonKey", query.getHandleReasonKey()); + } + if (StringUtils.isNotBlank(query.getHandleModeKey())) { + qw.like("aoa.handleModeKey", query.getHandleModeKey()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + String finishStartTime = query.getFinishStartTime(); + String finishEndTime = query.getFinishEndTime(); + qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (aoa.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" + ); + qw.groupBy("aoa.sid"); + qw.orderByDesc("aoa.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public String saveOrUpdateDto(AsOldparthandleApplyDto dto) { + String dtoSid = dto.getSid(); + List asOldparthandleList = dto.getAsOldparthandleList(); + String deptSid = dto.getDeptSid(); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + dto.setUseOrgSid(useOrgSid); + dto.setUseOrgName(organizationVo.getName()); + if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "JJCL" + 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 (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) { + asOldparthandleDto.setMainSid(sid); + asOldparthandleService.insertByDto(asOldparthandleDto); + } + return sid; + } + this.updateByDto(dto); + asOldparthandleService.delByMainSid(dtoSid); + for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) { + asOldparthandleDto.setMainSid(dtoSid); + asOldparthandleService.insertByDto(asOldparthandleDto); + } + return dtoSid; + } + + public String insertByDto(AsOldparthandleApplyDto dto) { + AsOldparthandleApply entity = new AsOldparthandleApply(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + List filePaths = dto.getFilePaths(); + String url = ""; + for (String filePath : filePaths) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + url = url + filePath + ","; + } + entity.setFilePath(url); + entity.setNodeState("待提交"); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(AsOldparthandleApplyDto dto) { String dtoSid = dto.getSid(); - List asOldparthandleList = dto.getAsOldparthandleList(); - String deptSid = dto.getDeptSid(); - SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); - String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); - SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); - dto.setUseOrgSid(useOrgSid); - dto.setUseOrgName(organizationVo.getName()); - if (StringUtils.isBlank(dtoSid)) { - //生成单据编号 - String billNo = ""; - String date = DateUtil.format(DateUtil.date(), "yyyyMM"); - billNo = "JJCL" + 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 (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) { - asOldparthandleDto.setMainSid(sid); - asOldparthandleService.insertByDto(asOldparthandleDto); - } - return sid; - } - this.updateByDto(dto); - asOldparthandleService.delByMainSid(dtoSid); - for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) { - asOldparthandleDto.setMainSid(dtoSid); - asOldparthandleService.insertByDto(asOldparthandleDto); - } - return dtoSid; - } - - public String insertByDto(AsOldparthandleApplyDto dto){ - AsOldparthandleApply entity = new AsOldparthandleApply(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - List filePaths = dto.getFilePaths(); - String url = ""; - for (String filePath : filePaths) { - filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); - url = url + filePath + ","; - } - entity.setFilePath(url); - entity.setNodeState("待提交"); - baseMapper.insert(entity); - return entity.getSid(); - } - - public void updateByDto(AsOldparthandleApplyDto dto){ - String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - AsOldparthandleApply entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public AsOldparthandleApplyDetailsVo fetchDetailsVoBySid(String sid){ - AsOldparthandleApply entity = fetchBySid(sid); - AsOldparthandleApplyDetailsVo vo = new AsOldparthandleApplyDetailsVo(); - BeanUtil.copyProperties(entity, vo); - String filePath = entity.getFilePath(); - String[] filePaths = filePath.split(","); - List urlPahts = new ArrayList<>(); - for (String path : filePaths) { - String url = fileUploadComponent.getUrlPrefix() + path; - urlPahts.add(url); - } - vo.setFilePaths(urlPahts); - List asOldpartreturnDetailsVos = asOldparthandleService.selByMainSid(sid); - vo.setAsOldparthandleList(asOldpartreturnDetailsVos); - return vo; - } + } + AsOldparthandleApply entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public AsOldparthandleApplyDetailsVo fetchDetailsVoBySid(String sid) { + AsOldparthandleApply entity = fetchBySid(sid); + AsOldparthandleApplyDetailsVo vo = new AsOldparthandleApplyDetailsVo(); + BeanUtil.copyProperties(entity, vo); + String filePath = entity.getFilePath(); + String[] filePaths = filePath.split(","); + List urlPahts = new ArrayList<>(); + for (String path : filePaths) { + String url = fileUploadComponent.getUrlPrefix() + path; + urlPahts.add(url); + } + vo.setFilePaths(urlPahts); + List asOldpartreturnDetailsVos = asOldparthandleService.selByMainSid(sid); + vo.setAsOldparthandleList(asOldpartreturnDetailsVos); + return vo; + } - public ResultBean delAll(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) { - asOldparthandleService.delByMainSid(sid); - } - return rb.success(); - } + public ResultBean delAll(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) { + asOldparthandleService.delByMainSid(sid); + } + return rb.success(); + } - public ResultBean submit(SubmitAsOldparthandleApplyDto dto) { - ResultBean rb = ResultBean.fireFail(); - AsOldparthandleApply asOldparthandleApply = fetchBySid(dto.getSid()); - int r = submitBusinessData(dto, asOldparthandleApply); - if (r == 3) { - return rb.setMsg("该申请不存在"); - } - if (r == 0) { - return rb.setMsg("操作失败!提交的数据不一致"); - } - //新增修改保存 - String businessSid = saveOrUpdateDto(dto); - asOldparthandleApply = fetchBySid(businessSid); - //创建BusinessVariables实体对象 - BusinessVariables bv = new BusinessVariables(); - //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 - Map variables = new HashMap<>(); - //用户的部门全路径sid - SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData(); - bv.setOrgSidPath(deptVo.getOrgSidPath()); - //业务sid - bv.setBusinessSid(businessSid); - //用户sid - bv.setUserSid(asOldparthandleApply.getCreateBySid()); - //若app移动端有此功能，则传递appMap参数 - Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); - //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 - variables.put("app", appMap); - //流程定义id - bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); - bv.setFormVariables(variables); - if (r == 1) { - ResultBean voResultBean = flowFeign.startProcess(bv); - UpdateFlowFieldVo ufVo = voResultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(ufVo)); - //极光推送 - asOldparthandleApply = fetchBySid(businessSid); - 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(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("旧件处理申请"); - messageFeign.pushMessage(messageFlowableQuery); - return voResultBean; - } - if (r == 2) { - // ToDo:驳回到发起人后再次提交 - if (StringUtils.isBlank(dto.getInstanceId())) { - return rb.setMsg("参数错误：instanceId"); - } - bv.setTaskId(asOldparthandleApply.getTaskId()); - bv.setTaskDefKey(asOldparthandleApply.getNodeId()); - bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); - bv.setInstanceId(dto.getInstanceId()); - return complete(bv); - } - return rb; - } + public ResultBean submit(SubmitAsOldparthandleApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + AsOldparthandleApply asOldparthandleApply = fetchBySid(dto.getSid()); + int r = submitBusinessData(dto, asOldparthandleApply); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + //新增修改保存 + String businessSid = saveOrUpdateDto(dto); + asOldparthandleApply = fetchBySid(businessSid); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //用户的部门全路径sid + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData(); + bv.setOrgSidPath(deptVo.getOrgSidPath()); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(asOldparthandleApply.getCreateBySid()); + //若app移动端有此功能，则传递appMap参数 + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 + variables.put("app", appMap); + //流程定义id + bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); + bv.setFormVariables(variables); + if (r == 1) { + ResultBean voResultBean = flowFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + //极光推送 + asOldparthandleApply = fetchBySid(businessSid); + 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(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("旧件处理申请"); + messageFeign.pushMessage(messageFlowableQuery); + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + bv.setTaskId(asOldparthandleApply.getTaskId()); + bv.setTaskDefKey(asOldparthandleApply.getNodeId()); + bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } - private synchronized int submitBusinessData(SubmitAsOldparthandleApplyDto dto, AsOldparthandleApply asOldparthandleApply) { - int r = 0; - if (StringUtils.isBlank(dto.getSid())) { - r = 1; - } else { - if (asOldparthandleApply != null) { - String businessTaskId = asOldparthandleApply.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; - } + private synchronized int submitBusinessData(SubmitAsOldparthandleApplyDto dto, AsOldparthandleApply asOldparthandleApply) { + int r = 0; + if (StringUtils.isBlank(dto.getSid())) { + r = 1; + } else { + if (asOldparthandleApply != null) { + String businessTaskId = asOldparthandleApply.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; - } + } + return r; + } - private int updateFlowFiled(Map map) { - return baseMapper.updateFlowFiled(map); - } + private int updateFlowFiled(Map map) { + return baseMapper.updateFlowFiled(map); + } - public ResultBean complete(BusinessVariables bv) { - ResultBean rb = ResultBean.fireFail(); - String businessSid = bv.getBusinessSid(); - AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid); - Map variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); - variables.put("app", appMap); - FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); - if (StringUtils.isBlank(asOldparthandleApply.getProcDefId())) { - flowProcessMapQuery.setProDefKey(bv.getModelId()); - } else { - flowProcessMapQuery.setProDefKey(asOldparthandleApply.getProcDefId()); - } - flowProcessMapQuery.setVariables(variables); - variables = flowableFeign.getMap(flowProcessMapQuery).getData(); - //======================================= - bv.setFormVariables(variables); - //用户的部门全路径sid - SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData(); - bv.setOrgSidPath(deptVo.getOrgSidPath()); - if (bv.getTaskId().equals(asOldparthandleApply.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())) { + public ResultBean complete(BusinessVariables bv) { + ResultBean rb = ResultBean.fireFail(); + String businessSid = bv.getBusinessSid(); + AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + if (StringUtils.isBlank(asOldparthandleApply.getProcDefId())) { + flowProcessMapQuery.setProDefKey(bv.getModelId()); + } else { + flowProcessMapQuery.setProDefKey(asOldparthandleApply.getProcDefId()); + } + flowProcessMapQuery.setVariables(variables); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + bv.setFormVariables(variables); + //用户的部门全路径sid + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData(); + bv.setOrgSidPath(deptVo.getOrgSidPath()); + if (bv.getTaskId().equals(asOldparthandleApply.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 { - //极光推送 - asOldparthandleApply = fetchBySid(businessSid); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - ufVo.setProcDefId(asOldparthandleApply.getProcDefId()); - ufVo.setProcInsId(asOldparthandleApply.getProcInstId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("旧件处理申请"); - messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("旧件处理申请"); - messageFeign.pushMessage(messageFlowableQuery); - } - return rb.success().setData(resultBean.getData()); - } else { - return rb.setMsg("操作失败!提交的数据不一致"); - } - } + } else { + //极光推送 + asOldparthandleApply = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + ufVo.setProcDefId(asOldparthandleApply.getProcDefId()); + ufVo.setProcInsId(asOldparthandleApply.getProcInstId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("旧件处理申请"); + messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("旧件处理申请"); + messageFeign.pushMessage(messageFlowableQuery); + } + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } - public ResultBean> getPreviousNodesForReject(AsOldparthandleApplyNodeQuery query) { - ResultBean> rb = ResultBean.fireFail(); - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); - ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList()); - return rb.success().setData(voList); - } + public ResultBean> getPreviousNodesForReject(AsOldparthandleApplyNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } - public ResultBean> getNextNodesForSubmit(AsOldparthandleApplyNodeQuery query) { - ResultBean> rb = ResultBean.fireFail(); - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); - ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList()); - return rb.success().setData(voList); - } + public ResultBean> getNextNodesForSubmit(AsOldparthandleApplyNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } - public ResultBean reject(AsOldparthandleApplyTaskQuery query) { - ResultBean rb = ResultBean.fireFail(); - String businessSid = query.getBusinessSid(); - AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid); - if (asOldparthandleApply == null) { - return rb.setMsg("该申请不存在"); - } - String businessTaskId = asOldparthandleApply.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); - 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); - //极光推送 - asOldparthandleApply = fetchBySid(businessSid); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - String procId = asOldparthandleApply.getProcInstId(); - ufVo.setProcInsId(procId); - ufVo.setProcDefId(asOldparthandleApply.getProcDefId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("旧件处理申请"); - ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(asOldparthandleApply.getCreateBySid())) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - } else { - messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - } - messageFlowableQuery.setMsgTitle("旧件处理申请"); - messageFeign.pushMessage(messageFlowableQuery); - return rb.success(); - } - } - return rb.setMsg("操作失败!提交的数据不一致!"); - } + public ResultBean reject(AsOldparthandleApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + String businessSid = query.getBusinessSid(); + AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid); + if (asOldparthandleApply == null) { + return rb.setMsg("该申请不存在"); + } + String businessTaskId = asOldparthandleApply.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); + 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); + //极光推送 + asOldparthandleApply = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = asOldparthandleApply.getProcInstId(); + ufVo.setProcInsId(procId); + ufVo.setProcDefId(asOldparthandleApply.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("旧件处理申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(asOldparthandleApply.getCreateBySid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + messageFlowableQuery.setMsgTitle("旧件处理申请"); + messageFeign.pushMessage(messageFlowableQuery); + return rb.success(); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } - public ResultBean revokeProcess(AsOldparthandleApplyTaskQuery query) { - ResultBean rb = ResultBean.fireFail(); - if (StringUtils.isBlank(query.getUserSid())) { - return rb.setMsg("参数错误：userSid"); - } - AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid()); - String businessTaskId = asOldparthandleApply.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 revokeProcess(AsOldparthandleApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = asOldparthandleApply.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(AsOldparthandleApplyTaskQuery 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("请填写意见"); - } - AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid()); - String businessTaskId = asOldparthandleApply.getTaskId(); - if (StringUtils.isNotBlank(businessTaskId)) { - if (query.getUserSid().equals(asOldparthandleApply.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()); - } - } + public ResultBean breakProcess(AsOldparthandleApplyTaskQuery 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("请填写意见"); + } + AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = asOldparthandleApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (query.getUserSid().equals(asOldparthandleApply.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("操作失败!提交的数据不一致!"); - } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } - public ResultBean delegate(AsOldparthandleApplyDelegateQuery query) { - ResultBean rb = ResultBean.fireFail(); - FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); - BeanUtil.copyProperties(query, delegateQuery); - flowFeign.delegate(delegateQuery); - return rb.success(); - } + public ResultBean delegate(AsOldparthandleApplyDelegateQuery 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