Răsfoiți Sursa

Merge remote-tracking branch 'origin/master'

Cashgift Li 8 luni în urmă
părinte
comite
9e27338dcd
35 a modificat fișierele cu 205 adăugiri și 84 ștergeri
  1. 3 2
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/BondInvestmentAction.java
  2. 3 2
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/DiscountTableAction.java
  3. 3 2
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/InterbankDepositOrLendingTableAction.java
  4. 3 2
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/NonStandardInvestmentAction.java
  5. 3 2
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/OffCreditCardAction.java
  6. 3 2
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/OnCreditCardAction.java
  7. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/BondInvestmentMapper.java
  8. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/DiscountTableMapper.java
  9. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/InterbankDepositOrLendingTableMapper.java
  10. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/NonStandardInvestmentMapper.java
  11. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/OffCreditCardMapper.java
  12. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/OnCreditCardMapper.java
  13. 23 4
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/BondInvestmentMapper.xml
  14. 5 5
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/CollateralTableMapper.xml
  15. 23 5
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/DiscountTableMapper.xml
  16. 23 5
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/InterbankDepositOrLendingTableMapper.xml
  17. 23 5
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/NonStandardInvestmentMapper.xml
  18. 23 5
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/OffCreditCardMapper.xml
  19. 20 2
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/OnCreditCardMapper.xml
  20. 3 3
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/BondInvestmentService.java
  21. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/CollateralTableService.java
  22. 3 3
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/DiscountTableService.java
  23. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/GuaranteeTableService.java
  24. 3 3
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/InterbankDepositOrLendingTableService.java
  25. 3 3
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/NonStandardInvestmentService.java
  26. 3 3
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/OffCreditCardService.java
  27. 3 3
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/OnCreditCardService.java
  28. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/PledgeRelatedTableService.java
  29. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/RepoRelatedTableService.java
  30. 4 3
      Procedure/frontend/projectb/src/services/rwa/dataquality/BondInvestment.ts
  31. 3 2
      Procedure/frontend/projectb/src/services/rwa/dataquality/DiscountTable.ts
  32. 3 2
      Procedure/frontend/projectb/src/services/rwa/dataquality/InterbankDepositOrLendingTable.ts
  33. 3 2
      Procedure/frontend/projectb/src/services/rwa/dataquality/NonStandardInvestment.ts
  34. 3 2
      Procedure/frontend/projectb/src/services/rwa/dataquality/OffCreditCard.ts
  35. 3 2
      Procedure/frontend/projectb/src/services/rwa/dataquality/OnCreditCard.ts

+ 3 - 2
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/BondInvestmentAction.java

@@ -32,8 +32,9 @@ public class BondInvestmentAction extends BaseAction {
     // 查询当前行
     @RequestMapping("/selectRowData")
     public void selectRowData (HttpServletRequest request, HttpServletResponse response,
-                               @RequestBody BondInvestmentModel model) {
-        sendData(response, bondInvestmentService.selectRowData(model));
+                               @RequestParam String subjectNumber,
+                               @RequestParam String search, @RequestParam String term) {
+        sendData(response, bondInvestmentService.selectRowData(subjectNumber,term));
     }
 
     @RequestMapping("/exportExcelModel")

+ 3 - 2
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/DiscountTableAction.java

@@ -32,8 +32,9 @@ public class DiscountTableAction extends BaseAction{
     // 查询当前行
     @RequestMapping("/selectRowData")
     public void selectRowData (HttpServletRequest request, HttpServletResponse response,
-                               @RequestBody DiscountTableModel model) {
-        sendData(response, discountTableService.selectRowData(model));
+                               @RequestParam String subjectNumber,
+                               @RequestParam String search, @RequestParam String term) {
+        sendData(response, discountTableService.selectRowData(subjectNumber,term));
     }
 
     @RequestMapping("/exportExcelModel")

+ 3 - 2
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/InterbankDepositOrLendingTableAction.java

@@ -31,8 +31,9 @@ public class InterbankDepositOrLendingTableAction extends BaseAction {
     // 查询当前行
     @RequestMapping("/selectRowData")
     public void selectRowData (HttpServletRequest request, HttpServletResponse response,
-                               @RequestBody InterbankDepositOrLendingTableModel model) {
-        sendData(response, interbankDepositOrLendingTableService.selectRowData(model));
+                               @RequestParam String subjectNumber,
+                               @RequestParam String search, @RequestParam String term) {
+        sendData(response, interbankDepositOrLendingTableService.selectRowData(subjectNumber,term));
     }
 
     @RequestMapping("/exportExcelModel")

+ 3 - 2
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/NonStandardInvestmentAction.java

@@ -32,8 +32,9 @@ public class NonStandardInvestmentAction extends BaseAction {
     // 查询当前行
     @RequestMapping("/selectRowData")
     public void selectRowData (HttpServletRequest request, HttpServletResponse response,
-                               @RequestBody NonStandardInvestmentModel model) {
-        sendData(response, nonStandardInvestmentService.selectRowData(model));
+                               @RequestParam String subjectNumber,
+                               @RequestParam String search, @RequestParam String term) {
+        sendData(response, nonStandardInvestmentService.selectRowData(subjectNumber,term));
     }
 
     @RequestMapping("/exportExcelModel")

+ 3 - 2
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/OffCreditCardAction.java

@@ -31,8 +31,9 @@ public class OffCreditCardAction extends BaseAction {
     // 查询当前行
     @RequestMapping("/selectRowData")
     public void selectRowData (HttpServletRequest request, HttpServletResponse response,
-                               @RequestBody OffCreditCardModel model) {
-        sendData(response, offCreditCardService.selectRowData(model));
+                               @RequestParam String subjectNumber,
+                               @RequestParam String search, @RequestParam String term) {
+        sendData(response, offCreditCardService.selectRowData(subjectNumber,term));
     }
 
     @RequestMapping("/exportExcelModel")

+ 3 - 2
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/action/OnCreditCardAction.java

@@ -32,8 +32,9 @@ public class OnCreditCardAction extends BaseAction {
     // 查询当前行
     @RequestMapping("/selectRowData")
     public void selectRowData (HttpServletRequest request, HttpServletResponse response,
-                               @RequestBody OnCreditCardModel model) {
-        sendData(response, onCreditCardService.selectRowData(model));
+                               @RequestParam String subjectNumber,
+                               @RequestParam String search, @RequestParam String term) {
+        sendData(response, onCreditCardService.selectRowData(subjectNumber,term));
     }
 
     @RequestMapping("/exportExcelModel")

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/BondInvestmentMapper.java

@@ -8,5 +8,5 @@ public interface BondInvestmentMapper {
     // 初始化查询
     public List<BondInvestmentModel> selectDataList (BondInvestmentModel model);
     // 查询当前行
-    public BondInvestmentModel selectRowData(BondInvestmentModel model);
+    public BondInvestmentModel selectRowData(String subjectNumber,String term);
 }

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/DiscountTableMapper.java

@@ -9,5 +9,5 @@ public interface DiscountTableMapper {
     // 初始化查询
     public List<DiscountTableModel> selectDataList (@Param("model") DiscountTableModel model);
     // 查询当前行
-    public DiscountTableModel selectRowData(@Param("model") DiscountTableModel model);
+    public DiscountTableModel selectRowData(String subjectNumber,String term);
 }

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/InterbankDepositOrLendingTableMapper.java

@@ -8,5 +8,5 @@ public interface InterbankDepositOrLendingTableMapper {
     // 初始化查询
     public List<InterbankDepositOrLendingTableModel> selectDataList (InterbankDepositOrLendingTableModel model);
     // 查询当前行
-    public InterbankDepositOrLendingTableModel selectRowData(InterbankDepositOrLendingTableModel model);
+    public InterbankDepositOrLendingTableModel selectRowData(String subjectNumber,String term);
 }

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/NonStandardInvestmentMapper.java

@@ -8,5 +8,5 @@ public interface NonStandardInvestmentMapper {
     // 初始化查询
     public List<NonStandardInvestmentModel> selectDataList (NonStandardInvestmentModel model);
     // 查询当前行
-    public NonStandardInvestmentModel selectRowData(NonStandardInvestmentModel model);
+    public NonStandardInvestmentModel selectRowData(String subjectNumber, String term);
 }

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/OffCreditCardMapper.java

@@ -8,5 +8,5 @@ public interface OffCreditCardMapper {
     // 初始化查询
     public List<OffCreditCardModel> selectDataList (OffCreditCardModel model);
     // 查询当前行
-    public OffCreditCardModel selectRowData(OffCreditCardModel model);
+    public OffCreditCardModel selectRowData(String subjectNumber, String term);
 }

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mapper/OnCreditCardMapper.java

@@ -9,5 +9,5 @@ public interface OnCreditCardMapper {
     // 初始化查询
     public List<OnCreditCardModel> selectDataList (@Param("model") OnCreditCardModel model);
     // 查询当前行
-    public OnCreditCardModel selectRowData(@Param("model") OnCreditCardModel model);
+    public OnCreditCardModel selectRowData(String subjectNumber, String term);
 }

+ 23 - 4
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/BondInvestmentMapper.xml

@@ -77,10 +77,11 @@
     </select>
 
 
-    <select id="selectRowData" resultType="com.sundata.product.rwa.interfacedatasheet.model.CollateralTableModel" parameterType="com.sundata.product.rwa.interfacedatasheet.model.CollateralTableModel">
+    <select id="selectRowData" resultType="com.sundata.product.rwa.interfacedatasheet.model.CollateralTableModel">
         select
         SDATE                              AS    sDate,
         EDATE                              AS    eDate,
+        TERM                               AS    term,
         DATA_DATE                          AS    dataDate,
         DEBTITEM_NO                        AS    debtitemNo,
         PRODUCT_NO                         AS    productNo,
@@ -116,11 +117,29 @@
         RESERVE_ACCOUNT_NO                 AS    reserveAccountNo,
         CORE_CLIENT_NO                     AS    coreClientNo
         from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
-        <if test="null != #{model.debtitemNo} and '' != #{model.debtitemNo}">
             <where>
-                DEBTITEM_NO = #{model.debtitemNo}
+                <if test="null != #{term} and '' != #{term}">
+                    substr(DATA_DATE,1,6) = #{model.term}
+                </if>
+                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                    and PRIN_ACCOUNT_NO = #{subjectNumber}
+                </if>
+                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                    or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
+                </if>
+                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                    or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
+                </if>
+                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                    or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
+                </if>
+                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                    or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
+                </if>
+                <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                    or RESERVE_ACCOUNT_NO = #{subjectNumber}
+                </if>
             </where>
-        </if>
     </select>
 
 </mapper>

+ 5 - 5
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/CollateralTableMapper.xml

@@ -79,11 +79,11 @@
         MITIGANT_TOOL_EXPIRY_DATE                             AS   mitigantToolExpiryDate,
         IF_FIRST_PRIORITY_RIGHT                               AS   ifFirstPriorityRight
         from RWA_BUS_IT_FC_COLLATERAL
-        <if test="null != model.mitigationProdNo and '' != model.mitigationProdNo">
-            <where>
-                MITIGATION_PROD_NO = #{model.mitigationProdNo}
-            </where>
-        </if>
+        <where>
+            <if test="null != #{term} and '' != #{term}">
+                TERM = #{model.term}
+            </if>
+        </where>
     </select>
 
 </mapper>

+ 23 - 5
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/DiscountTableMapper.xml

@@ -119,11 +119,29 @@
         ACCEPTOR_CLIENT_NAME                           AS    acceptorClientName,
         CORE_CLIENT_NO                                 AS    coreClientNo
         from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
-        <if test="null != model.debtitemNo and '' != model.debtitemNo">
-            <where>
-                DEBTITEM_NO = #{model.debtitemNo}
-            </where>
-        </if>
+        <where>
+            <if test="null != #{term} and '' != #{term}">
+                substr(DATA_DATE,1,6) = #{model.term}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                and PRIN_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or RESERVE_ACCOUNT_NO = #{subjectNumber}
+            </if>
+        </where>
     </select>
 
 </mapper>

+ 23 - 5
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/InterbankDepositOrLendingTableMapper.xml

@@ -97,11 +97,29 @@
         FAIR_VALUE_CHANGE_ACCOUNT_NO            AS     fairValueChangeAccountNo,
         RESERVE_ACCOUNT_NO                      AS     reserveAccountNo
         from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
-            <where>
-                <if test="model.debtitemNo != null and '' != model.debtitemNo">
-                     DEBTITEM_NO = #{model.debtitemNo}
-                </if>
-            </where>
+        <where>
+            <if test="null != #{term} and '' != #{term}">
+                substr(DATA_DATE,1,6) = #{model.term}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                and PRIN_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or RESERVE_ACCOUNT_NO = #{subjectNumber}
+            </if>
+        </where>
     </select>
 
 </mapper>

+ 23 - 5
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/NonStandardInvestmentMapper.xml

@@ -105,11 +105,29 @@
         RESERVE_ACCOUNT_NO                           AS      reserveAccountNo,
         CORE_CLIENT_NO                               AS      coreClientNo
         from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
-        <if test="null != #{model.debtitemNo} and '' != #{model.debtitemNo}">
-            <where>
-                DEBTITEM_NO = #{model.debtitemNo}
-            </where>
-        </if>
+        <where>
+            <if test="null != #{term} and '' != #{term}">
+                substr(DATA_DATE,1,6) = #{model.term}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                and PRIN_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or RESERVE_ACCOUNT_NO = #{subjectNumber}
+            </if>
+        </where>
     </select>
 
 </mapper>

+ 23 - 5
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/OffCreditCardMapper.xml

@@ -114,11 +114,29 @@
         QUALIFIED_TRADERS_FLAG                         AS    qualifiedTradersFlag,
         CORE_CLIENT_NO                                 AS    coreClientNo
         from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
-        <if test="null != #{model.businessType} and '' != #{model.businessType}">
-            <where>
-                BUS_TYPE = #{model.businessType}
-            </where>
-        </if>
+        <where>
+            <if test="null != #{term} and '' != #{term}">
+                substr(DATA_DATE,1,6) = #{model.term}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                and PRIN_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or RESERVE_ACCOUNT_NO = #{subjectNumber}
+            </if>
+        </where>
     </select>
 
 </mapper>

+ 20 - 2
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/OnCreditCardMapper.xml

@@ -113,8 +113,26 @@
         CORE_CLIENT_NO                                  AS   coreClientNo
         from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
         <where>
-            <if test="model.debtitemNo != null and '' != model.debtitemNo">
-                 DEBTITEM_NO = #{model.debtitemNo}
+            <if test="null != #{term} and '' != #{term}">
+                substr(DATA_DATE,1,6) = #{model.term}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                and PRIN_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or RECEIVABLE_INT_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or ACCR_INT_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or INT_ADJ_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or FAIR_VALUE_CHANGE_ACCOUNT_NO = #{subjectNumber}
+            </if>
+            <if test="null != #{subjectNumber} and '' != #{subjectNumber}">
+                or RESERVE_ACCOUNT_NO = #{subjectNumber}
             </if>
         </where>
     </select>

+ 3 - 3
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/BondInvestmentService.java

@@ -35,8 +35,8 @@ public class BondInvestmentService extends BaseService<RptDefineModel> {
     }
 
     // 查看当前行
-    public BondInvestmentModel selectRowData(BondInvestmentModel model) {
-        return bondInvestmentMapper.selectRowData(model);
+    public BondInvestmentModel selectRowData(String subjectNumber,String term) {
+        return bondInvestmentMapper.selectRowData(subjectNumber,term);
     }
 
     public void exportExcelModel(HttpServletResponse response, String fileNameCode, List<BondInvestmentModel> modelList) throws IOException {
@@ -52,7 +52,7 @@ public class BondInvestmentService extends BaseService<RptDefineModel> {
         String templatePath = DBExecutor.doQuery("select NOUNVALUE from sys_noun where NOUNITEM = 'ATTACHPATH'");
 
         // TODO  获取菜单名
-        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200107'");
+        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200116'");
         StringBuilder pathName = new StringBuilder(templatePath+"/"+menuName);
         // 获取数据库模板文件
         RptDefineModel entity = (RptDefineModel)this.queryOne(fileNameCode);

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/CollateralTableService.java

@@ -53,7 +53,7 @@ public class CollateralTableService extends BaseService<RptDefineModel> {
         String templatePath = DBExecutor.doQuery("select NOUNVALUE from sys_noun where NOUNITEM = 'ATTACHPATH'");
 
         // TODO  获取菜单名
-        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200107'");
+        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200108'");
         StringBuilder pathName = new StringBuilder(templatePath+"/"+menuName);
         // 获取数据库模板文件
         RptDefineModel entity = (RptDefineModel)this.queryOne(fileNameCode);

+ 3 - 3
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/DiscountTableService.java

@@ -36,8 +36,8 @@ public class DiscountTableService extends BaseService<RptDefineModel> {
     }
 
     // 查看当前行
-    public DiscountTableModel selectRowData(DiscountTableModel model) {
-        return discountTableMapper.selectRowData(model);
+    public DiscountTableModel selectRowData(String subjectNumber,String term) {
+        return discountTableMapper.selectRowData(subjectNumber,term);
     }
 
     public void exportExcelModel(HttpServletResponse response, String fileNameCode, List<DiscountTableModel> modelList) throws IOException {
@@ -53,7 +53,7 @@ public class DiscountTableService extends BaseService<RptDefineModel> {
         String templatePath = DBExecutor.doQuery("select NOUNVALUE from sys_noun where NOUNITEM = 'ATTACHPATH'");
 
         // TODO  获取菜单名
-        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200107'");
+        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200112'");
         StringBuilder pathName = new StringBuilder(templatePath+"/"+menuName);
         // 获取数据库模板文件
         RptDefineModel entity = (RptDefineModel)this.queryOne(fileNameCode);

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/GuaranteeTableService.java

@@ -54,7 +54,7 @@ public class GuaranteeTableService extends BaseService<RptDefineModel> {
         String templatePath = DBExecutor.doQuery("select NOUNVALUE from sys_noun where NOUNITEM = 'ATTACHPATH'");
 
         // TODO  获取菜单名
-        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200107'");
+        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200109'");
         StringBuilder pathName = new StringBuilder(templatePath+"/"+menuName);
         // 获取数据库模板文件
         RptDefineModel entity = (RptDefineModel)this.queryOne(fileNameCode);

+ 3 - 3
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/InterbankDepositOrLendingTableService.java

@@ -36,8 +36,8 @@ public class InterbankDepositOrLendingTableService extends BaseService<RptDefine
     }
 
     // 查看当前行
-    public InterbankDepositOrLendingTableModel selectRowData(InterbankDepositOrLendingTableModel model) {
-        return interbankDepositOrLendingTableMapper.selectRowData(model);
+    public InterbankDepositOrLendingTableModel selectRowData(String subjectNumber,String term) {
+        return interbankDepositOrLendingTableMapper.selectRowData(subjectNumber,term);
     }
 
     public void exportExcelModel(HttpServletResponse response, String fileNameCode, List<InterbankDepositOrLendingTableModel> modelList) throws IOException {
@@ -53,7 +53,7 @@ public class InterbankDepositOrLendingTableService extends BaseService<RptDefine
         String templatePath = DBExecutor.doQuery("select NOUNVALUE from sys_noun where NOUNITEM = 'ATTACHPATH'");
 
         // TODO  获取菜单名
-        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200107'");
+        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200115'");
         StringBuilder pathName = new StringBuilder(templatePath+"/"+menuName);
         // 获取数据库模板文件
         RptDefineModel entity = (RptDefineModel)this.queryOne(fileNameCode);

+ 3 - 3
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/NonStandardInvestmentService.java

@@ -36,8 +36,8 @@ public class NonStandardInvestmentService extends BaseService<RptDefineModel> {
     }
 
     // 查看当前行
-    public NonStandardInvestmentModel selectRowData(NonStandardInvestmentModel model) {
-        return nonStandardInvestmentMapper.selectRowData(model);
+    public NonStandardInvestmentModel selectRowData(String subjectNumber, String term) {
+        return nonStandardInvestmentMapper.selectRowData(subjectNumber,term);
     }
 
     public void exportExcelModel(HttpServletResponse response, String fileNameCode, List<NonStandardInvestmentModel> modelList) throws IOException {
@@ -53,7 +53,7 @@ public class NonStandardInvestmentService extends BaseService<RptDefineModel> {
         String templatePath = DBExecutor.doQuery("select NOUNVALUE from sys_noun where NOUNITEM = 'ATTACHPATH'");
 
         // TODO  获取菜单名
-        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200107'");
+        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200100'");
         StringBuilder pathName = new StringBuilder(templatePath+"/"+menuName);
         // 获取数据库模板文件
         RptDefineModel entity = (RptDefineModel)this.queryOne(fileNameCode);

+ 3 - 3
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/OffCreditCardService.java

@@ -36,8 +36,8 @@ public class OffCreditCardService extends BaseService<RptDefineModel> {
     }
 
     // 查看当前行
-    public OffCreditCardModel selectRowData(OffCreditCardModel model) {
-        return offCreditCardMapper.selectRowData(model);
+    public OffCreditCardModel selectRowData(String subjectNumber, String term) {
+        return offCreditCardMapper.selectRowData(subjectNumber,term);
     }
 
     public void exportExcelModel(HttpServletResponse response, String fileNameCode, List<OffCreditCardModel> modelList) throws IOException {
@@ -53,7 +53,7 @@ public class OffCreditCardService extends BaseService<RptDefineModel> {
         String templatePath = DBExecutor.doQuery("select NOUNVALUE from sys_noun where NOUNITEM = 'ATTACHPATH'");
 
         // TODO  获取菜单名
-        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200107'");
+        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200114'");
         StringBuilder pathName = new StringBuilder(templatePath+"/"+menuName);
         // 获取数据库模板文件
         RptDefineModel entity = (RptDefineModel)this.queryOne(fileNameCode);

+ 3 - 3
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/OnCreditCardService.java

@@ -36,8 +36,8 @@ public class OnCreditCardService extends BaseService<RptDefineModel> {
     }
 
     // 查看当前行
-    public OnCreditCardModel selectRowData(OnCreditCardModel model) {
-        return onCreditCardMapper.selectRowData(model);
+    public OnCreditCardModel selectRowData(String subjectNumber, String term) {
+        return onCreditCardMapper.selectRowData(subjectNumber,term);
     }
 
     public void exportExcelModel(HttpServletResponse response, String fileNameCode, List<OnCreditCardModel> modelList) throws IOException {
@@ -53,7 +53,7 @@ public class OnCreditCardService extends BaseService<RptDefineModel> {
         String templatePath = DBExecutor.doQuery("select NOUNVALUE from sys_noun where NOUNITEM = 'ATTACHPATH'");
 
         // TODO  获取菜单名
-        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200107'");
+        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200113'");
         StringBuilder pathName = new StringBuilder(templatePath+"/"+menuName);
         // 获取数据库模板文件
         RptDefineModel entity = (RptDefineModel)this.queryOne(fileNameCode);

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/PledgeRelatedTableService.java

@@ -53,7 +53,7 @@ public class PledgeRelatedTableService extends BaseService<RptDefineModel> {
         String templatePath = DBExecutor.doQuery("select NOUNVALUE from sys_noun where NOUNITEM = 'ATTACHPATH'");
 
         // TODO  获取菜单名
-        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200107'");
+        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200111'");
         StringBuilder pathName = new StringBuilder(templatePath+"/"+menuName);
         // 获取数据库模板文件
         RptDefineModel entity = (RptDefineModel)this.queryOne(fileNameCode);

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/service/RepoRelatedTableService.java

@@ -53,7 +53,7 @@ public class RepoRelatedTableService extends BaseService<RptDefineModel> {
         String templatePath = DBExecutor.doQuery("select NOUNVALUE from sys_noun where NOUNITEM = 'ATTACHPATH'");
 
         // TODO  获取菜单名
-        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200107'");
+        String menuName = DBExecutor.doQuery("select funcname from sys_funinfo where funccode='M200110'");
         StringBuilder pathName = new StringBuilder(templatePath+"/"+menuName);
         // 获取数据库模板文件
         RptDefineModel entity = (RptDefineModel)this.queryOne(fileNameCode);

+ 4 - 3
Procedure/frontend/projectb/src/services/rwa/dataquality/BondInvestment.ts

@@ -45,7 +45,7 @@ export type SysListModel = {
     //生效日
     effectDate?:string;
     //到期日
-    expiryDate?:string;    
+    expiryDate?:string;
     //表内外标识代码
     onbalshOffbalshFlag?:string;
     //表内外标识
@@ -89,8 +89,9 @@ export async function getDataList(body:SysListModel) {
 
 
   /** 查询当前行详细数据 POST*/
-export async function selectDetailData(body: any) {
-    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/BondInvestmentAction/selectRowData.do',{data: body});
+export async function selectDetailData(subjectNumber:string,search:string,term:string) {
+    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/BondInvestmentAction/selectRowData.do',
+      {params: {subjectNumber:subjectNumber,search:search,term:term}});
   }
 
 

+ 3 - 2
Procedure/frontend/projectb/src/services/rwa/dataquality/DiscountTable.ts

@@ -93,8 +93,9 @@ export async function getDataList(body:SysListModel) {
 
 
   /** 查询当前行详细数据 POST*/
-export async function selectDetailData(body: any) {
-    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/DiscountTableAction/selectRowData.do',{data: body});
+export async function selectDetailData(subjectNumber:string,search:string,term:string) {
+    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/DiscountTableAction/selectRowData.do',
+      {params: {subjectNumber:subjectNumber,search:search,term:term}});
   }
 
 /** 全部导出 */

+ 3 - 2
Procedure/frontend/projectb/src/services/rwa/dataquality/InterbankDepositOrLendingTable.ts

@@ -69,8 +69,9 @@ export async function getDataList(body:SysListModel) {
   }
 
   /** 查询当前行详细数据 POST*/
-export async function selectDetailData(body: any) {
-    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/InterbankDepositOrLendingTableAction/selectRowData.do',{data: body});
+export async function selectDetailData(subjectNumber:string,search:string,term:string) {
+    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/InterbankDepositOrLendingTableAction/selectRowData.do',
+      {params: {subjectNumber:subjectNumber,search:search,term:term}});
   }
 
 /** 全部导出 */

+ 3 - 2
Procedure/frontend/projectb/src/services/rwa/dataquality/NonStandardInvestment.ts

@@ -71,8 +71,9 @@ export async function getDataList(body:SysListModel) {
   }
 
   /** 查询当前行详细数据 POST*/
-export async function selectDetailData(body: any) {
-    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/NonStandardInvestmentAction/selectRowData.do',{data: body});
+export async function selectDetailData(subjectNumber:string,search:string,term:string) {
+    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/NonStandardInvestmentAction/selectRowData.do',
+      {params: {subjectNumber:subjectNumber,search:search,term:term}});
   }
 
 /** 全部导出 */

+ 3 - 2
Procedure/frontend/projectb/src/services/rwa/dataquality/OffCreditCard.ts

@@ -78,8 +78,9 @@ export async function getDataList(body:SysListModel) {
   }
 
   /** 查询当前行详细数据 POST*/
-export async function selectDetailData(body: any) {
-    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/OffCreditCardAction/selectRowData.do',{data: body});
+export async function selectDetailData(subjectNumber:string,search:string,term:string) {
+    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/OffCreditCardAction/selectRowData.do',
+      {params: {subjectNumber:subjectNumber,search:search,term:term}});
   }
 
 /** 全部导出 */

+ 3 - 2
Procedure/frontend/projectb/src/services/rwa/dataquality/OnCreditCard.ts

@@ -82,8 +82,9 @@ export async function getDataList(body:SysListModel) {
 
 
   /** 查询当前行详细数据 POST*/
-export async function selectDetailData(body: any) {
-    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/OnCreditCardAction/selectRowData.do',{data: body});
+export async function selectDetailData(subjectNumber:string,search:string,term:string) {
+    return baseFun.request<SysListModel>('/api/product/rwa/interfacedatasheet/OnCreditCardAction/selectRowData.do',
+      {params: {subjectNumber:subjectNumber,search:search,term:term}});
   }