Browse Source

更新后端代码

zhang_qk 10 months ago
parent
commit
ddb92f8467
40 changed files with 680 additions and 202 deletions
  1. 3 3
      Procedure/backend/project/out/production/project/com/sundata/product/rwa/parameter/mybatis/FcCommitmentMapper.xml
  2. 114 12
      Procedure/backend/project/out/production/project/com/sundata/product/rwa/parameter/mybatis/FcLoanMapper.xml
  3. 66 40
      Procedure/backend/project/out/production/project/com/sundata/product/rwa/parameter/mybatis/FcOffSheetMapper.xml
  4. 2 2
      Procedure/backend/project/out/production/project/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/mybatis/InfoListMapper.xml
  5. 32 13
      Procedure/backend/project/out/production/project/com/sundata/product/rwa/rwaCalcConfigDataparam/mybatis/ProductListMapper.xml
  6. 4 4
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/action/FcLoanAction.java
  7. 2 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mapper/FcLoanMapper.java
  8. 18 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/model/FcCommitmentModel.java
  9. 36 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/model/FcLoanModel.java
  10. 141 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/model/FcOffSheetModel.java
  11. 3 3
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/FcCommitmentMapper.xml
  12. 114 12
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/FcLoanMapper.xml
  13. 66 40
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/FcOffSheetMapper.xml
  14. 5 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/service/FcLoanService.java
  15. 6 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/action/InfoListAction.java
  16. 2 2
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/mybatis/InfoListMapper.xml
  17. 4 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/service/InfoListService.java
  18. 13 14
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/action/InfoAction.java
  19. 1 2
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/mapper/InfoMapper.java
  20. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/mybatis/InfoMapper.xml
  21. 12 12
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/service/InfoService.java
  22. 0 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/action/BusinessAction.java
  23. 5 7
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/action/ProductListAction.java
  24. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/action/RealEstateAction.java
  25. 0 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mapper/BusinessMapper.java
  26. 5 5
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mapper/ProductListMapper.java
  27. 0 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mapper/RealEstateMapper.java
  28. 0 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/BusinessModel.java
  29. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/ProductListModel.java
  30. 0 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/RealEstateModel.java
  31. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/RiskListModel.java
  32. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/RwaCalcConfOffbalanceprotyperuleModel.java
  33. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/RwaCalcConfProductrulesModel.java
  34. 0 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/SubjectListModel.java
  35. 0 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mybatis/BusinessMapper.xml
  36. 14 14
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mybatis/ProductListMapper.xml
  37. 0 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mybatis/RealEstateMapper.xml
  38. 0 0
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/service/BusinessService.java
  39. 6 6
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/service/ProductListService.java
  40. 0 2
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/service/RealEstateService.java

+ 3 - 3
Procedure/backend/project/out/production/project/com/sundata/product/rwa/parameter/mybatis/FcCommitmentMapper.xml

@@ -9,7 +9,7 @@
         ,T1.BALANCE as balance
         ,T1.BOOK_TYPE_CD as bookTypeCd
         ,T1.BP_CUST_NO as bpCustNo
-        ,T1.BUS_LINE as busLine
+        ,T1.BUS_LINE as busLines
         ,T1.BUS_TYPE as busType
         ,T1.CALCINDEX as calcindex
         ,T1.CCY_CD as ccyCd
@@ -22,7 +22,7 @@
         ,T1.FIN_BRANCH_NO as finBranchNo
         ,T1.LOAN_REFERENCE_NO as loanReferenceNo
         ,T1.MAT_DT as matDt
-        ,T1.MGMT_BRANCH_NO as mgmtBranchNo
+        ,T1.MGMT_BRANCH_NO as mgmtBranchNos
         ,T1.ON_OFF_FLAG as onOffFlag
         ,T1.PRODUCT_NAME as productName
         ,T1.PRODUCT_NO as productNo
@@ -32,7 +32,7 @@
         ,T1.SDATE as sdate
         ,T1.START_DT as startDt
         ,T1.TERM as term
-        ,T1.CUST_TYPE as custType
+        ,T1.CUST_TYPE as custTypes
         ,T2.NOUNNAME as ccyCdId
         ,T3.NOUNNAME as commTypeId
         ,T4.NOUNNAME as onOffFlagId

+ 114 - 12
Procedure/backend/project/out/production/project/com/sundata/product/rwa/parameter/mybatis/FcLoanMapper.xml

@@ -11,13 +11,13 @@
         T1.BALANCE as balance,
         T1.BOOK_TYPE_CD as bookTypeCd,
         T1.BP_CUST_NO as bpCustNo,
-        T1.BUS_LINE as busLine,
+        T1.BUS_LINE as busLines,
         T1.CALCINDEX as calcindex,
         T1.CCY_CD as ccyCd,
         T1.CONT_NO as contNo,
         T1.CUST_NAME as custName,
         T1.CUST_NO as custNo,
-        T1.CUST_TYPE as custType,
+        T1.CUST_TYPE as custTypes,
         T1.DATA_DATE as dataDate,
         T1.DOM_DOC_FLAG as domDocFlag,
         T1.EDATE as edate,
@@ -28,13 +28,13 @@
         T1.GL_ACCOUNT_ID as glAccountId,
         T1.INT_ADJ as intAdj,
         T1.INT_ADJ_ACCOUNT as intAdjAccount,
-        T1.INVEST_INDUSTRY_CD as investIndustryCd,
+        T1.INVEST_INDUSTRY_CD as investIndustryCds,
         T1.INVEST_INDUSTRY_CD_1 as investIndustryCd1,
         T1.INVEST_INDUSTRY_CD_2 as investIndustryCd2,
         T1.INVEST_INDUSTRY_CD_3 as investIndustryCd3,
         T1.LOAN_REFERENCE_NO as loanReferenceNo,
         T1.MAT_DT as matDt,
-        T1.MGMT_BRANCH_NO as mgmtBranchNo,
+        T1.MGMT_BRANCH_NO as mgmtBranchNos,
         T1.ON_OFF_FLAG as onOffFlag,
         T1.OPENING_BANK as openingBank,
         T1.OPENING_BANKNO as openingBankno,
@@ -64,19 +64,19 @@
         T12.NOUNNAME AS domDocFlagId,
         T13.ORGNAME AS orgname1,
         T14.ORGNAME AS orgname2
-        from  RWA_BUS_IT_FC_LOAN T1
+        from  RWA_BDM_BUS_IT_FC_LOAN T1
         LEFT JOIN SYS_NOUN T2
         ON T1.CCY_CD =T2.NOUNVALUE
-        AND T2.NOUNVALUE ='currCd'
+        AND T2.NOUNITEM ='currCd'
         LEFT JOIN SYS_NOUN T3
         ON T1.FIVE_CLASS_CD =T3.NOUNVALUE
-        AND T3.NOUNVALUE ='FIVECLASS'
+        AND T3.NOUNITEM ='FIVECLASS'
         LEFT JOIN SYS_NOUN T4
         ON T1.ON_OFF_FLAG =T4.NOUNVALUE
-        AND T4.NOUNVALUE ='ONOROFF'
+        AND T4.NOUNITEM ='ONOROFF'
         LEFT JOIN SYS_NOUN T5
         ON T1.BOOK_TYPE_CD =T5.NOUNVALUE
-        AND T5.NOUNSUPER ='ACCOUNT_TYPE'
+        AND T5.NOUNITEM ='ACCOUNT_TYPE'
         LEFT JOIN SYS_NOUN T6
         ON T1.INVEST_INDUSTRY_CD =T6.NOUNVALUE
         AND t6.NOUNITEM='interIndustry'
@@ -91,13 +91,13 @@
         AND T9.NOUNITEM ='interIndustry'
         LEFT JOIN SYS_NOUN T10
         ON T1.CUST_TYPE =T10.NOUNVALUE
-        AND T10.NOUNSUPER ='CUST_TYPE_LV01'
+        AND T10.NOUNITEM ='CUST_TYPE_LV01'
         LEFT JOIN SYS_NOUN T11
         ON T1.PROP_DEVEL_PROJ_TYPE_CD =T11.NOUNVALUE
-        AND T11.NOUNSUPER ='REAL_ESTATE_PROJECT_TYPE'
+        AND T11.NOUNITEM ='REAL_ESTATE_PROJECT_TYPE'
         LEFT JOIN SYS_NOUN T12
         ON T1.DOM_DOC_FLAG =T12.NOUNVALUE
-        AND T12.NOUNSUPER ='YESORNO'
+        AND T12.NOUNITEM ='YESORNO'
         LEFT JOIN sys_organization T13
         ON T13.ORGCODE = T1.FIN_BRANCH_NO
         LEFT JOIN sys_organization T14
@@ -143,4 +143,106 @@
         </if>
         order by LOAN_REFERENCE_NO asc
     </select>
+    <select id="getFcLoan1" resultType="com.sundata.product.rwa.parameter.model.FcLoanModel">
+        select
+        T1.ACCR_INT as accrInt,
+        T1.ACCR_INT_ACCOUNT as accrIntAccount,
+        T1.AMOUNT as amount,
+        T1.BALANCE as balance,
+        T1.BOOK_TYPE_CD as bookTypeCd,
+        concat(substr(T1.BP_CUST_NO,1,6),'*') as bpCustNo,
+        T1.BUS_LINE as busLine,
+        T1.CALCINDEX as calcindex,
+        T1.CCY_CD as ccyCd,
+        T1.CONT_NO as contNo,
+        T1.CUST_NAME as custName,
+        concat(substr(T1.CUST_NO,1,6),'*') as custNo,
+        T1.CUST_TYPE as custType,
+        T1.DATA_DATE as dataDate,
+        T1.DOM_DOC_FLAG as domDocFlag,
+        T1.EDATE as edate,
+        T1.FAIR_VAL_ACCOUNT as fairValAccount,
+        T1.FAIR_VALUE_CHANGE as fairValueChange,
+        T1.FIN_BRANCH_NO as finBranchNo,
+        T1.FIVE_CLASS_CD as fiveClassCd,
+        T1.GL_ACCOUNT_ID as glAccountId,
+        T1.INT_ADJ as intAdj,
+        T1.INT_ADJ_ACCOUNT as intAdjAccount,
+        T1.INVEST_INDUSTRY_CD as investIndustryCd,
+        T1.INVEST_INDUSTRY_CD_1 as investIndustryCd1,
+        T1.INVEST_INDUSTRY_CD_2 as investIndustryCd2,
+        T1.INVEST_INDUSTRY_CD_3 as investIndustryCd3,
+        T1.LOAN_REFERENCE_NO as loanReferenceNo,
+        T1.MAT_DT as matDt,
+        T1.MGMT_BRANCH_NO as mgmtBranchNo,
+        T1.ON_OFF_FLAG as onOffFlag,
+        T1.OPENING_BANK as openingBank,
+        T1.OPENING_BANKNO as openingBankno,
+        T1.OVERDUE_DAYS as overdueDays,
+        T1.PRODUCT_NAME as productName,
+        T1.PRODUCT_NO as productNo,
+        T1.PROP_DEVEL_PROJ_TYPE_CD as propDevelProjTypeCd,
+        T1.QUALIFIED_APPROVAL_PROCEDURE as qualifiedApprovalProcedure,
+        T1.REC_INT as recInt,
+        T1.REC_INT_ACCOUNT as recIntAccount,
+        T1.reconstruction_FLAG as reconstructionFlag,
+        T1.RESERVE as reserve,
+        T1.RESERVE_ACCOUNT as reserveAccount,
+        T1.SDATE as sdate,
+        T1.START_DT as startDt,
+        T1.TERM as term,
+        T2.NOUNNAME AS ccyCdId,
+        T3.NOUNNAME AS fiveClassCdId,
+        T4.NOUNNAME AS onOffFlagId,
+        T5.NOUNNAME AS bookTypeCdId,
+        T6.NOUNNAME AS investIndustryCdId,
+        T7.NOUNNAME AS investIndustryCd1Id,
+        T8.NOUNNAME AS investIndustryCd2Id,
+        T9.NOUNNAME AS investIndustryCd3Id,
+        T10.NOUNNAME AS custTypeId,
+        T11.NOUNNAME AS propDevelProjTypeCdId,
+        T12.NOUNNAME AS domDocFlagId,
+        T13.ORGNAME AS orgname1,
+        T14.ORGNAME AS orgname2
+        from  RWA_BDM_BUS_IT_FC_LOAN T1
+        LEFT JOIN SYS_NOUN T2
+        ON T1.CCY_CD =T2.NOUNVALUE
+        AND T2.NOUNITEM ='currCd'
+        LEFT JOIN SYS_NOUN T3
+        ON T1.FIVE_CLASS_CD =T3.NOUNVALUE
+        AND T3.NOUNITEM ='FIVECLASS'
+        LEFT JOIN SYS_NOUN T4
+        ON T1.ON_OFF_FLAG =T4.NOUNVALUE
+        AND T4.NOUNITEM ='ONOROFF'
+        LEFT JOIN SYS_NOUN T5
+        ON T1.BOOK_TYPE_CD =T5.NOUNVALUE
+        AND T5.NOUNITEM ='ACCOUNT_TYPE'
+        LEFT JOIN SYS_NOUN T6
+        ON T1.INVEST_INDUSTRY_CD =T6.NOUNVALUE
+        AND t6.NOUNITEM='interIndustry'
+        LEFT JOIN SYS_NOUN T7
+        ON T1.INVEST_INDUSTRY_CD_1 =T7.NOUNVALUE
+        AND T7.NOUNITEM ='interIndustry'
+        LEFT JOIN SYS_NOUN T8
+        ON T1.INVEST_INDUSTRY_CD_2 =T8.NOUNVALUE
+        AND T8.NOUNITEM ='interIndustry'
+        LEFT JOIN SYS_NOUN T9
+        ON T1.INVEST_INDUSTRY_CD_3 =T9.NOUNVALUE
+        AND T9.NOUNITEM ='interIndustry'
+        LEFT JOIN SYS_NOUN T10
+        ON T1.CUST_TYPE =T10.NOUNVALUE
+        AND T10.NOUNITEM ='CUST_TYPE_LV01'
+        LEFT JOIN SYS_NOUN T11
+        ON T1.PROP_DEVEL_PROJ_TYPE_CD =T11.NOUNVALUE
+        AND T11.NOUNITEM ='REAL_ESTATE_PROJECT_TYPE'
+        LEFT JOIN SYS_NOUN T12
+        ON T1.DOM_DOC_FLAG =T12.NOUNVALUE
+        AND T12.NOUNITEM ='YESORNO'
+        LEFT JOIN sys_organization T13
+        ON T13.ORGCODE = T1.FIN_BRANCH_NO
+        LEFT JOIN sys_organization T14
+        ON T1.MGMT_BRANCH_NO = T14.ORGCODE
+        where 1=1
+        and (GL_ACCOUNT_ID =#{subjectNumber} or FAIR_VAL_ACCOUNT =#{subjectNumber} or INT_ADJ_ACCOUNT =#{subjectNumber} or REC_INT_ACCOUNT =#{subjectNumber} or ACCR_INT_ACCOUNT =#{subjectNumber})
+    </select>
 </mapper>

+ 66 - 40
Procedure/backend/project/out/production/project/com/sundata/product/rwa/parameter/mybatis/FcOffSheetMapper.xml

@@ -5,46 +5,72 @@
 <mapper namespace="com.sundata.product.rwa.parameter.mapper.FcOffSheetMapper">
     <select id="fcOffSheet" resultType="com.sundata.product.rwa.parameter.model.FcOffSheetModel">
         select
-         ACCR_INT as accrInt
-        ,ACCR_INT_ACCOUNT as accrIntAccount
-        ,BAL_ACCOUNT as balAccount
-        ,BALANCE as balance
-        ,BILL_NO as billNo
-        ,BOOK_TYPE as bookType
-        ,BP_CUST_NO as bpCustNo
-        ,CALCINDEX as calcindex
-        ,CCY_CD as ccyCd
-        ,CONTRACT_NO as contractNo
-        ,CUST_NAME as custName
-        ,CUST_NO as custNo
-        ,DATA_DATE as dataDate
-        ,DOM_DOC_FLAG as domDocFlag
-        ,DOM_INTE_FLAG as domInteFlag
-        ,EDATE as edate
-        ,FAIR_VAL_ACCOUNT as fairValAccount
-        ,FAIR_VALUE_CHANGE as fairValueChange
-        ,FIN_BRANCH_NO as finBranchNo
-        ,FIVE_CLASS_CD as fiveClassCd
-        ,INT_ADJ as intAdj
-        ,INT_ADJ_ACCOUNT as intAdjAccount
-        ,LC_EXPI_DT as lcExpiDt
-        ,LG_TYPE as lgType
-        ,LOAN_REFERENCE_NO as loanReferenceNo
-        ,MAT_DT as matDt
-        ,MGMT_BRANCH_NO as mgmtBranchNo
-        ,ON_OFF_FLAG as onOffFlag
-        ,OPENING_DT as openingDt
-        ,PRODUCT_NAME as productName
-        ,PRODUCT_NO as productNo
-        ,REC_INT as recInt
-        ,REC_INT_ACCOUNT as recIntAccount
-        ,RESERVE as reserve
-        ,RESERVE_ACCOUNT as reserveAccount
-        ,SDATE as sdate
-        ,START_DT as startDt
-        ,TERM as term
-        ,TRADE_TYPE_CD as tradeTypeCd
-        from  RWA_BUS_IT_FC_OFF_SHEET
+         T1.ACCR_INT as accrInt
+        ,T1.ACCR_INT_ACCOUNT as accrIntAccount
+        ,T1.BAL_ACCOUNT as balAccount
+        ,T1.BALANCE as balance
+        ,T1.BILL_NO as billNo
+        ,T1.BOOK_TYPE as bookType
+        ,T1.BP_CUST_NO as bpCustNo
+        ,T1.CALCINDEX as calcindex
+        ,T1.CCY_CD as ccyCd
+        ,T1.CONTRACT_NO as contractNo
+        ,T1.CUST_NAME as custName
+        ,T1.CUST_NO as custNo
+        ,T1.DATA_DATE as dataDate
+        ,T1.DOM_DOC_FLAG as domDocFlag
+        ,T1.DOM_INTE_FLAG as domInteFlag
+        ,T1.EDATE as edate
+        ,T1.FAIR_VAL_ACCOUNT as fairValAccount
+        ,T1.FAIR_VALUE_CHANGE as fairValueChange
+        ,T1.FIN_BRANCH_NO as finBranchNo
+        ,T1.FIVE_CLASS_CD as fiveClassCd
+        ,T1.INT_ADJ as intAdj
+        ,T1.INT_ADJ_ACCOUNT as intAdjAccount
+        ,T1.LC_EXPI_DT as lcExpiDt
+        ,T1.LG_TYPE as lgType
+        ,T1.LOAN_REFERENCE_NO as loanReferenceNo
+        ,T1.MAT_DT as matDt
+        ,T1.MGMT_BRANCH_NO as mgmtBranchNo
+        ,T1.ON_OFF_FLAG as onOffFlag
+        ,T1.OPENING_DT as openingDt
+        ,T1.PRODUCT_NAME as productName
+        ,T1.PRODUCT_NO as productNo
+        ,T1.REC_INT as recInt
+        ,T1.REC_INT_ACCOUNT as recIntAccount
+        ,T1.RESERVE as reserve
+        ,T1.RESERVE_ACCOUNT as reserveAccount
+        ,T1.SDATE as sdate
+        ,T1.START_DT as startDt
+        ,T1.TERM as term
+        ,T1.TRADE_TYPE_CD as tradeTypeCd
+        ,T2.NOUNNAME  AS ccyCdId
+        ,T3.NOUNNAME  AS dataDateId
+        ,T4.NOUNNAME  AS onOffFlagId
+        ,T5.NOUNNAME  AS bookTypeId
+        ,T6.NOUNNAME  AS lgTypeId
+        ,T7.NOUNNAME  AS domDocFlagId
+        ,T8.NOUNNAME  AS domInteFlagId
+        ,T9.NOUNNAME  AS intAdjAccountId
+        ,T10.NOUNNAME  AS billNoId
+        ,T11.NOUNNAME  AS dataDateId
+        ,T12.ORGNAME AS orgname1
+        ,T13.ORGNAME AS orgname2
+        from  RWA_BUS_IT_FC_OFF_SHEET T1
+        LEFT JOIN SYS_NOUN  T2  ON T1.CCY_CD =T2.NOUNVALUE  AND  T2.NOUNITEM ='currCd'
+        LEFT JOIN SYS_NOUN  T3  ON T1.DATA_DATE =T3.NOUNVALUE  AND  T3.NOUNITEM ='FIVECLASS'
+        LEFT JOIN SYS_NOUN  T4  ON T1.ON_OFF_FLAG =T4.NOUNVALUE  AND  T4.NOUNITEM ='ONOROFF'
+        LEFT JOIN SYS_NOUN  T5  ON T1.BOOK_TYPE =T5.NOUNVALUE  AND  T5.NOUNITEM ='ACCOUNT_TYPE'
+        LEFT JOIN SYS_NOUN  T6  ON T1.LG_TYPE =T6.NOUNVALUE  AND  T6.NOUNITEM ='FINANCING_NULLOROTHER'
+        LEFT JOIN SYS_NOUN  T7  ON T1.DOM_DOC_FLAG =T7.NOUNVALUE  AND  T7.NOUNITEM ='YESORNO'
+        LEFT JOIN SYS_NOUN  T8  ON T1.DOM_INTE_FLAG =T8.NOUNVALUE  AND  T8.NOUNITEM ='DOF'
+        LEFT JOIN SYS_NOUN  T9  ON T1.INT_ADJ_ACCOUNT =T9.NOUNVALUE  AND  T9.NOUNITEM ='TRADE_TYPE'
+        LEFT JOIN SYS_NOUN  T10  ON T1.BILL_NO =T10.NOUNVALUE  AND  T10.NOUNITEM ='BILL_TYPE'
+        LEFT JOIN SYS_NOUN  T11  ON T1.DATA_DATE =T11.NOUNVALUE  AND  T11.NOUNITEM ='暂时为空'
+        LEFT JOIN sys_organization T12
+        ON T12.ORGCODE = T1.FIN_BRANCH_NO
+        LEFT JOIN sys_organization T13
+        ON T1.MGMT_BRANCH_NO = T13.ORGCODE
         where 1=1
         <if test="dataDate !='' and dataDate!=null">
             and DATA_DATE = replace(#{dataDate},'-','')

+ 2 - 2
Procedure/backend/project/out/production/project/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/mybatis/InfoListMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundata.product.rwa.rwaCalcConfig002offbalanceprotype.mapper.InfoListMapper">
     <select id="getFunTree1" resultType="com.sundata.admin.nounmanage.model.DictContent">
-         select OFFOBJECT_NO as id ,OFFOBJECT_NAME as text ,OFFOBJECT_SUPER as parentid
+         select OFFOBJECT_NO as id ,OFFOBJECT_NAME as text ,OFFOBJECT_SUPER as parentid,YESORNO as attributes
         from RWA_CALC_CONF_OFFBALANCEPROTYPE
         order by OFFOBJECT_SUPER,OFFOBJECT_NO
     </select>
@@ -41,7 +41,7 @@
         f.OFFOBJECT_SUPER as offobjectSuper,
         f.ISMINI as ismini,
         f.CCF as ccf,
-        case when f.YESORNO ='1' then '生效' else '失效' end  as yesorno,
+        case when f.YESORNO ='1' then '生效' when f.YESORNO ='0' then '失效' else f.YESORNO  end  as yesorno,
         (select OFFOBJECT_NAME from RWA_CALC_CONF_OFFBALANCEPROTYPE where OFFOBJECT_NO=f.OFFOBJECT_SUPER) as offobjectSuperName
         from RWA_CALC_CONF_OFFBALANCEPROTYPE f
         where f.OFFOBJECT_NO = #{offobjectNo}

+ 32 - 13
Procedure/backend/project/out/production/project/com/sundata/product/rwa/rwaCalcConfigDataparam/mybatis/ProductListMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sundata.product.rwa.rwaCalcConfigDataparam.mapper.ProductListMapper">
-    <select id="productlist" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel">
+<mapper namespace="com.sundata.product.rwa.rwacalcconfigdataparam.mapper.ProductListMapper">
+    <select id="productlist" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
         select
              CALCINDEX as calcindex,
              SDATE as sdate,
@@ -33,7 +33,7 @@
         </if>
     </select>
 
-    <select id="productlist1" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <select id="productlist1" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         select
               CALCINDEX as calcindex,
               DATA_DATE as dataDate,
@@ -65,7 +65,7 @@
 <!--        </if>-->
     </select>
 
-    <select id="product_modifyone" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <select id="product_modifyone" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         select
              CALCINDEX as calcindex,
              DATA_DATE as dataDate,
@@ -88,7 +88,7 @@
 
     </select>
 
-    <select id="product_modifyone1" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel">
+    <select id="product_modifyone1" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
         select
               CALCINDEX as calcindex,
               SDATE as sdate,
@@ -110,7 +110,7 @@
             and PRODUCT_NO =#{productNo}
     </select>
 
-    <select id="product_modifyone2" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <select id="product_modifyone2" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         select
               CALCINDEX as calcindex,
               DATA_DATE as dataDate,
@@ -132,22 +132,22 @@
               and PRODUCT_NO =#{productNo}
     </select>
 
-    <delete id="product_deleteone" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel">
+    <delete id="product_deleteone" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
         delete from RWA_CALC_CONF_PRODUCT where PRODUCT_NO =#{productNo}
     </delete>
 
-    <delete id="product_deleteone1" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <delete id="product_deleteone1" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         delete from RWA_CALC_CONF_PRODUCTRULES where RULE_CODE =#{ruleCode}
     </delete>
-    <delete id="product_deleteone2" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel">
+    <delete id="product_deleteone2" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
         delete from RWA_CALC_CONF_PRODUCTRULES  where (PRODUCT_NO =#{productNo} or PRODUCT_NO is null)
     </delete>
 
-    <insert id="product_addone" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel">
+    <insert id="product_addone" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
         INSERT INTO RWA_CALC_CONF_PRODUCT(CALCINDEX,SDATE,EDATE,TERM,DATA_DATE,PRODUCT_NO,PRODUCT_NAME,PRODUCT_TYPE,PRODUCT_BUSSINESS_CODE,PRODUCT_STAGE_ID,PRODUCT_INDEX,PRODUCT_FROM_SYSTEM,DEFAULT_GETDATARULE,DEFAULT_OUT)
         VALUES(#{calcindex},#{sdate},#{edate},#{term},#{dataDate},#{productNo},#{productName},#{productType},#{productBussinessCode},#{productStageId},#{productIndex},#{productFromSystem},#{defaultGetdatarule},#{defaultOut})
     </insert>
-    <insert id="product_addone1" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <insert id="product_addone1" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         INSERT INTO RWA_CALC_CONF_PRODUCTRULES (CALCINDEX,SDATE,EDATE,TERM,DATA_DATE,PRODUCT_NO,RULE_CODE,RULE_NAME,RULE_INDEX,DATA_TYPE,RULE_SUBJECT,RULE_IN,RULE_OUT,RULE_GETDATA)
         VALUES
         <foreach collection="list" item="item" index="index" open="(" separator="),(" close=")">
@@ -155,12 +155,12 @@
         </foreach>
     </insert>
 
-    <insert id="product_addone2" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <insert id="product_addone2" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         INSERT INTO RWA_CALC_CONF_PRODUCTRULES (CALCINDEX,SDATE,EDATE,TERM,DATA_DATE,PRODUCT_NO,RULE_CODE,RULE_NAME,RULE_INDEX,DATA_TYPE,RULE_SUBJECT,RULE_IN,RULE_OUT,RULE_GETDATA)
         VALUES(#{calcindex},#{sdate},#{edate},#{term},#{dataDate},#{productNo},#{ruleCode},#{ruleName},#{ruleIndex},#{dataType},#{ruleSubject},#{ruleIn},#{ruleOut},#{ruleGetdata})
     </insert>
 
-    <select id="select" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfOffbalanceprotyperuleModel">
+    <select id="select" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfOffbalanceprotyperuleModel">
         select
         T1.OFFOBJECT_NO as offobjectNo,
         T1.RULE_NAME as ruleName,
@@ -177,4 +177,23 @@
         ON T2.OFFOBJECT_NO =T1.OFFOBJECT_NO
         where T1.OFFOBJECT_NO =#{productNo}
     </select>
+
+<select id="selectRiskList" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RiskListModel">
+        select
+        T1.RULE_NAME            AS ruleName,
+        T1.RULE_NO              AS ruleCode,
+        T1.RISKEXPOSURE_NO      AS riskExposureCode,
+        T2.RISKEXPOSURE_NAME    AS riskExposureName,
+        T1.RULE_GETDATA         AS classRiskRule,
+        T2.RISKEXPOSURE_WEIGHT  AS riskWeight
+        FROM RWA_CALC_CONF_RISKEXPOSURERULE T1
+        LEFT JOIN RWA_CALC_CONF_RISKEXPOSURE T2
+        ON T1.RISKEXPOSURE_NO = T2.RISKEXPOSURE_NO
+        <where>
+            <if test="productNo != null and productNo != '' ">
+                T1.RULE_PRODUCT_NO = #{productNo}
+            </if>
+        </where>
+    </select>
+
 </mapper>

+ 4 - 4
Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/action/FcLoanAction.java

@@ -34,12 +34,12 @@ public class FcLoanAction  extends BaseAction {
         //sendData(response,sql );
     }
     @RequestMapping("/getFcLoan1")
-    public void getFcLoan1(HttpServletRequest request, HttpServletResponse response, @RequestParam String loanReferenceNo){
+    public void getFcLoan1(HttpServletRequest request, HttpServletResponse response, @RequestParam String subjectNumber){
 
 
-        System.out.println(loanReferenceNo);
-        //sql=sql.replace("${","#").replace("}","#");
-        //sendData(response,sql );
+        System.out.println(subjectNumber);
+
+        sendData(response,fcLoanService.getFcLoan1(subjectNumber) );
     }
     @RequestMapping("/exportExcelModel")
     public void exportExcelModel (HttpServletRequest request,

+ 2 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mapper/FcLoanMapper.java

@@ -2,9 +2,11 @@ package com.sundata.product.rwa.parameter.mapper;
 
 import com.sundata.product.rwa.parameter.model.FcLoanModel;
 import com.sundata.product.rwa.parameter.model.SovereignModel;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface FcLoanMapper {
     public List<FcLoanModel> fcLoan(FcLoanModel fcLoanModelDemoFr);
+    public List<FcLoanModel>getFcLoan1(@Param("subjectNumber") String subjectNumber);
 }

+ 18 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/model/FcCommitmentModel.java

@@ -9,6 +9,7 @@ public class FcCommitmentModel {
     private String  bookTypeCd;  // 账簿类型
     private String  bpCustNo;  // 核心客户号
     private String[]  busLine;  // 所属条线
+    private String  busLines;  // 所属条线
     private String  busType;  // 业务类型
     private String  calcindex;  // 计算实例号
     private String  ccyCd;  // 币种代码
@@ -23,6 +24,7 @@ public class FcCommitmentModel {
     private String  loanReferenceNo;  // 债项编号
     private String  matDt;  // 到期日
     private List<String> mgmtBranchNo;  // 经营机构编号
+    private String  mgmtBranchNos;  // 经营机构编号
     private String  onOffFlag;  // 表内外标识
     private String  productName;  // 产品名称
     private String  productNo;  // 产品编号
@@ -43,6 +45,22 @@ public class FcCommitmentModel {
     private String  orgname2;  //
 
 
+    public String getMgmtBranchNos() {
+        return mgmtBranchNos;
+    }
+
+    public void setMgmtBranchNos(String mgmtBranchNos) {
+        this.mgmtBranchNos = mgmtBranchNos;
+    }
+
+    public String getBusLines() {
+        return busLines;
+    }
+
+    public void setBusLines(String busLines) {
+        this.busLines = busLines;
+    }
+
     public String getBalAccount() {
         return balAccount;
     }

+ 36 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/model/FcLoanModel.java

@@ -10,12 +10,14 @@ public class FcLoanModel {
     private String  bookTypeCd;  // 账簿类型
     private String  bpCustNo;  // 核心客户号
     private String[]  busLine;  // 所属条线
+    private String  busLines;  // 所属条线
     private String  calcindex;  // 计算实例号
     private String  ccyCd;  // 币种代码
     private String  contNo;  // 借款合同编号
     private String  custName;  // 客户名称
     private String  custNo;  // 客户编号
     private String[]  custType;  // 客户类型
+    private String  custTypes;  // 客户类型
     private String  dataDate;  // 数据日期
     private String  domDocFlag;  // 跨境货物贸易标志
     private String  edate;  // 截止数据日期
@@ -27,12 +29,14 @@ public class FcLoanModel {
     private BigDecimal  intAdj;  // 利息调整
     private String  intAdjAccount;  // 利息调整科目号
     private String[]  investIndustryCd;  // 行业投向门类
+    private String  investIndustryCds;  // 行业投向门类
     private String  investIndustryCd1;  // 行业投向大类
     private String  investIndustryCd2;  // 行业投向中类
     private String  investIndustryCd3;  // 行业投向子类
     private String  loanReferenceNo;  // 债项编号
     private String  matDt;  // 到期日
     private String[]  mgmtBranchNo;  // 经营机构编号
+    private String  mgmtBranchNos;  // 经营机构编号
     private String  onOffFlag;  // 表内外标识
     private String  openingBank;  // 开证行名称
     private String  openingBankno;  // 开证行行号
@@ -64,6 +68,38 @@ public class FcLoanModel {
     private String  orgname1;
     private String  orgname2;
 
+    public String getBusLines() {
+        return busLines;
+    }
+
+    public void setBusLines(String busLines) {
+        this.busLines = busLines;
+    }
+
+    public String getCustTypes() {
+        return custTypes;
+    }
+
+    public void setCustTypes(String custTypes) {
+        this.custTypes = custTypes;
+    }
+
+    public String getInvestIndustryCds() {
+        return investIndustryCds;
+    }
+
+    public void setInvestIndustryCds(String investIndustryCds) {
+        this.investIndustryCds = investIndustryCds;
+    }
+
+    public String getMgmtBranchNos() {
+        return mgmtBranchNos;
+    }
+
+    public void setMgmtBranchNos(String mgmtBranchNos) {
+        this.mgmtBranchNos = mgmtBranchNos;
+    }
+
     public BigDecimal getAccrInt() {
         return accrInt;
     }

+ 141 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/model/FcOffSheetModel.java

@@ -29,6 +29,7 @@ public class FcOffSheetModel {
     private String  lgType;  // 融资性/非融资性标签
     private String  loanReferenceNo;  // 债项编号
     private String  matDt;  // 到期日
+    private String  mgmtBranchNos;  // 经营机构编号
     private String[]  mgmtBranchNo;  // 经营机构编号
     private String  onOffFlag;  // 表内外标识
     private String  openingDt;  // 开证日
@@ -41,7 +42,147 @@ public class FcOffSheetModel {
     private String  sdate;  // 起始数据日期
     private String  startDt;  // 生效日
     private String  term;  // 年月
+    private String  tradeTypeCds;  // 贸易类型代码
     private String[]  tradeTypeCd;  // 贸易类型代码
+    private   String  ccyCdId;
+    private   String  onOffFlagId;
+    private   String  propDevelProjTypeCdId;
+    private   String  orgname1;
+    private   String  custTypeId;
+    private   String  domDocFlagId;
+    private   String  qualifiedApprovalProcedureId;
+    private   String  busLineId;
+    private   String  fiveClassCdId;
+    private   String  investIndustryCdId;
+    private   String  investIndustryCd1Id;
+    private   String  investIndustryCd2Id;
+    private   String  investIndustryCd3Id;
+    private   String  bookTypeCdId;
+    private   String  orgname2;
+
+    public String[] getTradeTypeCd() {
+        return tradeTypeCd;
+    }
+
+    public String getCcyCdId() {
+        return ccyCdId;
+    }
+
+    public void setCcyCdId(String ccyCdId) {
+        this.ccyCdId = ccyCdId;
+    }
+
+    public String getOnOffFlagId() {
+        return onOffFlagId;
+    }
+
+    public void setOnOffFlagId(String onOffFlagId) {
+        this.onOffFlagId = onOffFlagId;
+    }
+
+    public String getPropDevelProjTypeCdId() {
+        return propDevelProjTypeCdId;
+    }
+
+    public void setPropDevelProjTypeCdId(String propDevelProjTypeCdId) {
+        this.propDevelProjTypeCdId = propDevelProjTypeCdId;
+    }
+
+    public String getOrgname1() {
+        return orgname1;
+    }
+
+    public void setOrgname1(String orgname1) {
+        this.orgname1 = orgname1;
+    }
+
+    public String getCustTypeId() {
+        return custTypeId;
+    }
+
+    public void setCustTypeId(String custTypeId) {
+        this.custTypeId = custTypeId;
+    }
+
+    public String getDomDocFlagId() {
+        return domDocFlagId;
+    }
+
+    public void setDomDocFlagId(String domDocFlagId) {
+        this.domDocFlagId = domDocFlagId;
+    }
+
+    public String getQualifiedApprovalProcedureId() {
+        return qualifiedApprovalProcedureId;
+    }
+
+    public void setQualifiedApprovalProcedureId(String qualifiedApprovalProcedureId) {
+        this.qualifiedApprovalProcedureId = qualifiedApprovalProcedureId;
+    }
+
+    public String getBusLineId() {
+        return busLineId;
+    }
+
+    public void setBusLineId(String busLineId) {
+        this.busLineId = busLineId;
+    }
+
+    public String getFiveClassCdId() {
+        return fiveClassCdId;
+    }
+
+    public void setFiveClassCdId(String fiveClassCdId) {
+        this.fiveClassCdId = fiveClassCdId;
+    }
+
+    public String getInvestIndustryCdId() {
+        return investIndustryCdId;
+    }
+
+    public void setInvestIndustryCdId(String investIndustryCdId) {
+        this.investIndustryCdId = investIndustryCdId;
+    }
+
+    public String getInvestIndustryCd1Id() {
+        return investIndustryCd1Id;
+    }
+
+    public void setInvestIndustryCd1Id(String investIndustryCd1Id) {
+        this.investIndustryCd1Id = investIndustryCd1Id;
+    }
+
+    public String getInvestIndustryCd2Id() {
+        return investIndustryCd2Id;
+    }
+
+    public void setInvestIndustryCd2Id(String investIndustryCd2Id) {
+        this.investIndustryCd2Id = investIndustryCd2Id;
+    }
+
+    public String getInvestIndustryCd3Id() {
+        return investIndustryCd3Id;
+    }
+
+    public void setInvestIndustryCd3Id(String investIndustryCd3Id) {
+        this.investIndustryCd3Id = investIndustryCd3Id;
+    }
+
+    public String getBookTypeCdId() {
+        return bookTypeCdId;
+    }
+
+    public void setBookTypeCdId(String bookTypeCdId) {
+        this.bookTypeCdId = bookTypeCdId;
+    }
+
+    public String getOrgname2() {
+        return orgname2;
+    }
+
+    public void setOrgname2(String orgname2) {
+        this.orgname2 = orgname2;
+    }
 
     public BigDecimal getAccrInt() {
         return accrInt;

+ 3 - 3
Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/FcCommitmentMapper.xml

@@ -9,7 +9,7 @@
         ,T1.BALANCE as balance
         ,T1.BOOK_TYPE_CD as bookTypeCd
         ,T1.BP_CUST_NO as bpCustNo
-        ,T1.BUS_LINE as busLine
+        ,T1.BUS_LINE as busLines
         ,T1.BUS_TYPE as busType
         ,T1.CALCINDEX as calcindex
         ,T1.CCY_CD as ccyCd
@@ -22,7 +22,7 @@
         ,T1.FIN_BRANCH_NO as finBranchNo
         ,T1.LOAN_REFERENCE_NO as loanReferenceNo
         ,T1.MAT_DT as matDt
-        ,T1.MGMT_BRANCH_NO as mgmtBranchNo
+        ,T1.MGMT_BRANCH_NO as mgmtBranchNos
         ,T1.ON_OFF_FLAG as onOffFlag
         ,T1.PRODUCT_NAME as productName
         ,T1.PRODUCT_NO as productNo
@@ -32,7 +32,7 @@
         ,T1.SDATE as sdate
         ,T1.START_DT as startDt
         ,T1.TERM as term
-        ,T1.CUST_TYPE as custType
+        ,T1.CUST_TYPE as custTypes
         ,T2.NOUNNAME as ccyCdId
         ,T3.NOUNNAME as commTypeId
         ,T4.NOUNNAME as onOffFlagId

+ 114 - 12
Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/FcLoanMapper.xml

@@ -11,13 +11,13 @@
         T1.BALANCE as balance,
         T1.BOOK_TYPE_CD as bookTypeCd,
         T1.BP_CUST_NO as bpCustNo,
-        T1.BUS_LINE as busLine,
+        T1.BUS_LINE as busLines,
         T1.CALCINDEX as calcindex,
         T1.CCY_CD as ccyCd,
         T1.CONT_NO as contNo,
         T1.CUST_NAME as custName,
         T1.CUST_NO as custNo,
-        T1.CUST_TYPE as custType,
+        T1.CUST_TYPE as custTypes,
         T1.DATA_DATE as dataDate,
         T1.DOM_DOC_FLAG as domDocFlag,
         T1.EDATE as edate,
@@ -28,13 +28,13 @@
         T1.GL_ACCOUNT_ID as glAccountId,
         T1.INT_ADJ as intAdj,
         T1.INT_ADJ_ACCOUNT as intAdjAccount,
-        T1.INVEST_INDUSTRY_CD as investIndustryCd,
+        T1.INVEST_INDUSTRY_CD as investIndustryCds,
         T1.INVEST_INDUSTRY_CD_1 as investIndustryCd1,
         T1.INVEST_INDUSTRY_CD_2 as investIndustryCd2,
         T1.INVEST_INDUSTRY_CD_3 as investIndustryCd3,
         T1.LOAN_REFERENCE_NO as loanReferenceNo,
         T1.MAT_DT as matDt,
-        T1.MGMT_BRANCH_NO as mgmtBranchNo,
+        T1.MGMT_BRANCH_NO as mgmtBranchNos,
         T1.ON_OFF_FLAG as onOffFlag,
         T1.OPENING_BANK as openingBank,
         T1.OPENING_BANKNO as openingBankno,
@@ -64,19 +64,19 @@
         T12.NOUNNAME AS domDocFlagId,
         T13.ORGNAME AS orgname1,
         T14.ORGNAME AS orgname2
-        from  RWA_BUS_IT_FC_LOAN T1
+        from  RWA_BDM_BUS_IT_FC_LOAN T1
         LEFT JOIN SYS_NOUN T2
         ON T1.CCY_CD =T2.NOUNVALUE
-        AND T2.NOUNVALUE ='currCd'
+        AND T2.NOUNITEM ='currCd'
         LEFT JOIN SYS_NOUN T3
         ON T1.FIVE_CLASS_CD =T3.NOUNVALUE
-        AND T3.NOUNVALUE ='FIVECLASS'
+        AND T3.NOUNITEM ='FIVECLASS'
         LEFT JOIN SYS_NOUN T4
         ON T1.ON_OFF_FLAG =T4.NOUNVALUE
-        AND T4.NOUNVALUE ='ONOROFF'
+        AND T4.NOUNITEM ='ONOROFF'
         LEFT JOIN SYS_NOUN T5
         ON T1.BOOK_TYPE_CD =T5.NOUNVALUE
-        AND T5.NOUNSUPER ='ACCOUNT_TYPE'
+        AND T5.NOUNITEM ='ACCOUNT_TYPE'
         LEFT JOIN SYS_NOUN T6
         ON T1.INVEST_INDUSTRY_CD =T6.NOUNVALUE
         AND t6.NOUNITEM='interIndustry'
@@ -91,13 +91,13 @@
         AND T9.NOUNITEM ='interIndustry'
         LEFT JOIN SYS_NOUN T10
         ON T1.CUST_TYPE =T10.NOUNVALUE
-        AND T10.NOUNSUPER ='CUST_TYPE_LV01'
+        AND T10.NOUNITEM ='CUST_TYPE_LV01'
         LEFT JOIN SYS_NOUN T11
         ON T1.PROP_DEVEL_PROJ_TYPE_CD =T11.NOUNVALUE
-        AND T11.NOUNSUPER ='REAL_ESTATE_PROJECT_TYPE'
+        AND T11.NOUNITEM ='REAL_ESTATE_PROJECT_TYPE'
         LEFT JOIN SYS_NOUN T12
         ON T1.DOM_DOC_FLAG =T12.NOUNVALUE
-        AND T12.NOUNSUPER ='YESORNO'
+        AND T12.NOUNITEM ='YESORNO'
         LEFT JOIN sys_organization T13
         ON T13.ORGCODE = T1.FIN_BRANCH_NO
         LEFT JOIN sys_organization T14
@@ -143,4 +143,106 @@
         </if>
         order by LOAN_REFERENCE_NO asc
     </select>
+    <select id="getFcLoan1" resultType="com.sundata.product.rwa.parameter.model.FcLoanModel">
+        select
+        T1.ACCR_INT as accrInt,
+        T1.ACCR_INT_ACCOUNT as accrIntAccount,
+        T1.AMOUNT as amount,
+        T1.BALANCE as balance,
+        T1.BOOK_TYPE_CD as bookTypeCd,
+        concat(substr(T1.BP_CUST_NO,1,6),'*') as bpCustNo,
+        T1.BUS_LINE as busLine,
+        T1.CALCINDEX as calcindex,
+        T1.CCY_CD as ccyCd,
+        T1.CONT_NO as contNo,
+        T1.CUST_NAME as custName,
+        concat(substr(T1.CUST_NO,1,6),'*') as custNo,
+        T1.CUST_TYPE as custType,
+        T1.DATA_DATE as dataDate,
+        T1.DOM_DOC_FLAG as domDocFlag,
+        T1.EDATE as edate,
+        T1.FAIR_VAL_ACCOUNT as fairValAccount,
+        T1.FAIR_VALUE_CHANGE as fairValueChange,
+        T1.FIN_BRANCH_NO as finBranchNo,
+        T1.FIVE_CLASS_CD as fiveClassCd,
+        T1.GL_ACCOUNT_ID as glAccountId,
+        T1.INT_ADJ as intAdj,
+        T1.INT_ADJ_ACCOUNT as intAdjAccount,
+        T1.INVEST_INDUSTRY_CD as investIndustryCd,
+        T1.INVEST_INDUSTRY_CD_1 as investIndustryCd1,
+        T1.INVEST_INDUSTRY_CD_2 as investIndustryCd2,
+        T1.INVEST_INDUSTRY_CD_3 as investIndustryCd3,
+        T1.LOAN_REFERENCE_NO as loanReferenceNo,
+        T1.MAT_DT as matDt,
+        T1.MGMT_BRANCH_NO as mgmtBranchNo,
+        T1.ON_OFF_FLAG as onOffFlag,
+        T1.OPENING_BANK as openingBank,
+        T1.OPENING_BANKNO as openingBankno,
+        T1.OVERDUE_DAYS as overdueDays,
+        T1.PRODUCT_NAME as productName,
+        T1.PRODUCT_NO as productNo,
+        T1.PROP_DEVEL_PROJ_TYPE_CD as propDevelProjTypeCd,
+        T1.QUALIFIED_APPROVAL_PROCEDURE as qualifiedApprovalProcedure,
+        T1.REC_INT as recInt,
+        T1.REC_INT_ACCOUNT as recIntAccount,
+        T1.reconstruction_FLAG as reconstructionFlag,
+        T1.RESERVE as reserve,
+        T1.RESERVE_ACCOUNT as reserveAccount,
+        T1.SDATE as sdate,
+        T1.START_DT as startDt,
+        T1.TERM as term,
+        T2.NOUNNAME AS ccyCdId,
+        T3.NOUNNAME AS fiveClassCdId,
+        T4.NOUNNAME AS onOffFlagId,
+        T5.NOUNNAME AS bookTypeCdId,
+        T6.NOUNNAME AS investIndustryCdId,
+        T7.NOUNNAME AS investIndustryCd1Id,
+        T8.NOUNNAME AS investIndustryCd2Id,
+        T9.NOUNNAME AS investIndustryCd3Id,
+        T10.NOUNNAME AS custTypeId,
+        T11.NOUNNAME AS propDevelProjTypeCdId,
+        T12.NOUNNAME AS domDocFlagId,
+        T13.ORGNAME AS orgname1,
+        T14.ORGNAME AS orgname2
+        from  RWA_BDM_BUS_IT_FC_LOAN T1
+        LEFT JOIN SYS_NOUN T2
+        ON T1.CCY_CD =T2.NOUNVALUE
+        AND T2.NOUNITEM ='currCd'
+        LEFT JOIN SYS_NOUN T3
+        ON T1.FIVE_CLASS_CD =T3.NOUNVALUE
+        AND T3.NOUNITEM ='FIVECLASS'
+        LEFT JOIN SYS_NOUN T4
+        ON T1.ON_OFF_FLAG =T4.NOUNVALUE
+        AND T4.NOUNITEM ='ONOROFF'
+        LEFT JOIN SYS_NOUN T5
+        ON T1.BOOK_TYPE_CD =T5.NOUNVALUE
+        AND T5.NOUNITEM ='ACCOUNT_TYPE'
+        LEFT JOIN SYS_NOUN T6
+        ON T1.INVEST_INDUSTRY_CD =T6.NOUNVALUE
+        AND t6.NOUNITEM='interIndustry'
+        LEFT JOIN SYS_NOUN T7
+        ON T1.INVEST_INDUSTRY_CD_1 =T7.NOUNVALUE
+        AND T7.NOUNITEM ='interIndustry'
+        LEFT JOIN SYS_NOUN T8
+        ON T1.INVEST_INDUSTRY_CD_2 =T8.NOUNVALUE
+        AND T8.NOUNITEM ='interIndustry'
+        LEFT JOIN SYS_NOUN T9
+        ON T1.INVEST_INDUSTRY_CD_3 =T9.NOUNVALUE
+        AND T9.NOUNITEM ='interIndustry'
+        LEFT JOIN SYS_NOUN T10
+        ON T1.CUST_TYPE =T10.NOUNVALUE
+        AND T10.NOUNITEM ='CUST_TYPE_LV01'
+        LEFT JOIN SYS_NOUN T11
+        ON T1.PROP_DEVEL_PROJ_TYPE_CD =T11.NOUNVALUE
+        AND T11.NOUNITEM ='REAL_ESTATE_PROJECT_TYPE'
+        LEFT JOIN SYS_NOUN T12
+        ON T1.DOM_DOC_FLAG =T12.NOUNVALUE
+        AND T12.NOUNITEM ='YESORNO'
+        LEFT JOIN sys_organization T13
+        ON T13.ORGCODE = T1.FIN_BRANCH_NO
+        LEFT JOIN sys_organization T14
+        ON T1.MGMT_BRANCH_NO = T14.ORGCODE
+        where 1=1
+        and (GL_ACCOUNT_ID =#{subjectNumber} or FAIR_VAL_ACCOUNT =#{subjectNumber} or INT_ADJ_ACCOUNT =#{subjectNumber} or REC_INT_ACCOUNT =#{subjectNumber} or ACCR_INT_ACCOUNT =#{subjectNumber})
+    </select>
 </mapper>

+ 66 - 40
Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/mybatis/FcOffSheetMapper.xml

@@ -5,46 +5,72 @@
 <mapper namespace="com.sundata.product.rwa.parameter.mapper.FcOffSheetMapper">
     <select id="fcOffSheet" resultType="com.sundata.product.rwa.parameter.model.FcOffSheetModel">
         select
-         ACCR_INT as accrInt
-        ,ACCR_INT_ACCOUNT as accrIntAccount
-        ,BAL_ACCOUNT as balAccount
-        ,BALANCE as balance
-        ,BILL_NO as billNo
-        ,BOOK_TYPE as bookType
-        ,BP_CUST_NO as bpCustNo
-        ,CALCINDEX as calcindex
-        ,CCY_CD as ccyCd
-        ,CONTRACT_NO as contractNo
-        ,CUST_NAME as custName
-        ,CUST_NO as custNo
-        ,DATA_DATE as dataDate
-        ,DOM_DOC_FLAG as domDocFlag
-        ,DOM_INTE_FLAG as domInteFlag
-        ,EDATE as edate
-        ,FAIR_VAL_ACCOUNT as fairValAccount
-        ,FAIR_VALUE_CHANGE as fairValueChange
-        ,FIN_BRANCH_NO as finBranchNo
-        ,FIVE_CLASS_CD as fiveClassCd
-        ,INT_ADJ as intAdj
-        ,INT_ADJ_ACCOUNT as intAdjAccount
-        ,LC_EXPI_DT as lcExpiDt
-        ,LG_TYPE as lgType
-        ,LOAN_REFERENCE_NO as loanReferenceNo
-        ,MAT_DT as matDt
-        ,MGMT_BRANCH_NO as mgmtBranchNo
-        ,ON_OFF_FLAG as onOffFlag
-        ,OPENING_DT as openingDt
-        ,PRODUCT_NAME as productName
-        ,PRODUCT_NO as productNo
-        ,REC_INT as recInt
-        ,REC_INT_ACCOUNT as recIntAccount
-        ,RESERVE as reserve
-        ,RESERVE_ACCOUNT as reserveAccount
-        ,SDATE as sdate
-        ,START_DT as startDt
-        ,TERM as term
-        ,TRADE_TYPE_CD as tradeTypeCd
-        from  RWA_BUS_IT_FC_OFF_SHEET
+         T1.ACCR_INT as accrInt
+        ,T1.ACCR_INT_ACCOUNT as accrIntAccount
+        ,T1.BAL_ACCOUNT as balAccount
+        ,T1.BALANCE as balance
+        ,T1.BILL_NO as billNo
+        ,T1.BOOK_TYPE as bookType
+        ,T1.BP_CUST_NO as bpCustNo
+        ,T1.CALCINDEX as calcindex
+        ,T1.CCY_CD as ccyCd
+        ,T1.CONTRACT_NO as contractNo
+        ,T1.CUST_NAME as custName
+        ,T1.CUST_NO as custNo
+        ,T1.DATA_DATE as dataDate
+        ,T1.DOM_DOC_FLAG as domDocFlag
+        ,T1.DOM_INTE_FLAG as domInteFlag
+        ,T1.EDATE as edate
+        ,T1.FAIR_VAL_ACCOUNT as fairValAccount
+        ,T1.FAIR_VALUE_CHANGE as fairValueChange
+        ,T1.FIN_BRANCH_NO as finBranchNo
+        ,T1.FIVE_CLASS_CD as fiveClassCd
+        ,T1.INT_ADJ as intAdj
+        ,T1.INT_ADJ_ACCOUNT as intAdjAccount
+        ,T1.LC_EXPI_DT as lcExpiDt
+        ,T1.LG_TYPE as lgType
+        ,T1.LOAN_REFERENCE_NO as loanReferenceNo
+        ,T1.MAT_DT as matDt
+        ,T1.MGMT_BRANCH_NO as mgmtBranchNo
+        ,T1.ON_OFF_FLAG as onOffFlag
+        ,T1.OPENING_DT as openingDt
+        ,T1.PRODUCT_NAME as productName
+        ,T1.PRODUCT_NO as productNo
+        ,T1.REC_INT as recInt
+        ,T1.REC_INT_ACCOUNT as recIntAccount
+        ,T1.RESERVE as reserve
+        ,T1.RESERVE_ACCOUNT as reserveAccount
+        ,T1.SDATE as sdate
+        ,T1.START_DT as startDt
+        ,T1.TERM as term
+        ,T1.TRADE_TYPE_CD as tradeTypeCd
+        ,T2.NOUNNAME  AS ccyCdId
+        ,T3.NOUNNAME  AS dataDateId
+        ,T4.NOUNNAME  AS onOffFlagId
+        ,T5.NOUNNAME  AS bookTypeId
+        ,T6.NOUNNAME  AS lgTypeId
+        ,T7.NOUNNAME  AS domDocFlagId
+        ,T8.NOUNNAME  AS domInteFlagId
+        ,T9.NOUNNAME  AS intAdjAccountId
+        ,T10.NOUNNAME  AS billNoId
+        ,T11.NOUNNAME  AS dataDateId
+        ,T12.ORGNAME AS orgname1
+        ,T13.ORGNAME AS orgname2
+        from  RWA_BUS_IT_FC_OFF_SHEET T1
+        LEFT JOIN SYS_NOUN  T2  ON T1.CCY_CD =T2.NOUNVALUE  AND  T2.NOUNITEM ='currCd'
+        LEFT JOIN SYS_NOUN  T3  ON T1.DATA_DATE =T3.NOUNVALUE  AND  T3.NOUNITEM ='FIVECLASS'
+        LEFT JOIN SYS_NOUN  T4  ON T1.ON_OFF_FLAG =T4.NOUNVALUE  AND  T4.NOUNITEM ='ONOROFF'
+        LEFT JOIN SYS_NOUN  T5  ON T1.BOOK_TYPE =T5.NOUNVALUE  AND  T5.NOUNITEM ='ACCOUNT_TYPE'
+        LEFT JOIN SYS_NOUN  T6  ON T1.LG_TYPE =T6.NOUNVALUE  AND  T6.NOUNITEM ='FINANCING_NULLOROTHER'
+        LEFT JOIN SYS_NOUN  T7  ON T1.DOM_DOC_FLAG =T7.NOUNVALUE  AND  T7.NOUNITEM ='YESORNO'
+        LEFT JOIN SYS_NOUN  T8  ON T1.DOM_INTE_FLAG =T8.NOUNVALUE  AND  T8.NOUNITEM ='DOF'
+        LEFT JOIN SYS_NOUN  T9  ON T1.INT_ADJ_ACCOUNT =T9.NOUNVALUE  AND  T9.NOUNITEM ='TRADE_TYPE'
+        LEFT JOIN SYS_NOUN  T10  ON T1.BILL_NO =T10.NOUNVALUE  AND  T10.NOUNITEM ='BILL_TYPE'
+        LEFT JOIN SYS_NOUN  T11  ON T1.DATA_DATE =T11.NOUNVALUE  AND  T11.NOUNITEM ='暂时为空'
+        LEFT JOIN sys_organization T12
+        ON T12.ORGCODE = T1.FIN_BRANCH_NO
+        LEFT JOIN sys_organization T13
+        ON T1.MGMT_BRANCH_NO = T13.ORGCODE
         where 1=1
         <if test="dataDate !='' and dataDate!=null">
             and DATA_DATE = replace(#{dataDate},'-','')

+ 5 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/service/FcLoanService.java

@@ -40,6 +40,11 @@ public class FcLoanService extends BaseService<RptDefineModel> {
 
         return fcLoanMapper.fcLoan(fcLoanModelDemoFr);
     }
+    public List<FcLoanModel> getFcLoan1(String subjectNumber){
+
+        return fcLoanMapper.getFcLoan1(subjectNumber);
+    }
+
     // 导出数据
     public boolean exportExcelModel(String fileName, HttpServletResponse response, List<FcLoanModel> fcLoanModelDemoFr, String fileNameModel ) throws IOException {
         // List <FcLoanModel> model =policyBankMapper.getPolicyBank(new FcLoanModel());

+ 6 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/action/InfoListAction.java

@@ -7,7 +7,6 @@ import com.sundata.common.base.BaseAction;
 import com.sundata.product.rwa.rwaCalcConfig002offbalanceprotype.model.InfoListModel;
 import com.sundata.product.rwa.rwaCalcConfig002offbalanceprotype.model.RwaCalcConfOffbalanceprotyperuleModel;
 import com.sundata.product.rwa.rwaCalcConfig002offbalanceprotype.service.InfoListService;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,6 +102,12 @@ public class InfoListAction extends BaseAction {
         sendData(response,infoListService.jiaoyan(offobjectNo));
     }
 
+    @RequestMapping("/deleteFunc")
+    @SysLog(funcName="树状结构作废")
+    public void  deleteFunc (HttpServletRequest request, HttpServletResponse response, @RequestParam String  offobjectNo){
+        sendData(response,infoListService.deleteFunc(offobjectNo));
+    }
+
 
 
 

+ 2 - 2
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/mybatis/InfoListMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundata.product.rwa.rwaCalcConfig002offbalanceprotype.mapper.InfoListMapper">
     <select id="getFunTree1" resultType="com.sundata.admin.nounmanage.model.DictContent">
-         select OFFOBJECT_NO as id ,OFFOBJECT_NAME as text ,OFFOBJECT_SUPER as parentid
+         select OFFOBJECT_NO as id ,OFFOBJECT_NAME as text ,OFFOBJECT_SUPER as parentid,YESORNO as attributes
         from RWA_CALC_CONF_OFFBALANCEPROTYPE
         order by OFFOBJECT_SUPER,OFFOBJECT_NO
     </select>
@@ -41,7 +41,7 @@
         f.OFFOBJECT_SUPER as offobjectSuper,
         f.ISMINI as ismini,
         f.CCF as ccf,
-        case when f.YESORNO ='1' then '生效' else '失效' end  as yesorno,
+        case when f.YESORNO ='1' then '生效' when f.YESORNO ='0' then '失效' else f.YESORNO  end  as yesorno,
         (select OFFOBJECT_NAME from RWA_CALC_CONF_OFFBALANCEPROTYPE where OFFOBJECT_NO=f.OFFOBJECT_SUPER) as offobjectSuperName
         from RWA_CALC_CONF_OFFBALANCEPROTYPE f
         where f.OFFOBJECT_NO = #{offobjectNo}

+ 4 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfig002offbalanceprotype/service/InfoListService.java

@@ -9,7 +9,6 @@ import com.sundata.common.util.TreeUtil;
 import com.sundata.product.rwa.rwaCalcConfig002offbalanceprotype.mapper.InfoListMapper;
 import com.sundata.product.rwa.rwaCalcConfig002offbalanceprotype.model.InfoListModel;
 import com.sundata.product.rwa.rwaCalcConfig002offbalanceprotype.model.RwaCalcConfOffbalanceprotyperuleModel;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Service;
@@ -90,6 +89,10 @@ public  class InfoListService extends BaseService<InfoListModel> implements Comm
         return "删除成功";
     }
 
+    public String deleteFunc(String offobjectNo){
+        DBExecutor.doModify("UPDATE RWA_CALC_CONF_OFFBALANCEPROTYPE SET YESORNO='0' WHERE OFFOBJECT_NO='"+offobjectNo+"'");
+        return "作废成功";
+    }
     public String jiaoyan(String offobjectNo){
         String res =DBExecutor.doQuery("select count(OFFOBJECT_NO) from RWA_CALC_CONF_OFFBALANCEPROTYPE where OFFOBJECT_NO='"+offobjectNo+"'");
         return res;

+ 13 - 14
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/action/InfoListAction.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/action/InfoAction.java

@@ -1,12 +1,11 @@
 package com.sundata.product.rwa.rwacalcconfig001riskexposure.action;
 
-import com.sundata.admin.nounmanage.model.DictContent;
 import com.sundata.admin.nounmanage.model.DictTree;
 import com.sundata.common.base.BaseAction;
 
 import com.sundata.product.rwa.rwacalcconfig001riskexposure.model.RiskExposureClassRuleModel;
 import com.sundata.product.rwa.rwacalcconfig001riskexposure.model.RiskExposureDefinitionModel;
-import com.sundata.product.rwa.rwacalcconfig001riskexposure.service.InfoListService;
+import com.sundata.product.rwa.rwacalcconfig001riskexposure.service.InfoService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,36 +18,36 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/product/rwa/rwacalcconfig001riskexposure/InfoListAction")
-public class InfoListAction extends BaseAction {
+public class InfoAction extends BaseAction {
     @Autowired
-    InfoListService infoListService;
+    InfoService infoService;
 
     @RequestMapping({"getFunTree1"})
     public List<DictTree> getFunTree1(HttpServletRequest request, HttpServletResponse response) {
-        return this.infoListService.getFunTree1();
+        return this.infoService.getFunTree1();
     }
 
     @RequestMapping({"getSelectTreeData"})
     public void getSelectTreeData(HttpServletRequest request, HttpServletResponse response, @RequestParam String key) {
-        sendData(response,infoListService.getSelectTreeData(key));
+        sendData(response, infoService.getSelectTreeData(key));
     }
 
     // 新增风险暴漏定义
     @RequestMapping({"createRiskData"})
     public void createRiskData(HttpServletRequest request, HttpServletResponse response, @RequestBody RiskExposureDefinitionModel model) {
-        infoListService.createRiskData(model);
+        infoService.createRiskData(model);
     }
 
     // 风险暴漏定义维护修改
     @RequestMapping({"updateRiskData"})
     public void updateRiskData(HttpServletRequest request, HttpServletResponse response, @RequestBody RiskExposureDefinitionModel model) {
-        infoListService.updateRiskData(model);
+        infoService.updateRiskData(model);
     }
 
     // 风险暴漏定义维护作废
     @RequestMapping({"delRiskData"})
     public void delRiskData(HttpServletRequest request, HttpServletResponse response, @RequestParam String code) {
-        infoListService.delRiskData(code);
+        infoService.delRiskData(code);
     }
 
 
@@ -56,32 +55,32 @@ public class InfoListAction extends BaseAction {
     @RequestMapping({"getRiskDataList"})
     public void getRiskDataList(HttpServletRequest request, HttpServletResponse response,
                                 @RequestBody RiskExposureClassRuleModel model, @RequestParam String key) {
-        sendData(response,infoListService.getRiskDataList(model,key));
+        sendData(response, infoService.getRiskDataList(model,key));
     }
 
 
     @RequestMapping({"createRiskRuleData"})
     public void createRiskRuleData(HttpServletRequest request, HttpServletResponse response,
                                    @RequestBody RiskExposureClassRuleModel model, @RequestParam String key ) {
-        infoListService.createRiskRuleData(model,key);
+        infoService.createRiskRuleData(model,key);
     }
 
     @RequestMapping({"updateRiskRuleExistData"})
     public void updateRiskRuleExistData(HttpServletRequest request, HttpServletResponse response,
                                         @RequestBody RiskExposureClassRuleModel model,@RequestParam String ruleNo ) {
-        infoListService.updateRiskRuleExistData(model,ruleNo);
+        infoService.updateRiskRuleExistData(model,ruleNo);
     }
 
     @RequestMapping({"delRiskRuleData"})
     public void delRiskRuleData(HttpServletRequest request, HttpServletResponse response, @RequestBody RiskExposureClassRuleModel model) {
-        infoListService.delRiskRuleData(model);
+        infoService.delRiskRuleData(model);
     }
 
     // 校验数据
     @RequestMapping({"isNotExist"})
     public void isNotExist(HttpServletRequest request, HttpServletResponse response, @RequestBody RiskExposureDefinitionModel model) {
         if (null != model && !model.getRiskExposureNo().isEmpty()){
-            RiskExposureDefinitionModel checkModel = infoListService.getSelectTreeData(model.getRiskExposureNo());
+            RiskExposureDefinitionModel checkModel = infoService.getSelectTreeData(model.getRiskExposureNo());
             if (null != checkModel) {
                 sendData(response,"该代码已存在");
             } else {

+ 1 - 2
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/mapper/InfoListMapper.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/mapper/InfoMapper.java

@@ -1,7 +1,6 @@
 package com.sundata.product.rwa.rwacalcconfig001riskexposure.mapper;
 
 import com.sundata.admin.nounmanage.model.DictContent;
-import com.sundata.common.base.BaseMapper;
 
 import com.sundata.product.rwa.rwacalcconfig001riskexposure.model.RiskExposureClassRuleModel;
 import com.sundata.product.rwa.rwacalcconfig001riskexposure.model.RiskExposureDefinitionModel;
@@ -9,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface InfoListMapper{
+public interface InfoMapper {
     List<DictContent> getFunTree1();
 
     RiskExposureDefinitionModel getSelectTreeData(@Param("key") String key);

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/mybatis/InfoListMapper.xml → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/mybatis/InfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sundata.product.rwa.rwacalcconfig001riskexposure.mapper.InfoListMapper">
+<mapper namespace="com.sundata.product.rwa.rwacalcconfig001riskexposure.mapper.InfoMapper">
     <select id="getFunTree1" resultType="com.sundata.admin.nounmanage.model.DictContent">
          select
         RISKEXPOSURE_NO       as id,

+ 12 - 12
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/service/InfoListService.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfig001riskexposure/service/InfoService.java

@@ -5,7 +5,7 @@ import com.sundata.admin.nounmanage.model.DictContent;
 import com.sundata.admin.nounmanage.model.DictTree;
 import com.sundata.common.util.TreeUtil;
 
-import com.sundata.product.rwa.rwacalcconfig001riskexposure.mapper.InfoListMapper;
+import com.sundata.product.rwa.rwacalcconfig001riskexposure.mapper.InfoMapper;
 import com.sundata.product.rwa.rwacalcconfig001riskexposure.model.RiskExposureClassRuleModel;
 import com.sundata.product.rwa.rwacalcconfig001riskexposure.model.RiskExposureDefinitionModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,16 +15,16 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-public  class InfoListService  implements CommandLineRunner {
+public  class InfoService implements CommandLineRunner {
     @Autowired
-    InfoListMapper infoListMapper;
+    InfoMapper infoMapper;
 
 
 
 
     public List<DictTree> getFunTree1() {
         List<DictTree> treeList = null;
-        List<DictContent> parseTreeData = infoListMapper.getFunTree1();
+        List<DictContent> parseTreeData = infoMapper.getFunTree1();
         treeList = TreeUtil.parseTree(parseTreeData);
         return treeList;
     }
@@ -36,34 +36,34 @@ public  class InfoListService  implements CommandLineRunner {
     }
 
     public RiskExposureDefinitionModel getSelectTreeData(String key) {
-        return infoListMapper.getSelectTreeData(key);
+        return infoMapper.getSelectTreeData(key);
     }
 
     public List<RiskExposureClassRuleModel> getRiskDataList(RiskExposureClassRuleModel model, String key) {
-        return infoListMapper.getRiskDataList(model,key);
+        return infoMapper.getRiskDataList(model,key);
     }
 
     public void createRiskRuleData(RiskExposureClassRuleModel model,String key) {
-        infoListMapper.createRiskRuleData(model,key);
+        infoMapper.createRiskRuleData(model,key);
     }
 
     public void updateRiskRuleExistData(RiskExposureClassRuleModel model,String ruleNo) {
-        infoListMapper.updateRiskRuleExistData(model,ruleNo);
+        infoMapper.updateRiskRuleExistData(model,ruleNo);
     }
 
     public void delRiskRuleData(RiskExposureClassRuleModel model) {
-        infoListMapper.delRiskRuleData(model);
+        infoMapper.delRiskRuleData(model);
     }
 
     public void createRiskData(RiskExposureDefinitionModel model) {
-        infoListMapper.createRiskData(model);
+        infoMapper.createRiskData(model);
     }
 
     public void updateRiskData(RiskExposureDefinitionModel model) {
-        infoListMapper.updateRiskData(model);
+        infoMapper.updateRiskData(model);
     }
 
     public void delRiskData(String code) {
-        infoListMapper.delRiskData(code);
+        infoMapper.delRiskData(code);
     }
 }

+ 0 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/action/BusinessAction.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/action/BusinessAction.java


+ 5 - 7
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/action/ProductListAction.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/action/ProductListAction.java

@@ -1,12 +1,10 @@
-package com.sundata.product.rwa.rwaCalcConfigDataparam.action;
+package com.sundata.product.rwa.rwacalcconfigdataparam.action;
 
 import com.sundata.common.annotation.SysLog;
 import com.sundata.common.base.BaseAction;
-import com.sundata.product.rwa.parameter.model.SovereignModel;
-import com.sundata.product.rwa.resultList.model.RuleListModel;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.service.ProductListService;
+import com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel;
+import com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel;
+import com.sundata.product.rwa.rwacalcconfigdataparam.service.ProductListService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +18,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Controller
-@RequestMapping("/product/rwa/rwaCalcConfigDataparam/ProductListAction")
+@RequestMapping("/product/rwa/rwacalcconfigdataparam/ProductListAction")
 public class ProductListAction extends BaseAction {
     @Autowired
     ProductListService productListService;

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/action/RealEstateAction.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/action/RealEstateAction.java

@@ -20,7 +20,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.List;
 
 @Controller
-@RequestMapping("product/rwa/rwacalcconfigdataparam/RealEstateAction")
+@RequestMapping("product/rwa/rwacalcConfigDataparam/RealEstateAction")
 public class RealEstateAction extends BaseAction {
 
     // 日志

+ 0 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/mapper/BusinessMapper.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mapper/BusinessMapper.java


+ 5 - 5
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/mapper/ProductListMapper.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mapper/ProductListMapper.java

@@ -1,9 +1,9 @@
-package com.sundata.product.rwa.rwaCalcConfigDataparam.mapper;
+package com.sundata.product.rwa.rwacalcconfigdataparam.mapper;
 
-import com.sundata.product.rwa.resultList.model.RuleListModel;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfOffbalanceprotyperuleModel;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel;
+import com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel;
+import com.sundata.product.rwa.rwacalcconfigdataparam.model.RiskListModel;
+import com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfOffbalanceprotyperuleModel;
+import com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

+ 0 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/mapper/RealEstateMapper.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mapper/RealEstateMapper.java

@@ -1,6 +1,5 @@
 package com.sundata.product.rwa.rwacalcconfigdataparam.mapper;
 
-import com.sundata.product.rwa.businessconfig.model.ListOfPublicSectorModel;
 import com.sundata.product.rwa.rwacalcconfigdataparam.model.RealEstateModel;
 import org.apache.ibatis.annotations.Param;
 

+ 0 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/model/BusinessModel.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/BusinessModel.java


+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/model/ProductListModel.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/ProductListModel.java

@@ -1,4 +1,4 @@
-package com.sundata.product.rwa.rwaCalcConfigDataparam.model;
+package com.sundata.product.rwa.rwacalcconfigdataparam.model;
 
 import java.math.BigDecimal;
 

+ 0 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/model/RealEstateModel.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/RealEstateModel.java


+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/model/RiskListModel.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/RiskListModel.java

@@ -1,4 +1,4 @@
-package com.sundata.product.rwa.rwaCalcConfigDataparam.model;
+package com.sundata.product.rwa.rwacalcconfigdataparam.model;
 
 public class RiskListModel {
     //规则编号

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/model/RwaCalcConfOffbalanceprotyperuleModel.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/RwaCalcConfOffbalanceprotyperuleModel.java

@@ -1,4 +1,4 @@
-package com.sundata.product.rwa.rwaCalcConfigDataparam.model;
+package com.sundata.product.rwa.rwacalcconfigdataparam.model;
 
 import java.math.BigDecimal;
 

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/model/RwaCalcConfProductrulesModel.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/RwaCalcConfProductrulesModel.java

@@ -1,4 +1,4 @@
-package com.sundata.product.rwa.rwaCalcConfigDataparam.model;
+package com.sundata.product.rwa.rwacalcconfigdataparam.model;
 
 import java.math.BigDecimal;
 

+ 0 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/model/SubjectListModel.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/model/SubjectListModel.java


+ 0 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/mybatis/BusinessMapper.xml → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mybatis/BusinessMapper.xml


+ 14 - 14
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/mybatis/ProductListMapper.xml → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mybatis/ProductListMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sundata.product.rwa.rwaCalcConfigDataparam.mapper.ProductListMapper">
-    <select id="productlist" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel">
+<mapper namespace="com.sundata.product.rwa.rwacalcconfigdataparam.mapper.ProductListMapper">
+    <select id="productlist" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
         select
              CALCINDEX as calcindex,
              SDATE as sdate,
@@ -33,7 +33,7 @@
         </if>
     </select>
 
-    <select id="productlist1" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <select id="productlist1" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         select
               CALCINDEX as calcindex,
               DATA_DATE as dataDate,
@@ -65,7 +65,7 @@
 <!--        </if>-->
     </select>
 
-    <select id="product_modifyone" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <select id="product_modifyone" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         select
              CALCINDEX as calcindex,
              DATA_DATE as dataDate,
@@ -88,7 +88,7 @@
 
     </select>
 
-    <select id="product_modifyone1" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel">
+    <select id="product_modifyone1" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
         select
               CALCINDEX as calcindex,
               SDATE as sdate,
@@ -110,7 +110,7 @@
             and PRODUCT_NO =#{productNo}
     </select>
 
-    <select id="product_modifyone2" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <select id="product_modifyone2" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         select
               CALCINDEX as calcindex,
               DATA_DATE as dataDate,
@@ -132,22 +132,22 @@
               and PRODUCT_NO =#{productNo}
     </select>
 
-    <delete id="product_deleteone" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel">
+    <delete id="product_deleteone" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
         delete from RWA_CALC_CONF_PRODUCT where PRODUCT_NO =#{productNo}
     </delete>
 
-    <delete id="product_deleteone1" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <delete id="product_deleteone1" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         delete from RWA_CALC_CONF_PRODUCTRULES where RULE_CODE =#{ruleCode}
     </delete>
-    <delete id="product_deleteone2" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel">
+    <delete id="product_deleteone2" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
         delete from RWA_CALC_CONF_PRODUCTRULES  where (PRODUCT_NO =#{productNo} or PRODUCT_NO is null)
     </delete>
 
-    <insert id="product_addone" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel">
+    <insert id="product_addone" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel">
         INSERT INTO RWA_CALC_CONF_PRODUCT(CALCINDEX,SDATE,EDATE,TERM,DATA_DATE,PRODUCT_NO,PRODUCT_NAME,PRODUCT_TYPE,PRODUCT_BUSSINESS_CODE,PRODUCT_STAGE_ID,PRODUCT_INDEX,PRODUCT_FROM_SYSTEM,DEFAULT_GETDATARULE,DEFAULT_OUT)
         VALUES(#{calcindex},#{sdate},#{edate},#{term},#{dataDate},#{productNo},#{productName},#{productType},#{productBussinessCode},#{productStageId},#{productIndex},#{productFromSystem},#{defaultGetdatarule},#{defaultOut})
     </insert>
-    <insert id="product_addone1" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <insert id="product_addone1" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         INSERT INTO RWA_CALC_CONF_PRODUCTRULES (CALCINDEX,SDATE,EDATE,TERM,DATA_DATE,PRODUCT_NO,RULE_CODE,RULE_NAME,RULE_INDEX,DATA_TYPE,RULE_SUBJECT,RULE_IN,RULE_OUT,RULE_GETDATA)
         VALUES
         <foreach collection="list" item="item" index="index" open="(" separator="),(" close=")">
@@ -155,12 +155,12 @@
         </foreach>
     </insert>
 
-    <insert id="product_addone2" parameterType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel">
+    <insert id="product_addone2" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel">
         INSERT INTO RWA_CALC_CONF_PRODUCTRULES (CALCINDEX,SDATE,EDATE,TERM,DATA_DATE,PRODUCT_NO,RULE_CODE,RULE_NAME,RULE_INDEX,DATA_TYPE,RULE_SUBJECT,RULE_IN,RULE_OUT,RULE_GETDATA)
         VALUES(#{calcindex},#{sdate},#{edate},#{term},#{dataDate},#{productNo},#{ruleCode},#{ruleName},#{ruleIndex},#{dataType},#{ruleSubject},#{ruleIn},#{ruleOut},#{ruleGetdata})
     </insert>
 
-    <select id="select" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfOffbalanceprotyperuleModel">
+    <select id="select" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfOffbalanceprotyperuleModel">
         select
         T1.OFFOBJECT_NO as offobjectNo,
         T1.RULE_NAME as ruleName,
@@ -178,7 +178,7 @@
         where T1.OFFOBJECT_NO =#{productNo}
     </select>
 
-<select id="selectRiskList" resultType="com.sundata.product.rwa.rwaCalcConfigDataparam.model.RiskListModel">
+<select id="selectRiskList" resultType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RiskListModel">
         select
         T1.RULE_NAME            AS ruleName,
         T1.RULE_NO              AS ruleCode,

+ 0 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/mybatis/RealEstateMapper.xml → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mybatis/RealEstateMapper.xml


+ 0 - 0
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/service/BusinessService.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/service/BusinessService.java


+ 6 - 6
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/service/ProductListService.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/service/ProductListService.java

@@ -1,16 +1,16 @@
-package com.sundata.product.rwa.rwaCalcConfigDataparam.service;
+package com.sundata.product.rwa.rwacalcconfigdataparam.service;
 
 import com.sundata.admin.excelmanage.mapper.RptDefineMapper;
 import com.sundata.admin.excelmanage.model.RptDefineModel;
 import com.sundata.common.base.BaseMapper;
 import com.sundata.common.base.BaseService;
 import com.sundata.common.util.DBExecutor;
-import com.sundata.product.rwa.parameter.model.SovereignModel;
 import com.sundata.product.rwa.parameter.utils.FilesValueCheckUtils;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.mapper.ProductListMapper;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.model.ProductListModel;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfOffbalanceprotyperuleModel;
-import com.sundata.product.rwa.rwaCalcConfigDataparam.model.RwaCalcConfProductrulesModel;
+import com.sundata.product.rwa.rwacalcconfigdataparam.mapper.ProductListMapper;
+import com.sundata.product.rwa.rwacalcconfigdataparam.model.ProductListModel;
+import com.sundata.product.rwa.rwacalcconfigdataparam.model.RiskListModel;
+import com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfOffbalanceprotyperuleModel;
+import com.sundata.product.rwa.rwacalcconfigdataparam.model.RwaCalcConfProductrulesModel;
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;

+ 0 - 2
Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwaCalcConfigDataparam/service/RealEstateService.java → Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/service/RealEstateService.java

@@ -8,7 +8,6 @@ import com.sundata.common.exception.BusinessException;
 import com.sundata.common.util.DBExecutor;
 
 
-import com.sundata.product.rwa.businessconfig.service.SysListOfPublicSectorService;
 import com.sundata.product.rwa.businessconfig.utils.FilesValueCheckUtils;
 import com.sundata.product.rwa.rwacalcconfigdataparam.mapper.RealEstateMapper;
 import com.sundata.product.rwa.rwacalcconfigdataparam.model.RealEstateModel;
@@ -22,7 +21,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;