From 806ef0a9388aa59abfa12a028ab44863d8a0e8ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= Date: Thu, 1 Feb 2024 12:07:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=A7=84=E5=88=99=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/SubjectSettlementRulesMapper.xml | 18 +- .../scm/SubjectaccountperiodrulesnoMapper.xml | 22 +++ .../SubjectaccountperiodrulesnoMapper.java | 1 + .../SubjectaccountperiodrulesnoService.java | 1 + ...ubjectaccountperiodrulesnoServiceImpl.java | 10 ++ ...SubjectaccountperiodrulesnoController.java | 52 +++++- jnpf-java-boot/jnpf-web/src/api/extend/scm.js | 9 + .../src/views/extend/subjectbasic/form.vue | 157 +++++++++++++++--- 8 files changed, 242 insertions(+), 28 deletions(-) create mode 100644 jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/SubjectaccountperiodrulesnoMapper.xml diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/SubjectSettlementRulesMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/SubjectSettlementRulesMapper.xml index 5cd7ce94..5981d4f8 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/SubjectSettlementRulesMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/SubjectSettlementRulesMapper.xml @@ -2,7 +2,23 @@ - select a.* from jg_subject_settlement_rules a left join flow_task b on a.id = b.f_id where a.f_delete_mark is null and b.f_current_node_code = 'end' and f_status = 2 and f_completion = 100 diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/SubjectaccountperiodrulesnoMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/SubjectaccountperiodrulesnoMapper.xml new file mode 100644 index 00000000..c24f7210 --- /dev/null +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/SubjectaccountperiodrulesnoMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/SubjectaccountperiodrulesnoMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/SubjectaccountperiodrulesnoMapper.java index 07038536..530f831a 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/SubjectaccountperiodrulesnoMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/SubjectaccountperiodrulesnoMapper.java @@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SubjectaccountperiodrulesnoMapper extends BaseMapper { + SubjectaccountperiodrulesnoEntity getDefaultAccountPeriodRules(SubjectaccountperiodrulesnoEntity subjectaccountperiodrulesnoEntity); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/SubjectaccountperiodrulesnoService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/SubjectaccountperiodrulesnoService.java index ac9ac7ca..1f1edeb6 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/SubjectaccountperiodrulesnoService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/SubjectaccountperiodrulesnoService.java @@ -36,4 +36,5 @@ public interface SubjectaccountperiodrulesnoService extends IService getList(SubjectaccountperiodrulesnoPagination subjectaccountperiodrulesnoPagination){ return getTypeList(subjectaccountperiodrulesnoPagination,subjectaccountperiodrulesnoPagination.getDataType()); @@ -308,6 +312,7 @@ public class SubjectaccountperiodrulesnoServiceImpl extends ServiceImpl getSubjectaccountperiodrulesList(String id){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(SubjectaccountperiodrulesEntity::getNoId, id); + queryWrapper.lambda().orderByAsc(SubjectaccountperiodrulesEntity::getCreditRating); return subjectaccountperiodrulesService.list(queryWrapper); } /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/ @@ -448,4 +453,9 @@ public class SubjectaccountperiodrulesnoServiceImpl extends ServiceImpl subjectSettlementRulesQueryWrapper=new QueryWrapper<>(); + subjectSettlementRulesQueryWrapper.lambda().eq(SubjectSettlementRulesEntity::getCompanyId, companyId); + + + + userInfo.getOrganizeId();*/ + SubjectaccountperiodrulesnoEntity subjectaccountperiodrulesnoEntity = new SubjectaccountperiodrulesnoEntity(); + subjectaccountperiodrulesnoEntity.setCompanyId(companyId); + subjectaccountperiodrulesnoEntity.setBusinessType(businessType); + //查询同公司的最后一条审批通过的流程 + SubjectaccountperiodrulesnoEntity entity= subjectaccountperiodrulesnoService.getDefaultAccountPeriodRules(subjectaccountperiodrulesnoEntity); + + Map subjectaccountperiodrulesnoMap=JsonUtil.entityToMap(entity); + subjectaccountperiodrulesnoMap.put("id", subjectaccountperiodrulesnoMap.get("id")); + //副表数据 + //子表数据 + List subjectaccountperiodrulesList = subjectaccountperiodrulesnoService.getSubjectaccountperiodrulesList(entity.getId()); + subjectaccountperiodrulesnoMap.put("tableField102",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(subjectaccountperiodrulesList))); + subjectaccountperiodrulesnoMap = generaterSwapUtil.swapDataDetail(subjectaccountperiodrulesnoMap,SubjectaccountperiodrulesnoConstant.getFormData(),"522376064903685637",false); + return ActionResult.success(subjectaccountperiodrulesnoMap); + } } diff --git a/jnpf-java-boot/jnpf-web/src/api/extend/scm.js b/jnpf-java-boot/jnpf-web/src/api/extend/scm.js index 76f1db10..733ec6c8 100644 --- a/jnpf-java-boot/jnpf-web/src/api/extend/scm.js +++ b/jnpf-java-boot/jnpf-web/src/api/extend/scm.js @@ -7,3 +7,12 @@ export function queryDefaultSettlementRules(businessType) { method: 'GET' }) } +// 查询默认账期规则 +export function queryDefaultAccountPeriodRules(businessType) { + return request({ + url: `/api/scm/Subjectaccountperiodrulesno/getDefaultAccountPeriodRules/${businessType}`, + method: 'GET' + }) +} + + diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/subjectbasic/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/subjectbasic/form.vue index d98cfd7c..4c5f6884 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/subjectbasic/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/subjectbasic/form.vue @@ -558,7 +558,7 @@ - + + + + + + + + + + + + + + + + + + + - + + + - + - + - + + + + + + + + + + + + + + + + + + - + + + - + - + + + + + + + + + + + + + + + + + + - - + + @@ -660,19 +728,41 @@ - - - + + + + + - + + + + + + + + + + - - + + + + + + + + + + @@ -1132,7 +1222,7 @@ getDictionaryDataSelector } from '@/api/systemData/dictionary' import { - queryDefaultSettlementRules + queryDefaultSettlementRules, queryDefaultAccountPeriodRules } from '@/api/extend/scm' import { getDefaultCurrentValueUserId @@ -1156,6 +1246,9 @@ props: [], data() { return { + defaultSettlementRules: {}, + defaultAccountPeriodRules: [], + defaultAccountPeriod: {}, dataFormSubmitType: 0, continueBtnLoading: false, index: 0, @@ -2329,12 +2422,24 @@ }, getDefaultSettlementRules() { queryDefaultSettlementRules('1').then(res => { - debugger + this.defaultSettlementRules = res.data }) }, getDefaultAccountPeriodRules() { - getDictionaryDataSelector('9b542177a477488994ce09fff3c93901').then(res => { - this.enterpriseNatureOptions = res.data.list + queryDefaultAccountPeriodRules('1').then(res => { + this.defaultAccountPeriodRules = res.data.tableField102 + var customerStarRating = this.dataForm.customerStarRating + if(this.dataForm.customerStarRating == '517682428312028165'){ + this.defaultAccountPeriod = res.data.tableField102[0] + }else if(this.dataForm.customerStarRating == '517682463938446341'){ + this.defaultAccountPeriod = res.data.tableField102[1] + }else if(this.dataForm.customerStarRating == '517682488533844997'){ + this.defaultAccountPeriod = res.data.tableField102[2] + }else if(this.dataForm.customerStarRating == '517682518925771781'){ + this.defaultAccountPeriod = res.data.tableField102[3] + }else if(this.dataForm.customerStarRating == '517682574965867525'){ + this.defaultAccountPeriod = res.data.tableField102[4] + } }) },