From 87bb35c89a8c4469b94783eabac74f9097fc1cc1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 10 May 2024 16:26:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/databases/yxt-as.sql | 1 - .../AsBusclaimInvoiceBillService.java | 16 +++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/databases/yxt-as.sql b/doc/databases/yxt-as.sql index 11ea45d41f..ba98d2c103 100644 --- a/doc/databases/yxt-as.sql +++ b/doc/databases/yxt-as.sql @@ -176,7 +176,6 @@ CREATE TABLE `as_busclaim_invoice_bill` `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid', `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid', `useOrgName` varchar(64) DEFAULT NULL COMMENT '分公司', - `orgSidPath` text DEFAULT NULL COMMENT '组织全路径sid', `closeDate` varchar(64) DEFAULT NULL COMMENT '办结日期', `procInstId` varchar(64) DEFAULT NULL COMMENT '实例id', `procDefId` varchar(64) DEFAULT NULL COMMENT '流程定义id', diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java index f8f90479af..3ee6621bf6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java @@ -24,6 +24,8 @@ import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo; import com.yxt.anrui.as.feign.message.MessageFeign; import com.yxt.anrui.as.feign.message.MessageFlowVo; import com.yxt.anrui.as.feign.message.MessageFlowableQuery; +import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -74,6 +76,9 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService listPage(PagerQuery pagerQuery) { AsBusclaimInvoiceBillQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -123,7 +128,6 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService fileList = dto.getFileList(); @@ -220,7 +224,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService resultBean = flowFeign.handleProsess(bv); From bf718dfc0864ca74a67f24800d0cdd84d5d6b448 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 10 May 2024 16:29:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java | 3 +++ .../java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java | 1 + 2 files changed, 4 insertions(+) diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java index f1389b7859..adb3bec566 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java @@ -218,6 +218,9 @@ public class BaseGoodsSkuService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { + if (StringUtils.isNotBlank(query.getOrgSid())) { + qw.eq("spu.useOrgSid", query.getOrgSid()); + } //商品名称 if (StringUtils.isNotBlank(query.getGoodsSpuName())) { qw.like("spu.goodsName", query.getGoodsSpuName()); diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java index d89ed6d3bd..b21b7acd4d 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java @@ -12,6 +12,7 @@ import lombok.Data; @Data public class GoodsSkuQuery implements Query { + private static final long serialVersionUID = 7444031420898897515L; @ApiModelProperty("分公司sid") private String orgSid; @ApiModelProperty("商品名称") From 86fc58170fa2e6f3b13bcb3ddeeb66b6c31ede89 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 10 May 2024 16:30:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BF=98=E6=AC=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/repaymentschedule/repaymentschedule.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue b/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue index 178ecca8c8..1f880aa3f6 100644 --- a/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue +++ b/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue @@ -209,7 +209,10 @@ export default { this.multipleSelection = row row.forEach(element => { aa.push(element.salesOrderSid) - bb.push(element.builded) + bb.push({ + builded: element.builded, + bankContractNo: element.bankContractNo + }) }) this.sids = aa this.state_list = bb @@ -274,8 +277,8 @@ export default { // } if (this.state_list.length > 0) { for (var i = 0; i < this.state_list.length; i++) { - if (this.state_list[i] === '是') { - this.$message({ showClose: true, type: 'error', message: '请选择是否已生成还款计划表状态为否的记录进行操作' }) + if (this.state_list[i].bankContractNo === '' || this.state_list[i].builded === '是') { + this.$message({ showClose: true, type: 'error', message: '请选择是否已生成还款计划表状态为否且资方合同编号不为空的记录进行操作' }) return } }