From 785341f4fd57af722a190e4388976ff7e5059a10 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Tue, 11 Jun 2024 10:01:29 +0800 Subject: [PATCH] update --- app.platform/build.gradle | 6 +- .../capitalplan/api/StrategicTargetVo.java | 87 ++++++++++ erm.frontend/package.json | 15 +- erm.frontend/src/components/index.ts | 2 + erm.frontend/src/i18n/messages.json | 9 +- erm.frontend/src/i18n/messages_tw_CN.json | 9 +- erm.frontend/src/i18n/messages_zh_CN.json | 9 +- erm.frontend/src/menus/menus.json | 2 + erm.frontend/src/routes/routes.json | 15 ++ .../src/views/capitalPlan/StrategicTarget.vue | 79 ++++++++++ erm.frontend/src/views/kpi/Indicator.vue | 2 +- .../StrategicTargetWebController.java | 15 ++ .../jpa/entity/StrategicTargetEntity.java | 148 ++++++++++++++++++ .../repository/StrategicTargetRepository.java | 11 ++ .../service/StrategicTargetService.java | 10 ++ .../impl/StrategicTargetServiceImpl.java | 12 ++ .../META-INF/platform/plugins/components.json | 5 +- .../META-INF/platform/plugins/liquibase.json | 5 +- .../platform/plugins/repositories.json | 5 +- .../liquibase/data/rp_cp_strategic_target.csv | 23 +++ ...221020__ERM Capital Plan Database Data.xml | 19 +++ ..._20221020__ERM Capital Plan Schema DDL.xml | 44 ++++++ gradle.properties | 2 +- io.sc.engine.mv.frontend/package.json | 15 +- io.sc.engine.rule.frontend/package.json | 15 +- io.sc.engine.st.frontend/package.json | 15 +- .../platform/components/grid/TreeGridRow.vue | 4 +- .../src/platform/components/grid/WGrid.vue | 6 + .../template-project/package.json | 4 +- .../package.json | 15 +- .../io/sc/platform/installer/installer.html | 36 +++++ io.sc.platform.lcdp.frontend/package.json | 15 +- .../sc/platform/lcdp/configure/api/Sider.java | 2 +- io.sc.platform.mvc.frontend/package.json | 15 +- io.sc.platform.security.frontend/package.json | 2 +- io.sc.platform.system.frontend/package.json | 15 +- .../announcement/AnnouncementManager.vue | 5 +- .../src/views/role/Role.vue | 1 - io.sc.standard.frontend/package.json | 15 +- 39 files changed, 674 insertions(+), 40 deletions(-) create mode 100644 erm.api/src/main/java/erm/capitalplan/api/StrategicTargetVo.java create mode 100644 erm.frontend/src/views/capitalPlan/StrategicTarget.vue create mode 100644 erm/src/main/java/erm/capitalplan/controller/StrategicTargetWebController.java create mode 100644 erm/src/main/java/erm/capitalplan/jpa/entity/StrategicTargetEntity.java create mode 100644 erm/src/main/java/erm/capitalplan/jpa/entity/repository/StrategicTargetRepository.java create mode 100644 erm/src/main/java/erm/capitalplan/service/StrategicTargetService.java create mode 100644 erm/src/main/java/erm/capitalplan/service/impl/StrategicTargetServiceImpl.java create mode 100644 erm/src/main/resources/erm/liquibase/data/rp_cp_strategic_target.csv create mode 100644 erm/src/main/resources/liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Database Data.xml create mode 100644 erm/src/main/resources/liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Schema DDL.xml diff --git a/app.platform/build.gradle b/app.platform/build.gradle index 2a592956..583824a5 100644 --- a/app.platform/build.gradle +++ b/app.platform/build.gradle @@ -33,10 +33,10 @@ dependencies { // project(":io.sc.engine.st"), // project(":io.sc.engine.st.frontend"), // -// project(":erm"), -// project(":erm.frontend"), + project(":erm"), + project(":erm.frontend"), - project(":io.sc.standard"), +// project(":io.sc.standard"), ) } diff --git a/erm.api/src/main/java/erm/capitalplan/api/StrategicTargetVo.java b/erm.api/src/main/java/erm/capitalplan/api/StrategicTargetVo.java new file mode 100644 index 00000000..e8e384a1 --- /dev/null +++ b/erm.api/src/main/java/erm/capitalplan/api/StrategicTargetVo.java @@ -0,0 +1,87 @@ +package erm.capitalplan.api; + +import io.sc.platform.orm.api.vo.CorporationAuditorVo; + +public class StrategicTargetVo extends CorporationAuditorVo { + private String id; + private String code; + private String name; + private String category; + private Integer order; + private Double t; + private Double t1; + private Double t2; + private Double t3; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public Integer getOrder() { + return order; + } + + public void setOrder(Integer order) { + this.order = order; + } + + public Double getT() { + return t; + } + + public void setT(Double t) { + this.t = t; + } + + public Double getT1() { + return t1; + } + + public void setT1(Double t1) { + this.t1 = t1; + } + + public Double getT2() { + return t2; + } + + public void setT2(Double t2) { + this.t2 = t2; + } + + public Double getT3() { + return t3; + } + + public void setT3(Double t3) { + this.t3 = t3; + } +} diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 54651ac5..6360f657 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -92,12 +92,23 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.219", + "platform-core": "8.1.227", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", "vue-dompurify-html": "5.0.1", "vue-i18n": "9.13.1", - "vue-router": "4.3.2" + "vue-router": "4.3.2", + "@univerjs/core": "0.1.13", + "@univerjs/design": "0.1.13", + "@univerjs/docs": "0.1.13", + "@univerjs/docs-ui": "0.1.13", + "@univerjs/engine-formula": "0.1.13", + "@univerjs/engine-render": "0.1.13", + "@univerjs/facade": "0.1.13", + "@univerjs/sheets": "0.1.13", + "@univerjs/sheets-formula": "0.1.13", + "@univerjs/sheets-ui": "0.1.13", + "@univerjs/ui": "0.1.13" } } \ No newline at end of file diff --git a/erm.frontend/src/components/index.ts b/erm.frontend/src/components/index.ts index 8a1ab839..29a1a004 100644 --- a/erm.frontend/src/components/index.ts +++ b/erm.frontend/src/components/index.ts @@ -29,6 +29,7 @@ import component_erm_assessment_managementResult from '@/views/assessment/Manage import component_erm_assessment_selfEvaluation from '@/views/assessment/SelfEvaluation.vue'; import component_erm_assessment_reEvaluation from '@/views/assessment/ReEvaluation.vue'; import component_erm_assessment_additional from '@/views/assessment/Additional.vue'; +import component_erm_capitalPlan_strategicTarget from '@/views/capitalPlan/StrategicTarget.vue'; import component_erm_capitalPlan_parameter from '@/views/capitalPlan/Parameter.vue'; import component_erm_capitalPlan_result from '@/views/capitalPlan/Result.vue'; import component_erm_capitalPlan_insufficiency from '@/views/capitalPlan/Insufficiency.vue'; @@ -67,6 +68,7 @@ const localComponents = { 'component.erm.assessment.selfEvaluation': component_erm_assessment_selfEvaluation, 'component.erm.assessment.reEvaluation': component_erm_assessment_reEvaluation, 'component.erm.assessment.additional': component_erm_assessment_additional, + 'component.erm.capitalPlan.strategicTarget': component_erm_capitalPlan_strategicTarget, 'component.erm.capitalPlan.parameter': component_erm_capitalPlan_parameter, 'component.erm.capitalPlan.result': component_erm_capitalPlan_result, 'component.erm.capitalPlan.insufficiency': component_erm_capitalPlan_insufficiency, diff --git a/erm.frontend/src/i18n/messages.json b/erm.frontend/src/i18n/messages.json index b4e68114..566c8c8e 100644 --- a/erm.frontend/src/i18n/messages.json +++ b/erm.frontend/src/i18n/messages.json @@ -35,6 +35,7 @@ "menu.erm.assessment.reEvaluation" : "Management Re Evaluation", "menu.erm.assessment.additional" : "Capital Additional", "menu.erm.capitalPlan" : "Capital Plan", + "menu.erm.capitalPlan.strategicTarget" : "Strategic Objectives", "menu.erm.capitalPlan.parameter" : "Parameter", "menu.erm.capitalPlan.result" : "Result", "menu.erm.capitalPlan.insufficiency" : "Insufficiency", @@ -136,5 +137,11 @@ "erm.appetite.spread.coreIndicator.grid.entity.supervisionMinValue": "Minial Value of Supervision", "erm.appetite.spread.coreIndicator.grid.entity.expectValue": "Expect Value", "erm.appetite.spread.coreIndicator.grid.entity.referenceValue": "Reference Value", - "erm.appetite.spread.coreIndicator.grid.entity.lastYearValue": "Last Year Value" + "erm.appetite.spread.coreIndicator.grid.entity.lastYearValue": "Last Year Value", + + "erm.capitalPlan.strategicTarget.grid.title": "Strategic Objectives", + "erm.capitalPlan.strategicTarget.grid.entity.t": "T Year", + "erm.capitalPlan.strategicTarget.grid.entity.t1": "T+1 Year", + "erm.capitalPlan.strategicTarget.grid.entity.t2": "T+2 Year", + "erm.capitalPlan.strategicTarget.grid.entity.t3": "T+3 Year", } diff --git a/erm.frontend/src/i18n/messages_tw_CN.json b/erm.frontend/src/i18n/messages_tw_CN.json index c4a1a1b6..8bedbaf2 100644 --- a/erm.frontend/src/i18n/messages_tw_CN.json +++ b/erm.frontend/src/i18n/messages_tw_CN.json @@ -35,6 +35,7 @@ "menu.erm.assessment.reEvaluation" : "管理能力復評估", "menu.erm.assessment.additional" : "資本附加結果", "menu.erm.capitalPlan" : "資本規劃", + "menu.erm.capitalPlan.strategicTarget" : "戰略目標", "menu.erm.capitalPlan.parameter" : "參數管理", "menu.erm.capitalPlan.result" : "規劃結果", "menu.erm.capitalPlan.insufficiency" : "缺口測算", @@ -136,5 +137,11 @@ "erm.appetite.spread.coreIndicator.grid.entity.supervisionMinValue": "容忍下限(監管要求)", "erm.appetite.spread.coreIndicator.grid.entity.expectValue": "目標值(股東期望)", "erm.appetite.spread.coreIndicator.grid.entity.referenceValue": "參考值(定量傳導)", - "erm.appetite.spread.coreIndicator.grid.entity.lastYearValue": "上年度指標值" + "erm.appetite.spread.coreIndicator.grid.entity.lastYearValue": "上年度指標值", + + "erm.capitalPlan.strategicTarget.grid.title": "戰略目標", + "erm.capitalPlan.strategicTarget.grid.entity.t": "T 年", + "erm.capitalPlan.strategicTarget.grid.entity.t1": "T+1 年", + "erm.capitalPlan.strategicTarget.grid.entity.t2": "T+2 年", + "erm.capitalPlan.strategicTarget.grid.entity.t3": "T+3 年", } diff --git a/erm.frontend/src/i18n/messages_zh_CN.json b/erm.frontend/src/i18n/messages_zh_CN.json index 72962903..37f80f90 100644 --- a/erm.frontend/src/i18n/messages_zh_CN.json +++ b/erm.frontend/src/i18n/messages_zh_CN.json @@ -35,6 +35,7 @@ "menu.erm.assessment.reEvaluation" : "管理能力复评估", "menu.erm.assessment.additional" : "资本附加结果", "menu.erm.capitalPlan" : "资本规划", + "menu.erm.capitalPlan.strategicTarget": "战略目标", "menu.erm.capitalPlan.parameter" : "参数管理", "menu.erm.capitalPlan.result" : "规划结果", "menu.erm.capitalPlan.insufficiency" : "缺口测算", @@ -136,5 +137,11 @@ "erm.appetite.spread.coreIndicator.grid.entity.supervisionMinValue": "容忍下限(监管要求)", "erm.appetite.spread.coreIndicator.grid.entity.expectValue": "目标值(股东期望)", "erm.appetite.spread.coreIndicator.grid.entity.referenceValue": "参考值(定量传导)", - "erm.appetite.spread.coreIndicator.grid.entity.lastYearValue": "上年度指标值" + "erm.appetite.spread.coreIndicator.grid.entity.lastYearValue": "上年度指标值", + + "erm.capitalPlan.strategicTarget.grid.title": "战略目标", + "erm.capitalPlan.strategicTarget.grid.entity.t": "T 年", + "erm.capitalPlan.strategicTarget.grid.entity.t1": "T+1 年", + "erm.capitalPlan.strategicTarget.grid.entity.t2": "T+2 年", + "erm.capitalPlan.strategicTarget.grid.entity.t3": "T+3 年", } diff --git a/erm.frontend/src/menus/menus.json b/erm.frontend/src/menus/menus.json index 23613508..f838edf5 100644 --- a/erm.frontend/src/menus/menus.json +++ b/erm.frontend/src/menus/menus.json @@ -97,6 +97,8 @@ /*全面风险管理/资本规划*/ {"type":"GROUP", "order":600, "parentId":"menu.erm", "id":"menu.erm.capitalPlan", "titleI18nKey":"menu.erm.capitalPlan", "icon":"bi-textarea"}, + /*全面风险管理/资本规划/战略目标*/ + {"type":"ROUTE", "order":50, "parentId":"menu.erm.capitalPlan", "id":"menu.erm.capitalPlan.strategicTarget", "titleI18nKey":"menu.erm.capitalPlan.strategicTarget", "icon":"bi-gear", "routeName":"route.erm.capitalPlan.strategicTarget"}, /*全面风险管理/资本规划/参数管理*/ {"type":"ROUTE", "order":100, "parentId":"menu.erm.capitalPlan", "id":"menu.erm.capitalPlan.parameter", "titleI18nKey":"menu.erm.capitalPlan.parameter", "icon":"bi-gear", "routeName":"route.erm.capitalPlan.parameter"}, /*全面风险管理/资本规划/规划结果*/ diff --git a/erm.frontend/src/routes/routes.json b/erm.frontend/src/routes/routes.json index 7b6dc320..7406872a 100644 --- a/erm.frontend/src/routes/routes.json +++ b/erm.frontend/src/routes/routes.json @@ -404,6 +404,21 @@ ] } }, + { + "name": "route.erm.capitalPlan.strategicTarget", + "path": "erm/capitalPlan/strategicTarget", + "parent": "/", + "priority": 0, + "module": "erm.frontend", + "component": "component.erm.capitalPlan.strategicTarget", + "componentPath": "@/views/capitalPlan/StrategicTarget.vue", + "redirect": null, + "meta": { + "permissions": [ + "/erm/capitalPlan/**/*" + ] + } + }, { "name": "route.erm.capitalPlan.parameter", "path": "erm/capitalPlan/parameter", diff --git a/erm.frontend/src/views/capitalPlan/StrategicTarget.vue b/erm.frontend/src/views/capitalPlan/StrategicTarget.vue new file mode 100644 index 00000000..434f3963 --- /dev/null +++ b/erm.frontend/src/views/capitalPlan/StrategicTarget.vue @@ -0,0 +1,79 @@ + + diff --git a/erm.frontend/src/views/kpi/Indicator.vue b/erm.frontend/src/views/kpi/Indicator.vue index f2cfad54..61bc2879 100644 --- a/erm.frontend/src/views/kpi/Indicator.vue +++ b/erm.frontend/src/views/kpi/Indicator.vue @@ -32,7 +32,7 @@ label: $t('erm.kpi.indicator.grid.entity.category'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY), queryOperator: 'equals', }, { diff --git a/erm/src/main/java/erm/capitalplan/controller/StrategicTargetWebController.java b/erm/src/main/java/erm/capitalplan/controller/StrategicTargetWebController.java new file mode 100644 index 00000000..7cd3f816 --- /dev/null +++ b/erm/src/main/java/erm/capitalplan/controller/StrategicTargetWebController.java @@ -0,0 +1,15 @@ +package erm.capitalplan.controller; + +import erm.capitalplan.api.StrategicTargetVo; +import erm.capitalplan.jpa.entity.StrategicTargetEntity; +import erm.capitalplan.jpa.entity.repository.StrategicTargetRepository; +import erm.capitalplan.service.StrategicTargetService; +import io.sc.platform.mvc.controller.support.RestCrudController; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController("erm.capitalplan.controller.StrategicTargetWebController") +@RequestMapping("/api/erm/capitalpan/strategicTarget") +public class StrategicTargetWebController extends RestCrudController { + +} diff --git a/erm/src/main/java/erm/capitalplan/jpa/entity/StrategicTargetEntity.java b/erm/src/main/java/erm/capitalplan/jpa/entity/StrategicTargetEntity.java new file mode 100644 index 00000000..c1ff136e --- /dev/null +++ b/erm/src/main/java/erm/capitalplan/jpa/entity/StrategicTargetEntity.java @@ -0,0 +1,148 @@ +package erm.capitalplan.jpa.entity; + +import erm.appetite.api.CrossValidateVo; +import erm.capitalplan.api.StrategicTargetVo; +import io.sc.platform.orm.entity.CorporationAuditorEntity; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import javax.validation.constraints.Size; + +@Entity +@Table(name="RP_CP_STRATEGIC_TARGET") +public class StrategicTargetEntity extends CorporationAuditorEntity { + //ID，主键 + @Id + @GeneratedValue(generator = "system-uuid") + @GenericGenerator(name = "system-uuid", strategy = "uuid2") + @Column(name="ID_", length=36) + @Size(max=36) + private String id; + + //代码 + @Column(name="CODE_",nullable=false,length=255) + @Size(max=255) + private String code; + + //名称 + @Column(name="NAME_",nullable=false, length=255) + @Size(min=1,max=255) + private String name; + + //分类 + @Column(name="CATEGORY_",length=255) + @Size(max=255) + private String category; + + @Column(name="ORDER_") + private Integer order; + + //T年 + @Column(name="T_") + private Double t; + + //T+1年 + @Column(name="T1_") + private Double t1; + + //T+2年 + @Column(name="T2_") + private Double t2; + + //T+3年 + @Column(name="T3_") + private Double t3; + + @Override + public StrategicTargetVo toVo() { + StrategicTargetVo vo =new StrategicTargetVo(); + super.toVo(vo); + vo.setId(this.getId()); + vo.setCode(this.getCode()); + vo.setName(this.getName()); + vo.setCategory(this.getCategory()); + vo.setOrder(this.getOrder()); + vo.setT(this.getT()); + vo.setT1(this.getT1()); + vo.setT2(this.getT2()); + vo.setT3(this.getT3()); + return vo; + } + + public StrategicTargetEntity(){} + public StrategicTargetEntity(String id){ + this.id =id; + } + + public @Size(max = 36) String getId() { + return id; + } + + public void setId(@Size(max = 36) String id) { + this.id = id; + } + + public @Size(max = 255) String getCode() { + return code; + } + + public void setCode(@Size(max = 255) String code) { + this.code = code; + } + + public @Size(min = 1, max = 255) String getName() { + return name; + } + + public void setName(@Size(min = 1, max = 255) String name) { + this.name = name; + } + + public @Size(max = 255) String getCategory() { + return category; + } + + public void setCategory(@Size(max = 255) String category) { + this.category = category; + } + + public Integer getOrder() { + return order; + } + + public void setOrder(Integer order) { + this.order = order; + } + + public Double getT() { + return t; + } + + public void setT(Double t) { + this.t = t; + } + + public Double getT1() { + return t1; + } + + public void setT1(Double t1) { + this.t1 = t1; + } + + public Double getT2() { + return t2; + } + + public void setT2(Double t2) { + this.t2 = t2; + } + + public Double getT3() { + return t3; + } + + public void setT3(Double t3) { + this.t3 = t3; + } +} diff --git a/erm/src/main/java/erm/capitalplan/jpa/entity/repository/StrategicTargetRepository.java b/erm/src/main/java/erm/capitalplan/jpa/entity/repository/StrategicTargetRepository.java new file mode 100644 index 00000000..594da065 --- /dev/null +++ b/erm/src/main/java/erm/capitalplan/jpa/entity/repository/StrategicTargetRepository.java @@ -0,0 +1,11 @@ +package erm.capitalplan.jpa.entity.repository; + +import erm.appetite.jpa.entity.CrossValidateEntity; +import erm.capitalplan.jpa.entity.StrategicTargetEntity; +import io.sc.platform.orm.repository.DaoRepository; +import org.springframework.stereotype.Repository; + +@Repository("erm.capitalplan.jpa.entity.repository.StrategicTargetRepository") +public interface StrategicTargetRepository extends DaoRepository { + +} diff --git a/erm/src/main/java/erm/capitalplan/service/StrategicTargetService.java b/erm/src/main/java/erm/capitalplan/service/StrategicTargetService.java new file mode 100644 index 00000000..d1180c04 --- /dev/null +++ b/erm/src/main/java/erm/capitalplan/service/StrategicTargetService.java @@ -0,0 +1,10 @@ +package erm.capitalplan.service; + +import erm.appetite.jpa.entity.CrossValidateEntity; +import erm.appetite.jpa.repository.CrossValidateRepository; +import erm.capitalplan.jpa.entity.StrategicTargetEntity; +import erm.capitalplan.jpa.entity.repository.StrategicTargetRepository; +import io.sc.platform.orm.service.DaoService; + +public interface StrategicTargetService extends DaoService { +} diff --git a/erm/src/main/java/erm/capitalplan/service/impl/StrategicTargetServiceImpl.java b/erm/src/main/java/erm/capitalplan/service/impl/StrategicTargetServiceImpl.java new file mode 100644 index 00000000..a973d32a --- /dev/null +++ b/erm/src/main/java/erm/capitalplan/service/impl/StrategicTargetServiceImpl.java @@ -0,0 +1,12 @@ +package erm.capitalplan.service.impl; + +import erm.capitalplan.jpa.entity.StrategicTargetEntity; +import erm.capitalplan.jpa.entity.repository.StrategicTargetRepository; +import erm.capitalplan.service.StrategicTargetService; +import io.sc.platform.orm.service.impl.DaoServiceImpl; +import org.springframework.stereotype.Service; + +@Service("erm.capitalplan.service.impl.StrategicTargetServiceImpl") +public class StrategicTargetServiceImpl extends DaoServiceImpl implements StrategicTargetService { + +} diff --git a/erm/src/main/resources/META-INF/platform/plugins/components.json b/erm/src/main/resources/META-INF/platform/plugins/components.json index 6a417b71..80f85b32 100644 --- a/erm/src/main/resources/META-INF/platform/plugins/components.json +++ b/erm/src/main/resources/META-INF/platform/plugins/components.json @@ -13,7 +13,10 @@ "erm.kpi.service.impl", "erm.appetite.controller", - "erm.appetite.service.impl" + "erm.appetite.service.impl", + + "erm.capitalplan.controller", + "erm.capitalplan.service.impl" ], "excludes":[] } diff --git a/erm/src/main/resources/META-INF/platform/plugins/liquibase.json b/erm/src/main/resources/META-INF/platform/plugins/liquibase.json index 5a98597c..c844f485 100644 --- a/erm/src/main/resources/META-INF/platform/plugins/liquibase.json +++ b/erm/src/main/resources/META-INF/platform/plugins/liquibase.json @@ -20,7 +20,10 @@ "liquibase/kpi/erm.kpi_1.0.0_20221020__ERM KPI Database Data.xml", "liquibase/appetite/erm.appetite_1.0.0_20221020__ERM Appetite Database Schema DDL.xml", - "liquibase/appetite/erm.appetite_1.0.0_20221020__ERM Appetite Database Data.xml" + "liquibase/appetite/erm.appetite_1.0.0_20221020__ERM Appetite Database Data.xml", + + "liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Schema DDL.xml", + "liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Database Data.xml" ] } ] diff --git a/erm/src/main/resources/META-INF/platform/plugins/repositories.json b/erm/src/main/resources/META-INF/platform/plugins/repositories.json index eba8c3ca..117f94f9 100644 --- a/erm/src/main/resources/META-INF/platform/plugins/repositories.json +++ b/erm/src/main/resources/META-INF/platform/plugins/repositories.json @@ -13,7 +13,10 @@ "erm.kpi.jpa.repository", "erm.appetite.jpa.entity", - "erm.appetite.jpa.repository" + "erm.appetite.jpa.repository", + + "erm.capitalplan.jpa.entity", + "erm.capitalplan.jpa.repository" ], "excludes":[] } diff --git a/erm/src/main/resources/erm/liquibase/data/rp_cp_strategic_target.csv b/erm/src/main/resources/erm/liquibase/data/rp_cp_strategic_target.csv new file mode 100644 index 00000000..9297c781 --- /dev/null +++ b/erm/src/main/resources/erm/liquibase/data/rp_cp_strategic_target.csv @@ -0,0 +1,23 @@ +"RP_CP_STRATEGIC_TARGET",,,,,,,,,,,,,,, +"ID_","CODE_","NAME_","CATEGORY_","ORDER_","T_","T1_","T2_","T3_","JPA_VERSION_","DATA_COME_FROM_","CREATOR_","CREATE_DATE_","LAST_MODIFIER_","LAST_MODIFYDATE_","CORP_CODE_" +"ID","指标代码","指标名称","指标分类","指标排序","指标T年值","指标T+1年值","指标T+2年值","指标T+3年值","JPA乐观锁版本","数据来源(INPUT:手工录入,IMPORT:系统自动导入)","创建人","创建日期","最后修改人","最后修改日期","所属法人代码" +"VARCHAR","VARCHAR","VARCHAR","VARCHAR","INTEGER","DECIMAL","DECIMAL","DECIMAL","DECIMAL","INTEGER","VARCHAR","VARCHAR","TIMESTAMP","VARCHAR","TIMESTAMP","VARCHAR" +"java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.Integer","java.math.BigDecimal","java.math.BigDecimal","java.math.BigDecimal","java.math.BigDecimal","java.lang.Integer","java.lang.String","java.lang.String","java.sql.Timestamp","java.lang.String","java.sql.Timestamp","java.lang.String" +"238bd862-b2d9-4904-bf61-d95ad2c4b459","ROA","资产收益率","经营管理","8","0.050000","0.050000","0.050000","0.050000",,"INPUT","admin","2024-06-07 12:14:39.0","admin","2024-06-07 13:51:28.0","_PRIMARY_" +"4079f3cd-76bb-4b23-97a5-681eac6ae9d4","ITR","所得税税率","经营管理","15","0.250000","0.000000","0.000000","0.000000",,"INPUT","admin","2024-06-07 12:22:49.0","admin","2024-06-07 13:57:02.0","_PRIMARY_" +"456e09b8-a176-474b-afa5-3356f82b250c","CIR","成本收入比","经营管理","9","0.400000","0.390000","0.380000","0.370000",,"INPUT","admin","2024-06-07 12:15:19.0","admin","2024-06-07 13:52:13.0","_PRIMARY_" +"4b4a5075-8aff-447d-8419-3f006e325d8c","BM","业务及管理费","经营管理","14","2000000000.000000","0.000000","0.000000","0.000000",,"INPUT","admin","2024-06-07 12:21:18.0","admin","2024-06-07 13:55:57.0","_PRIMARY_" +"4cfaa729-880f-408e-a94d-2bc135e5f88f","CORE_1_CAP_RATIO","一级核心资本充足率","监管合规","3","0.080000","0.080000","0.080000","0.080000",,"INPUT","admin","2024-06-07 11:50:33.0","admin","2024-06-07 13:46:34.0","_PRIMARY_" +"5b3556ec-0428-4dc9-a830-8689796dd5b8","ARN","实际拨备余额","经营管理","13","4000000000.000000","0.000000","0.000000","0.000000",,"INPUT","admin","2024-06-07 12:20:49.0","admin","2024-06-07 13:55:44.0","_PRIMARY_" +"6f979bea-bb5f-43f7-bce2-ee4334c5f77c","NOI","营业净收入","经营管理","17","6000000000.000000","0.000000","0.000000","0.000000",,"INPUT","admin","2024-06-07 12:23:57.0","admin","2024-06-07 13:57:55.0","_PRIMARY_" +"75a9f87f-5763-45ef-8901-2de91170b7df","ROE","净资产收益率","经营管理","16","0.090000","0.000000","0.000000","0.000000",,"INPUT","admin","2024-06-07 12:23:10.0","admin","2024-06-07 13:57:31.0","_PRIMARY_" +"7e6a1712-3626-437d-83e4-e98f750c9936","TOTAL_LOANS","资产总额","业务规模","2","50000000000.000000","60000000000.000000","70000000000.000000","80000000000.000000",,"INPUT","admin","2024-06-07 11:37:32.0","admin","2024-06-07 12:07:48.0","_PRIMARY_" +"7fedd979-50dc-4b91-ba8a-ae04744bcff3","TP","税金预测","经营管理","11","0.000000","100000000.000000","200000000.000000","300000000.000000",,"INPUT","admin","2024-06-07 12:18:27.0","admin","2024-06-07 13:53:24.0","_PRIMARY_" +"aec9b6cf-cf22-480e-b5d5-75819847f136","PCR","拨备覆盖率","风险管理","7","2.000000","2.000000","2.000000","2.000000",,"INPUT","admin","2024-06-07 12:13:25.0","admin","2024-06-07 12:13:33.0","_PRIMARY_" +"b5117a57-4af0-4293-807c-38600c8b9690","CAP_RATIO","资本充足率","监管合规","5","0.100000","0.105000","0.110000","0.115000",,"INPUT","admin","2024-06-07 11:57:47.0","admin","2024-06-07 13:47:34.0","_PRIMARY_" +"c408da96-b191-4f51-8fec-b5d3e2764548","1_CAP_RATIO","一级资本充足率","监管合规","4","0.080000","0.080000","0.080000","0.080000",,"INPUT","admin","2024-06-07 11:53:44.0","admin","2024-06-07 13:46:47.0","_PRIMARY_" +"c7f3a151-62eb-40ba-9027-2acd3d4c9b50","NPL","不良贷款率","风险管理","6","0.020000","0.020000","0.020000","0.020000",,"INPUT","admin","2024-06-07 12:12:15.0","admin","2024-06-07 13:50:26.0","_PRIMARY_" +"dcd8fdff-6dfb-4184-a5c7-5f7bfa25ba0b","AR","计提拨备","经营管理","12","1100000000.000000","1200000000.000000","1300000000.000000","1400000000.000000",,"INPUT","admin","2024-06-07 12:19:42.0","admin","2024-06-07 13:54:23.0","_PRIMARY_" +"dd4a2cb8-7ac2-406f-96d7-25afb8f36fd6","DPR","股利支付率","经营管理","10","0.000000","0.300000","0.300000","0.300000",,"INPUT","admin","2024-06-07 12:16:35.0","admin","2024-06-07 13:52:40.0","_PRIMARY_" +"e985a261-affb-4065-ad2c-917b23473543","NP","净利润","经营管理","14","1500000000.000000","0.000000","0.000000","0.000000",,"INPUT","admin","2024-06-07 12:22:00.0","admin","2024-06-07 13:56:26.0","_PRIMARY_" +"f0e0a744-cafa-4482-a845-7a19aee866ff","TOTAL_ASSETS","资产总额","业务规模","1","100000000000.000000","110000000000.000000","120000000000.000000","130000000000.000000",,"INPUT","admin","2024-06-07 11:18:03.0","admin","2024-06-07 12:07:36.0","_PRIMARY_" diff --git a/erm/src/main/resources/liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Database Data.xml b/erm/src/main/resources/liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Database Data.xml new file mode 100644 index 00000000..e192f9d8 --- /dev/null +++ b/erm/src/main/resources/liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Database Data.xml @@ -0,0 +1,19 @@ + + + + + + + + + diff --git a/erm/src/main/resources/liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Schema DDL.xml b/erm/src/main/resources/liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Schema DDL.xml new file mode 100644 index 00000000..e80495fc --- /dev/null +++ b/erm/src/main/resources/liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Schema DDL.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gradle.properties b/gradle.properties index 068ef42f..74ac807b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.1.43 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.219 +platform_core_frontend_version=8.1.227 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index e02395ec..fc17eaa5 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -92,12 +92,23 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.219", + "platform-core": "8.1.227", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", "vue-dompurify-html": "5.0.1", "vue-i18n": "9.13.1", - "vue-router": "4.3.2" + "vue-router": "4.3.2", + "@univerjs/core": "0.1.13", + "@univerjs/design": "0.1.13", + "@univerjs/docs": "0.1.13", + "@univerjs/docs-ui": "0.1.13", + "@univerjs/engine-formula": "0.1.13", + "@univerjs/engine-render": "0.1.13", + "@univerjs/facade": "0.1.13", + "@univerjs/sheets": "0.1.13", + "@univerjs/sheets-formula": "0.1.13", + "@univerjs/sheets-ui": "0.1.13", + "@univerjs/ui": "0.1.13" } } \ No newline at end of file diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index 6884b290..8f5bd75e 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -92,12 +92,23 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.219", + "platform-core": "8.1.227", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", "vue-dompurify-html": "5.0.1", "vue-i18n": "9.13.1", - "vue-router": "4.3.2" + "vue-router": "4.3.2", + "@univerjs/core": "0.1.13", + "@univerjs/design": "0.1.13", + "@univerjs/docs": "0.1.13", + "@univerjs/docs-ui": "0.1.13", + "@univerjs/engine-formula": "0.1.13", + "@univerjs/engine-render": "0.1.13", + "@univerjs/facade": "0.1.13", + "@univerjs/sheets": "0.1.13", + "@univerjs/sheets-formula": "0.1.13", + "@univerjs/sheets-ui": "0.1.13", + "@univerjs/ui": "0.1.13" } } \ No newline at end of file diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index 8c5e673b..9c18297d 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -92,12 +92,23 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.219", + "platform-core": "8.1.227", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", "vue-dompurify-html": "5.0.1", "vue-i18n": "9.13.1", - "vue-router": "4.3.2" + "vue-router": "4.3.2", + "@univerjs/core": "0.1.13", + "@univerjs/design": "0.1.13", + "@univerjs/docs": "0.1.13", + "@univerjs/docs-ui": "0.1.13", + "@univerjs/engine-formula": "0.1.13", + "@univerjs/engine-render": "0.1.13", + "@univerjs/facade": "0.1.13", + "@univerjs/sheets": "0.1.13", + "@univerjs/sheets-formula": "0.1.13", + "@univerjs/sheets-ui": "0.1.13", + "@univerjs/ui": "0.1.13" } } \ No newline at end of file diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue index 9ef99757..cb9c6ed3 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue +++ b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue @@ -16,7 +16,7 @@ >
- + - + diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 0ffe750b..9da41dff 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -92,12 +92,23 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.221", + "platform-core": "8.1.227", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", "vue-dompurify-html": "5.0.1", "vue-i18n": "9.13.1", - "vue-router": "4.3.2" + "vue-router": "4.3.2", + "@univerjs/core": "0.1.13", + "@univerjs/design": "0.1.13", + "@univerjs/docs": "0.1.13", + "@univerjs/docs-ui": "0.1.13", + "@univerjs/engine-formula": "0.1.13", + "@univerjs/engine-render": "0.1.13", + "@univerjs/facade": "0.1.13", + "@univerjs/sheets": "0.1.13", + "@univerjs/sheets-formula": "0.1.13", + "@univerjs/sheets-ui": "0.1.13", + "@univerjs/ui": "0.1.13" } } \ No newline at end of file diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Sider.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Sider.java index 6a274625..41cdb9bf 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Sider.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Sider.java @@ -2,7 +2,7 @@ package io.sc.platform.lcdp.configure.api; public class Sider { private String position ="left"; // 位置(可选值:left;right) - private boolean isSiderExpaned; // 边栏状态(是否展开) + private boolean isSiderExpaned=true; // 边栏状态(是否展开) private boolean dense =true; // 是否采用紧凑模式 private boolean border =true; // 是否显示边框 diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index 42d8fade..7d3fe9c3 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -92,12 +92,23 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.219", + "platform-core": "8.1.227", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", "vue-dompurify-html": "5.0.1", "vue-i18n": "9.13.1", - "vue-router": "4.3.2" + "vue-router": "4.3.2", + "@univerjs/core": "0.1.13", + "@univerjs/design": "0.1.13", + "@univerjs/docs": "0.1.13", + "@univerjs/docs-ui": "0.1.13", + "@univerjs/engine-formula": "0.1.13", + "@univerjs/engine-render": "0.1.13", + "@univerjs/facade": "0.1.13", + "@univerjs/sheets": "0.1.13", + "@univerjs/sheets-formula": "0.1.13", + "@univerjs/sheets-ui": "0.1.13", + "@univerjs/ui": "0.1.13" } } \ No newline at end of file diff --git a/io.sc.platform.security.frontend/package.json b/io.sc.platform.security.frontend/package.json index 2614f6d2..d25d4fc7 100644 --- a/io.sc.platform.security.frontend/package.json +++ b/io.sc.platform.security.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.219", + "platform-core": "8.1.227", "quasar": "2.14.5", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index 554ce9b1..a8858120 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -92,12 +92,23 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.225", + "platform-core": "8.1.227", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", "vue-dompurify-html": "5.0.1", "vue-i18n": "9.13.1", - "vue-router": "4.3.2" + "vue-router": "4.3.2", + "@univerjs/core": "0.1.13", + "@univerjs/design": "0.1.13", + "@univerjs/docs": "0.1.13", + "@univerjs/docs-ui": "0.1.13", + "@univerjs/engine-formula": "0.1.13", + "@univerjs/engine-render": "0.1.13", + "@univerjs/facade": "0.1.13", + "@univerjs/sheets": "0.1.13", + "@univerjs/sheets-formula": "0.1.13", + "@univerjs/sheets-ui": "0.1.13", + "@univerjs/ui": "0.1.13" } } \ No newline at end of file diff --git a/io.sc.platform.system.frontend/src/views/announcement/AnnouncementManager.vue b/io.sc.platform.system.frontend/src/views/announcement/AnnouncementManager.vue index f5fd2ca0..86097315 100644 --- a/io.sc.platform.system.frontend/src/views/announcement/AnnouncementManager.vue +++ b/io.sc.platform.system.frontend/src/views/announcement/AnnouncementManager.vue @@ -6,10 +6,7 @@ selection="multiple" :checkbox-selection="true" :data-url="Environment.apiContextPath('/api/system/announcement')" - :pagination="{ - sortBy: 'lastModifyDate', - descending: true, - }" + :sort-by="['-lastModifyDate']" :query-form-cols-num="2" :query-form-fields="[{ name: 'title', label: $t('title'), type: 'text' }]" :toolbar-configure="{ noIcon: false }" diff --git a/io.sc.platform.system.frontend/src/views/role/Role.vue b/io.sc.platform.system.frontend/src/views/role/Role.vue index 555e1464..5e3bd7d0 100644 --- a/io.sc.platform.system.frontend/src/views/role/Role.vue +++ b/io.sc.platform.system.frontend/src/views/role/Role.vue @@ -31,7 +31,6 @@ :editor="{ dialog: { width: '600px', - height: '300px', }, form: { colsNum: 1, diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index f6b8c3b4..c2c9054f 100644 --- a/io.sc.standard.frontend/package.json +++ b/io.sc.standard.frontend/package.json @@ -92,12 +92,23 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.219", + "platform-core": "8.1.227", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", "vue-dompurify-html": "5.0.1", "vue-i18n": "9.13.1", - "vue-router": "4.3.2" + "vue-router": "4.3.2", + "@univerjs/core": "0.1.13", + "@univerjs/design": "0.1.13", + "@univerjs/docs": "0.1.13", + "@univerjs/docs-ui": "0.1.13", + "@univerjs/engine-formula": "0.1.13", + "@univerjs/engine-render": "0.1.13", + "@univerjs/facade": "0.1.13", + "@univerjs/sheets": "0.1.13", + "@univerjs/sheets-formula": "0.1.13", + "@univerjs/sheets-ui": "0.1.13", + "@univerjs/ui": "0.1.13" } } \ No newline at end of file