diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java index 9b8efe9d..ae28dc51 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java @@ -384,10 +384,10 @@ public class CwaccountServiceImpl extends ServiceImpl 0){ cwaccountNum++; - cwaccountQueryWrapper.lambda().eq(CwaccountEntity::getContractCode,cwaccountPagination.getContractCode()); + cwaccountQueryWrapper.lambda().in(CwaccountEntity::getContractCode,cwaccountPagination.getContractCodeList()); } if(ObjectUtil.isNotEmpty(cwaccountPagination.getAccountState())){ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountPagination.java index 1ca5c093..3489b845 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountPagination.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountPagination.java @@ -45,7 +45,7 @@ public class CwaccountPagination extends Pagination { private List excludeIdList; @JsonProperty("idList") private List idList; - private String contractCode; + private List contractCodeList; private String accountState; @JsonProperty("queryFlowTaskPass") private String queryFlowTaskPass; diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue index e96ca718..3e31d942 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue @@ -2476,8 +2476,12 @@ export default { for (let i = 0; i < this.dataForm.cwsettlementaccountList.length; i++) { excludeIdList.push(this.dataForm.cwsettlementaccountList[i].accountId); } + let contractNameList = []; + for (let i = 0; i < this.dataForm.cwsettlementcontractList.length; i++) { + contractNameList.push(this.dataForm.cwsettlementcontractList[i].contractName); + } this.$nextTick(() => { - this.$refs.goodsBox.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectName, this.dataForm.cwsettlementcontractList[0].contractName, '1', this.dataForm.type, this.dataForm.businessType) + this.$refs.goodsBox.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectName, contractNameList, '1', this.dataForm.type, this.dataForm.businessType) }) }, choice2() { diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementaccountList.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementaccountList.vue index 85d051ea..d39f8a20 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementaccountList.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementaccountList.vue @@ -45,7 +45,7 @@ {{ scope.row.type}} - + @@ -87,7 +87,7 @@ export default { }, excludeIdList: [], accountSubjectName: '', - contractCode: '', + contractCodeListList: '', accountState: '', type: '', businessType: '', @@ -95,7 +95,7 @@ export default { } }, methods: { - init(excludeIdList, accountSubjectName, contractCode, accountState, type, businessType) { + init(excludeIdList, accountSubjectName, contractCodeList, accountState, type, businessType) { this.visible = true this.listLoading = true if (excludeIdList && excludeIdList instanceof Array) { @@ -104,8 +104,8 @@ export default { if (accountSubjectName && typeof (accountSubjectName) == 'string') { this.accountSubjectName = accountSubjectName; } - if (contractCode && typeof (contractCode) == 'string') { - this.contractCode = contractCode; + if (contractCodeList && contractCodeList instanceof Array) { + this.contractCodeList = contractCodeList; } if (accountState && typeof (accountState) == 'string') { this.accountState = accountState; @@ -121,7 +121,7 @@ export default { keyword: this.keyword, excludeIdList: this.excludeIdList, accountSubjectName: this.accountSubjectName, - contractCode: this.contractCode, + contractCodeList: this.contractCodeList, accountState: this.accountState, type: this.type, businessType: this.businessType,