升级框架版本

app.irbs/build.gradle

@@ -29,12 +29,9 @@ dependencies {
 		"io.sc:io.sc.engine.st:${platform_version}",
 		"io.sc:io.sc.engine.st.frontend:${platform_version}",
 
-		"io.sc:io.sc.platform.page.config:${rwa_version}",
 //		"io.sc:rwa.params:${rwa_version}",
 //		"io.sc:rwa.report:${rwa_version}",
-		"io.sc:app.rwa.frontend:${rwa_version}",
-
-
+//		"io.sc:app.rwa.frontend:${rwa_version}",
 
 		project(":irbs.frontend"),
 		project(":irbs.cust.rating"),

app.irbs/src/main/resources/liquibase/IRBS_20240627_DATA.xml

@@ -29,10 +29,10 @@
         <customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
             <param name="dataFile" value="classpath:/liquibase/data/irbs/SYS_I18N.csv"/>
         </customChange>
-        <!-- 流程定义数据 -->
+        <!-- 流程定义数据
         <customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
             <param name="dataFile" value="classpath:/liquibase/data/irbs/SYS_PROCESS.csv"/>
-        </customChange>
+        </customChange>-->
         <!-- 角色配置数据 -->
         <customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
             <param name="dataFile" value="classpath:/liquibase/data/irbs/SYS_ROLE.csv"/>
@@ -146,13 +146,13 @@
             <param name="dataFile" value="classpath:/liquibase/data/irbs/P_IRS_CUST_INFO.csv"/>
         </customChange>
         <customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
-            <param name="dataFile" value="classpath:/liquibase/data/irbs/SYS_TEMP_CONF_IRS.csv"/>
+            <param name="dataFile" value="classpath:/liquibase/data/irbs/LCDP_FORM.csv"/>
         </customChange>
         <customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
-            <param name="dataFile" value="classpath:/liquibase/data/irbs/SYS_TEMP_GRID_IRS.csv"/>
+            <param name="dataFile" value="classpath:/liquibase/data/irbs/LCDP_FORM_GRID.csv"/>
         </customChange>
         <customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
-            <param name="dataFile" value="classpath:/liquibase/data/irbs/SYS_TEMP_GRID_FIELD_IRS.csv"/>
+            <param name="dataFile" value="classpath:/liquibase/data/irbs/LCDP_FORM_GRID_FIELD.csv"/>
         </customChange>
         <!-- 上农POC start-->
         <customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">

app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_CONF_IRS.csv → app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM.csv

@@ -1,4 +1,4 @@
-"SYS_TEMP_CONF",,,,,,,,,,
+"LCDP_FORM",,,,,,,,,,
 "ID_","NAME_","TYPE_","CONFIG_","PAGE_LOAD_TYPE_","DATA_COME_FROM_","CREATOR_","CREATE_DATE_","LAST_MODIFIER_","LAST_MODIFYDATE_","CORP_CODE_"
 "ID主键","模板名称","模板类型","页面配置项","页面加载类型(JSON:通过本表的_config字段存储的json字符串加载；CONFIG:通过系统配置加载)","数据来源(INPUT:手工录入,IMPORT:系统自动导入)","创建人","创建日期","最后修改人","最后修改日期","所属法人代码"
 "VARCHAR","VARCHAR","VARCHAR","LONGVARCHAR","VARCHAR","VARCHAR","VARCHAR","TIMESTAMP","VARCHAR","TIMESTAMP","VARCHAR"

app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_GRID_IRS.csv → app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM_GRID.csv

@@ -1,4 +1,4 @@
-"SYS_TEMP_GRID",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+"LCDP_FORM_GRID",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 "ID_","TEMPLATE_ID_","FIELD_COME_FROM","SCHEMA_","DATABASE_TABLE_","SQL_","TITLE_","BUTTONS_","SELECTION_","PRIMARY_KEY_","FOREIGN_KEY_","DATA_URL_","FETCH_DATA_URL_","ADD_DATA_URL_","EDIT_DATA_URL_","REMOVE_DATA_URL_","SORT_NO_","CHECKBOX_SELECTION_","DRAGGABLE_","AUTO_FETCH_DATA_","DENSE_","STICKY_NUM_","TREE_","TREE_RELATIONSHIP_","TREE_ICON_","TREE_DEFAULT_EXPAND_ALL_","TREE_TICK_STRATEGY_","TICKED_FIELD_","SELECTED_FIELD_","DEFAULT_SORT_BY_","DESCENDING_","PAGEABLE_","ROWS_PER_PAGE_","REQ_PAGE_START_","QUERY_FORM_COLS_NUM_","QUERY_FORM_ROW_NUM_","EDITOR_FORM_COLS_NUM_","DATA_COME_FROM_","CREATOR_","CREATE_DATE_","LAST_MODIFIER_","LAST_MODIFYDATE_","CORP_CODE_"
 "ID主键","模板ID","字段来源","数据库实例","数据表名","sql","表格名称","表格按钮","选中模式(single:单选,multiple:多选)","数据主键","数据外键","数据操作URL前缀","表格加载数据URL","新增URL","编辑URL","删除URL","是否显示序号列","是否显示复选框列","行是否允许拖拽","是否自动加载数据","紧凑模式","列冻结数","是否为树形表格","树形表格数据关系","树形表格图标函数","树形表格默认全部展开","树形表格勾选策略","checkbox勾选映射字段名","行点击选中映射字段名","默认排序字段","排序方式(1:倒序,0:正序)","是否分页","每页显示行数","后端查询使用的初始页码(默认从1开始)","查询面板一行显示个数(0为自适应)","查询面板显示行数(默认1)","编辑面板一行显示元素个数","数据来源(INPUT:手工录入,IMPORT:系统自动导入)","创建人","创建日期","最后修改人","最后修改日期","所属法人代码"
 "VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","LONGVARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","SMALLINT","SMALLINT","SMALLINT","SMALLINT","VARCHAR","SMALLINT","SMALLINT","VARCHAR","VARCHAR","SMALLINT","VARCHAR","VARCHAR","VARCHAR","VARCHAR","SMALLINT","SMALLINT","SMALLINT","SMALLINT","SMALLINT","SMALLINT","SMALLINT","VARCHAR","VARCHAR","TIMESTAMP","VARCHAR","TIMESTAMP","VARCHAR"

app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_GRID_FIELD_IRS.csv → app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM_GRID_FIELD.csv

@@ -1,4 +1,4 @@
-"SYS_TEMP_GRID_FIELD",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+"LCDP_FORM_GRID_FIELD",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 "ID_","GRID_ID_","PARENT_","FIELD_NAME_","FIELD_LABEL_","FIELD_TYPE_","SORT_NO_","FIELD_LENGTH_","FIELD_PRECISION_","FIELD_IS_SELECT_","OPTION_COME_FROM_","DICT_OPTION_VALUE_","OTHER_OPTION_VALUE_","ADD_SYS_VALUE_TYPE_","EDIT_OVERRIDE_","QUERY_SHOW_","QUERY_FORM_TYPE_","QUERY_DEFA_VALUE_","QUERY_IS_REQUIRED_","QUERY_OPERATOR_","TABLE_SHOW_","TABLE_SORT_","TABLE_COLUMN_ALIGN_","TABLE_COLUMN_WIDTH_","EDITOR_SHOW_","EDITOR_FORM_TYPE_","EDITOR_DEFA_VALUE_","EDITOR_IS_REQUIRED_","DATA_COME_FROM_","CREATOR_","CREATE_DATE_","LAST_MODIFIER_","LAST_MODIFYDATE_","CORP_CODE_"
 "ID主键","所属表格模板ID","字段所属的父类型(query_field: 查询字段;where_field: 条件字段)","字段名称","页面显示名称","字段类型","字段序号","字段长度","字段精度","字段是否为选项值(0:否，1:是)","选项值来源","数据字典选项值","其他选项值","新增时系统自动填充类型","修改时覆盖系统自动填充值(0:否，1:是)","查询面板中显示(0:否，1:是)","使用的表单类型","默认值","是否必填项(0:否，1:是)","查询时匹配模式","列表中显示(0:否，1:是)","是否支持排序(0:否，1:是)","列对齐方式","列宽","编辑页面是否显示(0:否，1:是)","使用的表单类型","默认值","是否必填项(0:否，1:是)","数据来源(INPUT:手工录入,IMPORT:系统自动导入)","创建人","创建日期","最后修改人","最后修改日期","所属法人代码"
 "VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","SMALLINT","SMALLINT","SMALLINT","SMALLINT","VARCHAR","VARCHAR","VARCHAR","VARCHAR","SMALLINT","SMALLINT","VARCHAR","VARCHAR","SMALLINT","VARCHAR","SMALLINT","SMALLINT","VARCHAR","SMALLINT","SMALLINT","VARCHAR","VARCHAR","SMALLINT","VARCHAR","VARCHAR","TIMESTAMP","VARCHAR","TIMESTAMP","VARCHAR"

app.irbs/src/main/resources/liquibase/data/irbs/shrcb/NS_IRS_CFG_MAIN_SCALE_VERSION.csv

@@ -3,4 +3,4 @@
 "ID主键","版本代码","版本名称","版本状态(RELEASE-发布，DRAFT-草稿，HISTORY-历史)","版本序号","审核状态(AWAIT_SUBMIT：待提交，APPROVALING：审批中，PASS：通过，NEGATIVED：否决)","流程ID","当前处理人","数据来源(INPUT:手工录入,IMPORT:系统自动导入)","创建人","创建日期","最后修改人","最后修改日期","所属法人代码"
 "VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","TIMESTAMP","VARCHAR","TIMESTAMP","VARCHAR"
 "java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.sql.Timestamp","java.lang.String","java.sql.Timestamp","java.lang.String"
-"1","SHRCB_MANSCALE_VERSION","上农内评POC项目主标尺","DRAFT","1","AWAIT_SUBMIT","","","INPUT",,,"admin","2024-07-22 16:36:59.0","_PRIMARY_"
+"1","SHRCB_MANSCALE_VERSION","上农内评POC项目主标尺","RELEASE","1","AWAIT_SUBMIT","","","INPUT",,,"admin","2024-07-22 16:36:59.0","_PRIMARY_"

build-version.gradle

@@ -1,201 +1,218 @@
+/***********************************************************************
+ * 统一定义依赖的版本，解决同一个库出现不同版本的问题
+ **********************************************************************/
+ext['PlatformDependencyVersions'] =[
+        "commons-io:commons-io"                 : "${commons_io_version}",
+        "org.ow2.asm:asm"                       : "${asm_version}",
+        "org.checkerframework:checker-qual"     : "${checker_version}",
+        "com.google.guava:guava"                : "${guava_version}",
+        "com.nimbusds:nimbus-jose-jwt"          : "9.22",
+        "org.codehaus.groovy:groovy"            : "3.0.19",
+        "org.codehaus.groovy:groovy-jsr223"     : "3.0.19",
+        "org.codehaus.groovy:groovy-datetime"   : "3.0.19",
+        "org.codehaus.groovy:groovy-dateutil"   : "3.0.19",
+        "org.codehaus.groovy:groovy-json"       : "3.0.19",
+        "org.codehaus.groovy:groovy-sql"        : "3.0.19",
+        "org.codehaus.groovy:groovy-xml"        : "3.0.19",
+];
+
 /***********************************************************************
  * 覆盖 springboot 默认包版本
  **********************************************************************/
-subprojects {
-	// ext['activemq.version'] =
-	// ext['antlr2.version'] =
-	// ext['appengine-sdk.version'] =
-	// ext['artemis.version'] =
-	// ext['aspectj.version'] =
-	// ext['assertj.version'] =
-	// ext['atomikos.version'] =
-	// ext['awaitility.version'] =
-	// ext['bitronix.version'] =
-	// ext['build-helper-maven-plugin.version'] =
-	// ext['byte-buddy.version'] =
-	// ext['caffeine.version'] =
-	// ext['cassandra-driver.version'] =
-	// ext['classmate.version'] =
-	// ext['commons-codec.version'] =
-	// ext['commons-dbcp2.version'] =
-	// ext['commons-lang3.version'] =
-	// ext['commons-pool.version'] =
-	// ext['commons-pool2.version'] =
-	// ext['couchbase-client.version'] =
-	// ext['db2-jdbc.version'] =
-	// ext['dependency-management-plugin.version'] =
-	// ext['derby.version'] =
-	// ext['dropwizard-metrics.version'] =
-	// ext['ehcache.version'] =
-	// ext['ehcache3.version'] =
-	// ext['elasticsearch.version'] =
-	// ext['embedded-mongo.version'] =
-	// ext['flyway.version'] =
-	// ext['freemarker.version'] =
-	// ext['git-commit-id-plugin.version'] =
-	// ext['glassfish-el.version'] =
-	// ext['glassfish-jaxb.version'] =
-	// ext['groovy.version'] =
-	// ext['gson.version'] =
-	// ext['h2.version'] =
-	// ext['hamcrest.version'] =
-	// ext['hazelcast.version'] =
-	// ext['hazelcast-hibernate5.version'] =
-	// ext['hibernate.version'] =
-	// ext['hibernate-validator.version'] =
-	// ext['hikaricp.version'] =
-	// ext['hsqldb.version'] =
-	// ext['htmlunit.version'] =
-	// ext['httpasyncclient.version'] =
-	// ext['httpclient.version'] =
-	// ext['httpcore.version'] =
-	// ext['infinispan.version'] =
-	// ext['influxdb-java.version'] =
-	// ext['jackson-bom.version'] =
-	// ext['jakarta-activation.version'] =
-	// ext['jakarta-annotation.version'] =
-	// ext['jakarta-jms.version'] =
-	// ext['jakarta-json.version'] =
-	// ext['jakarta-json-bind.version'] =
-	// ext['jakarta-mail.version'] =
-	// ext['jakarta-persistence.version'] =
-	// ext['jakarta-servlet.version'] =
-	// ext['jakarta-servlet-jsp-jstl.version'] =
-	// ext['jakarta-transaction.version'] =
-	// ext['jakarta-validation.version'] =
-	// ext['jakarta-websocket.version'] =
-	// ext['jakarta-ws-rs.version'] =
-	// ext['jakarta-xml-bind.version'] =
-	// ext['jakarta-xml-soap.version'] =
-	// ext['jakarta-xml-ws.version'] =
-	// ext['janino.version'] =
-	// ext['javax-activation.version'] =
-	// ext['javax-annotation.version'] =
-	// ext['javax-cache.version'] =
-	// ext['javax-jaxb.version'] =
-	// ext['javax-jaxws.version'] =
-	// ext['javax-jms.version'] =
-	// ext['javax-json.version'] =
-	// ext['javax-jsonb.version'] =
-	// ext['javax-mail.version'] =
-	// ext['javax-money.version'] =
-	// ext['javax-persistence.version'] =
-	// ext['javax-transaction.version'] =
-	// ext['javax-validation.version'] =
-	// ext['javax-websocket.version'] =
-	// ext['jaxen.version'] =
-	// ext['jaybird.version'] =
-	// ext['jboss-logging.version'] =
-	// ext['jboss-transaction-spi.version'] =
-	// ext['jdom2.version'] =
-	// ext['jedis.version'] =
-	// ext['jersey.version'] =
-	// ext['jetty.version'] =
-	// ext['jetty-el.version'] =
-	// ext['jetty-jsp.version'] =
-	// ext['jetty-reactive-httpclient.version'] =
-	// ext['jmustache.version'] =
-	// ext['johnzon.version'] =
-	// ext['jolokia.version'] =
-	// ext['jooq.version'] =
-	// ext['json-path.version'] =
-	// ext['json-smart.version'] =
-	// ext['jsonassert.version'] =
-	// ext['jstl.version'] =
-	// ext['jtds.version'] =
-	// ext['junit.version'] =
-	// ext['junit-jupiter.version'] =
-	// ext['kafka.version'] =
-	// ext['kotlin.version'] =
-	// ext['kotlin-coroutines.version'] =
-	// ext['lettuce.version'] =
-	// ext['liquibase.version'] =
-	// ext['log4j2.version'] =
-	// ext['logback.version'] =
-	// ext['lombok.version'] =
-	// ext['mariadb.version'] =
-	// ext['maven-antrun-plugin.version'] =
-	// ext['maven-assembly-plugin.version'] =
-	// ext['maven-clean-plugin.version'] =
-	// ext['maven-compiler-plugin.version'] =
-	// ext['maven-dependency-plugin.version'] =
-	// ext['maven-deploy-plugin.version'] =
-	// ext['maven-enforcer-plugin.version'] =
-	// ext['maven-failsafe-plugin.version'] =
-	// ext['maven-help-plugin.version'] =
-	// ext['maven-install-plugin.version'] =
-	// ext['maven-invoker-plugin.version'] =
-	// ext['maven-jar-plugin.version'] =
-	// ext['maven-javadoc-plugin.version'] =
-	// ext['maven-resources-plugin.version'] =
-	// ext['maven-shade-plugin.version'] =
-	// ext['maven-source-plugin.version'] =
-	// ext['maven-surefire-plugin.version'] =
-	// ext['maven-war-plugin.version'] =
-	// ext['micrometer.version'] =
-	// ext['mimepull.version'] =
-	// ext['mockito.version'] =
-	// ext['mongodb.version'] =
-	// ext['mssql-jdbc.version'] =
-	// ext['mysql.version'] =
-	// ext['nekohtml.version'] =
-	// ext['neo4j-java-driver.version'] =
-	// ext['netty.version'] =
-	// ext['netty-tcnative.version'] =
-	// ext['nimbus-jose-jwt.version'] =
-	// ext['oauth2-oidc-sdk.version'] =
-	// ext['ojdbc.version'] =
-	// ext['okhttp3.version'] =
-	// ext['oracle-database.version'] =
-	// ext['pooled-jms.version'] =
-	// ext['postgresql.version'] =
-	// ext['prometheus-pushgateway.version'] =
-	// ext['quartz.version'] =
-	// ext['querydsl.version'] =
-	// ext['r2dbc-bom.version'] =
-	// ext['rabbit-amqp-client.version'] =
-	// ext['reactive-streams.version'] =
-	// ext['reactor-bom.version'] =
-	// ext['rest-assured.version'] =
-	// ext['rsocket.version'] =
-	// ext['rxjava.version'] =
-	// ext['rxjava-adapter.version'] =
-	// ext['rxjava2.version'] =
-	// ext['saaj-impl.version'] =
-	// ext['selenium.version'] =
-	// ext['selenium-htmlunit.version'] =
-	// ext['sendgrid.version'] =
-	// ext['servlet-api.version'] =
-	// ext['slf4j.version'] =
-	// ext['snakeyaml.version'] =
-	// ext['solr.version'] =
-	// ext['spring-amqp.version'] =
-	// ext['spring-batch.version'] =
-	// ext['spring-data-bom.version'] =
-	// ext['spring-framework.version'] =
-	// ext['spring-hateoas.version'] =
-	// ext['spring-integration.version'] =
-	// ext['spring-kafka.version'] =
-	// ext['spring-ldap.version'] =
-	// ext['spring-restdocs.version'] =
-	// ext['spring-retry.version'] =
-	// ext['spring-security.version'] =
-	// ext['spring-session-bom.version'] =
-	// ext['spring-ws.version'] =
-	// ext['sqlite-jdbc.version'] =
-	// ext['sun-mail.version'] =
-	// ext['thymeleaf.version'] =
-	// ext['thymeleaf-extras-data-attribute.version'] =
-	// ext['thymeleaf-extras-java8time.version'] =
-	// ext['thymeleaf-extras-springsecurity.version'] =
-	// ext['thymeleaf-layout-dialect.version'] =
-	// ext['tomcat.version'] =
-	// ext['unboundid-ldapsdk.version'] =
-	// ext['undertow.version'] =
-	// ext['versions-maven-plugin.version'] =
-	// ext['webjars-hal-browser.version'] =
-	// ext['webjars-locator-core.version'] =
-	// ext['wsdl4j.version'] =
-	// ext['xml-maven-plugin.version'] =
-	// ext['xmlunit2.version'] =
-}
+// ext['groovy.version'] ='3.0.17'
+// ext['activemq.version'] =
+// ext['antlr2.version'] =
+// ext['appengine-sdk.version'] =
+// ext['artemis.version'] =
+// ext['aspectj.version'] =
+// ext['assertj.version'] =
+// ext['atomikos.version'] =
+// ext['awaitility.version'] =
+// ext['bitronix.version'] =
+// ext['build-helper-maven-plugin.version'] =
+// ext['byte-buddy.version'] =
+// ext['caffeine.version'] =
+// ext['cassandra-driver.version'] =
+// ext['classmate.version'] =
+// ext['commons-codec.version'] =
+// ext['commons-dbcp2.version'] =
+// ext['commons-lang3.version'] =
+// ext['commons-pool.version'] =
+// ext['commons-pool2.version'] =
+// ext['couchbase-client.version'] =
+// ext['db2-jdbc.version'] =
+// ext['dependency-management-plugin.version'] =
+// ext['derby.version'] =
+// ext['dropwizard-metrics.version'] =
+// ext['ehcache.version'] =
+// ext['ehcache3.version'] =
+// ext['elasticsearch.version'] =
+// ext['embedded-mongo.version'] =
+// ext['flyway.version'] =
+// ext['freemarker.version'] =
+// ext['git-commit-id-plugin.version'] =
+// ext['glassfish-el.version'] =
+// ext['glassfish-jaxb.version'] =
+// ext['groovy.version'] =
+// ext['gson.version'] =
+// ext['h2.version'] =
+// ext['hamcrest.version'] =
+// ext['hazelcast.version'] =
+// ext['hazelcast-hibernate5.version'] =
+// ext['hibernate.version'] =
+// ext['hibernate-validator.version'] =
+// ext['hikaricp.version'] =
+// ext['hsqldb.version'] =
+// ext['htmlunit.version'] =
+// ext['httpasyncclient.version'] =
+// ext['httpclient.version'] =
+// ext['httpcore.version'] =
+// ext['infinispan.version'] =
+// ext['influxdb-java.version'] =
+// ext['jackson-bom.version'] =
+// ext['jakarta-activation.version'] =
+// ext['jakarta-annotation.version'] =
+// ext['jakarta-jms.version'] =
+// ext['jakarta-json.version'] =
+// ext['jakarta-json-bind.version'] =
+// ext['jakarta-mail.version'] =
+// ext['jakarta-persistence.version'] =
+// ext['jakarta-servlet.version'] =
+// ext['jakarta-servlet-jsp-jstl.version'] =
+// ext['jakarta-transaction.version'] =
+// ext['jakarta-validation.version'] =
+// ext['jakarta-websocket.version'] =
+// ext['jakarta-ws-rs.version'] =
+// ext['jakarta-xml-bind.version'] =
+// ext['jakarta-xml-soap.version'] =
+// ext['jakarta-xml-ws.version'] =
+// ext['janino.version'] =
+// ext['javax-activation.version'] =
+// ext['javax-annotation.version'] =
+// ext['javax-cache.version'] =
+// ext['javax-jaxb.version'] =
+// ext['javax-jaxws.version'] =
+// ext['javax-jms.version'] =
+// ext['javax-json.version'] =
+// ext['javax-jsonb.version'] =
+// ext['javax-mail.version'] =
+// ext['javax-money.version'] =
+// ext['javax-persistence.version'] =
+// ext['javax-transaction.version'] =
+// ext['javax-validation.version'] =
+// ext['javax-websocket.version'] =
+// ext['jaxen.version'] =
+// ext['jaybird.version'] =
+// ext['jboss-logging.version'] =
+// ext['jboss-transaction-spi.version'] =
+// ext['jdom2.version'] =
+// ext['jedis.version'] =
+// ext['jersey.version'] =
+// ext['jetty.version'] =
+// ext['jetty-el.version'] =
+// ext['jetty-jsp.version'] =
+// ext['jetty-reactive-httpclient.version'] =
+// ext['jmustache.version'] =
+// ext['johnzon.version'] =
+// ext['jolokia.version'] =
+// ext['jooq.version'] =
+// ext['json-path.version'] =
+// ext['json-smart.version'] =
+// ext['jsonassert.version'] =
+// ext['jstl.version'] =
+// ext['jtds.version'] =
+// ext['junit.version'] =
+// ext['junit-jupiter.version'] =
+// ext['kafka.version'] =
+// ext['kotlin.version'] =
+// ext['kotlin-coroutines.version'] =
+// ext['lettuce.version'] =
+// ext['liquibase.version'] =
+// ext['log4j2.version'] =
+// ext['logback.version'] =
+// ext['lombok.version'] =
+// ext['mariadb.version'] =
+// ext['maven-antrun-plugin.version'] =
+// ext['maven-assembly-plugin.version'] =
+// ext['maven-clean-plugin.version'] =
+// ext['maven-compiler-plugin.version'] =
+// ext['maven-dependency-plugin.version'] =
+// ext['maven-deploy-plugin.version'] =
+// ext['maven-enforcer-plugin.version'] =
+// ext['maven-failsafe-plugin.version'] =
+// ext['maven-help-plugin.version'] =
+// ext['maven-install-plugin.version'] =
+// ext['maven-invoker-plugin.version'] =
+// ext['maven-jar-plugin.version'] =
+// ext['maven-javadoc-plugin.version'] =
+// ext['maven-resources-plugin.version'] =
+// ext['maven-shade-plugin.version'] =
+// ext['maven-source-plugin.version'] =
+// ext['maven-surefire-plugin.version'] =
+// ext['maven-war-plugin.version'] =
+// ext['micrometer.version'] =
+// ext['mimepull.version'] =
+// ext['mockito.version'] =
+// ext['mongodb.version'] =
+// ext['mssql-jdbc.version'] =
+// ext['mysql.version'] =
+// ext['nekohtml.version'] =
+// ext['neo4j-java-driver.version'] =
+// ext['netty.version'] =
+// ext['netty-tcnative.version'] =
+// ext['nimbus-jose-jwt.version'] =
+// ext['oauth2-oidc-sdk.version'] =
+// ext['ojdbc.version'] =
+// ext['okhttp3.version'] =
+// ext['oracle-database.version'] ='12.2.0.1'
+// ext['pooled-jms.version'] =
+// ext['postgresql.version'] =
+// ext['prometheus-pushgateway.version'] =
+// ext['quartz.version'] =
+// ext['querydsl.version'] =
+// ext['r2dbc-bom.version'] =
+// ext['rabbit-amqp-client.version'] =
+// ext['reactive-streams.version'] =
+// ext['reactor-bom.version'] =
+// ext['rest-assured.version'] =
+// ext['rsocket.version'] =
+// ext['rxjava.version'] =
+// ext['rxjava-adapter.version'] =
+// ext['rxjava2.version'] =
+// ext['saaj-impl.version'] =
+// ext['selenium.version'] =
+// ext['selenium-htmlunit.version'] =
+// ext['sendgrid.version'] =
+// ext['servlet-api.version'] =
+// ext['slf4j.version'] =
+// ext['snakeyaml.version'] =
+// ext['solr.version'] =
+// ext['spring-amqp.version'] =
+// ext['spring-batch.version'] =
+// ext['spring-data-bom.version'] =
+// ext['spring-framework.version'] =
+// ext['spring-hateoas.version'] =
+// ext['spring-integration.version'] =
+// ext['spring-kafka.version'] =
+// ext['spring-ldap.version'] =
+// ext['spring-restdocs.version'] =
+// ext['spring-retry.version'] =
+// ext['spring-security.version'] =
+// ext['spring-session-bom.version'] =
+// ext['spring-ws.version'] =
+// ext['sqlite-jdbc.version'] =
+// ext['sun-mail.version'] =
+// ext['thymeleaf.version'] =
+// ext['thymeleaf-extras-data-attribute.version'] =
+// ext['thymeleaf-extras-java8time.version'] =
+// ext['thymeleaf-extras-springsecurity.version'] =
+// ext['thymeleaf-layout-dialect.version'] =
+// ext['tomcat.version'] =
+// ext['unboundid-ldapsdk.version'] =
+// ext['undertow.version'] =
+// ext['versions-maven-plugin.version'] =
+// ext['webjars-hal-browser.version'] =
+// ext['webjars-locator-core.version'] =
+// ext['wsdl4j.version'] =
+// ext['xml-maven-plugin.version'] =
+// ext['xmlunit2.version'] =

gradle.properties

@@ -36,9 +36,9 @@ application_version=1.0.1
 # platform
 ###########################################################rwa_version
 platform_group=io.sc
-platform_version=8.1.44
-platform_plugin_version=8.1.44
-platform_core_frontend_version=8.1.287
+platform_version=8.2.7
+platform_plugin_version=8.2.7
+platform_core_frontend_version=8.2.32
 
 ###########################################################
 # product dependencies version
@@ -50,15 +50,19 @@ rwa_version=1.0.2
 # dependencies version
 ###########################################################
 asciidoctor_version=3.3.2
+asm_version=9.7.1
+checker_version=3.43.0
 commons_fileupload_version=1.4
-commons_io_version=2.11.0
+commons_io_version=2.16.1
+commons_text_version=1.12.0
 cxf_version=3.2.7
-
 dm_hibernate_version=8.1.2.192
+enjoy_version=5.2.2
 flowable_version=6.8.0
 guava_version=31.1-jre
 ipaddress_version=5.4.0
 jackson_version=2.13.5
+javassist_version=3.21.0-GA
 jasypt_version=2.1.2
 jboss_logging_version=3.3.2.Final
 jcommander_version=1.82
@@ -70,19 +74,21 @@ jxls_poi_version=1.0.15
 jxls_version=2.4.6
 mybatis_version=3.5.10
 opencsv_version=5.7.1
-oshi_version=6.4.2
+oshi_version=6.6.1
 p6spy_version=3.9.1
 pinyin4j_version=2.5.1
-poi_ooxml_version=3.17
+poi_version=5.2.5
 schemacrawler_version=16.19.11
-#schemacrawler_version=14.21.02
+shadow_gradle_plugin_version=8.3.1
 spring_boot_version=2.7.18
 spring_cloud_alibaba_version=2021.0.4.0
 spring_cloud_context_version=3.1.4
 spring_cloud_version=2021.0.8
 spring_security_oauth2_authorization_server_version=0.4.5
 spring_statemachine_version=3.2.1
+truelicense_version=4.0.3
 webjars_locator_weblogic_version=0.10
+weka_version=3.8.6
 zip4j_version=2.11.5
 
 ###########################################################

irbs.cust.rating/build.gradle

@@ -3,7 +3,7 @@ dependencies {
 		"io.sc:io.sc.platform.mvc:${platform_version}",
 		"io.sc:io.sc.engine.rule.client.spring:${platform_version}",
 		"io.sc:io.sc.platform.flowable:${platform_version}",
-		"io.sc:io.sc.platform.page.config:${rwa_version}",
+		"io.sc:io.sc.platform.lcdp:${platform_version}",
 
 		project(":irbs.defaultManager"),
 		project(":irbs.financialTemplate"),

irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/CustRatingWorkFlowInitializer.java

@@ -3,10 +3,10 @@ package irbs.cust.rating.initializer;
 import io.sc.platform.core.Environment;
 import io.sc.platform.core.initializer.ApplicationInitializer;
 import io.sc.platform.core.initializer.ApplicationInitializerExecuteException;
-import io.sc.platform.core.util.FileUtil;
 import io.sc.platform.flowable.enums.ProcessStatus;
 import io.sc.platform.flowable.jpa.entity.ProcessEntity;
 import io.sc.platform.flowable.service.ProcessEntityService;
+import io.sc.platform.util.FileUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
@@ -21,6 +21,10 @@ public class CustRatingWorkFlowInitializer implements ApplicationInitializer{
 	private ApplicationContext applicationContext;
 	private ProcessEntityService processEntityService;
 
+	private static final String KEY = "COMPANY_CUSTOMER_RATING";
+	private static final String I18N_KEY = "WORK_FLOW.COMPANY_CUSTOMER_RATING";
+	private static final String BPMN_PATH = "classpath:/workflow/irbs/cust/rating/CustRating.bpmn";
+
 	@Override
 	public void init(ApplicationContext applicationContext) {
 		this.processEntityService =applicationContext.getBean(ProcessEntityService.class);
@@ -37,7 +41,7 @@ public class CustRatingWorkFlowInitializer implements ApplicationInitializer{
 		if(isInitialized!=null) {
 			return isInitialized;
 		}
-		List<ProcessEntity> entities =processEntityService.getRepository().findByKey("COMPANY_CUSTOMER_RATING");
+		List<ProcessEntity> entities =processEntityService.getRepository().findByKey(KEY);
 		if(entities==null || entities.isEmpty()){
 			isInitialized =false;
 		}else {
@@ -50,13 +54,13 @@ public class CustRatingWorkFlowInitializer implements ApplicationInitializer{
 	public void execute() throws ApplicationInitializerExecuteException {
 		try {
 			ProcessEntity entity = new ProcessEntity();
-			entity.setCategory("COMPANY_CUSTOMER_RATING");
-			entity.setKey("COMPANY_CUSTOMER_RATING");
-			entity.setName(applicationContext.getMessage("WORK_FLOW.COMPANY_CUSTOMER_RATING", null, Locale.getDefault()));
+			entity.setCategory(KEY);
+			entity.setKey(KEY);
+			entity.setName(applicationContext.getMessage(I18N_KEY, null, Locale.getDefault()));
 			entity.setStatus(ProcessStatus.RELEASE);
 			entity.setVersion(1);
 			entity.setCanClaimTask(false);
-			entity.setXml(getRuleEngineWorkflowXmlContent());
+			entity.setXml(getWorkflowXmlContent());
 			entity = processEntityService.add(entity);
 			processEntityService.deploy(entity.getId());
 		}catch (Exception e){
@@ -65,7 +69,7 @@ public class CustRatingWorkFlowInitializer implements ApplicationInitializer{
 		}
 	}
 
-	private String getRuleEngineWorkflowXmlContent() throws IOException {
-		return FileUtil.readString("classpath:/workflow/irbs/cust/rating/CustRating.bpmn", Environment.DEFAULT_CHARSET_NAME);
+	private String getWorkflowXmlContent() throws IOException {
+		return FileUtil.readString(BPMN_PATH, Environment.DEFAULT_CHARSET_NAME);
 	}
 }

irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/DefaultWorkFlowInitializer.java

@@ -0,0 +1,75 @@
+package irbs.cust.rating.initializer;
+
+import io.sc.platform.core.Environment;
+import io.sc.platform.core.initializer.ApplicationInitializer;
+import io.sc.platform.core.initializer.ApplicationInitializerExecuteException;
+import io.sc.platform.flowable.enums.ProcessStatus;
+import io.sc.platform.flowable.jpa.entity.ProcessEntity;
+import io.sc.platform.flowable.service.ProcessEntityService;
+import io.sc.platform.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
+
+public class DefaultWorkFlowInitializer implements ApplicationInitializer{
+	private static final Logger log =LoggerFactory.getLogger(DefaultWorkFlowInitializer.class);
+	private Boolean isInitialized =null;
+	private ApplicationContext applicationContext;
+	private ProcessEntityService processEntityService;
+
+	private static final String KEY = "DEFAULT_CUSTOMER_F";
+	private static final String I18N_KEY = "WORK_FLOW.DEFAULT_CUSTOMER_F";
+	private static final String BPMN_PATH = "classpath:/workflow/irbs/cust/rating/DEFAULT_CUSTOMER_F.bpmn";
+
+	@Override
+	public void init(ApplicationContext applicationContext) {
+		this.processEntityService =applicationContext.getBean(ProcessEntityService.class);
+		this.applicationContext =applicationContext;
+	}
+
+	@Override
+	public int getOrder() {
+		return 1100;
+	}
+
+	@Override
+	public synchronized boolean isInitialized() {
+		if(isInitialized!=null) {
+			return isInitialized;
+		}
+		List<ProcessEntity> entities =processEntityService.getRepository().findByKey(KEY);
+		if(entities==null || entities.isEmpty()){
+			isInitialized =false;
+		}else {
+			isInitialized = true;
+		}
+		return isInitialized;
+	}
+
+	@Override
+	public void execute() throws ApplicationInitializerExecuteException {
+		try {
+			ProcessEntity entity = new ProcessEntity();
+			entity.setCategory(KEY);
+			entity.setKey(KEY);
+			entity.setName(applicationContext.getMessage(I18N_KEY, null, Locale.getDefault()));
+			entity.setStatus(ProcessStatus.RELEASE);
+			entity.setVersion(1);
+			entity.setCanClaimTask(false);
+			entity.setXml(getWorkflowXmlContent());
+			entity = processEntityService.add(entity);
+			processEntityService.deploy(entity.getId());
+		}catch (Exception e){
+			log.error("",e);
+			throw new ApplicationInitializerExecuteException(e);
+		}
+	}
+
+	private String getWorkflowXmlContent() throws IOException {
+		return FileUtil.readString(BPMN_PATH, Environment.DEFAULT_CHARSET_NAME);
+	}
+}

irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/RebirthWorkFlowInitializer.java

@@ -0,0 +1,75 @@
+package irbs.cust.rating.initializer;
+
+import io.sc.platform.core.Environment;
+import io.sc.platform.core.initializer.ApplicationInitializer;
+import io.sc.platform.core.initializer.ApplicationInitializerExecuteException;
+import io.sc.platform.flowable.enums.ProcessStatus;
+import io.sc.platform.flowable.jpa.entity.ProcessEntity;
+import io.sc.platform.flowable.service.ProcessEntityService;
+import io.sc.platform.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
+
+public class RebirthWorkFlowInitializer implements ApplicationInitializer{
+	private static final Logger log =LoggerFactory.getLogger(RebirthWorkFlowInitializer.class);
+	private Boolean isInitialized =null;
+	private ApplicationContext applicationContext;
+	private ProcessEntityService processEntityService;
+
+	private static final String KEY = "REBIRTH_CUSTOMER_F";
+	private static final String I18N_KEY = "WORK_FLOW.REBIRTH_CUSTOMER_F";
+	private static final String BPMN_PATH = "classpath:/workflow/irbs/cust/rating/REBIRTH_CUSTOMER_F.bpmn";
+
+	@Override
+	public void init(ApplicationContext applicationContext) {
+		this.processEntityService =applicationContext.getBean(ProcessEntityService.class);
+		this.applicationContext =applicationContext;
+	}
+
+	@Override
+	public int getOrder() {
+		return 1100;
+	}
+
+	@Override
+	public synchronized boolean isInitialized() {
+		if(isInitialized!=null) {
+			return isInitialized;
+		}
+		List<ProcessEntity> entities =processEntityService.getRepository().findByKey(KEY);
+		if(entities==null || entities.isEmpty()){
+			isInitialized =false;
+		}else {
+			isInitialized = true;
+		}
+		return isInitialized;
+	}
+
+	@Override
+	public void execute() throws ApplicationInitializerExecuteException {
+		try {
+			ProcessEntity entity = new ProcessEntity();
+			entity.setCategory(KEY);
+			entity.setKey(KEY);
+			entity.setName(applicationContext.getMessage(I18N_KEY, null, Locale.getDefault()));
+			entity.setStatus(ProcessStatus.RELEASE);
+			entity.setVersion(1);
+			entity.setCanClaimTask(false);
+			entity.setXml(getWorkflowXmlContent());
+			entity = processEntityService.add(entity);
+			processEntityService.deploy(entity.getId());
+		}catch (Exception e){
+			log.error("",e);
+			throw new ApplicationInitializerExecuteException(e);
+		}
+	}
+
+	private String getWorkflowXmlContent() throws IOException {
+		return FileUtil.readString(BPMN_PATH, Environment.DEFAULT_CHARSET_NAME);
+	}
+}

irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/RiskExposureWorkFlowInitializer.java

@@ -0,0 +1,75 @@
+package irbs.cust.rating.initializer;
+
+import io.sc.platform.core.Environment;
+import io.sc.platform.core.initializer.ApplicationInitializer;
+import io.sc.platform.core.initializer.ApplicationInitializerExecuteException;
+import io.sc.platform.flowable.enums.ProcessStatus;
+import io.sc.platform.flowable.jpa.entity.ProcessEntity;
+import io.sc.platform.flowable.service.ProcessEntityService;
+import io.sc.platform.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
+
+public class RiskExposureWorkFlowInitializer implements ApplicationInitializer{
+	private static final Logger log =LoggerFactory.getLogger(RiskExposureWorkFlowInitializer.class);
+	private Boolean isInitialized =null;
+	private ApplicationContext applicationContext;
+	private ProcessEntityService processEntityService;
+
+	private static final String KEY = "RISK_EXPOSURE_FLOW";
+	private static final String I18N_KEY = "WORK_FLOW.RISK_EXPOSURE_FLOW";
+	private static final String BPMN_PATH = "classpath:/workflow/irbs/cust/rating/RISK_EXPOSURE_FLOW.bpmn";
+
+	@Override
+	public void init(ApplicationContext applicationContext) {
+		this.processEntityService =applicationContext.getBean(ProcessEntityService.class);
+		this.applicationContext =applicationContext;
+	}
+
+	@Override
+	public int getOrder() {
+		return 1100;
+	}
+
+	@Override
+	public synchronized boolean isInitialized() {
+		if(isInitialized!=null) {
+			return isInitialized;
+		}
+		List<ProcessEntity> entities =processEntityService.getRepository().findByKey(KEY);
+		if(entities==null || entities.isEmpty()){
+			isInitialized =false;
+		}else {
+			isInitialized = true;
+		}
+		return isInitialized;
+	}
+
+	@Override
+	public void execute() throws ApplicationInitializerExecuteException {
+		try {
+			ProcessEntity entity = new ProcessEntity();
+			entity.setCategory(KEY);
+			entity.setKey(KEY);
+			entity.setName(applicationContext.getMessage(I18N_KEY, null, Locale.getDefault()));
+			entity.setStatus(ProcessStatus.RELEASE);
+			entity.setVersion(1);
+			entity.setCanClaimTask(false);
+			entity.setXml(getWorkflowXmlContent());
+			entity = processEntityService.add(entity);
+			processEntityService.deploy(entity.getId());
+		}catch (Exception e){
+			log.error("",e);
+			throw new ApplicationInitializerExecuteException(e);
+		}
+	}
+
+	private String getWorkflowXmlContent() throws IOException {
+		return FileUtil.readString(BPMN_PATH, Environment.DEFAULT_CHARSET_NAME);
+	}
+}

irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/SampleWorkFlowInitializer.java

@@ -0,0 +1,75 @@
+package irbs.cust.rating.initializer;
+
+import io.sc.platform.core.Environment;
+import io.sc.platform.core.initializer.ApplicationInitializer;
+import io.sc.platform.core.initializer.ApplicationInitializerExecuteException;
+import io.sc.platform.flowable.enums.ProcessStatus;
+import io.sc.platform.flowable.jpa.entity.ProcessEntity;
+import io.sc.platform.flowable.service.ProcessEntityService;
+import io.sc.platform.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
+
+public class SampleWorkFlowInitializer implements ApplicationInitializer{
+	private static final Logger log =LoggerFactory.getLogger(SampleWorkFlowInitializer.class);
+	private Boolean isInitialized =null;
+	private ApplicationContext applicationContext;
+	private ProcessEntityService processEntityService;
+
+	private static final String KEY = "SAMPLE";
+	private static final String I18N_KEY = "WORK_FLOW.SAMPLE";
+	private static final String BPMN_PATH = "classpath:/workflow/irbs/cust/rating/SAMPLE.bpmn";
+
+	@Override
+	public void init(ApplicationContext applicationContext) {
+		this.processEntityService =applicationContext.getBean(ProcessEntityService.class);
+		this.applicationContext =applicationContext;
+	}
+
+	@Override
+	public int getOrder() {
+		return 1100;
+	}
+
+	@Override
+	public synchronized boolean isInitialized() {
+		if(isInitialized!=null) {
+			return isInitialized;
+		}
+		List<ProcessEntity> entities =processEntityService.getRepository().findByKey(KEY);
+		if(entities==null || entities.isEmpty()){
+			isInitialized =false;
+		}else {
+			isInitialized = true;
+		}
+		return isInitialized;
+	}
+
+	@Override
+	public void execute() throws ApplicationInitializerExecuteException {
+		try {
+			ProcessEntity entity = new ProcessEntity();
+			entity.setCategory(KEY);
+			entity.setKey(KEY);
+			entity.setName(applicationContext.getMessage(I18N_KEY, null, Locale.getDefault()));
+			entity.setStatus(ProcessStatus.RELEASE);
+			entity.setVersion(1);
+			entity.setCanClaimTask(false);
+			entity.setXml(getWorkflowXmlContent());
+			entity = processEntityService.add(entity);
+			processEntityService.deploy(entity.getId());
+		}catch (Exception e){
+			log.error("",e);
+			throw new ApplicationInitializerExecuteException(e);
+		}
+	}
+
+	private String getWorkflowXmlContent() throws IOException {
+		return FileUtil.readString(BPMN_PATH, Environment.DEFAULT_CHARSET_NAME);
+	}
+}

irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java

@@ -1,13 +1,13 @@
 package irbs.cust.rating.service.impl;
 
 import io.sc.engine.rule.core.po.resource.ModelResource;
-import io.sc.platform.core.util.StringUtil;
 import io.sc.platform.flowable.support.ProcessTaskWrapper;
 import io.sc.platform.mvc.service.SystemParameterService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import io.sc.platform.orm.service.support.QueryParameter;
 import io.sc.platform.orm.util.EntityVoUtil;
 import io.sc.platform.security.util.SecurityUtil;
+import io.sc.platform.util.StringUtil;
 import irbs.cust.rating.constant.ProcessConstant;
 import irbs.cust.rating.constant.RatingConstant;
 import irbs.cust.rating.enums.*;
@@ -617,6 +617,11 @@ public class CompanyRatingServiceImpl extends DaoServiceImpl<CompanyRating, Stri
     @Override
     public CompanyRating stepRatingReport(String ratingId) throws Exception {
         CompanyRating rating = this.findById(ratingId);
+        // 找taskId
+        ProcessTaskWrapper ptw = busiProcessService.findTaskByProcInstId(rating.getProcessInstanceId());
+        if (ptw!=null && null!=ptw.getId()) {
+            rating.setTaskId(ptw.getId());
+        }
         return rating;
     }
 

irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/FinanceReportIndexServiceImpl.java

@@ -1,6 +1,8 @@
 package irbs.cust.rating.service.impl;
 
 import io.sc.engine.rule.client.spring.service.ExecutorFactoryService;
+import io.sc.engine.rule.core.ParameterResult;
+import io.sc.engine.rule.core.ResourceResult;
 import io.sc.platform.mvc.service.SystemParameterService;
 import irbs.cust.rating.jpa.entity.FinanceReport;
 import irbs.cust.rating.jpa.entity.FinanceReportDetail;
@@ -16,8 +18,6 @@ import org.springframework.stereotype.Service;
 import io.sc.engine.rule.client.Executor;
 import io.sc.engine.rule.client.ExecutorBuilder;
 import io.sc.engine.rule.client.enums.ExecutorMode;
-import io.sc.engine.rule.core.code.impl.support.ParameterResult;
-import io.sc.engine.rule.core.code.impl.support.ResourceResult;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/HomeServiceImpl.java

@@ -43,7 +43,7 @@ public class HomeServiceImpl implements HomeService {
 		sql += ",CASE WHEN HT.ASSIGNEE_ = :assignee AND HT.END_TIME_ IS NOT NULL AND hp.end_time_ is not null and hp.end_act_id_ is not null THEN HT.PROC_INST_ID_ ELSE NULL END AS end_task ";
 		sql += "FROM ACT_HI_TASKINST HT ";
 		sql += "LEFT JOIN ACT_RU_TASK T ON T.PROC_INST_ID_ = HT.PROC_INST_ID_ ";
-		sql += "LEFT JOIN ACT_HI_PROCINST hp ON hp.proc_inst_id_ = HT.proc_inst_id_) ";
+		sql += "LEFT JOIN ACT_HI_PROCINST hp ON hp.proc_inst_id_ = HT.proc_inst_id_) a ";
 		Map<String, Object> params = new HashMap<>();
 		params.put("assignee", SecurityUtil.getLoginName());
 		List<HomeTotalWrapper> res = namedParameterJdbcTemplate.query(sql, params, HomeTotalWrapperRowMapper);

irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/ModelLibServiceImpl.java

@@ -3,8 +3,12 @@ package irbs.cust.rating.service.impl;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.sc.engine.rule.client.enums.LoaderMode;
 import io.sc.engine.rule.client.spring.service.ExecutorFactoryService;
+import io.sc.engine.rule.core.ParameterResult;
+import io.sc.engine.rule.core.ResourceResult;
+import io.sc.engine.rule.core.code.ExecuteUnit;
+import io.sc.engine.rule.core.code.ExecuteUnit4Resource;
 import io.sc.engine.rule.core.enums.ParameterType;
-import io.sc.platform.core.util.StringUtil;
+import io.sc.engine.rule.server.resource.service.support.ResourceWrapper;
 import io.sc.platform.mvc.service.SystemParameterService;
 import irbs.cust.rating.jpa.entity.RatingCompanyCustomer;
 import irbs.cust.rating.service.FinanceReportService;
@@ -16,10 +20,6 @@ import org.springframework.stereotype.Service;
 import io.sc.engine.rule.client.Executor;
 import io.sc.engine.rule.client.ExecutorBuilder;
 import io.sc.engine.rule.client.enums.ExecutorMode;
-import io.sc.engine.rule.core.code.impl.support.ParameterResult;
-import io.sc.engine.rule.core.code.impl.support.ResourceResult;
-import io.sc.engine.rule.core.code.impl.support.ResourceWrapper;
-import io.sc.engine.rule.core.code.impl.support.ResourceWrapper4Resource;
 import io.sc.engine.rule.core.po.resource.ModelResource;
 
 import java.util.HashMap;
@@ -92,7 +92,7 @@ public class ModelLibServiceImpl implements ModelLibService {
                 result = executor.executeByCode(callModelCode,null, params);
             }
         } catch (Exception e) {
-            System.out.println(e);
+            e.printStackTrace();
             throw new RuntimeException("调用评级模型出错，模型编码为：" + callModelCode + "，请确认模型是否部署正确。");
         }
 
@@ -121,10 +121,10 @@ public class ModelLibServiceImpl implements ModelLibService {
 //        String modelResourceUrl = systemParameterService.getParameter("parameter.irbs.engine.remote.config.re.url");
 //        Executor executor = new ExecutorBuilder().executor(ExecutorMode.REMOTE).url(modelResourceUrl).build();
         Executor executor = executorFactoryService.getExecutor();
-        ResourceWrapper resourceWrapper = executor.getLoader().getResourceByCode(modelCode, null);
+        ExecuteUnit resourceWrapper = executor.getLoader().load(modelCode, null);
         if(resourceWrapper != null) {
-            if(resourceWrapper instanceof ResourceWrapper4Resource) {
-                ResourceWrapper4Resource resourceWrapper4Resource =(ResourceWrapper4Resource)resourceWrapper;
+            if(resourceWrapper instanceof ExecuteUnit4Resource) {
+                ExecuteUnit4Resource resourceWrapper4Resource =(ExecuteUnit4Resource)resourceWrapper;
                 io.sc.engine.rule.core.po.resource.Resource resource = resourceWrapper4Resource.getResource();
                 if(resource instanceof ModelResource) {
                     return (ModelResource)resource;

irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingCompanyCustomerServiceImpl.java

@@ -1,7 +1,7 @@
 package irbs.cust.rating.service.impl;
 
-import io.sc.platform.core.util.StringUtil;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
+import io.sc.platform.util.StringUtil;
 import irbs.cust.rating.enums.RatingProcessStatus;
 import irbs.cust.rating.enums.RatingStepType;
 import irbs.cust.rating.jpa.entity.CompanyRating;

irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingIndexServiceImpl.java

@@ -1,13 +1,15 @@
 package irbs.cust.rating.service.impl;
 
 import io.sc.engine.rule.client.spring.service.ExecutorFactoryService;
+import io.sc.engine.rule.core.ParameterResult;
+import io.sc.engine.rule.core.ResourceResult;
 import io.sc.engine.rule.core.po.model.parameter.IndicatorParameter;
-import io.sc.platform.core.util.StringUtil;
 import io.sc.platform.jdbc.sql.condition.Condition;
+import io.sc.platform.lcdp.form.service.JdbcTemplateService;
 import io.sc.platform.mvc.service.SystemParameterService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import io.sc.platform.orm.service.support.QueryParameter;
-import io.sc.platform.page.config.service.JdbcTemplateService;
+import io.sc.platform.util.StringUtil;
 import irbs.cust.rating.constant.RatingConstant;
 import irbs.cust.rating.enums.ModelParamCode;
 import irbs.cust.rating.enums.ModelReturnCode;
@@ -24,8 +26,6 @@ import org.springframework.stereotype.Service;
 import io.sc.engine.rule.client.Executor;
 import io.sc.engine.rule.client.ExecutorBuilder;
 import io.sc.engine.rule.client.enums.ExecutorMode;
-import io.sc.engine.rule.core.code.impl.support.ParameterResult;
-import io.sc.engine.rule.core.code.impl.support.ResourceResult;
 import io.sc.engine.rule.core.enums.ParameterType;
 import io.sc.engine.rule.core.po.model.Model;
 import io.sc.engine.rule.core.po.model.Parameter;

irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingReportShowScoreRoleServiceImpl.java

@@ -1,10 +1,10 @@
 package irbs.cust.rating.service.impl;
 
 import io.sc.platform.jdbc.sql.condition.Condition;
+import io.sc.platform.lcdp.form.service.JdbcTemplateService;
 import io.sc.platform.mvc.service.SystemParameterService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import io.sc.platform.orm.service.support.QueryParameter;
-import io.sc.platform.page.config.service.JdbcTemplateService;
 import io.sc.platform.security.util.SecurityUtil;
 import io.sc.platform.system.role.jpa.entity.RoleEntity;
 import io.sc.platform.system.role.service.RoleService;

irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/TaskOperationServiceImpl.java

@@ -1,8 +1,8 @@
 package irbs.cust.rating.service.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.sc.platform.lcdp.form.service.JdbcTemplateService;
 import io.sc.platform.orm.service.support.QueryParameter;
-import io.sc.platform.page.config.service.JdbcTemplateService;
 import io.sc.platform.security.util.SecurityUtil;
 import irbs.cust.rating.constant.TaskVariable;
 import irbs.cust.rating.jpa.support.WaitTaskWrapper;

irbs.cust.rating/src/main/java/irbs/cust/rating/util/DateUtil.java

@@ -1,6 +1,6 @@
 package irbs.cust.rating.util;
 
-import io.sc.platform.core.util.StringUtil;
+import io.sc.platform.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/CustRating.bpmn

@@ -40,42 +40,68 @@
     <endEvent id="endevent1" name="End"/>
     <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="A1"/>
     <endEvent id="endevent2" name="结束"/>
-    <sequenceFlow id="flow2" name="提交" sourceRef="A1" targetRef="A2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==6}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="flow12" name="退回发起人" sourceRef="A3" targetRef="A1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    <exclusiveGateway id="sid-83ADF4A5-C1E9-4E22-803D-EA37AF111A7E"/>
+    <exclusiveGateway id="sid-D9D7B214-D130-4070-AF80-22029ECF805C"/>
+    <sequenceFlow id="flow6" name="提交" sourceRef="A4" targetRef="A5">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow8" name="退回发起人" sourceRef="A2" targetRef="A1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    <sequenceFlow id="sid-48C11432-6FBB-4657-A7B0-5AA0F9C3D900" name="通过" sourceRef="A5" targetRef="endevent2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==999}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow9" name="退回发起人" sourceRef="A4" targetRef="A1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    <sequenceFlow id="sid-C0A72034-8C59-4DCB-B2E0-1AC84315A8BA" name="否决" sourceRef="A5" targetRef="endevent2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==2}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow10" name="否决" sourceRef="A3" targetRef="endevent1">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==2}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow4" name="通过" sourceRef="A3" targetRef="endevent1">
+    <sequenceFlow id="flow3" name="提交" sourceRef="A2" targetRef="A3">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow3" name="提交" sourceRef="A2" targetRef="A3">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==6}]]></conditionExpression>
+    <sequenceFlow id="sid-B3FC7586-27CA-4E99-8DAD-3067CA07A622" name="提交" sourceRef="A1" targetRef="sid-D9D7B214-D130-4070-AF80-22029ECF805C">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow6" name="提交" sourceRef="A4" targetRef="A5">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==6}]]></conditionExpression>
+    <sequenceFlow id="flow4" name="通过" sourceRef="A3" targetRef="sid-83ADF4A5-C1E9-4E22-803D-EA37AF111A7E">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==3}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-C0A72034-8C59-4DCB-B2E0-1AC84315A8BA" name="否决" sourceRef="A5" targetRef="endevent2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==2}]]></conditionExpression>
+    <sequenceFlow id="sid-1C2CBC6E-3411-4960-91B7-45C6626B7F8A" name="提交" sourceRef="sid-D9D7B214-D130-4070-AF80-22029ECF805C" targetRef="A3">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${submit==-2}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-48C11432-6FBB-4657-A7B0-5AA0F9C3D900" name="通过" sourceRef="A5" targetRef="endevent2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==1}]]></conditionExpression>
+    <sequenceFlow id="flow2" name="提交" sourceRef="sid-D9D7B214-D130-4070-AF80-22029ECF805C" targetRef="A2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${submit==-1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow13" name="退回发起人" sourceRef="A5" targetRef="A1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    <sequenceFlow id="sid-684015C0-A8F4-4915-936A-151CCDB48987" sourceRef="sid-D9D7B214-D130-4070-AF80-22029ECF805C" targetRef="A4">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${submit==-3}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow5" name="提交" sourceRef="A3" targetRef="A4">
+    <sequenceFlow id="flow5" name="提交" sourceRef="sid-83ADF4A5-C1E9-4E22-803D-EA37AF111A7E" targetRef="A4">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${submit==1}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-25FB5262-5015-43AA-B2E8-C90103256178" sourceRef="sid-83ADF4A5-C1E9-4E22-803D-EA37AF111A7E" targetRef="endevent1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${submit==999}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow8" name="退回发起人" sourceRef="A2" targetRef="A1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow12" name="退回发起人(修改数据)" sourceRef="A3" targetRef="A1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-2}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow9" name="退回发起人(修改数据)" sourceRef="A4" targetRef="A1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-3}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-A02815ED-F9C4-4EBB-A7A0-EAABDB96103A" name="退回发起人(重新审批)" sourceRef="A3" targetRef="A1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-DE99FB25-CD16-41D8-977F-0EDEC2048406" name="退回发起人(重新审批)" sourceRef="A4" targetRef="A1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-21CB8859-DD90-4C2F-9B85-E8E27215DF09" sourceRef="sid-D9D7B214-D130-4070-AF80-22029ECF805C" targetRef="A5">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${submit==-4}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-D11A93AB-07CB-44FD-B93C-CCABFA68F654" name="退回发起人(重新审批)" sourceRef="A5" targetRef="A1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow13" name="退回发起人(修改数据)" sourceRef="A5" targetRef="A1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-4}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_COMPANY_CUSTOMER_RATING">
     <bpmndi:BPMNPlane bpmnElement="COMPANY_CUSTOMER_RATING" id="BPMNPlane_COMPANY_CUSTOMER_RATING">
@@ -103,37 +129,76 @@
       <bpmndi:BPMNShape bpmnElement="endevent2" id="BPMNShape_endevent2">
         <omgdc:Bounds height="28.0" width="28.0" x="915.0" y="341.0"/>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-83ADF4A5-C1E9-4E22-803D-EA37AF111A7E" id="BPMNShape_sid-83ADF4A5-C1E9-4E22-803D-EA37AF111A7E">
+        <omgdc:Bounds height="40.0" width="40.0" x="615.0" y="240.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-D9D7B214-D130-4070-AF80-22029ECF805C" id="BPMNShape_sid-D9D7B214-D130-4070-AF80-22029ECF805C">
+        <omgdc:Bounds height="40.0" width="40.0" x="240.0" y="225.0"/>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow13" id="BPMNEdge_flow13" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
         <omgdi:waypoint x="772.5" y="394.95000000000005"/>
         <omgdi:waypoint x="772.5" y="485.0"/>
-        <omgdi:waypoint x="157.5" y="485.0"/>
-        <omgdi:waypoint x="157.5" y="224.0484406626969"/>
+        <omgdi:waypoint x="157.0" y="485.0"/>
+        <omgdi:waypoint x="157.43353307957577" y="224.0484406626969"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-DE99FB25-CD16-41D8-977F-0EDEC2048406" id="BPMNEdge_sid-DE99FB25-CD16-41D8-977F-0EDEC2048406" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="499.9999999999999" y="348.6363636363636"/>
+        <omgdi:waypoint x="222.5" y="315.0"/>
+        <omgdi:waypoint x="177.33742602568068" y="224.0484406626969"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-B3FC7586-27CA-4E99-8DAD-3067CA07A622" id="BPMNEdge_sid-B3FC7586-27CA-4E99-8DAD-3067CA07A622" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="20.0" flowable:targetDockerY="20.0">
+        <omgdi:waypoint x="209.9499999999999" y="215.2622141967607"/>
+        <omgdi:waypoint x="247.44305601515615" y="237.5457799075728"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-1C2CBC6E-3411-4960-91B7-45C6626B7F8A" id="BPMNEdge_sid-1C2CBC6E-3411-4960-91B7-45C6626B7F8A" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="257.9591836734694" y="227.03539823008845"/>
+        <omgdi:waypoint x="245.0" y="113.0"/>
+        <omgdi:waypoint x="495.0" y="94.0"/>
+        <omgdi:waypoint x="526.9723661909916" y="144.09844066269687"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-684015C0-A8F4-4915-936A-151CCDB48987" id="BPMNEdge_sid-684015C0-A8F4-4915-936A-151CCDB48987" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="274.4967026825633" y="250.45217391304354"/>
+        <omgdi:waypoint x="499.9999999999999" y="335.2564102564102"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-48C11432-6FBB-4657-A7B0-5AA0F9C3D900" id="BPMNEdge_sid-48C11432-6FBB-4657-A7B0-5AA0F9C3D900" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
         <omgdi:waypoint x="824.9499999999999" y="355.0"/>
-        <omgdi:waypoint x="864.5" y="355.0"/>
-        <omgdi:waypoint x="851.5" y="355.0"/>
         <omgdi:waypoint x="915.0" y="355.0"/>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-25FB5262-5015-43AA-B2E8-C90103256178" id="BPMNEdge_sid-25FB5262-5015-43AA-B2E8-C90103256178" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
+        <omgdi:waypoint x="644.8484632616668" y="249.87314612698432"/>
+        <omgdi:waypoint x="699.22686536105" y="194.08691210490898"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-A02815ED-F9C4-4EBB-A7A0-EAABDB96103A" id="BPMNEdge_sid-A02815ED-F9C4-4EBB-A7A0-EAABDB96103A" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="552.5" y="144.09844066269687"/>
+        <omgdi:waypoint x="552.5" y="16.0"/>
+        <omgdi:waypoint x="157.5" y="16.0"/>
+        <omgdi:waypoint x="157.5" y="144.09844066269687"/>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
         <omgdi:waypoint x="61.97187420581508" y="184.09844066269687"/>
         <omgdi:waypoint x="105.0" y="184.09844066269687"/>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
-        <omgdi:waypoint x="209.9499999999619" y="184.09844066269687"/>
-        <omgdi:waypoint x="300.0" y="184.09844066269687"/>
+      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="272.0297017055892" y="237.05985133392406"/>
+        <omgdi:waypoint x="299.99999999999994" y="218.63127079503792"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-21CB8859-DD90-4C2F-9B85-E8E27215DF09" id="BPMNEdge_sid-21CB8859-DD90-4C2F-9B85-E8E27215DF09" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="260.0" y="264.9450643245917"/>
+        <omgdi:waypoint x="260.0" y="447.0"/>
+        <omgdi:waypoint x="550.0" y="447.0"/>
+        <omgdi:waypoint x="719.9999999999999" y="376.687191011236"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
         <omgdi:waypoint x="404.95000000000005" y="184.09844066269687"/>
         <omgdi:waypoint x="500.0" y="184.09844066269687"/>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
-        <omgdi:waypoint x="604.94999999995" y="184.09844066269687"/>
-        <omgdi:waypoint x="695.0" y="184.09844066269687"/>
+      <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="20.0" flowable:targetDockerY="20.0">
+        <omgdi:waypoint x="595.9207345941911" y="224.0484406626969"/>
+        <omgdi:waypoint x="624.5816171844783" y="250.41656412287247"/>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="14.0">
-        <omgdi:waypoint x="552.5" y="224.0484406626969"/>
-        <omgdi:waypoint x="552.5" y="315.0"/>
+      <bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5" flowable:sourceDockerX="20.0" flowable:sourceDockerY="20.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="625.7042253521126" y="270.6774647887324"/>
+        <omgdi:waypoint x="587.1934210526316" y="315.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
         <omgdi:waypoint x="604.95" y="355.0"/>
@@ -145,10 +210,16 @@
         <omgdi:waypoint x="929.0" y="275.0"/>
         <omgdi:waypoint x="929.0" y="341.0"/>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-D11A93AB-07CB-44FD-B93C-CCABFA68F654" id="BPMNEdge_sid-D11A93AB-07CB-44FD-B93C-CCABFA68F654" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="732.1551724137931" y="394.95000000000005"/>
+        <omgdi:waypoint x="655.5" y="471.0"/>
+        <omgdi:waypoint x="214.5" y="471.0"/>
+        <omgdi:waypoint x="165.43704295389628" y="224.0484406626969"/>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow10" id="BPMNEdge_flow10" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
-        <omgdi:waypoint x="603.5071973955154" y="144.09844066269687"/>
-        <omgdi:waypoint x="642.0" y="114.0"/>
-        <omgdi:waypoint x="699.326689310983" y="173.97684030512815"/>
+        <omgdi:waypoint x="604.95" y="147.71824461089594"/>
+        <omgdi:waypoint x="645.0" y="120.0"/>
+        <omgdi:waypoint x="699.1081154618752" y="174.19130988236307"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow8" id="BPMNEdge_flow8" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
         <omgdi:waypoint x="352.30934506477934" y="224.0484406626969"/>

irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/DEFAULT_CUSTOMER_F.bpmn

@@ -0,0 +1,101 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test" exporter="Flowable Open Source Modeler" exporterVersion="6.8.0">
+  <process id="DEFAULT_CUSTOMER_F" name="分支行违约认定流程" isExecutable="true">
+    <dataObject id="assignment-strategy" name="任务分配策略" itemSubjectRef="xsd:string">
+      <extensionElements>
+        <flowable:value>{"A2":"frAssigneeQueryService"}</flowable:value>
+      </extensionElements>
+    </dataObject>
+    <startEvent id="startevent1" name="开始" flowable:formFieldValidation="true"/>
+    <userTask id="A1" name="客户经理" flowable:assignee="${assignee}" flowable:formFieldValidation="true" flowable:skipExpression="${execution.getVariable('skipFirst')==true}">
+      <documentation>${desc}</documentation>
+      <extensionElements>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <userTask id="A2" name="一级支行违约认定审查岗" flowable:assignee="${assignee}" flowable:candidateGroups="y_defa_approve" flowable:formFieldValidation="true">
+      <documentation>${desc}</documentation>
+      <extensionElements>
+        <modeler:group-info-name-y_defa_approve xmlns:modeler="http://flowable.org/modeler"><![CDATA[一级支行违约认定审查岗]]></modeler:group-info-name-y_defa_approve>
+        <modeler:activiti-idm-candidate-group xmlns:modeler="http://flowable.org/modeler"><![CDATA[true]]></modeler:activiti-idm-candidate-group>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <userTask id="A3" name="一级支行违约认定审批岗" flowable:assignee="${assignee}" flowable:candidateGroups="y_defa_approve2" flowable:formFieldValidation="true">
+      <documentation>${desc}</documentation>
+      <extensionElements>
+        <modeler:group-info-name-y_defa_approve2 xmlns:modeler="http://flowable.org/modeler"><![CDATA[一级支行违约认定审批岗]]></modeler:group-info-name-y_defa_approve2>
+        <modeler:activiti-idm-candidate-group xmlns:modeler="http://flowable.org/modeler"><![CDATA[true]]></modeler:activiti-idm-candidate-group>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="A1"/>
+    <endEvent id="endevent1" name="同意"/>
+    <endEvent id="sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2" name="否决"/>
+    <sequenceFlow id="sid-DBFDB8F4-F4CC-42B4-969E-27DE6C9AD478" name="退回" sourceRef="A2" targetRef="A1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-B1F31A14-650E-4E6F-AC5F-E59C642FB699" name="否决" sourceRef="A3" targetRef="sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==2}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-BAB02F50-F776-4C87-9EA2-E158E566EDF5" name="通过" sourceRef="A3" targetRef="endevent1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-96F21917-301D-4D2B-941D-6F6D41699550" name="提交" sourceRef="A2" targetRef="A3">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==6}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow2" name="提交" sourceRef="A1" targetRef="A2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==6}]]></conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_DEFAULT_CUSTOMER_F">
+    <bpmndi:BPMNPlane bpmnElement="DEFAULT_CUSTOMER_F" id="BPMNPlane_DEFAULT_CUSTOMER_F">
+      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
+        <omgdc:Bounds height="30.0" width="30.0" x="32.02187570282153" y="169.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A1" id="BPMNShape_A1">
+        <omgdc:Bounds height="80.0" width="105.0" x="105.0" y="144.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A2" id="BPMNShape_A2">
+        <omgdc:Bounds height="80.0" width="105.0" x="300.0" y="144.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A3" id="BPMNShape_A3">
+        <omgdc:Bounds height="80.0" width="105.0" x="495.0" y="144.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
+        <omgdc:Bounds height="28.0" width="28.0" x="720.0" y="170.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2" id="BPMNShape_sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2">
+        <omgdc:Bounds height="28.0" width="28.0" x="720.0" y="300.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="61.97187420581508" y="184.09844066269687"/>
+        <omgdi:waypoint x="105.0" y="184.09844066269687"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="209.9499999999619" y="184.09844066269687"/>
+        <omgdi:waypoint x="300.0" y="184.09844066269687"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-B1F31A14-650E-4E6F-AC5F-E59C642FB699" id="BPMNEdge_sid-B1F31A14-650E-4E6F-AC5F-E59C642FB699" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
+        <omgdi:waypoint x="547.2097308073669" y="224.0484406626969"/>
+        <omgdi:waypoint x="547.0" y="253.0"/>
+        <omgdi:waypoint x="734.0" y="253.0"/>
+        <omgdi:waypoint x="734.0" y="300.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-96F21917-301D-4D2B-941D-6F6D41699550" id="BPMNEdge_sid-96F21917-301D-4D2B-941D-6F6D41699550" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="404.95000000000005" y="184.09844066269687"/>
+        <omgdi:waypoint x="494.9999999999545" y="184.09844066269687"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-DBFDB8F4-F4CC-42B4-969E-27DE6C9AD478" id="BPMNEdge_sid-DBFDB8F4-F4CC-42B4-969E-27DE6C9AD478" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="352.3331964979393" y="224.0484406626969"/>
+        <omgdi:waypoint x="352.0" y="304.0"/>
+        <omgdi:waypoint x="157.0" y="304.0"/>
+        <omgdi:waypoint x="157.3331964979393" y="224.0484406626969"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-BAB02F50-F776-4C87-9EA2-E158E566EDF5" id="BPMNEdge_sid-BAB02F50-F776-4C87-9EA2-E158E566EDF5" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
+        <omgdi:waypoint x="599.95" y="184.09844066269687"/>
+        <omgdi:waypoint x="720.0" y="184.09844066269687"/>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/REBIRTH_CUSTOMER_F.bpmn

@@ -0,0 +1,100 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test" exporter="Flowable Open Source Modeler" exporterVersion="6.8.0">
+  <process id="REBIRTH_CUSTOMER_F" name="分支行违约重生流程" isExecutable="true">
+    <dataObject id="assignment-strategy" name="任务分配策略" itemSubjectRef="xsd:string">
+      <extensionElements>
+        <flowable:value>{"A2":"frAssigneeQueryService"}</flowable:value>
+      </extensionElements>
+    </dataObject>
+    <startEvent id="startevent1" name="开始" flowable:formFieldValidation="true"/>
+    <userTask id="A1" name="客户经理" flowable:assignee="${assignee}" flowable:formFieldValidation="true" flowable:skipExpression="${execution.getVariable('skipFirst')==true}">
+      <documentation>${desc}</documentation>
+      <extensionElements>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <userTask id="A2" name="一级支行违约重生审查岗" flowable:assignee="${assignee}" flowable:candidateGroups="y_rebirth_approve" flowable:formFieldValidation="true">
+      <documentation>${desc}</documentation>
+      <extensionElements>
+        <modeler:group-info-name-y_rebirth_approve xmlns:modeler="http://flowable.org/modeler"><![CDATA[一级支行违约重生审查岗]]></modeler:group-info-name-y_rebirth_approve>
+        <modeler:activiti-idm-candidate-group xmlns:modeler="http://flowable.org/modeler"><![CDATA[true]]></modeler:activiti-idm-candidate-group>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <userTask id="A3" name="一级支行违约重生审批岗" flowable:assignee="${assignee}" flowable:candidateGroups="y_rebirth_approve2" flowable:formFieldValidation="true">
+      <documentation>${desc}</documentation>
+      <extensionElements>
+        <modeler:group-info-name-y_rebirth_approve2 xmlns:modeler="http://flowable.org/modeler"><![CDATA[一级支行违约重生审批岗]]></modeler:group-info-name-y_rebirth_approve2>
+        <modeler:activiti-idm-candidate-group xmlns:modeler="http://flowable.org/modeler"><![CDATA[true]]></modeler:activiti-idm-candidate-group>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="A1"/>
+    <endEvent id="endevent1" name="同意"/>
+    <endEvent id="sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2" name="否决"/>
+    <sequenceFlow id="flow2" name="提交" sourceRef="A1" targetRef="A2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==6}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-96F21917-301D-4D2B-941D-6F6D41699550" name="提交" sourceRef="A2" targetRef="A3">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==6}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-BAB02F50-F776-4C87-9EA2-E158E566EDF5" name="通过" sourceRef="A3" targetRef="endevent1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-B1F31A14-650E-4E6F-AC5F-E59C642FB699" name="否决" sourceRef="A3" targetRef="sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==2}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-472D8758-83F7-44A1-A551-266AEBBF189A" name="否决" sourceRef="A2" targetRef="sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==2}]]></conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_REBIRTH_CUSTOMER_F">
+    <bpmndi:BPMNPlane bpmnElement="REBIRTH_CUSTOMER_F" id="BPMNPlane_REBIRTH_CUSTOMER_F">
+      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
+        <omgdc:Bounds height="30.0" width="30.0" x="32.02187570282153" y="169.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A1" id="BPMNShape_A1">
+        <omgdc:Bounds height="80.0" width="105.0" x="105.0" y="144.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A2" id="BPMNShape_A2">
+        <omgdc:Bounds height="80.0" width="105.0" x="300.0" y="144.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A3" id="BPMNShape_A3">
+        <omgdc:Bounds height="80.0" width="105.0" x="495.0" y="144.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
+        <omgdc:Bounds height="28.0" width="28.0" x="720.0" y="170.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2" id="BPMNShape_sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2">
+        <omgdc:Bounds height="28.0" width="28.0" x="720.0" y="300.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-472D8758-83F7-44A1-A551-266AEBBF189A" id="BPMNEdge_sid-472D8758-83F7-44A1-A551-266AEBBF189A" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
+        <omgdi:waypoint x="352.34603726004497" y="224.0484406626969"/>
+        <omgdi:waypoint x="352.0" y="314.0"/>
+        <omgdi:waypoint x="720.0" y="314.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="61.97187420581508" y="184.09844066269687"/>
+        <omgdi:waypoint x="105.0" y="184.09844066269687"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="209.9499999999619" y="184.09844066269687"/>
+        <omgdi:waypoint x="300.0" y="184.09844066269687"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-B1F31A14-650E-4E6F-AC5F-E59C642FB699" id="BPMNEdge_sid-B1F31A14-650E-4E6F-AC5F-E59C642FB699" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
+        <omgdi:waypoint x="547.2097308073669" y="224.0484406626969"/>
+        <omgdi:waypoint x="547.0" y="253.0"/>
+        <omgdi:waypoint x="734.0" y="253.0"/>
+        <omgdi:waypoint x="734.0" y="300.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-96F21917-301D-4D2B-941D-6F6D41699550" id="BPMNEdge_sid-96F21917-301D-4D2B-941D-6F6D41699550" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="404.95000000000005" y="184.09844066269687"/>
+        <omgdi:waypoint x="494.9999999999545" y="184.09844066269687"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-BAB02F50-F776-4C87-9EA2-E158E566EDF5" id="BPMNEdge_sid-BAB02F50-F776-4C87-9EA2-E158E566EDF5" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
+        <omgdi:waypoint x="599.95" y="184.09844066269687"/>
+        <omgdi:waypoint x="720.0" y="184.09844066269687"/>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/RISK_EXPOSURE_FLOW.bpmn

@@ -0,0 +1,101 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test" exporter="Flowable Open Source Modeler" exporterVersion="6.8.0">
+  <process id="RISK_EXPOSURE_FLOW" name="风险暴露流程分类" isExecutable="true">
+    <dataObject id="assignment-strategy" name="任务分配策略" itemSubjectRef="xsd:string">
+      <extensionElements>
+        <flowable:value>{"A2":"frAssigneeQueryService"}</flowable:value>
+      </extensionElements>
+    </dataObject>
+    <startEvent id="startevent1" name="开始" flowable:formFieldValidation="true"/>
+    <userTask id="A1" name="客户经理" flowable:assignee="${assignee}" flowable:formFieldValidation="true" flowable:skipExpression="${execution.getVariable('skipFirst')==true}">
+      <documentation>${desc}</documentation>
+      <extensionElements>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <userTask id="A2" name="一级支行违约认定审查岗" flowable:assignee="${assignee}" flowable:candidateGroups="y_defa_approve" flowable:formFieldValidation="true">
+      <documentation>${desc}</documentation>
+      <extensionElements>
+        <modeler:group-info-name-y_defa_approve xmlns:modeler="http://flowable.org/modeler"><![CDATA[一级支行违约认定审查岗]]></modeler:group-info-name-y_defa_approve>
+        <modeler:activiti-idm-candidate-group xmlns:modeler="http://flowable.org/modeler"><![CDATA[true]]></modeler:activiti-idm-candidate-group>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <userTask id="A3" name="一级支行违约认定审批岗" flowable:assignee="${assignee}" flowable:candidateGroups="y_defa_approve2" flowable:formFieldValidation="true">
+      <documentation>${desc}</documentation>
+      <extensionElements>
+        <modeler:group-info-name-y_defa_approve2 xmlns:modeler="http://flowable.org/modeler"><![CDATA[一级支行违约认定审批岗]]></modeler:group-info-name-y_defa_approve2>
+        <modeler:activiti-idm-candidate-group xmlns:modeler="http://flowable.org/modeler"><![CDATA[true]]></modeler:activiti-idm-candidate-group>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="A1"/>
+    <endEvent id="endevent1" name="同意"/>
+    <endEvent id="sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2" name="否决"/>
+    <sequenceFlow id="sid-DBFDB8F4-F4CC-42B4-969E-27DE6C9AD478" name="退回" sourceRef="A2" targetRef="A1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-B1F31A14-650E-4E6F-AC5F-E59C642FB699" name="否决" sourceRef="A3" targetRef="sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==2}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-BAB02F50-F776-4C87-9EA2-E158E566EDF5" name="通过" sourceRef="A3" targetRef="endevent1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-96F21917-301D-4D2B-941D-6F6D41699550" name="提交" sourceRef="A2" targetRef="A3">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==6}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow2" name="提交" sourceRef="A1" targetRef="A2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==6}]]></conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_RISK_EXPOSURE_FLOW">
+    <bpmndi:BPMNPlane bpmnElement="RISK_EXPOSURE_FLOW" id="BPMNPlane_RISK_EXPOSURE_FLOW">
+      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
+        <omgdc:Bounds height="30.0" width="30.0" x="32.02187570282153" y="169.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A1" id="BPMNShape_A1">
+        <omgdc:Bounds height="80.0" width="105.0" x="105.0" y="144.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A2" id="BPMNShape_A2">
+        <omgdc:Bounds height="80.0" width="105.0" x="300.0" y="144.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A3" id="BPMNShape_A3">
+        <omgdc:Bounds height="80.0" width="105.0" x="495.0" y="144.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
+        <omgdc:Bounds height="28.0" width="28.0" x="720.0" y="170.09844066269687"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2" id="BPMNShape_sid-CD21ADC0-A42C-4BAF-B796-B18E9B997AA2">
+        <omgdc:Bounds height="28.0" width="28.0" x="720.0" y="300.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="52.0" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="61.0" y="184.0"/>
+        <omgdi:waypoint x="105.0" y="184.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2" flowable:sourceDockerX="52.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.0" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="209.0" y="184.0"/>
+        <omgdi:waypoint x="300.0" y="184.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-B1F31A14-650E-4E6F-AC5F-E59C642FB699" id="BPMNEdge_sid-B1F31A14-650E-4E6F-AC5F-E59C642FB699" flowable:sourceDockerX="52.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
+        <omgdi:waypoint x="547.0" y="224.0"/>
+        <omgdi:waypoint x="547.0" y="253.0"/>
+        <omgdi:waypoint x="734.0" y="253.0"/>
+        <omgdi:waypoint x="734.0" y="300.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-96F21917-301D-4D2B-941D-6F6D41699550" id="BPMNEdge_sid-96F21917-301D-4D2B-941D-6F6D41699550" flowable:sourceDockerX="52.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.0" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="404.0" y="184.0"/>
+        <omgdi:waypoint x="494.0" y="184.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-DBFDB8F4-F4CC-42B4-969E-27DE6C9AD478" id="BPMNEdge_sid-DBFDB8F4-F4CC-42B4-969E-27DE6C9AD478" flowable:sourceDockerX="52.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.0" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="352.0" y="224.0"/>
+        <omgdi:waypoint x="352.0" y="304.0"/>
+        <omgdi:waypoint x="157.0" y="304.0"/>
+        <omgdi:waypoint x="157.0" y="224.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-BAB02F50-F776-4C87-9EA2-E158E566EDF5" id="BPMNEdge_sid-BAB02F50-F776-4C87-9EA2-E158E566EDF5" flowable:sourceDockerX="52.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
+        <omgdi:waypoint x="599.0" y="184.0"/>
+        <omgdi:waypoint x="720.0" y="184.0"/>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/SAMPLE.bpmn

@@ -0,0 +1,79 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test" exporter="Flowable Open Source Modeler" exporterVersion="6.8.0">
+  <process id="SAMPLE" name="示例流程" isExecutable="true">
+    <extensionElements>
+      <flowable:executionListener event="end" delegateExpression="${ruleEngineResourceDeployComplementListener}"/>
+    </extensionElements>
+    <startEvent id="startevent1" name="Start" flowable:formFieldValidation="true"/>
+    <endEvent id="endevent1" name="通过"/>
+    <userTask id="A2" name="审批" flowable:assignee="${assignee}" flowable:candidateGroups="admin" flowable:formFieldValidation="true">
+      <extensionElements>
+        <modeler:group-info-name-admin xmlns:modeler="http://flowable.org/modeler"><![CDATA[系统管理员]]></modeler:group-info-name-admin>
+        <modeler:activiti-idm-candidate-group xmlns:modeler="http://flowable.org/modeler"><![CDATA[true]]></modeler:activiti-idm-candidate-group>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="A1"/>
+    <userTask id="A1" name="提交" flowable:assignee="${assignee}" flowable:candidateGroups="admin" flowable:formFieldValidation="true" flowable:skipExpression="${execution.getVariable('skipFirst')==true}">
+      <extensionElements>
+        <modeler:group-info-name-admin xmlns:modeler="http://flowable.org/modeler"><![CDATA[系统管理员]]></modeler:group-info-name-admin>
+        <modeler:activiti-idm-candidate-group xmlns:modeler="http://flowable.org/modeler"><![CDATA[true]]></modeler:activiti-idm-candidate-group>
+        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
+      </extensionElements>
+    </userTask>
+    <endEvent id="sid-A71F005E-5443-454A-AEA3-B39EB898CF2C" name="拒绝"/>
+    <sequenceFlow id="sid-DFC55ACA-3CA7-4F71-963C-659BDD7EF379" name="否决" sourceRef="A2" targetRef="sid-A71F005E-5443-454A-AEA3-B39EB898CF2C">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==2}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-7727ADC3-E654-4ADD-894A-6D6AF2130C3E" name="同意" sourceRef="A2" targetRef="endevent1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow2" name="提交" sourceRef="A1" targetRef="A2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==6}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-E0E2165C-BE27-4B8F-9B06-7834E561A053" name="退回" sourceRef="A2" targetRef="A1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${goback==-1}]]></conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_SAMPLE">
+    <bpmndi:BPMNPlane bpmnElement="SAMPLE" id="BPMNPlane_SAMPLE">
+      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
+        <omgdc:Bounds height="30.0" width="30.0" x="99.51093785141074" y="100.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
+        <omgdc:Bounds height="28.0" width="28.0" x="495.0" y="101.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A2" id="BPMNShape_A2">
+        <omgdc:Bounds height="80.0" width="105.0" x="345.0" y="75.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="A1" id="BPMNShape_A1">
+        <omgdc:Bounds height="80.0" width="105.0" x="172.4890621485892" y="75.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-A71F005E-5443-454A-AEA3-B39EB898CF2C" id="BPMNShape_sid-A71F005E-5443-454A-AEA3-B39EB898CF2C">
+        <omgdc:Bounds height="28.0" width="28.0" x="494.9999963119626" y="209.99999843537807"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-E0E2165C-BE27-4B8F-9B06-7834E561A053" id="BPMNEdge_sid-E0E2165C-BE27-4B8F-9B06-7834E561A053" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="397.2260273972603" y="75.0"/>
+        <omgdi:waypoint x="397.0" y="42.0"/>
+        <omgdi:waypoint x="224.0" y="42.0"/>
+        <omgdi:waypoint x="224.44711028634853" y="75.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="129.46093635440428" y="115.0"/>
+        <omgdi:waypoint x="172.48906214857433" y="115.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="52.5" flowable:targetDockerY="40.0">
+        <omgdi:waypoint x="277.4390621485892" y="115.0"/>
+        <omgdi:waypoint x="344.99999999998187" y="115.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-7727ADC3-E654-4ADD-894A-6D6AF2130C3E" id="BPMNEdge_sid-7727ADC3-E654-4ADD-894A-6D6AF2130C3E" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
+        <omgdi:waypoint x="449.95000000000005" y="115.0"/>
+        <omgdi:waypoint x="495.0" y="115.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-DFC55ACA-3CA7-4F71-963C-659BDD7EF379" id="BPMNEdge_sid-DFC55ACA-3CA7-4F71-963C-659BDD7EF379" flowable:sourceDockerX="52.5" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
+        <omgdi:waypoint x="438.3658635176757" y="154.95"/>
+        <omgdi:waypoint x="498.98839166271546" y="214.21336792683616"/>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

irbs.defaultManager/build.gradle

@@ -2,7 +2,7 @@ dependencies {
 	api(
 		"io.sc:io.sc.platform.mvc:${platform_version}",
 		"io.sc:io.sc.platform.flowable:${platform_version}",
-		"io.sc:io.sc.platform.page.config:${rwa_version}",
 		"io.sc:io.sc.platform.scheduler.core:${platform_version}",
+		"io.sc:io.sc.platform.lcdp:${platform_version}"
 	)
 }

irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultAutoBatchServiceImpl.java

@@ -1,6 +1,5 @@
 package irbs.defaultManager.service.impl;
 
-import io.sc.platform.core.util.StringUtil;
 import io.sc.platform.jdbc.DatabaseType;
 import io.sc.platform.orm.service.support.OperatorType;
 import io.sc.platform.orm.service.support.QueryParameter;
@@ -8,6 +7,7 @@ import io.sc.platform.orm.service.support.criteria.Criteria;
 import io.sc.platform.orm.service.support.criteria.impl.Equals;
 import io.sc.platform.scheduler.core.JobHandler;
 import io.sc.platform.scheduler.core.vo.Task;
+import io.sc.platform.util.StringUtil;
 import irbs.defaultManager.enums.*;
 import irbs.defaultManager.jpa.entity.DefaultAutoDebt;
 import irbs.defaultManager.jpa.entity.DefaultAutoRule;

irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultAutoRuleServiceImpl.java

@@ -1,32 +1,12 @@
 package irbs.defaultManager.service.impl;
 
-import io.sc.platform.flowable.controller.support.ProcessProperties;
-import io.sc.platform.flowable.service.ProcessQueryService;
-import io.sc.platform.flowable.support.ProcessTaskWrapper;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
-import io.sc.platform.orm.service.support.QueryParameter;
-import io.sc.platform.orm.util.EntityVoUtil;
-import io.sc.platform.page.config.service.JdbcTemplateService;
-import io.sc.platform.security.util.SecurityUtil;
-import irbs.defaultManager.constant.DefaultConstant;
-import irbs.defaultManager.enums.DefaultCustomerLogOperate;
-import irbs.defaultManager.enums.DefaultEventItemStatus;
-import irbs.defaultManager.enums.DefaultProcessStatus;
-import irbs.defaultManager.jpa.entity.*;
-import irbs.defaultManager.jpa.repository.*;
-import irbs.defaultManager.jpa.vo.DefaultCognizanceVo;
+import irbs.defaultManager.jpa.entity.DefaultAutoRule;
+import irbs.defaultManager.jpa.repository.DefaultAutoRuleRepository;
 import irbs.defaultManager.service.DefaultAutoRuleService;
-import irbs.defaultManager.service.DefaultCognizanceService;
-import irbs.defaultManager.service.DefaultStatusService;
-import org.flowable.engine.ProcessEngine;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.List;
 
 @Service("defaultAutoRuleService")
 public class DefaultAutoRuleServiceImpl extends DaoServiceImpl<DefaultAutoRule, String, DefaultAutoRuleRepository> implements DefaultAutoRuleService {

irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultCognizanceServiceImpl.java

@@ -3,10 +3,10 @@ package irbs.defaultManager.service.impl;
 import io.sc.platform.flowable.controller.support.ProcessProperties;
 import io.sc.platform.flowable.service.ProcessQueryService;
 import io.sc.platform.flowable.support.ProcessTaskWrapper;
+import io.sc.platform.lcdp.form.service.JdbcTemplateService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import io.sc.platform.orm.service.support.QueryParameter;
 import io.sc.platform.orm.util.EntityVoUtil;
-import io.sc.platform.page.config.service.JdbcTemplateService;
 import io.sc.platform.security.util.SecurityUtil;
 import irbs.defaultManager.constant.DefaultConstant;
 import irbs.defaultManager.enums.DefaultCustomerLogOperate;

irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultRebirthServiceImpl.java

@@ -4,10 +4,10 @@ import io.sc.platform.flowable.controller.support.ProcessProperties;
 import io.sc.platform.flowable.service.ProcessQueryService;
 import io.sc.platform.flowable.support.ProcessTaskWrapper;
 import io.sc.platform.jdbc.sql.condition.Condition;
+import io.sc.platform.lcdp.form.service.JdbcTemplateService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import io.sc.platform.orm.service.support.QueryParameter;
 import io.sc.platform.orm.util.EntityVoUtil;
-import io.sc.platform.page.config.service.JdbcTemplateService;
 import io.sc.platform.security.util.SecurityUtil;
 import irbs.defaultManager.constant.DefaultConstant;
 import irbs.defaultManager.enums.DefaultCustomerLogOperate;

irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/RebirthAutoBatchServiceImpl.java

@@ -1,6 +1,5 @@
 package irbs.defaultManager.service.impl;
 
-import io.sc.platform.core.util.StringUtil;
 import io.sc.platform.mvc.service.SystemParameterService;
 import io.sc.platform.orm.service.support.OperatorType;
 import io.sc.platform.orm.service.support.QueryParameter;
@@ -8,6 +7,7 @@ import io.sc.platform.orm.service.support.criteria.Criteria;
 import io.sc.platform.orm.service.support.criteria.impl.Equals;
 import io.sc.platform.scheduler.core.JobHandler;
 import io.sc.platform.scheduler.core.vo.Task;
+import io.sc.platform.util.StringUtil;
 import irbs.defaultManager.enums.*;
 import irbs.defaultManager.jpa.entity.DefaultAutoDebt;
 import irbs.defaultManager.jpa.entity.DefaultAutoRule;

irbs.defaultManager/src/main/java/irbs/defaultManager/utils/DateUtil.java

@@ -14,7 +14,7 @@ public class DateUtil {
         if(dtStr != null){
             dtStr = dtStr.replaceAll("[-./年月日]","");
             try {
-                return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyyMMdd");
+                return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyyMMdd");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -29,7 +29,7 @@ public class DateUtil {
                 dtStr = dtStr.substring(0,4) + "-" + dtStr.substring(4,6) + "-" + dtStr.substring(6);
             }
             try {
-                return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd");
+                return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -44,7 +44,7 @@ public class DateUtil {
                 dtStr = dtStr.substring(0,4) + "-" + dtStr.substring(4,6) + "-" + dtStr.substring(6);
             }
             try {
-                return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd HH:mm:ss");
+                return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd HH:mm:ss");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -54,7 +54,7 @@ public class DateUtil {
 
     public static String toString(Date dt, String format){
         if(dt != null){
-            return io.sc.platform.core.util.DateUtil.formatDate(dt, format);
+            return io.sc.platform.util.DateUtil.formatDate(dt, format);
         }
         return null;
     }

irbs.defaultManager/src/main/java/irbs/defaultManager/utils/RptSqlFormat.java

@@ -1,6 +1,7 @@
 package irbs.defaultManager.utils;
 
-import io.sc.platform.core.util.StringUtil;
+
+import io.sc.platform.util.StringUtil;
 
 import java.util.Map;
 

irbs.feature/src/main/java/irbs/feature/service/impl/CustFeatureCalcBatchServiceImpl.java

@@ -4,15 +4,12 @@ import io.sc.engine.rule.client.Executor;
 import io.sc.engine.rule.client.runtime.impl.groovy.GroovyScriptEngineService;
 import io.sc.engine.rule.client.runtime.impl.groovy.GroovyScriptEngineServiceImpl;
 import io.sc.engine.rule.client.spring.service.ExecutorFactoryService;
+import io.sc.engine.rule.core.ParameterResult;
+import io.sc.engine.rule.core.ResourceResult;
+import io.sc.engine.rule.core.code.ExecuteUnit;
 import io.sc.engine.rule.core.code.SourceCode;
-import io.sc.engine.rule.core.code.impl.GroovySourceCodeGenerator;
-import io.sc.engine.rule.core.code.impl.support.ParameterResult;
-import io.sc.engine.rule.core.code.impl.support.ResourceResult;
-import io.sc.engine.rule.core.code.impl.support.ResourceWrapper;
-import io.sc.engine.rule.core.po.dictionary.UserDefinedJavaClassDictionary;
-import io.sc.engine.rule.server.dictionary.entity.UserDefinedJavaClassDictionaryEntity;
+import io.sc.engine.rule.core.code.generator.GroovySourceCodeGenerator;
 import io.sc.engine.rule.server.dictionary.entity.UserDefinedJavaClassFieldEntity;
-import io.sc.engine.rule.server.dictionary.repository.UserDefinedJavaClassFieldRepository;
 import io.sc.engine.rule.server.dictionary.service.UserDefinedJavaClassFieldService;
 import io.sc.platform.jdbc.DatabaseType;
 import io.sc.platform.orm.service.support.OperatorType;
@@ -73,8 +70,8 @@ public class CustFeatureCalcBatchServiceImpl implements CustFeatureCalcBatchServ
             DatabaseType type = DatabaseType.fromMetaData(dataSource);
             String dbType = type.getProductName();
             Executor executor =executorFactoryService.getExecutor();
-            ResourceWrapper resourceWrapper =executor.getLoader().getResourceByCode(SHRCB_LIB_CODE,null);
-            SourceCode groovySourceCode =new GroovySourceCodeGenerator().generateSourceCodeByCode(SHRCB_LIB_CODE,null,resourceWrapper);
+            ExecuteUnit resourceWrapper =executor.getLoader().load(SHRCB_LIB_CODE,null);
+            SourceCode groovySourceCode =new GroovySourceCodeGenerator().generate(SHRCB_LIB_CODE,null,resourceWrapper);
             int i = 1;
             BatchSqlUpdate bsu = null;
             for(Map<String, Object> map : list){
@@ -513,7 +510,7 @@ public class CustFeatureCalcBatchServiceImpl implements CustFeatureCalcBatchServ
                 }
             }
             Executor executor = executorFactoryService.getExecutor();
-            ResourceResult result = executor.executeByCode("QYCW_ZB",null,kiMap);
+            ResourceResult result = executor.executeByCode("QYCW_ZB", null, kiMap);
             if(result != null && !CollectionUtils.isEmpty(result.getData())) {
                 List<ParameterResult> results = result.getData();
                 List<CustFeatureRet> res = new ArrayList<>();

irbs.feature/src/main/java/irbs/feature/utils/DateUtil.java

@@ -10,7 +10,7 @@ public class DateUtil {
         if(dtStr != null){
             dtStr = dtStr.replaceAll("[-./年月日]","");
             try {
-                return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyyMMdd");
+                return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyyMMdd");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -25,7 +25,7 @@ public class DateUtil {
                 dtStr = dtStr.substring(0,4) + "-" + dtStr.substring(4,6) + "-" + dtStr.substring(6);
             }
             try {
-                return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd");
+                return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -40,7 +40,7 @@ public class DateUtil {
                 dtStr = dtStr.substring(0,4) + "-" + dtStr.substring(4,6) + "-" + dtStr.substring(6);
             }
             try {
-                return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd HH:mm:ss");
+                return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd HH:mm:ss");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -50,7 +50,7 @@ public class DateUtil {
 
     public static String toString(Date dt, String format){
         if(dt != null){
-            return io.sc.platform.core.util.DateUtil.formatDate(dt, format);
+            return io.sc.platform.util.DateUtil.formatDate(dt, format);
         }
         return null;
     }

irbs.frontend/package.json

@@ -7,7 +7,7 @@
   "author": "",
   "license": "ISC",
   "scripts": {
-    "clean": "rm -rf ./node_modules && rm -rf pnpm-lock.yaml",
+    "clean": "platform clean dist ./node_modules ./pnpm-lock.yaml ./package-lock.json",
     "dev": "nodemon",
     "serve": "node ./util-components-generator.cjs && cross-env NODE_ENV=development  webpack serve --config webpack.env.serve.cjs",
     "build": "node ./util-components-generator.cjs && cross-env NODE_ENV=development  webpack       --config webpack.env.build.cjs",
@@ -23,95 +23,103 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.24.7",
-    "@babel/preset-env": "7.24.7",
-    "@babel/preset-typescript": "7.24.7",
-    "@babel/plugin-transform-class-properties": "7.24.7",
-    "@babel/plugin-transform-object-rest-spread": "7.24.7",
-    "@quasar/app-webpack": "3.13.2",
+    "@babel/core": "7.26.0",
+    "@babel/plugin-transform-class-properties": "7.25.9",
+    "@babel/plugin-transform-object-rest-spread": "7.25.9",
+    "@babel/preset-env": "7.26.0",
+    "@babel/preset-typescript": "7.26.0",
+    "@quasar/app-webpack": "4.0.0-rc.4",
     "@quasar/cli": "2.4.1",
     "@types/mockjs": "1.0.10",
-    "@types/node": "20.14.10",
-    "@typescript-eslint/eslint-plugin": "7.15.0",
-    "@typescript-eslint/parser": "7.15.0",
-    "@vue/compiler-sfc": "3.4.31",
+    "@types/node": "22.10.0",
+    "@typescript-eslint/eslint-plugin": "8.16.0",
+    "@typescript-eslint/parser": "8.16.0",
+    "@vue/babel-plugin-jsx": "1.2.5",
+    "@vue/compiler-sfc": "3.5.13",
+    "@vuepress/bundler-webpack": "2.0.0-rc.15",
+    "@vuepress/theme-default": "2.0.0-rc.49",
     "@webpack-cli/serve": "2.0.5",
-    "autoprefixer": "10.4.19",
-    "babel-loader": "9.1.3",
+    "autoprefixer": "10.4.20",
+    "babel-loader": "9.2.1",
     "clean-webpack-plugin": "4.0.0",
     "copy-webpack-plugin": "12.0.2",
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
-    "eslint": "8.56.0",
+    "eslint": "9.15.0",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-vue": "9.27.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "eslint-plugin-vue": "9.31.0",
     "eslint-webpack-plugin": "4.2.0",
-    "html-webpack-plugin": "5.6.0",
+    "html-webpack-plugin": "5.6.3",
     "json5": "2.2.3",
-    "mini-css-extract-plugin": "2.9.0",
-    "nodemon": "3.1.4",
-    "postcss": "8.4.39",
+    "mini-css-extract-plugin": "2.9.2",
+    "nodemon": "3.1.7",
+    "postcss": "8.4.49",
     "postcss-import": "16.1.0",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "9.6.0",
-    "prettier": "3.3.2",
-    "sass": "1.77.6",
-    "sass-loader": "14.2.1",
-    "typescript": "5.5.3",
+    "postcss-preset-env": "10.1.1",
+    "prettier": "3.4.1",
+    "sass": "1.81.0",
+    "sass-loader": "16.0.3",
+    "tailwindcss": "3.4.15",
+    "typescript": "5.5.4",
     "vue-loader": "17.4.2",
-    "webpack": "5.92.1",
+    "vuepress": "2.0.0-rc.15",
+    "webpack": "5.96.1",
     "webpack-bundle-analyzer": "4.10.2",
     "webpack-cli": "5.1.4",
-    "webpack-dev-server": "5.0.4",
-    "webpack-merge": "6.0.1",
-    "@vue/babel-plugin-jsx": "1.2.2"
+    "webpack-dev-server": "5.1.0",
+    "webpack-merge": "6.0.1"
   },
   "dependencies": {
-    "@quasar/extras": "1.16.12",
-    "@vueuse/core": "10.11.0",
-    "axios": "1.7.2",
-    "dayjs": "1.11.11",
-    "echarts": "5.5.1",
-    "exceljs": "4.4.0",
-    "file-saver": "2.0.5",
-    "luckyexcel": "1.0.1",
-    "mockjs": "1.1.0",
-    "pinia": "2.1.7",
-    "platform-core": "8.1.287",
-    "quasar": "2.15.4",
-    "tailwindcss": "3.4.4",
-    "vue": "3.4.31",
-    "vue-dompurify-html": "5.1.0",
-    "vue-i18n": "9.13.1",
-    "vue-router": "4.4.0",
-    "lodash": "4.17.21",
-    "@codemirror/autocomplete": "6.17.0",
-    "@codemirror/commands": "6.6.0",
+    "@codemirror/autocomplete": "6.18.3",
+    "@codemirror/commands": "6.7.1",
     "@codemirror/lang-html": "6.4.9",
     "@codemirror/lang-java": "6.0.1",
     "@codemirror/lang-javascript": "6.2.2",
     "@codemirror/lang-json": "6.0.1",
-    "@codemirror/lang-sql": "6.7.0",
+    "@codemirror/lang-sql": "6.8.0",
     "@codemirror/lang-xml": "6.1.0",
-    "@codemirror/language": "6.10.2",
-    "@codemirror/search": "6.5.6",
+    "@codemirror/language": "6.10.4",
+    "@codemirror/search": "6.5.8",
     "@codemirror/state": "6.4.1",
-    "@codemirror/view": "6.28.4",
+    "@codemirror/view": "6.35.0",
+    "@maxgraph/core": "0.13.1",
+    "@quasar/extras": "1.16.13",
+    "@univerjs/core": "0.5.0",
+    "@univerjs/design": "0.5.0",
+    "@univerjs/docs": "0.5.0",
+    "@univerjs/docs-ui": "0.5.0",
+    "@univerjs/engine-formula": "0.5.0",
+    "@univerjs/engine-render": "0.5.0",
+    "@univerjs/facade": "0.5.0",
+    "@univerjs/sheets": "0.5.0",
+    "@univerjs/sheets-formula": "0.5.0",
+    "@univerjs/sheets-ui": "0.5.0",
+    "@univerjs/thread-comment": "0.5.0",
+    "@univerjs/ui": "0.5.0",
+    "@vueuse/core": "11.3.0",
+    "axios": "1.7.8",
     "codemirror": "6.0.1",
+    "dayjs": "1.11.13",
+    "echarts": "5.5.1",
+    "exceljs": "4.4.0",
+    "file-saver": "2.0.5",
+    "lodash": "4.17.21",
+    "luckyexcel": "1.0.1",
+    "mockjs": "1.1.0",
+    "node-sql-parser": "5.3.4",
+    "pinia": "2.2.6",
+    "platform-core": "8.2.32",
+    "quasar": "2.17.4",
+    "sort-array": "5.0.0",
+    "svg-path-commander": "2.1.5",
+    "tailwindcss": "3.4.4",
+    "vue": "3.5.13",
     "vue-codemirror6": "1.2.0",
-    "@maxgraph/core": "0.12.0",
-    "@univerjs/core": "0.2.0",
-    "@univerjs/design": "0.2.0",
-    "@univerjs/docs": "0.2.0",
-    "@univerjs/docs-ui": "0.2.0",
-    "@univerjs/engine-formula": "0.2.0",
-    "@univerjs/engine-render": "0.2.0",
-    "@univerjs/facade": "0.2.0",
-    "@univerjs/sheets": "0.2.0",
-    "@univerjs/sheets-formula": "0.2.0",
-    "@univerjs/sheets-ui": "0.2.0",
-    "@univerjs/ui": "0.2.0",
+    "vue-dompurify-html": "5.2.0",
+    "vue-i18n": "10.0.4",
+    "vue-router": "4.5.0",
     "xml-formatter": "3.6.3"
   }
 }

irbs.frontend/src/i18n/messages.json

@@ -60,6 +60,7 @@
   "menu.irbs.report.rptModelMonitorStable": "ModelMonitorStable",
   "menu.irbs.report.rptModelMonitorBinomialCheck": "ModelMonitorBinomialCheck",
 
+  "menu.irbs.config.headApprConf": "HeadApprConf",
   "menu.irbs.config.defaultAutoRule": "DefaultAutoRule",
   "menu.irbs.config.riskExposureRule": "RiskExposureRule",
   "menu.irbs.config.debtRatingProdRecRate": "ProductRecRate",

irbs.frontend/src/i18n/messages_tw_CN.json

@@ -56,6 +56,7 @@
   "menu.irbs.report.rptModelMonitorStable": "模型稳定性监控报表",
   "menu.irbs.report.rptModelMonitorBinomialCheck": "模型审慎性监控报表",
 
+  "menu.irbs.config.headApprConf": "总行审批客户配置",
   "menu.irbs.config.defaultAutoRule": "自动违约认定规则",
   "menu.irbs.config.riskExposureRule": "风险暴露分类规则",
   "menu.irbs.config.debtRatingProdRecRate": "产品基准回收率",

irbs.frontend/src/i18n/messages_zh_CN.json

@@ -56,6 +56,7 @@
   "menu.irbs.report.rptModelMonitorStable": "模型稳定性监控报表",
   "menu.irbs.report.rptModelMonitorBinomialCheck": "模型审慎性监控报表",
 
+  "menu.irbs.config.headApprConf": "总行审批客户配置",
   "menu.irbs.config.defaultAutoRule": "自动违约认定规则",
   "menu.irbs.config.riskExposureRule": "风险暴露分类规则",
   "menu.irbs.config.debtRatingProdRecRate": "产品基准回收率",

irbs.frontend/src/menus/menus.json

@@ -65,6 +65,9 @@
       /*查询管理/上农内评企业客户特征变量查询*/
       {"type":"ROUTE",      "order":700,  "parentId":"menu.irbs.query",         "id":"menu.irbs.query.shrcbCorpCustFeature",             "titleI18nKey":"menu.irbs.query.shrcbCorpCustFeature",               "icon":"bi-file-earmark-ruled-fill",        "routeName":"route.sys.comm.page", "routeQuery": {"id": "1a50a840-0e62-41b5-b952-9bd77a3775c2"}},
     {"type":"GROUP",	      "order":700,  "parentId":"menu.irbs",                 "id":"menu.irbs.config",                       "titleI18nKey":"menu.irbs.config",                        "icon":"display_settings"},
+    /*系统配置/评级调整项定义*/
+      /*系统配置/总行审批客户配置*/
+      {"type":"ROUTE",      "order":1,  "parentId":"menu.irbs.config",         "id":"menu.irbs.config.headApprConf",             "titleI18nKey":"menu.irbs.config.headApprConf",               "icon":"eva-image-2",        "routeName":"route.irbs.config.headApprConf" },
       /*系统配置/评级调整项定义*/
       {"type":"ROUTE",      "order":100,  "parentId":"menu.irbs.config",         "id":"menu.irbs.config.ratingAdjustment",             "titleI18nKey":"menu.irbs.config.ratingAdjustment",               "icon":"eva-map",        "routeName":"route.sys.comm.page", "routeQuery": {"id": "9a803997-ee15-47cc-bed2-872ec92be17e"}},
       /*系统配置/债项因素调整系数*/
@@ -83,7 +86,7 @@
       {"type":"ROUTE",      "order":600,  "parentId":"menu.irbs.config",         "id":"menu.irbs.config.debtRatingAdjRate",             "titleI18nKey":"menu.irbs.config.debtRatingAdjRate",               "icon":"eva-file-text",        "routeName":"route.sys.comm.page", "routeQuery": {"id": "d2b29ad7-5f84-4c94-bdca-bb6dac4434fa"}},
       /*系统配置/债项评级-抵质押物回收率*/
       {"type":"ROUTE",      "order":700,  "parentId":"menu.irbs.config",         "id":"menu.irbs.config.pledgeRecRate",             "titleI18nKey":"menu.irbs.config.pledgeRecRate",               "icon":"eva-grid-outline",        "routeName":"route.sys.comm.page", "routeQuery": {"id": "16ecfd08-371c-4d05-9e3a-9ab77b1fd748"}},
-      {"type":"ROUTE",      "order":800,  "parentId":"menu.irbs.config",         "id":"menu.irbs.config.mainScale",             "titleI18nKey":"menu.irbs.config.mainScale",               "icon":"sym_o_account_balance_wallet",        "routeName":"route.irbs.config.mainScale"},
+      {"type":"ROUTE",      "order":800,  "parentId":"menu.irbs.config",         "id":"menu.irbs.config.mainScale",             "titleI18nKey":"menu.irbs.config.mainScale",               "icon":"signal_cellular_null",        "routeName":"route.irbs.config.mainScale"},
       /*系统配置/财报模板映射*/
       {"type":"ROUTE",      "order":900,  "parentId":"menu.irbs.config",         "id":"menu.irbs.config.financialMapping",             "titleI18nKey":"menu.irbs.config.financialMapping",               "icon":"bi-reception-3",        "routeName":"route.irbs.config.financialMapping"},  
     {"type":"GROUP",	      "order":800,  "parentId":"menu.irbs",                 "id":"menu.irbs.report",                       "titleI18nKey":"menu.irbs.report",                        "icon":"find_in_page"},

irbs.frontend/src/routes/routes.json

@@ -455,6 +455,18 @@
     },
     "children": []
   },
+  {
+    "name": "route.irbs.config.headApprConf",
+    "path": "irbs/config/headApprConf",
+    "parent": "/",
+    "priority": -1,
+    "component": "irbs.config.headApprConf",
+    "componentPath": "@/views/config/HeadApprConf.vue",
+    "redirect": null,
+    "meta": {
+      "permissions": ["/example/**/*"]
+    },
+  },
   {
     "name": "route.irbs.config.financialMapping",
     "path": "irbs/config/financialMapping",

irbs.frontend/src/views/config/FinancialMapping.vue

@@ -20,12 +20,12 @@
         form: {
           colsNum: 2,
           fields: [
-            { name: 'fromModelNo', label: '财报模板', type: 'select', options: fromModelNoOptions, colSpan: 'full' },
-            { name: 'fromModelRuleType', label: '会计准则', type: 'select', options: fromModelRuleTypeOptions, colSpan: 'full' },
-            { name: 'toRowSubject', label: '目标科目编码', type: 'text' },
-            { name: 'toRowName', label: '目标科目名称', type: 'text' },
-            { name: 'fromRowSubject', label: '原科目编码', type: 'text' },
-            { name: 'fromRowName', label: '原科目名称', type: 'text' },
+            { name: 'fromModelNo', label: '财报模板', type: 'w-select', options: fromModelNoOptions, colSpan: 'full' },
+            { name: 'fromModelRuleType', label: '会计准则', type: 'w-select', options: fromModelRuleTypeOptions, colSpan: 'full' },
+            { name: 'toRowSubject', label: '目标科目编码', type: 'w-text' },
+            { name: 'toRowName', label: '目标科目名称', type: 'w-text' },
+            { name: 'fromRowSubject', label: '原科目编码', type: 'w-text' },
+            { name: 'fromRowName', label: '原科目名称', type: 'w-text' },
           ],
         },
       }"
@@ -76,21 +76,21 @@ const financialMappingGrid = {
     {
       label: '财报模板',
       name: 'fromModelNo',
-      type: 'select',
+      type: 'w-select',
       options: fromModelNoOptions,
       defaultValue: '1',
     },
     {
       label: '会计准则',
       name: 'fromModelRuleType',
-      type: 'select',
+      type: 'w-select',
       options: fromModelRuleTypeOptions,
       defaultValue: 'NEW',
     },
-    { label: '原科目编码', name: 'fromRowSubject', type: 'text' },
-    { label: '原科目名称', name: 'fromRowName', type: 'text' },
-    { label: '目标科目编码', name: 'toRowSubject', type: 'text' },
-    { label: '目标科目名称', name: 'toRowName', type: 'text' },
+    { label: '原科目编码', name: 'fromRowSubject', type: 'w-text' },
+    { label: '原科目名称', name: 'fromRowName', type: 'w-text' },
+    { label: '目标科目编码', name: 'toRowSubject', type: 'w-text' },
+    { label: '目标科目名称', name: 'toRowName', type: 'w-text' },
   ],
   columns: [
     { name: 'fromModelNo', label: '财报模板', format: fromModelNoFormat, width: 80 },

irbs.frontend/src/views/config/HeadApprConf.vue

@@ -0,0 +1,67 @@
+<template>
+  <w-form
+    :cols-num="2"
+    :fields="[
+      {
+        name: 'indu',
+        colSpan: 'full',
+        label: '客户所属行业',
+        multiple: true,
+        useChips: true,
+        type: 'w-select',
+        options: [
+          { label: '生物化学农药及微生物农药制造', value: 'C2632' },
+          { value: 'N7724', label: '危险废物治理' },
+        ],
+      },
+      {
+        name: 'size',
+        label: '客户规模',
+        colSpan: 'full',
+        multiple: true,
+        useChips: true,
+        type: 'w-select',
+        options: [
+          { label: '微型', value: '1' },
+          { value: '2', label: '小型' },
+          { value: '3', label: '中型' },
+          { value: '4', label: '大型' },
+        ],
+      },
+      {
+        name: 'type',
+        label: '企业类型',
+        colSpan: 'full',
+        multiple: true,
+        useChips: true,
+        type: 'w-select',
+        options: [
+          { label: '微型', value: '1' },
+          { value: '2', label: '小型' },
+          { value: '3', label: '中型' },
+          { value: '4', label: '大型' },
+        ],
+      },
+      {
+        name: 'type',
+        label: '注册所在地',
+        colSpan: 'full',
+        multiple: true,
+        useChips: true,
+        type: 'w-select',
+        options: [
+          { label: '微型', value: '1' },
+          { value: '2', label: '小型' },
+          { value: '3', label: '中型' },
+          { value: '4', label: '大型' },
+        ],
+      },
+    ]"
+  ></w-form>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref } from 'vue';
+import { useQuasar } from 'quasar';
+import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager } from 'platform-core';
+</script>

irbs.frontend/src/views/config/MainScale.vue

@@ -19,11 +19,11 @@
           form: {
             colsNum: 2,
             fields: [
-              { name: 'level', label: '标尺等级', type: 'text' },
-              { name: 'pd', label: '违约概率', type: 'number', precision: 4 },
-              { name: 'admissionSuggest', label: '审批建议', type: 'text' },
-              { name: 'down', label: 'PD下限', type: 'number', precision: 4 },
-              { name: 'up', label: 'PD上限', type: 'number', precision: 4 },
+              { name: 'level', label: '标尺等级', type: 'w-text' },
+              { name: 'pd', label: '违约概率', type: 'w-number', precision: 4 },
+              { name: 'admissionSuggest', label: '审批建议', type: 'w-text' },
+              { name: 'down', label: 'PD下限', type: 'w-number', precision: 4 },
+              { name: 'up', label: 'PD上限', type: 'w-number', precision: 4 },
             ],
           },
         }"
@@ -109,9 +109,9 @@ const dialogHide = () => {
   emit('refresh');
 };
 
-const dataSubmit = (data, callback_) => {
-  data['versionId'] = state.data['id'];
-  callback_(data);
+const dataSubmit = (args) => {
+  args.data['versionId'] = state.data['id'];
+  args.callback_(args.data);
 };
 
 const showLoading = (msg: string = '正在获取数据，请稍等...') => {

irbs.frontend/src/views/config/MainScaleVersion.vue

@@ -21,9 +21,9 @@
         form: {
           colsNum: 2,
           fields: [
-            { name: 'code', label: '版本代码', type: 'text' },
-            { name: 'name', label: '版本名称', type: 'text' },
-            { name: 'version', label: '版本号', type: 'text' },
+            { name: 'code', label: '版本代码', type: 'w-text' },
+            { name: 'name', label: '版本名称', type: 'w-text' },
+            { name: 'version', label: '版本号', type: 'w-text' },
           ],
         },
       }"
@@ -192,11 +192,11 @@ const mainScaleVersionGrid = {
     },
   ],
   queryFormFields: [
-    { label: '版本代码', name: 'code' },
-    { label: '版本名称', name: 'name' },
-    { label: '版本状态', name: 'status', type: 'select', options: statusOptions },
-    { label: '版本号', name: 'version' },
-    { label: '审核状态', name: 'apprvStatus', type: 'select', options: apprvStatusOptions },
+    { label: '版本代码', name: 'code', type: 'w-text' },
+    { label: '版本名称', name: 'name', type: 'w-text' },
+    { label: '版本状态', name: 'status', type: 'w-select', options: statusOptions },
+    { label: '版本号', name: 'version', type: 'w-text' },
+    { label: '审核状态', name: 'apprvStatus', type: 'w-select', options: apprvStatusOptions },
   ],
   columns: [
     { name: 'code', label: '版本代码' },

irbs.frontend/src/views/config/MainScaleVersionEditor.vue

@@ -20,9 +20,9 @@
         form: {
           colsNum: 2,
           fields: [
-            { name: 'code', label: '版本代码', type: 'text' },
-            { name: 'name', label: '版本名称', type: 'text' },
-            { name: 'version', label: '版本号', type: 'text' },
+            { name: 'code', label: '版本代码', type: 'w-text' },
+            { name: 'name', label: '版本名称', type: 'w-text' },
+            { name: 'version', label: '版本号', type: 'w-text' },
           ],
         },
       }"
@@ -175,11 +175,11 @@ const mainScaleVersionGrid = {
     },
   ],
   queryFormFields: [
-    { label: '版本代码', name: 'code' },
-    { label: '版本名称', name: 'name' },
-    { label: '版本状态', name: 'status', type: 'select', options: statusOptions },
-    { label: '版本号', name: 'version' },
-    { label: '审核状态', name: 'apprvStatus', type: 'select', options: apprvStatusOptions },
+    { label: '版本代码', name: 'code', type: 'w-text' },
+    { label: '版本名称', name: 'name', type: 'w-text' },
+    { label: '版本状态', name: 'status', type: 'w-select', options: statusOptions },
+    { label: '版本号', name: 'version', type: 'w-text' },
+    { label: '审核状态', name: 'apprvStatus', type: 'w-select', options: apprvStatusOptions },
   ],
   columns: [
     { name: 'code', label: '版本代码' },

irbs.frontend/src/views/config/MainScaleVersionFlowDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <w-dialog ref="dialogRef" :title="state.dialogTitle" width="80%" height="80%" @hide="dialogHide" @maximized="maximized">
     <div class="pt-[10px]" style="height: 200px">
-      <w-form ref="opinionFormRef" :cols-num="1" :fields="[{ name: 'remarks', label: '意见说明', type: 'textarea', required: true, rows: 4 }]"> </w-form>
+      <w-form ref="opinionFormRef" :cols-num="1" :fields="[{ name: 'remarks', label: '意见说明', type: 'w-textarea', requiredIf: true, rows: 4 }]"> </w-form>
       <div>
         <w-workflow-action
           ref="workflowActionRef"
@@ -11,7 +11,6 @@
           :action-url="Environment.apiContextPath('/api/irbs/mainScaleVersion/submitMainScaleVersionFlow')"
           @before-submit="
             async (action, callback) => {
-              console.log(action.title);
               state.opinionData = {
                 transientVariables: {
                   opaVal: action.transientVariables.goback,

irbs.frontend/src/views/config/ShowScoreAuth.vue

@@ -53,9 +53,9 @@
         dense
         :query-form-cols-num="3"
         :query-form-fields="[
-          { name: 'CODE_', label: '角色编码', type: 'text' },
-          { name: 'NAME_', label: '角色名称', type: 'text' },
-          { name: 'DESCRIPTION_', label: '角色描述', type: 'text' },
+          { name: 'CODE_', label: '角色编码', type: 'w-text' },
+          { name: 'NAME_', label: '角色名称', type: 'w-text' },
+          { name: 'DESCRIPTION_', label: '角色描述', type: 'w-text' },
         ]"
         :columns="[
           { name: 'CODE_', label: '角色编码' },

irbs.frontend/src/views/custRating/CustRating.vue

@@ -6,6 +6,7 @@
       :data-url="Environment.apiContextPath('api/irbs/companyRating')"
       :fetch-data-url="Environment.apiContextPath('api/irbs/companyRating/query')"
       :sort-no="true"
+      group-mode="alone"
       :checkbox-selection="false"
       :query-form-cols-num="4"
       :query-form-fields="companyRatingGrid.queryFormFields"
@@ -155,17 +156,17 @@ const companyRatingGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '申请编号', name: 'id', type: 'text' },
-    { label: '客户号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '申请编号', name: 'id', type: 'w-text' },
+    { label: '客户号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
     {
       label: '认定等级',
       name: 'finalLevel',
-      type: 'select',
+      type: 'w-select',
       options: RatingLevelOptions,
     },
-    { label: '流程状态', name: 'processStatus', type: 'select', options: Options.enum(RatingProcessStatusEnum) },
-    { label: '评级状态', name: 'ratingStatus', type: 'select', options: Options.enum(RatingStatusEnum) },
+    { label: '流程状态', name: 'processStatus', type: 'w-select', options: Options.enum(RatingProcessStatusEnum) },
+    { label: '评级状态', name: 'ratingStatus', type: 'w-select', options: Options.enum(RatingStatusEnum) },
   ],
   columns: [
     { name: 'id', label: '申请编号', align: 'center', width: 150 },

irbs.frontend/src/views/custRating/LaunchRatingDialog.vue

@@ -1,10 +1,8 @@
 <template>
   <w-dialog ref="dialogRef" :title="state.dialogTitle" width="80%" height="80%" :buttons="dialogButtons">
-    <div class="p-1.5">
     <w-grid
       ref="customerGridRef"
       title="客户列表"
-        :height="430"
       :fetch-data-url="Environment.apiContextPath('api/irbs/companyCustomer/query')"
       :sort-no="true"
       :checkbox-selection="false"
@@ -20,7 +18,6 @@
         value: SessionManager.getUser().loginName,
       }"
     ></w-grid>
-    </div>
   </w-dialog>
 </template>
 
@@ -146,9 +143,9 @@ const dialogButtons = [
 
 const customerGrid = {
   queryFormFields: [
-    { label: '客户号', name: 'custNo', type: 'text' }, //defaultValue: '2100601306'
-    { label: '客户名称', name: 'custName', type: 'text' },
-    { label: '企业规模', name: 'corpSizeCd', type: 'select', options: props.dictionary.optionsCustomerSizeCd },
+    { label: '客户号', name: 'custNo', type: 'w-text' }, //defaultValue: '2100601306'
+    { label: '客户名称', name: 'custName', type: 'w-text' },
+    { label: '企业规模', name: 'corpSizeCd', type: 'w-select', options: props.dictionary.optionsCustomerSizeCd },
   ],
   buttons: ['query', 'reset'],
   columns: [

irbs.frontend/src/views/custRating/RatingDialog.vue

@@ -101,7 +101,7 @@
             </q-item>
             <q-separator />
             <q-card-section class="p-[10px]">
-              <w-form ref="custFormRef" :cols-num="4" :fields="[{ name: 'actuCtrlYears', label: '实际控制人从业年限', type: 'number' }]"></w-form>
+              <w-form ref="custFormRef" :cols-num="4" :fields="[{ name: 'actuCtrlYears', label: '实际控制人从业年限', type: 'w-number' }]"></w-form>
             </q-card-section>
           </q-card>
         </div>
@@ -650,14 +650,14 @@
                   <w-form
                     ref="overturnFormRef"
                     :fields="[
-                      { label: '附件', name: 'file', type: 'file' },
-                      { label: '是否推翻', name: 'isOverturn', type: 'checkbox' },
+                      { label: '附件', name: 'file', type: 'w-file' },
+                      { label: '是否推翻', name: 'isOverturn', type: 'w-checkbox' },
                       {
                         label: '推翻类型',
                         name: 'overturnType',
-                        type: 'select',
+                        type: 'w-select',
                         options: optionsOverturnType,
-                        required: true,
+                        requiredIf: true,
                         showIf: (args) => {
                           if (args?.form && args.form.getFieldValue('isOverturn')) {
                             return true;
@@ -668,9 +668,9 @@
                       {
                         label: '建议等级',
                         name: 'suggestLevel',
-                        type: 'select',
+                        type: 'w-select',
                         options: RatingLevelOptionsComputed,
-                        required: true,
+                        requiredIf: true,
                         showIf: (args) => {
                           if (args?.form && args.form.getFieldValue('isOverturn')) {
                             return true;
@@ -681,8 +681,8 @@
                       {
                         label: '意见说明',
                         name: 'adjReason',
-                        type: 'textarea',
-                        required: true,
+                        type: 'w-textarea',
+                        requiredIf: true,
                       },
                     ]"
                     :cols-num="1"
@@ -1349,12 +1349,25 @@ const custInfoNext = async (loading = false) => {
             state.qualitativeEditInfo.push({
               label: i + 1 + '、' + index.indexName,
               name: index.indexCode,
-              type: 'option-group',
+              type: 'w-radio',
+              simple: false,
+              inline: false,
+              outlined: false,
+              dense: false,
               options: indexOptions,
               defaultValue: index.indexValue,
             });
           } else {
-            state.qualitativeEditInfo.push({ label: i + 1 + '、' + index.indexName, name: index.indexCode, type: 'option-group', options: indexOptions });
+            state.qualitativeEditInfo.push({
+              label: i + 1 + '、' + index.indexName,
+              name: index.indexCode,
+              type: 'w-radio',
+              simple: false,
+              inline: false,
+              outlined: false,
+              dense: false,
+              options: indexOptions,
+            });
           }
           state.qualitativeEditObj[index.indexCode] = [i + 1 + '、' + index.indexName, index];
         }
@@ -1409,12 +1422,25 @@ const quantitativeNext = async () => {
             state.qualitativeEditInfo.push({
               label: i + 1 + '、' + index.indexName,
               name: index.indexCode,
-              type: 'option-group',
+              type: 'w-radio',
+              simple: false,
+              inline: false,
+              outlined: false,
+              dense: false,
               options: indexOptions,
               defaultValue: index.indexValue,
             });
           } else {
-            state.qualitativeEditInfo.push({ label: i + 1 + '、' + index.indexName, name: index.indexCode, type: 'option-group', options: indexOptions });
+            state.qualitativeEditInfo.push({
+              label: i + 1 + '、' + index.indexName,
+              name: index.indexCode,
+              type: 'w-radio',
+              simple: false,
+              inline: false,
+              outlined: false,
+              dense: false,
+              options: indexOptions,
+            });
           }
           state.qualitativeEditObj[index.indexCode] = [i + 1 + '、' + index.indexName, index];
         }

irbs.frontend/src/views/debtRating/LgdQuery.vue

@@ -26,11 +26,11 @@ const $q = useQuasar();
 const appDebtRatingGridRef = ref();
 
 const appDebtRatingGrid = {
-  buttons: [['query', 'separator', 'moreQuery'], 'reset'],
+  buttons: ['query', 'reset'],
   queryFormFields: [
-    { label: '债项编号', name: 'contractNo', type: 'text' },
-    { label: '客户编号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '债项编号', name: 'contractNo', type: 'w-text' },
+    { label: '客户编号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
   ],
   columns: [
     { name: 'contractNo', label: '债项编号' },

irbs.frontend/src/views/default/CognizanceApply.vue

@@ -51,7 +51,7 @@ const dictionary = {
 
 const cognizanceGrid = {
   buttons: [
-    ['query', 'separator', 'moreQuery'],
+    'query',
     'reset',
     'separator',
     {
@@ -86,10 +86,10 @@ const cognizanceGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '申请编号', name: 'id', type: 'text' },
-    { label: '客户号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
-    { label: '流程状态', name: 'status', type: 'select', options: Options.enum(DefaultProcessStatusEnum) },
+    { label: '申请编号', name: 'id', type: 'w-text' },
+    { label: '客户号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
+    { label: '流程状态', name: 'status', type: 'w-select', options: Options.enum(DefaultProcessStatusEnum) },
   ],
   columns: [
     { name: 'id', label: '申请编号', width: 150 },

irbs.frontend/src/views/default/CognizanceDialog.vue

@@ -83,9 +83,9 @@
                   form: {
                     colsNum: 1,
                     fields: [
-                      { name: 'eventCode', label: '违约事件', type: 'select', options: DefaultEventItemOptions, required: true },
-                      { name: 'eventStartTime', label: '事件开始时间', type: 'date', required: true },
-                      { name: 'eventDesc', label: '违约事件说明', type: 'textarea' },
+                      { name: 'eventCode', label: '违约事件', type: 'w-select', options: DefaultEventItemOptions, requiredIf: true },
+                      { name: 'eventStartTime', label: '事件开始时间', type: 'w-date', requiredIf: true },
+                      { name: 'eventDesc', label: '违约事件说明', type: 'w-textarea' },
                     ],
                   },
                 }"
@@ -98,12 +98,12 @@
                   reqPageStart: 1,
                 }"
                 @before-editor-data-submit="
-                  (data, callback) => {
-                    data.defcusId = state.data['id'];
-                    data.custNo = state.data['custNo'];
-                    data.eventStatus = DefaultEventItemStatus.IN_DEFAULT;
-                    data.isValid = false;
-                    callback(data);
+                  (args) => {
+                    args.data.defcusId = state.data['id'];
+                    args.data.custNo = state.data['custNo'];
+                    args.data.eventStatus = DefaultEventItemStatus.IN_DEFAULT;
+                    args.data.isValid = false;
+                    args.callback(args.data);
                   }
                 "
               ></w-grid>
@@ -199,8 +199,8 @@
                 ref="opinionFormRef"
                 :cols-num="1"
                 :fields="[
-                  { name: 'remarks', label: '意见说明', type: 'textarea', required: true, rows: 4 },
-                  { name: 'suggestUploadAnnx', label: '上传文件', type: 'file' },
+                  { name: 'remarks', label: '意见说明', type: 'w-textarea', requiredIf: true, rows: 4 },
+                  { name: 'suggestUploadAnnx', label: '上传文件', type: 'w-file' },
                 ]"
               >
               </w-form>

irbs.frontend/src/views/default/RebirthApply.vue

@@ -39,8 +39,8 @@
         :query-form-cols-num="2"
         :config-button="false"
         :query-form-fields="[
-          { name: 'CUST_NO', label: '客户号', type: 'text' },
-          { name: 'CUST_NAME', label: '客户名称', type: 'text' },
+          { name: 'CUST_NO', label: '客户号', type: 'w-text' },
+          { name: 'CUST_NAME', label: '客户名称', type: 'w-text' },
         ]"
         :pagination="{
           reqPageStart: 1,
@@ -91,7 +91,7 @@ const DefaultProcessStatusEnum = await EnumTools.fetch('irbs.defaultManager.enum
 
 const rebirthGrid = {
   buttons: [
-    ['query', 'separator', 'moreQuery'],
+    'query',
     'reset',
     'separator',
     {
@@ -142,10 +142,10 @@ const rebirthGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '申请编号', name: 'id', type: 'text' },
-    { label: '客户号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
-    { label: '流程状态', name: 'status', type: 'select', options: Options.enum(DefaultProcessStatusEnum) },
+    { label: '申请编号', name: 'id', type: 'w-text' },
+    { label: '客户号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
+    { label: '流程状态', name: 'status', type: 'w-select', options: Options.enum(DefaultProcessStatusEnum) },
   ],
   columns: [
     { name: 'id', label: '申请编号' },

irbs.frontend/src/views/default/RebirthDialog.vue

@@ -178,8 +178,8 @@
                 ref="opinionFormRef"
                 :cols-num="1"
                 :fields="[
-                  { name: 'remarks', label: '意见说明', type: 'textarea', required: true, rows: 4 },
-                  { name: 'suggestUploadAnnx', label: '上传文件', type: 'file' },
+                  { name: 'remarks', label: '意见说明', type: 'w-textarea', requiredIf: true, rows: 4 },
+                  { name: 'suggestUploadAnnx', label: '上传文件', type: 'w-file' },
                 ]"
               >
               </w-form>

irbs.frontend/src/views/query/CorpCustFeatureRet.vue

@@ -36,8 +36,8 @@ const corpCustFeatureRetGridRef = ref();
 const corpCustFeatureRetGrid = {
   buttons: ['query', 'reset', 'separator', 'export'],
   queryFormFields: [
-    { label: '客户编号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '客户编号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
   ],
   columns: [
     { label: '客户编号', name: 'custNo' },

irbs.frontend/src/views/query/CustInfo.vue

@@ -39,11 +39,11 @@ const $q = useQuasar();
 const custGridRef = ref();
 
 const custGrid = {
-  buttons: [['query', 'separator', 'moreQuery'], 'reset', 'separator', 'export'],
+  buttons: ['query', 'reset', 'separator', 'export'],
   queryFormFields: [
-    { label: '客户编号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
-    { label: '客户类型', name: 'custType', type: 'select', options: CustTypeOptions },
+    { label: '客户编号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
+    { label: '客户类型', name: 'custType', type: 'w-select', options: CustTypeOptions },
   ],
   columns: [
     { name: 'custNo', label: '客户编号', align: 'center' },

irbs.frontend/src/views/query/CustRatingHist.vue

@@ -45,22 +45,22 @@ const $q = useQuasar();
 const custRatingHistGridRef = ref();
 
 const custRatingHistGrid = {
-  buttons: [['query', 'separator', 'moreQuery'], 'reset', 'separator', 'export'],
+  buttons: ['query', 'reset', 'separator', 'export'],
   queryFormFields: [
-    { label: '申请编号', name: 'id', type: 'text' },
-    { label: '客户编号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
-    { label: '客户类型', name: 'custType', type: 'select', options: CustTypeOptions },
+    { label: '申请编号', name: 'id', type: 'w-text' },
+    { label: '客户编号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
+    { label: '客户类型', name: 'custType', type: 'w-select', options: CustTypeOptions },
     {
       label: '认定等级',
       name: 'finalLevel',
-      type: 'select',
+      type: 'w-select',
       options: RatingLevelOptions,
     },
     {
       label: '是否违约',
       name: 'defaultInd',
-      type: 'select',
+      type: 'w-select',
       options: DefaultFlagOptions,
     },
   ],

irbs.frontend/src/views/query/DefaultHist.vue

@@ -30,15 +30,15 @@ const $q = useQuasar();
 const defaultHistGridRef = ref();
 
 const defaultHistGrid = {
-  buttons: [['query', 'separator', 'moreQuery'], 'reset', 'separator', 'export'],
+  buttons: ['query', 'reset', 'separator', 'export'],
   queryFormFields: [
-    { label: '客户编号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
-    { label: '客户类型', name: 'custType', type: 'select', options: CustTypeOptions },
-    { label: '违约前评级', name: 'ratingLevelHis', type: 'select', options: RatingLevelOptions },
-    { label: '违约认定类型', name: 'defaultType', type: 'select', options: DefaultTypeOptions },
-    { label: '客户经理名称', name: 'managerName', type: 'text' },
-    { label: '所属机构', name: 'mgerOrgNm', type: 'text' },
+    { label: '客户编号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
+    { label: '客户类型', name: 'custType', type: 'w-select', options: CustTypeOptions },
+    { label: '违约前评级', name: 'ratingLevelHis', type: 'w-select', options: RatingLevelOptions },
+    { label: '违约认定类型', name: 'defaultType', type: 'w-select', options: DefaultTypeOptions },
+    { label: '客户经理名称', name: 'managerName', type: 'w-text' },
+    { label: '所属机构', name: 'mgerOrgNm', type: 'w-text' },
   ],
   columns: [
     { label: '客户编号', name: 'custNo' },

irbs.frontend/src/views/query/InstitutionCustFeatureRet.vue

@@ -36,8 +36,8 @@ const institutionCustFeatureRetGridRef = ref();
 const institutionCustFeatureRetGrid = {
   buttons: ['query', 'reset', 'separator', 'export'],
   queryFormFields: [
-    { label: '客户编号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '客户编号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
   ],
   columns: [
     { label: '客户编号', name: 'custNo' },

irbs.frontend/src/views/query/PingAnLgdHist.vue

@@ -26,11 +26,11 @@ const $q = useQuasar();
 const pingAnLgdHistGridRef = ref();
 
 const pingAnLgdHistGrid = {
-  buttons: [['query', 'separator', 'moreQuery'], 'reset'],
+  buttons: ['query', 'reset'],
   queryFormFields: [
-    { label: '债项编号', name: 'contractNo', type: 'text' },
-    { label: '客户编号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '债项编号', name: 'contractNo', type: 'w-text' },
+    { label: '客户编号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
   ],
   columns: [
     { name: 'contractNo', label: '债项编号' },

irbs.frontend/src/views/query/RebirthDefaultHist.vue

@@ -38,14 +38,14 @@ const $q = useQuasar();
 const rebirthDefaultHistGridRef = ref();
 
 const rebirthDefaultHistGrid = {
-  buttons: [['query', 'separator', 'moreQuery'], 'reset', 'separator', 'export'],
+  buttons: ['query', 'reset', 'separator', 'export'],
   queryFormFields: [
-    { label: '客户编号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
-    { label: '客户类型', name: 'custType', type: 'select', options: CustTypeOptions },
-    { label: '违约重生类型', name: 'defaultRebornType', type: 'select', options: DefaultRebonTypeOptions },
-    { label: '客户经理名称', name: 'managerName', type: 'text' },
-    { label: '所属机构', name: 'defaMgerOrgNm', type: 'text' },
+    { label: '客户编号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
+    { label: '客户类型', name: 'custType', type: 'w-select', options: CustTypeOptions },
+    { label: '违约重生类型', name: 'defaultRebornType', type: 'w-select', options: DefaultRebonTypeOptions },
+    { label: '客户经理名称', name: 'managerName', type: 'w-text' },
+    { label: '所属机构', name: 'defaMgerOrgNm', type: 'w-text' },
   ],
   columns: [
     { label: '客户编号', name: 'custNo' },

irbs.frontend/src/views/query/RiskExposureHist.vue

@@ -35,16 +35,16 @@ const $q = useQuasar();
 const riskExposureHisGridRef = ref();
 
 const riskExposureHisGrid = {
-  buttons: [['query', 'separator', 'moreQuery'], 'reset', 'separator', 'export'],
+  buttons: ['query', 'reset', 'separator', 'export'],
   queryFormFields: [
-    { label: '业务编号', name: 'businessNo', type: 'text' },
-    { label: '客户编号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
-    { label: '客户类型', name: 'custType', type: 'select', options: RiskCustTypeOptions },
-    { label: '发起方式', name: 'startWay', type: 'select', options: StartWayOptions },
-    { label: '分类结果', name: 'finalResult', type: 'select', options: RiskExposureOptions },
-    { label: '客户经理名称', name: 'managerName', type: 'text' },
-    { label: '所属机构', name: 'mgerOrgNm', type: 'text' },
+    { label: '业务编号', name: 'businessNo', type: 'w-text' },
+    { label: '客户编号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
+    { label: '客户类型', name: 'custType', type: 'w-select', options: RiskCustTypeOptions },
+    { label: '发起方式', name: 'startWay', type: 'w-select', options: StartWayOptions },
+    { label: '分类结果', name: 'finalResult', type: 'w-select', options: RiskExposureOptions },
+    { label: '客户经理名称', name: 'managerName', type: 'w-text' },
+    { label: '所属机构', name: 'mgerOrgNm', type: 'w-text' },
   ],
   columns: [
     { label: '业务编号', name: 'businessNo' },

irbs.frontend/src/views/report/RptModelMonitorBinomialCheck.vue

@@ -40,11 +40,11 @@ const rptModelMonitorBinomialCheckGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },

irbs.frontend/src/views/report/RptModelMonitorDiff.vue

@@ -40,11 +40,11 @@ const rptModelMonitorDiffGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '报告期',
       name: 'yearPeriod',
-      type: 'select',
+      type: 'w-select',
       options: [
         { label: '往前推1年', value: '1' },
         { label: '往前推2年', value: '2' },
@@ -57,7 +57,7 @@ const rptModelMonitorDiffGrid = {
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },

irbs.frontend/src/views/report/RptModelMonitorStable.vue

@@ -40,11 +40,11 @@ const rptModelMonitorStableGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },

irbs.frontend/src/views/report/RptRatingAdjust.vue

@@ -228,7 +228,7 @@ const state = reactive({
   },
 });
 
-const afterRequestData = (data) => {
+const afterRequestData = (args) => {
   state.xData = [];
   state.custData.ratingCnt = [];
   state.custData.overturnCnt = [];
@@ -237,8 +237,8 @@ const afterRequestData = (data) => {
   state.range.l2 = [];
   state.range.l3 = [];
   state.range.ln = [];
-  if (data && data.length > 0) {
-    data.forEach((item) => {
+  if (args.rows && args.rows.length > 0) {
+    args.rows.forEach((item) => {
       state.xData.push(item['ratingMonth']);
       state.custData.ratingCnt.push(item['custCnt']);
       state.custData.overturnCnt.push(item['adjCnt']);
@@ -268,11 +268,11 @@ const rptRatingAdjustGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },
@@ -302,7 +302,7 @@ const rptRatingAdjustGrid = {
     {
       label: '分支机构',
       name: 'managerOrgCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: '01002', label: '总行营业部' },
         { value: '01003', label: 'JJJS开发区支行' },

irbs.frontend/src/views/report/RptRatingChange.vue

@@ -81,11 +81,11 @@ const rptRatingChangeGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },
@@ -115,7 +115,7 @@ const rptRatingChangeGrid = {
     {
       label: '分支机构',
       name: 'managerOrgCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: '01002', label: '总行营业部' },
         { value: '01003', label: 'JJJS开发区支行' },

irbs.frontend/src/views/report/RptRatingDistribution.vue

@@ -310,11 +310,11 @@ const rptRatingDistributionGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },
@@ -344,7 +344,7 @@ const rptRatingDistributionGrid = {
     {
       label: '分支机构',
       name: 'managerOrgCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: '01002', label: '总行营业部' },
         { value: '01003', label: 'JJJS开发区支行' },

irbs.frontend/src/views/report/RptRatingIndustryFocusDist.vue

@@ -214,8 +214,8 @@ const state = reactive({
   ratioSeriesData: <any>[],
 });
 
-const afterRequestData = (data) => {
-  if (data && data.length > 0) {
+const afterRequestData = (args) => {
+  if (args.rows && args.rows.length > 0) {
     state.xData = [];
     state.seriesData = [];
     state.legendData = [];
@@ -230,7 +230,7 @@ const afterRequestData = (data) => {
       totalData[rptRatingIndustryFocusDistGrid.tableColumns[i]['columns'][0]['name']] = [];
       totalData[rptRatingIndustryFocusDistGrid.tableColumns[i]['columns'][1]['name']] = [];
     }
-    data.forEach((item) => {
+    args.rows.forEach((item) => {
       state.xData.push(item['industryName']);
 
       Object.keys(totalData).forEach((key) => {
@@ -277,11 +277,11 @@ const rptRatingIndustryFocusDistGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },
@@ -311,7 +311,7 @@ const rptRatingIndustryFocusDistGrid = {
     {
       label: '分支机构',
       name: 'managerOrgCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: '01002', label: '总行营业部' },
         { value: '01003', label: 'JJJS开发区支行' },

irbs.frontend/src/views/report/RptRatingLoanBalanceMigrate.vue

@@ -268,8 +268,8 @@ const state = reactive({
   },
 });
 
-const afterRequestData = (data) => {
-  if (data && data.length > 0) {
+const afterRequestData = (args) => {
+  if (args.rows && args.rows.length > 0) {
     state.xData = [];
     state.seriesData = [];
     state.legendData = [];
@@ -282,7 +282,7 @@ const afterRequestData = (data) => {
       ]);
       totalData[rptRatingLoanBalanceMigrateGrid.tableColumns[1].columns[i]['name']] = [];
     }
-    data.forEach((item) => {
+    args.rows.forEach((item) => {
       state.xData.push(item['ratingLevel']);
       state.up.cnt.push(item['upBal']);
       state.up.ratio.push(item['upRatio']);
@@ -330,11 +330,11 @@ const rptRatingLoanBalanceMigrateGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },
@@ -365,7 +365,7 @@ const rptRatingLoanBalanceMigrateGrid = {
     {
       label: '分支机构',
       name: 'managerOrgCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: '01002', label: '总行营业部' },
         { value: '01003', label: 'JJJS开发区支行' },

irbs.frontend/src/views/report/RptRatingModelFocusDist.vue

@@ -213,9 +213,8 @@ const state = reactive({
   ratioSeriesData: <any>[],
 });
 
-const afterRequestData = (data) => {
-  console.info('data=======', data);
-  if (data && data.length > 0) {
+const afterRequestData = (args) => {
+  if (args.rows && args.rows.length > 0) {
     state.xData = [];
     state.seriesData = [];
     state.legendData = [];
@@ -231,7 +230,7 @@ const afterRequestData = (data) => {
       totalData[rptRatingModelFocusDistGrid.tableColumns[i]['columns'][0]['name']] = [];
       totalData[rptRatingModelFocusDistGrid.tableColumns[i]['columns'][1]['name']] = [];
     }
-    data.forEach((item) => {
+    args.rows.forEach((item) => {
       state.xData.push(item['modelName']);
 
       Object.keys(totalData).forEach((key) => {
@@ -278,11 +277,11 @@ const rptRatingModelFocusDistGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '分支机构',
       name: 'managerOrgCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: '01002', label: '总行营业部' },
         { value: '01003', label: 'JJJS开发区支行' },

irbs.frontend/src/views/report/RptRatingNumberMigrate.vue

@@ -268,8 +268,8 @@ const state = reactive({
   },
 });
 
-const afterRequestData = (data) => {
-  if (data && data.length > 0) {
+const afterRequestData = (args) => {
+  if (args.rows && args.rows.length > 0) {
     state.xData = [];
     state.seriesData = [];
     state.legendData = [];
@@ -279,7 +279,7 @@ const afterRequestData = (data) => {
       ratingLevel.push([rptRatingNumberMigrateGrid.tableColumns[1].columns[i]['label'], [rptRatingNumberMigrateGrid.tableColumns[1].columns[i]['name']]]);
       totalData[rptRatingNumberMigrateGrid.tableColumns[1].columns[i]['name']] = [];
     }
-    data.forEach((item) => {
+    args.rows.forEach((item) => {
       state.xData.push(item['ratingLevel']);
       state.up.cnt.push(item['upCnt']);
       state.up.ratio.push(item['upRatio']);
@@ -327,11 +327,11 @@ const rptRatingNumberMigrateGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },
@@ -361,7 +361,7 @@ const rptRatingNumberMigrateGrid = {
     {
       label: '分支机构',
       name: 'managerOrgCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: '01002', label: '总行营业部' },
         { value: '01003', label: 'JJJS开发区支行' },

irbs.frontend/src/views/report/RptRatingOrgFocusDist.vue

@@ -212,8 +212,8 @@ const state = reactive({
   ratioSeriesData: <any>[],
 });
 
-const afterRequestData = (data) => {
-  if (data && data.length > 0) {
+const afterRequestData = (args) => {
+  if (args.rows && args.rows.length > 0) {
     state.xData = [];
     state.seriesData = [];
     state.legendData = [];
@@ -228,7 +228,7 @@ const afterRequestData = (data) => {
       totalData[rptRatingOrgFocusDistGrid.tableColumns[i]['columns'][0]['name']] = [];
       totalData[rptRatingOrgFocusDistGrid.tableColumns[i]['columns'][1]['name']] = [];
     }
-    data.forEach((item) => {
+    args.rows.forEach((item) => {
       state.xData.push(item['managerOrgName']);
 
       Object.keys(totalData).forEach((key) => {
@@ -275,11 +275,11 @@ const rptRatingOrgFocusDistGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },

irbs.frontend/src/views/report/RptRatingOverturn.vue

@@ -288,7 +288,7 @@ const state = reactive({
   },
 });
 
-const afterRequestData = (data) => {
+const afterRequestData = (args) => {
   state.xData = [];
   state.custData.ratingCnt = [];
   state.custData.overturnCnt = [];
@@ -299,8 +299,8 @@ const afterRequestData = (data) => {
   state.range.l2 = [];
   state.range.l3 = [];
   state.range.ln = [];
-  if (data && data.length > 0) {
-    data.forEach((item) => {
+  if (args.rows && args.rows.length > 0) {
+    args.rows.forEach((item) => {
       state.xData.push(item['ratingMonth']);
       state.custData.ratingCnt.push(item['custCnt']);
       state.custData.overturnCnt.push(item['overturnCnt']);
@@ -332,11 +332,11 @@ const rptRatingOverturnGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' },
+    { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' },
     {
       label: '模型敞口',
       name: 'modelCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'WHM1', label: '政府投融资平台' },
         { value: 'WHM2', label: '事业单位' },
@@ -366,7 +366,7 @@ const rptRatingOverturnGrid = {
     {
       label: '分支机构',
       name: 'managerOrgCode',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: '01002', label: '总行营业部' },
         { value: '01003', label: 'JJJS开发区支行' },

irbs.frontend/src/views/report/tzblwdxfxbb.vue

@@ -28,9 +28,9 @@
     ]"
     :query-form-cols-num="6"
     :query-form-fields="[
-      { colSpan: 2, name: 'model', label: '模型', type: 'select', options: ['A评分卡', 'B评分卡', 'K评分卡'], defaultValue: 'A评分卡', clearable: true },
-      { name: 'year', label: '年', type: 'select', options: [2020, 2021, 2022, 2023, 2024], defaultValue: 2023, clearable: true },
-      { name: 'month', label: '月', type: 'select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], defaultValue: 6, clearable: true },
+      { colSpan: 2, name: 'model', label: '模型', type: 'w-select', options: ['A评分卡', 'B评分卡', 'K评分卡'], defaultValue: 'A评分卡', clearable: true },
+      { name: 'year', label: '年', type: 'w-select', options: [2020, 2021, 2022, 2023, 2024], defaultValue: 2023, clearable: true },
+      { name: 'month', label: '月', type: 'w-select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], defaultValue: 6, clearable: true },
     ]"
     :columns="[
       { width: 200, name: 'tzl', label: '特征量' },

irbs.frontend/src/views/report/tzblwoeivbb.vue

@@ -27,11 +27,11 @@
     ]"
     :query-form-cols-num="8"
     :query-form-fields="[
-      { colSpan: 2, name: 'model', label: '模型', type: 'select', options: ['A评分卡', 'B评分卡', 'K评分卡'], defaultValue: 'A评分卡', clearable: true },
-      { name: 'startYear', label: '开始年', type: 'select', options: [2020, 2021, 2022, 2023, 2024], defaultValue: 2023, clearable: true },
-      { name: 'startMonth', label: '开始月', type: 'select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], defaultValue: 6, clearable: true },
-      { name: 'endYear', label: '结束年', type: 'select', options: [2020, 2021, 2022, 2023, 2024], clearable: true },
-      { name: 'endMonth', label: '结束月', type: 'select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], clearable: true },
+      { colSpan: 2, name: 'model', label: '模型', type: 'w-select', options: ['A评分卡', 'B评分卡', 'K评分卡'], defaultValue: 'A评分卡', clearable: true },
+      { name: 'startYear', label: '开始年', type: 'w-select', options: [2020, 2021, 2022, 2023, 2024], defaultValue: 2023, clearable: true },
+      { name: 'startMonth', label: '开始月', type: 'w-select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], defaultValue: 6, clearable: true },
+      { name: 'endYear', label: '结束年', type: 'w-select', options: [2020, 2021, 2022, 2023, 2024], clearable: true },
+      { name: 'endMonth', label: '结束月', type: 'w-select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], clearable: true },
     ]"
     :columns="[
       { width: 200, name: 'tzl', label: '特征量' },

irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue

@@ -89,9 +89,9 @@
                   {
                     name: 'manResult',
                     label: '人工分类结果',
-                    type: 'select',
+                    type: 'w-select',
                     options: RiskExposureItemOptions,
-                    required: true,
+                    requiredIf: true,
                     showIf: (args) => {
                       if (state.data['processStatus'] === 'TO_BE_CHECKED') {
                         return false;
@@ -99,8 +99,8 @@
                       return true;
                     },
                   },
-                  { name: 'remarks', label: '意见说明', type: 'textarea', required: true, rows: 4 },
-                  { name: 'suggestUploadAnnx', label: '上传文件', type: 'file' },
+                  { name: 'remarks', label: '意见说明', type: 'w-textarea', requiredIf: true, rows: 4 },
+                  { name: 'suggestUploadAnnx', label: '上传文件', type: 'w-file' },
                 ]"
               >
               </w-form>

irbs.frontend/src/views/riskExposure/LaunchExposureAdjustDialog.vue

@@ -95,9 +95,9 @@ const dialogButtons = [
 const toExposureAdjustGrid = {
   buttons: [['query', 'separator'], 'reset'],
   queryFormFields: [
-    { label: '债项编号', name: 'businessNo', type: 'text' },
-    { label: '客户号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '债项编号', name: 'businessNo', type: 'w-text' },
+    { label: '客户号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
   ],
   columns: [
     { name: 'businessNo', label: '债项编号' },

irbs.frontend/src/views/riskExposure/LaunchExposureDialog.vue

@@ -95,9 +95,9 @@ const dialogButtons = [
 const toExposureGrid = {
   buttons: [['query', 'separator'], 'reset'],
   queryFormFields: [
-    { label: '债项编号', name: 'businessNo', type: 'text' },
-    { label: '客户号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '债项编号', name: 'businessNo', type: 'w-text' },
+    { label: '客户号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
   ],
   columns: [
     { name: 'businessNo', label: '债项编号' },

irbs.frontend/src/views/riskExposure/RiskExposureAdjustApply.vue

@@ -38,7 +38,7 @@ import { useQuasar } from 'quasar';
 import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager } from 'platform-core';
 import LaunchExposureAdjustDialog from '@/views/riskExposure/LaunchExposureAdjustDialog.vue';
 import HandmadeExposureDialog from '@/views/riskExposure/HandmadeExposureDialog.vue';
-import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions } from './RiskExposure.ts';
+import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions, RiskExposureItemOptions } from './RiskExposure.ts';
 
 const $q = useQuasar();
 const riskExposureAdjustGridRef = ref();
@@ -47,7 +47,7 @@ const handmadeExposureDialogRef = ref();
 
 const riskExposureAdjustGrid = {
   buttons: [
-    ['query', 'separator', 'moreQuery'],
+    'query',
     'reset',
     'separator',
     {
@@ -80,19 +80,19 @@ const riskExposureAdjustGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '债项编号', name: 'businessNo', type: 'text' },
-    { label: '客户号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '债项编号', name: 'businessNo', type: 'w-text' },
+    { label: '客户号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
     {
       label: '风险暴露分类',
       name: 'manResult',
-      type: 'select',
-      options: RiskExposureProcessStatus,
+      type: 'w-select',
+      options: RiskExposureItemOptions,
     },
     {
       label: '流程状态',
       name: 'status',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'TO_BE_SUBMITTED', label: '待发起' },
         { value: 'RETURNED', label: '退回' },

irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue

@@ -48,7 +48,7 @@ import { useQuasar } from 'quasar';
 import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager, SessionManager } from 'platform-core';
 import LaunchExposureDialog from '@/views/riskExposure/LaunchExposureDialog.vue';
 import HandmadeExposureDialog from '@/views/riskExposure/HandmadeExposureDialog.vue';
-import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions } from './RiskExposure.ts';
+import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions, RiskExposureItemOptions } from './RiskExposure.ts';
 
 const $q = useQuasar();
 const riskExposureAdjustGridRef = ref();
@@ -91,19 +91,19 @@ const riskExposureAdjustGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '债项编号', name: 'businessNo', type: 'text' },
-    { label: '客户号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '债项编号', name: 'businessNo', type: 'w-text' },
+    { label: '客户号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
     {
       label: '风险暴露分类',
       name: 'manResult',
-      type: 'select',
-      options: RiskExposureProcessStatus,
+      type: 'w-select',
+      options: RiskExposureItemOptions,
     },
     {
       label: '流程状态',
       name: 'status',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'TO_BE_SUBMITTED', label: '待发起' },
         { value: 'RETURNED', label: '退回' },

irbs.frontend/src/views/riskExposure/RiskExposureApply.vue

@@ -43,7 +43,7 @@ import { useQuasar } from 'quasar';
 import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager } from 'platform-core';
 import LaunchExposureDialog from '@/views/riskExposure/LaunchExposureDialog.vue';
 import HandmadeExposureDialog from '@/views/riskExposure/HandmadeExposureDialog.vue';
-import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions } from './RiskExposure.ts';
+import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions, RiskExposureItemOptions } from './RiskExposure.ts';
 
 const $q = useQuasar();
 const riskExposureGridRef = ref();
@@ -52,7 +52,7 @@ const handmadeExposureDialogRef = ref();
 
 const riskExposureGrid = {
   buttons: [
-    ['query', 'separator', 'moreQuery'],
+    'query',
     'reset',
     'separator',
     {
@@ -85,19 +85,19 @@ const riskExposureGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '债项编号', name: 'businessNo', type: 'text' },
-    { label: '客户号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '债项编号', name: 'businessNo', type: 'w-text' },
+    { label: '客户号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
     {
       label: '风险暴露分类',
       name: 'manResult',
-      type: 'select',
-      options: RiskExposureProcessStatus,
+      type: 'w-select',
+      options: RiskExposureItemOptions,
     },
     {
       label: '流程状态',
       name: 'status',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'TO_BE_SUBMITTED', label: '待发起' },
         { value: 'RETURNED', label: '退回' },

irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue

@@ -43,7 +43,7 @@ import { useQuasar } from 'quasar';
 import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager, SessionManager } from 'platform-core';
 import LaunchExposureDialog from '@/views/riskExposure/LaunchExposureDialog.vue';
 import HandmadeExposureDialog from '@/views/riskExposure/HandmadeExposureDialog.vue';
-import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions } from './RiskExposure.ts';
+import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions, RiskExposureItemOptions } from './RiskExposure.ts';
 
 const $q = useQuasar();
 const riskExposureGridRef = ref();
@@ -86,19 +86,19 @@ const riskExposureGrid = {
     'separator',
   ],
   queryFormFields: [
-    { label: '债项编号', name: 'businessNo', type: 'text' },
-    { label: '客户号', name: 'custNo', type: 'text' },
-    { label: '客户名称', name: 'custName', type: 'text' },
+    { label: '债项编号', name: 'businessNo', type: 'w-text' },
+    { label: '客户号', name: 'custNo', type: 'w-text' },
+    { label: '客户名称', name: 'custName', type: 'w-text' },
     {
       label: '风险暴露分类',
       name: 'manResult',
-      type: 'select',
-      options: RiskExposureProcessStatus,
+      type: 'w-select',
+      options: RiskExposureItemOptions,
     },
     {
       label: '流程状态',
       name: 'status',
-      type: 'select',
+      type: 'w-select',
       options: [
         { value: 'TO_BE_SUBMITTED', label: '待发起' },
         { value: 'RETURNED', label: '退回' },

irbs.frontend/src/views/workbench/DoneTask.vue

@@ -26,10 +26,10 @@ const gridRef = ref();
 
 const grid = {
   queryFormFields: [
-    { label: '业务流水号', name: 'BUSINESS_ID', type: 'text' },
-    { label: '流程名称', name: 'PROC_NAME', type: 'text' },
-    { label: '任务节点', name: 'TASK_NAME', type: 'text' },
-    { label: '任务描述', name: 'TASK_DESC', type: 'text' },
+    { label: '业务流水号', name: 'BUSINESS_ID', type: 'w-text' },
+    { label: '流程名称', name: 'PROC_NAME', type: 'w-text' },
+    { label: '任务节点', name: 'TASK_NAME', type: 'w-text' },
+    { label: '任务描述', name: 'TASK_DESC', type: 'w-text' },
   ],
   buttons: [
     'query',

irbs.frontend/src/views/workbench/EndTask.vue

@@ -26,10 +26,10 @@ const gridRef = ref();
 
 const grid = {
   queryFormFields: [
-    { label: '业务流水号', name: 'BUSINESS_ID', type: 'text' },
-    { label: '流程名称', name: 'PROC_NAME', type: 'text' },
-    { label: '任务节点', name: 'TASK_NAME', type: 'text' },
-    { label: '任务描述', name: 'TASK_DESC', type: 'text' },
+    { label: '业务流水号', name: 'BUSINESS_ID', type: 'w-text' },
+    { label: '流程名称', name: 'PROC_NAME', type: 'w-text' },
+    { label: '任务节点', name: 'TASK_NAME', type: 'w-text' },
+    { label: '任务描述', name: 'TASK_DESC', type: 'w-text' },
   ],
   buttons: [
     'query',

irbs.frontend/src/views/workbench/TodoTask.vue

@@ -39,10 +39,10 @@ const handmadeExposureDialogRef = ref();
 
 const grid = {
   queryFormFields: [
-    { label: '业务流水号', name: 'BUSINESS_ID', type: 'text' },
-    { label: '流程名称', name: 'PROC_NAME', type: 'text' },
-    { label: '任务节点', name: 'TASK_NAME', type: 'text' },
-    { label: '任务描述', name: 'TASK_DESC', type: 'text' },
+    { label: '业务流水号', name: 'BUSINESS_ID', type: 'w-text' },
+    { label: '流程名称', name: 'PROC_NAME', type: 'w-text' },
+    { label: '任务节点', name: 'TASK_NAME', type: 'w-text' },
+    { label: '任务描述', name: 'TASK_DESC', type: 'w-text' },
   ],
   buttons: [
     'query',

irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorDiffServiceImpl.java

@@ -1,7 +1,6 @@
 package irbs.reports.service.impl;
 
 import dm.jdbc.util.StringUtil;
-import io.sc.platform.core.util.DateUtil;
 import io.sc.platform.jdbc.DatabaseType;
 import irbs.reports.jpa.entity.ReportSqlConfig;
 import irbs.reports.jpa.repository.ReportSqlConfigRepository;

irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorStableServiceImpl.java

@@ -1,7 +1,6 @@
 package irbs.reports.service.impl;
 
 import dm.jdbc.util.StringUtil;
-import io.sc.platform.core.util.DateUtil;
 import io.sc.platform.jdbc.DatabaseType;
 import irbs.reports.jpa.entity.ReportSqlConfig;
 import irbs.reports.jpa.repository.ReportSqlConfigRepository;

irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingDistributionServiceImpl.java

@@ -1,7 +1,6 @@
 package irbs.reports.service.impl;
 
 import dm.jdbc.util.StringUtil;
-import io.sc.platform.core.util.DateUtil;
 import io.sc.platform.jdbc.DatabaseType;
 import irbs.reports.jpa.entity.ReportSqlConfig;
 import irbs.reports.jpa.repository.ReportSqlConfigRepository;

irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingIndustryFocusDistServiceImpl.java

@@ -1,7 +1,6 @@
 package irbs.reports.service.impl;
 
 import dm.jdbc.util.StringUtil;
-import io.sc.platform.core.util.DateUtil;
 import io.sc.platform.jdbc.DatabaseType;
 import irbs.reports.jpa.entity.ReportSqlConfig;
 import irbs.reports.jpa.repository.ReportSqlConfigRepository;

irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingLoanBalanceMigrateServiceImpl.java

@@ -1,7 +1,6 @@
 package irbs.reports.service.impl;
 
 import dm.jdbc.util.StringUtil;
-import io.sc.platform.core.util.DateUtil;
 import io.sc.platform.jdbc.DatabaseType;
 import irbs.reports.jpa.entity.ReportSqlConfig;
 import irbs.reports.jpa.repository.ReportSqlConfigRepository;

irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingModelFocusDistServiceImpl.java

@@ -1,7 +1,6 @@
 package irbs.reports.service.impl;
 
 import dm.jdbc.util.StringUtil;
-import io.sc.platform.core.util.DateUtil;
 import io.sc.platform.jdbc.DatabaseType;
 import irbs.reports.jpa.entity.ReportSqlConfig;
 import irbs.reports.jpa.repository.ReportSqlConfigRepository;

irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingNumberMigrateServiceImpl.java

@@ -1,7 +1,6 @@
 package irbs.reports.service.impl;
 
 import dm.jdbc.util.StringUtil;
-import io.sc.platform.core.util.DateUtil;
 import io.sc.platform.jdbc.DatabaseType;
 import irbs.reports.jpa.entity.ReportSqlConfig;
 import irbs.reports.jpa.repository.ReportSqlConfigRepository;

irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOrgFocusDistServiceImpl.java

@@ -1,7 +1,6 @@
 package irbs.reports.service.impl;
 
 import dm.jdbc.util.StringUtil;
-import io.sc.platform.core.util.DateUtil;
 import io.sc.platform.jdbc.DatabaseType;
 import irbs.reports.jpa.entity.ReportSqlConfig;
 import irbs.reports.jpa.repository.ReportSqlConfigRepository;

irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOverturnServiceImpl.java

@@ -1,7 +1,6 @@
 package irbs.reports.service.impl;
 
 import dm.jdbc.util.StringUtil;
-import io.sc.platform.core.util.DateUtil;
 import io.sc.platform.jdbc.DatabaseType;
 import irbs.reports.jpa.entity.ReportSqlConfig;
 import irbs.reports.jpa.repository.ReportSqlConfigRepository;