代码提交

irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/repository/MainScaleVersionRepository.java

@@ -3,6 +3,9 @@ package irbs.cust.rating.jpa.repository;
 import io.sc.platform.orm.repository.DaoRepository;
 import irbs.cust.rating.jpa.entity.MainScaleVersion;
 
+import java.util.List;
+
 public interface MainScaleVersionRepository extends DaoRepository<MainScaleVersion, String> {
 
+    List<MainScaleVersion> findByStatusAndCode(String status, String code);
 }

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

@@ -128,9 +128,13 @@ public class MainScaleVersionServiceImpl extends DaoServiceImpl<MainScaleVersion
         operation.setRoleName(SecurityUtil.getDefaultRoleName());
         mainScaleVersionOperationRepository.save(operation);
         mainScaleVersion.setApprvStatus(RatingProcessStatus.APPROVALING.name());
-        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
-            mainScaleVersion.setCurrentAssignee(processProperties.getTransientVariables().get("assignee").toString());
+        ProcessTaskWrapper ptw = findTaskByProcInstId(mainScaleVersion.getProcessInstanceId());
+        if (ptw!=null && null!=ptw.getId()) {
+            mainScaleVersion.setCurrentAssignee(ptw.getAssignee());
         }
+//        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
+//            mainScaleVersion.setCurrentAssignee(processProperties.getTransientVariables().get("assignee").toString());
+//        }
         repository.save(mainScaleVersion);
     }
 
@@ -149,6 +153,7 @@ public class MainScaleVersionServiceImpl extends DaoServiceImpl<MainScaleVersion
             mainScaleVersion.setCurrentAssignee("");
             mainScaleVersion.setStatus(VersionEnum.RELEASE.name());
             this.getRepository().save(mainScaleVersion);
+            updateOldVersionToHis(mainScaleVersion);
         }
     }
 
@@ -178,9 +183,13 @@ public class MainScaleVersionServiceImpl extends DaoServiceImpl<MainScaleVersion
         operation.setRoleName(SecurityUtil.getDefaultRoleName());
         mainScaleVersionOperationRepository.save(operation);
         mainScaleVersion.setApprvStatus(RatingProcessStatus.AWAIT_SUBMIT.name());
-        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
-            mainScaleVersion.setCurrentAssignee(processProperties.getTransientVariables().get("assignee").toString());
+        ProcessTaskWrapper ptw = findTaskByProcInstId(mainScaleVersion.getProcessInstanceId());
+        if (ptw!=null && null!=ptw.getId()) {
+            mainScaleVersion.setCurrentAssignee(ptw.getAssignee());
         }
+//        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
+//            mainScaleVersion.setCurrentAssignee(processProperties.getTransientVariables().get("assignee").toString());
+//        }
         repository.save(mainScaleVersion);
     }
 
@@ -228,4 +237,17 @@ public class MainScaleVersionServiceImpl extends DaoServiceImpl<MainScaleVersion
         }
         return newVersion;
     }
+
+    /**
+     * 版本发布后，将当前已发布的版本置为历史版本
+     * @param mainScaleVersion
+     */
+    private void updateOldVersionToHis(MainScaleVersion mainScaleVersion){
+        List<MainScaleVersion> oldVersions = repository.findByStatusAndCode(VersionEnum.RELEASE.name(), mainScaleVersion.getCode());
+        if(oldVersions != null){
+            MainScaleVersion old = oldVersions.get(0);
+            old.setStatus(VersionEnum.HISTORY.name());
+            repository.save(old);
+        }
+    }
 }

irbs.frontend/src/i18n/messages.json

@@ -68,5 +68,8 @@
   "menu.irbs.config.mainScale": "MainScale",
   "menu.irbs.query.shrcbCorpCustFeature": "Shrcb CorpCustFeature",
   "menu.irbs.report.rptRatingChange": "Rating Change Report",
-  "menu.irbs.config.defaultCancelCustList": "Default Cancel Cust List"
+  "menu.irbs.config.defaultCancelCustList": "Default Cancel Cust List",
+  "menu.irbs.report.tzblwdxfxbb": "Feature Variable Stability Report",
+  "menu.irbs.report.tzblwoeivbb": "Feature Variable WOE&IV Report"
+
 }

irbs.frontend/src/i18n/messages_tw_CN.json

@@ -67,5 +67,7 @@
   "menu.irbs.query.pingAnLgdHist": "债项评级历史查询",
   "menu.irbs.query.defaultRebirthHist": "违约重生历史查询",
   "menu.irbs.report.rptRatingChange": "客户评级重大变化情况报表",
-  "menu.irbs.config.defaultCancelCustList": "违约解除客户名单"
+  "menu.irbs.config.defaultCancelCustList": "违约解除客户名单",
+  "menu.irbs.report.tzblwdxfxbb": "特征变量稳定性分析报表",
+  "menu.irbs.report.tzblwoeivbb": "特征变量WOE趋势和IV统计报表"
 }

irbs.frontend/src/i18n/messages_zh_CN.json

@@ -67,5 +67,7 @@
   "menu.irbs.query.pingAnLgdHist": "债项评级历史查询",
   "menu.irbs.query.defaultRebirthHist": "违约重生历史查询",
   "menu.irbs.report.rptRatingChange": "客户评级重大变化情况报表",
-  "menu.irbs.config.defaultCancelCustList": "违约解除客户名单"
+  "menu.irbs.config.defaultCancelCustList": "违约解除客户名单",
+  "menu.irbs.report.tzblwdxfxbb": "特征变量稳定性分析报表",
+  "menu.irbs.report.tzblwoeivbb": "特征变量WOE趋势和IV统计报表"
 }

irbs.frontend/src/menus/menus.json

@@ -110,7 +110,11 @@
       /*报表管理/模型稳定性监控报表*/
       {"type":"ROUTE",      "order":501,  "parentId":"menu.irbs.report",         "id":"menu.irbs.report.rptModelMonitorStable",             "titleI18nKey":"menu.irbs.report.rptModelMonitorStable",               "icon":"bi-card-heading",        "routeName":"route.irbs.report.rptModelMonitorStable"},
       /*报表管理/模型审慎性监控报表*/
-      {"type":"ROUTE",      "order":502,  "parentId":"menu.irbs.report",         "id":"menu.irbs.report.rptModelMonitorBinomialCheck",             "titleI18nKey":"menu.irbs.report.rptModelMonitorBinomialCheck",               "icon":"bi-card-text",        "routeName":"route.irbs.report.rptModelMonitorBinomialCheck"}
+      {"type":"ROUTE",      "order":502,  "parentId":"menu.irbs.report",         "id":"menu.irbs.report.rptModelMonitorBinomialCheck",             "titleI18nKey":"menu.irbs.report.rptModelMonitorBinomialCheck",               "icon":"bi-card-text",        "routeName":"route.irbs.report.rptModelMonitorBinomialCheck"},
+      /*报表管理/特征变量稳定性分析报表*/
+      {"type":"ROUTE",      "order":600,  "parentId":"menu.irbs.report",         "id":"menu.irbs.report.tzblwdxfxbb",             "titleI18nKey":"menu.irbs.report.tzblwdxfxbb",               "icon":"bi-card-text",        "routeName":"route.irbs.report.tzblwdxfxbb"},
+      /*报表管理/特征变量WOE趋势和IV统计报表*/
+      {"type":"ROUTE",      "order":601,  "parentId":"menu.irbs.report",         "id":"menu.irbs.report.tzblwoeivbb",             "titleI18nKey":"menu.irbs.report.tzblwoeivbb",               "icon":"bi-card-text",        "routeName":"route.irbs.report.tzblwoeivbb"}
       
 ]
 

irbs.frontend/src/routes/routes.json

@@ -506,5 +506,31 @@
       "permissions": ["/example/**/*"]
     },
     "children": []
+  },
+  {
+    "name": "route.irbs.report.tzblwdxfxbb",
+    "path": "irbs/tzblwdxfxbb",
+    "parent": "/",
+    "priority": -1,
+    "component": "irbs.tzblwdxfxbb",
+    "componentPath": "@/views/report/tzblwdxfxbb.vue",
+    "redirect": null,
+    "meta": {
+      "permissions": ["/example/**/*"]
+    },
+    "children": []
+  },
+  {
+    "name": "route.irbs.report.tzblwoeivbb",
+    "path": "irbs/tzblwoeivbb",
+    "parent": "/",
+    "priority": -1,
+    "component": "irbs.tzblwoeivbb",
+    "componentPath": "@/views/report/tzblwoeivbb.vue",
+    "redirect": null,
+    "meta": {
+      "permissions": ["/example/**/*"]
+    },
+    "children": []
   }
 ]

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

@@ -38,7 +38,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { useQuasar } from 'quasar';
-import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager } from 'platform-core';
+import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager, SessionManager } from 'platform-core';
 import MainScale from './MainScale.vue';
 import MainScaleVersionFlowDialog from './MainScaleVersionFlowDialog.vue';
 
@@ -126,7 +126,15 @@ const mainScaleVersionGrid = {
           });
       },
     },
-    'remove',
+    {
+      extend: 'remove',
+      enableIf: (args) => {
+        if (args.selected && args.selected['apprvStatus'] === 'AWAIT_SUBMIT') {
+          return true;
+        }
+        return false;
+      },
+    },
     'export',
     'separator',
     {
@@ -165,7 +173,7 @@ const mainScaleVersionGrid = {
       name: 'approve',
       label: '审批',
       enableIf: (args) => {
-        if (args.selected && args.selected['apprvStatus'] === 'APPROVALING') {
+        if (args.selected && args.selected['apprvStatus'] === 'APPROVALING' && args.selected['currentAssignee'] === SessionManager.getUser().loginName) {
           return true;
         }
         return false;
@@ -174,6 +182,14 @@ const mainScaleVersionGrid = {
         mainScaleVersionFlowDialogRef.value.show(args.selected);
       },
     },
+    'separator',
+    {
+      name: 'forseStop',
+      label: '强制停止',
+      click: (args) => {
+        axios.post(Environment.apiContextPath('api/irbs/corpfeatureret/forseStop/'));
+      },
+    },
   ],
   queryFormFields: [
     { label: '版本代码', name: 'code' },

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

@@ -12,10 +12,7 @@
       :columns="riskExposureHisGrid.columns"
       :toolbar-actions="riskExposureHisGrid.buttons"
       :pageable="true"
-      :pagination="{
-        sortBy: 'lastModifyDate',
-        descending: true,
-      }"
+      :sort-by="['-lastModifyDate']"
     ></w-grid>
   </div>
 </template>
@@ -57,7 +54,7 @@ const riskExposureHisGrid = {
     { label: '发起方式', name: 'startWay', format: StartWayFormat },
     { label: '自动分类结果', name: 'sysResult', format: RiskExposureTypeFormat },
     { label: '人工分类结果', name: 'manResult', format: RiskExposureTypeFormat },
-    { label: '最终分类结果', name: 'FINAL_RESULT', format: RiskExposureTypeFormat },
+    { label: '最终分类结果', name: 'finalResult', format: RiskExposureTypeFormat },
     { label: '是否人工调整', name: 'isAdjusted', format: isValidFormat },
     { label: '调整原因', name: 'adjustReason' },
     { label: '完成时间', name: 'finishDate', format: Formater.dateOnly() },

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

@@ -0,0 +1,231 @@
+<template>
+  <w-grid
+    ref="gridRef"
+    title="特征变量稳定性分析报表"
+    dense
+    :config-button="true"
+    :checkbox-selection="false"
+    :pageable="false"
+    :toolbar-configure="{ noIcon: false }"
+    :toolbar-actions="[
+      {
+        extend: 'query',
+        click: () => {
+          const model = gridRef.getQueryForm().getFieldValue('model');
+          const year = gridRef.getQueryForm().getFieldValue('year');
+          const month = gridRef.getQueryForm().getFieldValue('month');
+          console.log(model, year, month);
+          if (model === 'A评分卡' && year === 2023 && month === 6) {
+            gridRef.setLocalData(data);
+          } else {
+            gridRef.setLocalData([]);
+          }
+        },
+      },
+      'refresh',
+      'separator',
+      'export',
+    ]"
+    :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 },
+    ]"
+    :columns="[
+      { width: 200, name: 'tzl', label: '特征量' },
+      { name: 'fxbq', label: '分箱标签' },
+      { name: 'kfjzz', label: '开发基准值%' },
+      { name: 'bs', label: '笔数' },
+      { name: 'sjfscsbfb', label: '实际发生次数百分比%' },
+      { name: 'bgbfb', label: '变更百分比%' },
+      { name: 'fxpf', label: '分箱的评分' },
+      { name: 'pfcz', label: '评分差值' },
+      { name: 'zrdsbgbl', label: '自然对数(变更比率)%' },
+      { name: 'wdxgxzs', label: '稳定性贡献指数' },
+    ]"
+  >
+  </w-grid>
+</template>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+
+const gridRef = ref();
+const data = [
+  { tzl: '主要业务开展时长', fxbq: '(15, )', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '主要业务开展时长', fxbq: '(10, 15]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '主要业务开展时长', fxbq: '(5,10]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '主要业务开展时长', fxbq: '( ,5]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '小计', fxbq: '-', kfjzz: '-', bs: '-', sjfscsbfb: '-', bgbfb: '-', fxpf: '-', pfcz: '-', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '背景支持', fxbq: '大企业', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '背景支持', fxbq: '小型', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '背景支持', fxbq: '其他', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '小计', fxbq: '-', kfjzz: '-', bs: '-', sjfscsbfb: '-', bgbfb: '-', fxpf: '-', pfcz: '-', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  {
+    tzl: '技术实力',
+    fxbq: '先进',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  { tzl: '技术实力', fxbq: '一般', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '技术实力', fxbq: '落后', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '小计', fxbq: '-', kfjzz: '-', bs: '-', sjfscsbfb: '-', bgbfb: '-', fxpf: '-', pfcz: '-', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '行内授信投向政策', fxbq: '扶持类', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '行内授信投向政策', fxbq: '适度支持类', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '行内授信投向政策', fxbq: '维持类', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '行内授信投向政策', fxbq: '限制类或禁止类', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '小计', fxbq: '-', kfjzz: '-', bs: '-', sjfscsbfb: '-', bgbfb: '-', fxpf: '-', pfcz: '-', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  {
+    tzl: '企业征信信用历史',
+    fxbq: '正常类',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  { tzl: '企业征信信用历史', fxbq: '关注类', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '企业征信信用历史', fxbq: '不良类', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '企业征信信用历史', fxbq: '不良贷款未还清', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '小计', fxbq: '-', kfjzz: '-', bs: '-', sjfscsbfb: '-', bgbfb: '-', fxpf: '-', pfcz: '-', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '负债利润倍数', fxbq: '(0,6]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '负债利润倍数', fxbq: '(6,12]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '负债利润倍数', fxbq: '(12,24]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '负债利润倍数', fxbq: '(24,70]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '负债利润倍数', fxbq: '(70,)', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '小计', fxbq: '-', kfjzz: '-', bs: '-', sjfscsbfb: '-', bgbfb: '-', fxpf: '-', pfcz: '-', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '货币资金负债比', fxbq: '(0,0.04]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '货币资金负债比', fxbq: '(0.04,0.18]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '货币资金负债比', fxbq: '(0.18,0.35]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '货币资金负债比', fxbq: '(0.35,)', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '小计', fxbq: '-', kfjzz: '-', bs: '-', sjfscsbfb: '-', bgbfb: '-', fxpf: '-', pfcz: '-', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '资本积累率', fxbq: '(0.04,0.17)', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '资本积累率', fxbq: '(0.17,0.4]', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '资本积累率', fxbq: '(0.4,)', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '小计', fxbq: '-', kfjzz: '-', bs: '-', sjfscsbfb: '-', bgbfb: '-', fxpf: '-', pfcz: '-', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  {
+    tzl: '净资产收益率(ROE)',
+    fxbq: '(,0.04]',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  {
+    tzl: '净资产收益率(ROE)',
+    fxbq: '(0.04,0.1]',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  {
+    tzl: '净资产收益率(ROE)',
+    fxbq: '(0.1,0.2]',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  {
+    tzl: '净资产收益率(ROE)',
+    fxbq: '(0.2,0.5]',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  {
+    tzl: '净资产收益率(ROE)',
+    fxbq: '(0.5,]',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  { tzl: '小计', fxbq: '-', kfjzz: '-', bs: '-', sjfscsbfb: '-', bgbfb: '-', fxpf: '-', pfcz: '-', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  {
+    tzl: '应收账款和存货的账期表现',
+    fxbq: '(,70]',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  {
+    tzl: '应收账款和存货的账期表现',
+    fxbq: '(70,140]',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  {
+    tzl: '应收账款和存货的账期表现',
+    fxbq: '(140,210]',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  {
+    tzl: '应收账款和存货的账期表现',
+    fxbq: '(210,400]',
+    kfjzz: '0%',
+    bs: '0',
+    sjfscsbfb: '0%',
+    bgbfb: '0%',
+    fxpf: '0',
+    pfcz: '0',
+    zrdsbgbl: '0%',
+    wdxgxzs: '0%',
+  },
+  { tzl: '应收账款和存货的账期表现', fxbq: '(400,+)', kfjzz: '0%', bs: '0', sjfscsbfb: '0%', bgbfb: '0%', fxpf: '0', pfcz: '0', zrdsbgbl: '0%', wdxgxzs: '0%' },
+  { tzl: '小计', fxbq: '-', kfjzz: '-', bs: '-', sjfscsbfb: '-', bgbfb: '-', fxpf: '-', pfcz: '-', zrdsbgbl: '0%', wdxgxzs: '0%' },
+];
+
+onMounted(() => {
+  //gridRef.value.setLocalData(data);
+});
+</script>

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

@@ -0,0 +1,243 @@
+<template>
+  <w-grid
+    ref="gridRef"
+    title="特征变量WOE趋势和IV统计报表"
+    dense
+    :config-button="true"
+    :checkbox-selection="false"
+    :pageable="false"
+    :toolbar-configure="{ noIcon: false }"
+    :toolbar-actions="[
+      {
+        extend: 'query',
+        click: () => {
+          const model = gridRef.getQueryForm().getFieldValue('model');
+          const startYear = gridRef.getQueryForm().getFieldValue('startYear');
+          const startMonth = gridRef.getQueryForm().getFieldValue('startMonth');
+          if (model === 'A评分卡' && startYear === 2023 && startMonth === 6) {
+            gridRef.setLocalData(data);
+          } else {
+            gridRef.setLocalData([]);
+          }
+        },
+      },
+      'refresh',
+      'separator',
+      'export',
+    ]"
+    :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 },
+    ]"
+    :columns="[
+      { width: 200, name: 'tzl', label: '特征量' },
+      { name: 'fxbq', label: '分箱标签' },
+      { name: 'jzgoodkh', label: '基准好客户' },
+      { name: 'jzbadkh', label: '基准坏客户' },
+      { name: 'jzwoe', label: '基准WOE' },
+      { name: 'jziv', label: '基准IV%' },
+      { name: 'dqgoodkh', label: '当前好客户' },
+      { name: 'dqbadkh', label: '当前坏客户' },
+      { name: 'dqwoe', label: '当前WOE' },
+      { name: 'dqiv', label: '当前IV%' },
+    ]"
+  >
+  </w-grid>
+</template>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+import { Environment } from 'platform-core';
+
+const gridRef = ref();
+const data = [
+  { tzl: '主要业务开展时长', fxbq: '(15, )', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '主要业务开展时长', fxbq: '(10, 15]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '主要业务开展时长', fxbq: '(5,10]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '主要业务开展时长', fxbq: '( ,5]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '小计', fxbq: '-', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '背景支持', fxbq: '大企业', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '背景支持', fxbq: '小型', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '背景支持', fxbq: '其他', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '小计', fxbq: '-', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  {
+    tzl: '技术实力',
+    fxbq: '先进',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  { tzl: '技术实力', fxbq: '一般', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '技术实力', fxbq: '落后', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '小计', fxbq: '-', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '行内授信投向政策', fxbq: '扶持类', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  {
+    tzl: '行内授信投向政策',
+    fxbq: '适度支持类',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  { tzl: '行内授信投向政策', fxbq: '维持类', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '行内授信投向政策', fxbq: '限制类或禁止类', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '小计', fxbq: '-', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  {
+    tzl: '企业征信信用历史',
+    fxbq: '正常类',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  { tzl: '企业征信信用历史', fxbq: '关注类', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '企业征信信用历史', fxbq: '不良类', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '企业征信信用历史', fxbq: '不良贷款未还清', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '小计', fxbq: '-', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '负债利润倍数', fxbq: '(0,6]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '负债利润倍数', fxbq: '(6,12]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '负债利润倍数', fxbq: '(12,24]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '负债利润倍数', fxbq: '(24,70]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '小计', fxbq: '-', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '货币资金负债比', fxbq: '(0,0.04]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '货币资金负债比', fxbq: '(0.04,0.18]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '货币资金负债比', fxbq: '(0.18,0.35]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '货币资金负债比', fxbq: '(0.35,)', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '小计', fxbq: '-', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '资本积累率', fxbq: '(0.04,0.17)', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '资本积累率', fxbq: '(0.17,0.4]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '资本积累率', fxbq: '(0.4,)', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '小计', fxbq: '-', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  {
+    tzl: '净资产收益率(ROE)',
+    fxbq: '(,0.04]',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  {
+    tzl: '净资产收益率(ROE)',
+    fxbq: '(0.04,0.1]',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  {
+    tzl: '净资产收益率(ROE)',
+    fxbq: '(0.1,0.2]',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  {
+    tzl: '净资产收益率(ROE)',
+    fxbq: '(0.2,0.5]',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  {
+    tzl: '净资产收益率(ROE)',
+    fxbq: '(0.5,]',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  { tzl: '小计', fxbq: '-', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  { tzl: '应收账款和存货的账期表现', fxbq: '(,70]', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+  {
+    tzl: '应收账款和存货的账期表现',
+    fxbq: '(70,140]',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  {
+    tzl: '应收账款和存货的账期表现',
+    fxbq: '(140,210]',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  {
+    tzl: '应收账款和存货的账期表现',
+    fxbq: '(210,400]',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  {
+    tzl: '应收账款和存货的账期表现',
+    fxbq: '(400,+)',
+    jzgoodkh: '0',
+    jzbadkh: '0',
+    jzwoe: '0',
+    jziv: '0%',
+    dqgoodkh: '0',
+    dqbadkh: '0',
+    dqwoe: '0',
+    dqiv: '0%',
+  },
+  { tzl: '小计', fxbq: '-', jzgoodkh: '0', jzbadkh: '0', jzwoe: '0', jziv: '0%', dqgoodkh: '0', dqbadkh: '0', dqwoe: '0', dqiv: '0%' },
+];
+
+onMounted(() => {
+  //gridRef.value.setLocalData(data);
+});
+</script>

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

@@ -10,10 +10,7 @@
       :query-form-fields="riskExposureAdjustGrid.queryFormFields"
       :columns="riskExposureAdjustGrid.columns"
       :toolbar-actions="riskExposureAdjustGrid.buttons"
-      :pagination="{
-        sortBy: 'lastModifyDate',
-        descending: true,
-      }"
+      :sort-by="['-lastModifyDate']"
       :query-criteria="{
         operator: 'and',
         criteria: [

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

@@ -10,10 +10,7 @@
       :query-form-fields="riskExposureAdjustGrid.queryFormFields"
       :columns="riskExposureAdjustGrid.columns"
       :toolbar-actions="riskExposureAdjustGrid.buttons"
-      :pagination="{
-        sortBy: 'lastModifyDate',
-        descending: true,
-      }"
+      :sort-by="['-lastModifyDate']"
       :query-criteria="{
         operator: 'and',
         criteria: [
@@ -32,6 +29,11 @@
             operator: 'equals',
             value: 'TO_BE_CHECKED',
           },
+          {
+            fieldName: 'currentAssignee',
+            operator: 'equals',
+            value: SessionManager.getUser().loginName,
+          },
         ],
       }"
     ></w-grid>
@@ -43,7 +45,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { useQuasar } from 'quasar';
-import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager } from 'platform-core';
+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';

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

@@ -11,9 +11,24 @@
       :columns="riskExposureGrid.columns"
       :toolbar-actions="riskExposureGrid.buttons"
       :query-criteria="{
+        operator: 'and',
+        criteria: [
+          {
+            fieldName: 'isNeedOperate',
+            operator: 'equals',
+            value: '1',
+          },
+          {
+            fieldName: 'startWay',
+            operator: 'equals',
+            value: '2',
+          },
+          {
             fieldName: 'dataStatus',
             operator: 'equals',
             value: '1',
+          },
+        ],
       }"
       :sort-by="['-lastModifyDate']"
     ></w-grid>

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

@@ -10,10 +10,7 @@
       :query-form-fields="riskExposureGrid.queryFormFields"
       :columns="riskExposureGrid.columns"
       :toolbar-actions="riskExposureGrid.buttons"
-      :pagination="{
-        sortBy: 'lastModifyDate',
-        descending: true,
-      }"
+      :sort-by="['-lastModifyDate']"
       :query-criteria="{
         operator: 'and',
         criteria: [
@@ -27,6 +24,11 @@
             operator: 'equals',
             value: 'TO_BE_CHECKED',
           },
+          {
+            fieldName: 'currentAssignee',
+            operator: 'equals',
+            value: SessionManager.getUser().loginName,
+          },
         ],
       }"
     ></w-grid>
@@ -38,7 +40,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { useQuasar } from 'quasar';
-import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager } from 'platform-core';
+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';

irbs.riskExposure/src/main/java/irbs/riskExposure/service/impl/RiskExposureAdjustServiceImpl.java

@@ -16,10 +16,14 @@ import irbs.riskExposure.service.RiskExposureFlowService;
 import irbs.riskExposure.service.RiskExposureOperationService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Optional;
 
 @Service("riskExposureAdjustService")
@@ -52,6 +56,7 @@ public class RiskExposureAdjustServiceImpl extends DaoServiceImpl<RiskExposure,
         if(optional.isPresent()){
             RiskExposure riskExposure = optional.get();
             riskExposure.setDataStatus("1");//发起风险暴露分类后，设置发起状态为已发起
+            riskExposure.setIsAdjusted("1");//设置是否人工调整为“是”
             riskExposure.setProcessStatus(RiskExposureProcessStatus.TO_BE_SUBMITTED.name());//发起风险暴露分类后，流程状态为待发起
             ProcessInstance processInstance = riskExposureFlowService.startProcess(
                     ProcessConstant.RISK_EXPOSURE_FLOW,
@@ -81,11 +86,22 @@ public class RiskExposureAdjustServiceImpl extends DaoServiceImpl<RiskExposure,
         }
         riskExposureOperation.setOperation(RiskExposureProcessOperate.SUBMIT.getCode());
         riskExposureOperationService.getRepository().save(riskExposureOperation);
-
+        List<Sort.Order> orders = new ArrayList<>();
+        orders.add(new Sort.Order(Sort.Direction.ASC, "lastModifyDate"));
+        Sort sort = Sort.by(orders);
+        List<RiskExposureOperation> operations = riskExposureOperationService.getRepository().findAll(sort);
+        if(operations != null){
+            RiskExposureOperation op = operations.get(0);
+            riskExposure.setAdjustReason(op.getRemarks());
+        }
         riskExposure.setProcessStatus(RiskExposureProcessStatus.TO_BE_CHECKED.name());
-        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
-            riskExposure.setCurrentAssignee (processProperties.getTransientVariables().get("assignee").toString());
+        ProcessTaskWrapper ptw = riskExposureFlowService.findTaskByProcInstId(riskExposure.getProcessInstanceId());
+        if (ptw!=null && null!=ptw.getId()) {
+            riskExposure.setCurrentAssignee (ptw.getAssignee());
         }
+//        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
+//            riskExposure.setCurrentAssignee (processProperties.getTransientVariables().get("assignee").toString());
+//        }
         repository.save(riskExposure);
     }
 
@@ -99,9 +115,13 @@ public class RiskExposureAdjustServiceImpl extends DaoServiceImpl<RiskExposure,
         riskExposureOperationService.getRepository().save(riskExposureOperation);
 
         riskExposure.setProcessStatus(RiskExposureProcessStatus.RETURNED.name());
-        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
-            riskExposure.setCurrentAssignee (processProperties.getTransientVariables().get("assignee").toString());
+        ProcessTaskWrapper ptw = riskExposureFlowService.findTaskByProcInstId(riskExposure.getProcessInstanceId());
+        if (ptw!=null && null!=ptw.getId()) {
+            riskExposure.setCurrentAssignee (ptw.getAssignee());
         }
+//        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
+//            riskExposure.setCurrentAssignee (processProperties.getTransientVariables().get("assignee").toString());
+//        }
         repository.save(riskExposure);
     }
 

irbs.riskExposure/src/main/java/irbs/riskExposure/service/impl/RiskExposureServiceImpl.java

@@ -8,9 +8,7 @@ import io.sc.platform.security.util.SecurityUtil;
 import irbs.riskExposure.jpa.entity.RiskExposure;
 import irbs.riskExposure.jpa.entity.RiskExposureOperation;
 import irbs.riskExposure.jpa.repository.RiskExposureRepository;
-import irbs.riskExposure.jpa.support.ProcessConstant;
-import irbs.riskExposure.jpa.support.RiskExposureProcessOperate;
-import irbs.riskExposure.jpa.support.RiskExposureProcessStatus;
+import irbs.riskExposure.jpa.support.*;
 import irbs.riskExposure.service.RiskExposureFlowService;
 import irbs.riskExposure.service.RiskExposureOperationService;
 import irbs.riskExposure.service.RiskExposureProcessService;
@@ -52,7 +50,8 @@ public class RiskExposureServiceImpl extends DaoServiceImpl<RiskExposure, String
         Optional<RiskExposure> optional = repository.findById(id);
         if(optional.isPresent()){
             RiskExposure riskExposure = optional.get();
-            riskExposure.setDataStatus("1");//发起风险暴露分类后，设置发起状态为已发起
+            riskExposure.setDataStatus(DataStatus.已发起.code());//发起风险暴露分类后，设置发起状态为已发起
+            riskExposure.setStartWay(StartWay.手动.code());//发起风险暴露分类后，设置发起类型为“人工发起”
             riskExposure.setProcessStatus(RiskExposureProcessStatus.TO_BE_SUBMITTED.name());//发起风险暴露分类后，流程状态为待发起
             ProcessInstance processInstance = riskExposureFlowService.startProcess(
                     ProcessConstant.RISK_EXPOSURE_FLOW,
@@ -84,9 +83,13 @@ public class RiskExposureServiceImpl extends DaoServiceImpl<RiskExposure, String
         riskExposureOperationService.getRepository().save(riskExposureOperation);
 
         riskExposure.setProcessStatus(RiskExposureProcessStatus.TO_BE_CHECKED.name());
-        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
-            riskExposure.setCurrentAssignee (processProperties.getTransientVariables().get("assignee").toString());
+        ProcessTaskWrapper ptw = riskExposureFlowService.findTaskByProcInstId(riskExposure.getProcessInstanceId());
+        if (ptw!=null && null!=ptw.getId()) {
+            riskExposure.setCurrentAssignee (ptw.getAssignee());
         }
+//        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
+//            riskExposure.setCurrentAssignee (processProperties.getTransientVariables().get("assignee").toString());
+//        }
         repository.save(riskExposure);
     }
 
@@ -100,9 +103,13 @@ public class RiskExposureServiceImpl extends DaoServiceImpl<RiskExposure, String
         riskExposureOperationService.getRepository().save(riskExposureOperation);
 
         riskExposure.setProcessStatus(RiskExposureProcessStatus.RETURNED.name());
-        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
-            riskExposure.setCurrentAssignee (processProperties.getTransientVariables().get("assignee").toString());
+        ProcessTaskWrapper ptw = riskExposureFlowService.findTaskByProcInstId(riskExposure.getProcessInstanceId());
+        if (ptw!=null && null!=ptw.getId()) {
+            riskExposure.setCurrentAssignee (ptw.getAssignee());
         }
+//        if (processProperties.getTransientVariables().containsKey("assignee") && processProperties.getTransientVariables().get("assignee")!=null) {
+//            riskExposure.setCurrentAssignee (processProperties.getTransientVariables().get("assignee").toString());
+//        }
         repository.save(riskExposure);
     }