修改内管报表日期格式

Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/action/CapitalOccupyMonitorAction.java

@@ -49,8 +49,10 @@ public class CapitalOccupyMonitorAction extends BaseAction {
      */
     @RequestMapping("/getDetailDataList")
     public void getDetailDataList (HttpServletRequest request, HttpServletResponse response,
-                             @RequestBody CapitalOccupyMonitorModel model) {
+                             @RequestBody CapitalOccupyMonitorModel model,@RequestParam String sDate,@RequestParam String eDate) {
         // 页面初始化
+        model.setsDate(sDate);
+        model.seteDate(eDate);
         sendData(response, capitalOccupyMonitorService.getDetailDataList(model));
     }
 

Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/action/ProductCreditRiskListAction.java

@@ -40,8 +40,10 @@ public class ProductCreditRiskListAction extends BaseAction {
 
     @RequestMapping("/getDetailDataList")
     public void getDetailDataList (HttpServletRequest request, HttpServletResponse response,
-                                   @RequestBody ProductCreditRiskListModel model) {
+                                   @RequestBody ProductCreditRiskListModel model,@RequestParam String sDate,@RequestParam String eDate) {
         // 页面初始化
+        model.setsDate(sDate);
+        model.seteDate(eDate);
         sendData(response, productCreditRiskListService.getDetailDataList(model));
     }
 

Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/action/ProductTypeCreditRiskListAction.java

@@ -41,8 +41,10 @@ public class ProductTypeCreditRiskListAction extends BaseAction {
 
     @RequestMapping("/getDetailDataList")
     public void getDetailDataList (HttpServletRequest request, HttpServletResponse response,
-                                   @RequestBody ProductTypeCreditRiskListModel model) {
+                                   @RequestBody ProductTypeCreditRiskListModel model,@RequestParam String sDate,@RequestParam String eDate) {
         // 页面初始化
+        model.setsDate(sDate);
+        model.seteDate(eDate);
         sendData(response, productTypeCreditRiskListService.getDetailDataList(model));
     }
 

Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/AccountManageListMapper.xml

@@ -36,7 +36,7 @@
                 and LOAN_REFERENCE_NO =#{model.loanReferenceNo}
             </if>
             <if test="model.eDate != null and '' != model.eDate">
-                and EDATE = #{model.eDate}
+                and substr(data_Date,1,6) = replace(#{model.eDate},'-','')
             </if>
         </where>
         union all
@@ -57,12 +57,12 @@
             <if test="model.loanReferenceNo != null and '' !=model.loanReferenceNo">
                 and LOAN_REFERENCE_NO =#{model.loanReferenceNo}
             </if>
-            <if test="model.sDate != null and '' != model.sDate">
-                <![CDATA[    and SDATE >= #{model.sDate}  ]]>
-            </if>
-            <if test="model.eDate != null and '' != model.eDate">
-                <![CDATA[  and EDATE <= #{model.eDate}  ]]>
+            <if test="model.sDate != null and '' != model.sDate and model.eDate != null and '' != model.eDate">
+                <![CDATA[    and substr(data_Date,1,6) between replace(#{model.sDate},'-','') and replace(#{model.eDate},'-','')  ]]>
             </if>
+<!--            <if test="model.eDate != null and '' != model.eDate">-->
+<!--                <![CDATA[  and substr(data_Date) <= replace(#{model.eDate},'-','')  ]]>-->
+<!--            </if>-->
         </where>
         group by LOAN_REFERENCE_NO
         )group by loanReferenceNo

Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/CapitalOccupyMonitorMapper.xml

@@ -58,7 +58,7 @@
                 and T2.ORGCODE like concat(concat('%',#{model.orgCode}),'%')
             </if>
             <if test="model.eDate != null and '' != model.eDate">
-                and EDATE = #{model.eDate}
+                and substr(data_Date,1,6) = replace(#{model.eDate},'-','')
             </if>
         </where>
         union all
@@ -91,12 +91,12 @@
         <if test="model.orgCode != null and '' != model.orgCode">
         and T2.ORGCODE like concat(concat('%',#{model.orgCode}),'%')
       </if>
-       <if test="model.sDate != null and '' != model.sDate">
-           <![CDATA[    and SDATE >= #{model.sDate}  ]]>
+       <if test="model.sDate != null and '' != model.sDate and model.eDate != null and '' != model.eDate">
+           <![CDATA[    and substr(data_Date,1,6) between  replace(#{model.sDate},'-','') and replace(#{model.eDate},'-','')  ]]>
          </if>
-        <if test="model.eDate != null and '' != model.eDate">
-            <![CDATA[  and EDATE <= #{model.eDate}  ]]>
-        </if>
+<!--        <if test="model.eDate != null and '' != model.eDate">-->
+<!--            <![CDATA[  and substr(data_Date) <= replace(#{model.eDate},'-','')  ]]>-->
+<!--        </if>-->
         </where>
         group by T2.ORGCODE
         )
@@ -177,6 +177,12 @@
             <if test="model.orgCode != null and '' != model.orgCode">
                 MANAGE_ORGN_NO in (select underorg from sys_orgrelational where orgcode = #{model.orgCode})
             </if>
+            <if test="model.sDate != null and '' != model.sDate and  model.eDate != null and '' != model.eDate">
+                <![CDATA[    and substr(data_Date,1,6) between replace(#{model.sDate},'-','') and replace(#{model.eDate},'-','')  ]]>
+            </if>
+<!--            <if test="model.eDate != null and '' != model.eDate">-->
+<!--                <![CDATA[  and substr(data_Date) <= replace(#{model.eDate},'-','')  ]]>-->
+<!--            </if>-->
 <!--            <if test="model.ruleName != null and '' != model.ruleName">-->
 <!--                and RULE_NAME like concat(concat('%',#{model.ruleName}),'%')-->
 <!--            </if>-->
@@ -239,7 +245,7 @@
                 and  ORGCODE  in (select underorg from sys_orgrelational where orgcode = #{model.orgCode})
             </if>
             <if test="model.eDate != null and '' != model.eDate">
-                and EDATE = #{model.eDate}
+                and substr(data_date,1,6) = replace(#{model.eDate},'-','')
             </if>
         </where>
         union all
@@ -270,12 +276,12 @@
             <if test="model.orgCode != null and '' != model.orgCode">
                 and ORGCODE  in (select underorg from sys_orgrelational where orgcode = #{model.orgCode})
             </if>
-            <if test="model.sDate != null and '' != model.sDate">
-                <![CDATA[    and SDATE >= #{model.sDate}  ]]>
-            </if>
-            <if test="model.eDate != null and '' != model.eDate">
-                <![CDATA[  and EDATE <= #{model.eDate}  ]]>
+            <if test="model.sDate != null and '' != model.sDate and model.eDate != null and '' != model.eDate">
+                <![CDATA[    and substr(data_Date,1,6) between replace(#{model.sDate},'-','') and replace(#{model.eDate},'-','')  ]]>
             </if>
+<!--            <if test="model.eDate != null and '' != model.eDate">-->
+<!--                <![CDATA[  and substr(data_Date) <= replace(#{model.eDate},'-','')  ]]>-->
+<!--            </if>-->
         </where>
         group by ORGCODE
         )

Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/CorporateLoansCustomersMapper.xml

@@ -6,9 +6,6 @@
     <!-- 初始化与按查询条件查询 -->
     <select id="getDataList" resultType="com.sundata.product.rwa.internal.model.CorporateLoansCustomersModel" parameterType="com.sundata.product.rwa.internal.model.CorporateLoansCustomersModel">
         select
-        CALCINDEX                        AS   calcIndex,
-        SDATE                            AS   sDate,
-        EDATE                            AS   eDate,
         TERM                             AS   term,
         DATA_DATE                        AS   dataDate,
         CUST_NAME                        AS   custName,
@@ -33,9 +30,11 @@
 <!--                and ORGCODE like concat(concat('%',#{model.orgCode}),'%')-->
 <!--            </if>-->
             <if test="model.term != null and '' != model.term">
-                and TERM like concat(concat('%',#{model.term}),'%')
+                and substr(TERM,1,6) like concat(concat('%',replace(#{model.term},'-','')),'%')
             </if>
         </where>
+        order by balance desc
+        limit 10
     </select>
 
     <select id="getDetailDataList" resultType="com.sundata.product.rwa.internal.model.MultiDimensionalCreditRiskModel" parameterType="com.sundata.product.rwa.internal.model.MultiDimensionalCreditRiskModel">
@@ -110,6 +109,7 @@
             <if test="model.custNo != null and '' != model.custNo">
               and  CLIENT_NO = #{model.custNo}
             </if>
+            and substr(term,1,6) = substr(replace(#{model.term},'-',''),1,6)
             <!--            <if test="model.ruleName != null and '' != model.ruleName">-->
             <!--                and RULE_NAME like concat(concat('%',#{model.ruleName}),'%')-->
             <!--            </if>-->

Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/MultiDimensionalCreditRiskMapper.xml

@@ -76,7 +76,7 @@
         from  RWA_REPORT_RS_MULTI_DIMENSIONAL_CREDIT_RISK
         <where>
             <if test="model.term != null and '' != model.term">
-                AND TERM like concat(concat('%',#{model.term}),'%')
+                AND substr(TERM,1,6) like concat(concat('%',replace(#{model.term},'-','')),'%')
             </if>
             <if test="model.manageOrgnNo != null and '' != model.manageOrgnNo">
                 and MANAGE_ORGN_NO like concat(concat('%',#{model.manageOrgnNo}),'%')

Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/ProductCreditRiskListMapper.xml

@@ -35,7 +35,7 @@
         from RWA_REPORT_RS_PRODUCTCREDICTRISKGROUP
         <where>
             <if test="model.eDate != null and '' != model.eDate">
-                and EDATE = #{model.eDate}
+                and substr(data_date,1,6) = replace(#{model.eDate},'-'，''）
             </if>
         </where>
         union all
@@ -54,12 +54,12 @@
         null                          AS    averageRiskWeight
         from RWA_REPORT_RS_PRODUCTCREDICTRISKGROUP
         <where>
-            <if test="model.sDate != null and '' != model.sDate">
-                <![CDATA[    and SDATE >= #{model.sDate}  ]]>
-            </if>
-            <if test="model.eDate != null and '' != model.eDate">
-                <![CDATA[  and EDATE <= #{model.eDate}  ]]>
+            <if test="model.sDate != null and '' != model.sDate and model.eDate != null and '' != model.eDate">
+                <![CDATA[    and substr(data_date,1,6) between  replace(#{model.sDate},'-','') and replace(#{model.eDate},'-','')  ]]>
             </if>
+<!--            <if test="model.eDate != null and '' != model.eDate">-->
+<!--                <![CDATA[  and substr(data_date,1,6) <= replace(#{model.eDate},'-','')  ]]>-->
+<!--            </if>-->
         </where>
         group by PRODUCT_NO,PRODUCT_NAME
         )group by productNo,productName
@@ -137,6 +137,12 @@
             <if test="model.productName != null and '' != model.productName">
                 and  PROD_NAME = #{model.productName}
             </if>
+            <if test="model.sDate != null and '' != model.sDate and model.eDate != null and '' != model.eDate">
+                <![CDATA[    and substr(data_date,1,6) between replace(#{model.sDate},'-','')  and replace(#{model.eDate},'-','') ]]>
+            </if>
+<!--            <if test="model.eDate != null and '' != model.eDate">-->
+<!--                <![CDATA[  and substr(data_date,1,6) <= replace(#{model.eDate},'-','')  ]]>-->
+<!--            </if>-->
             <!--            <if test="model.ruleName != null and '' != model.ruleName">-->
             <!--                and RULE_NAME like concat(concat('%',#{model.ruleName}),'%')-->
             <!--            </if>-->

Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/ProductTypeCreditRiskListMapper.xml

@@ -35,7 +35,7 @@
         from RWA_REPORT_RS_PRODUCTTYPECREDICTGROUP
         <where>
             <if test="model.eDate != null and '' != model.eDate">
-                and EDATE = #{model.eDate}
+                and substr(data_date,1,6) = replace(#{model.eDate},'-','')
             </if>
         </where>
         union all
@@ -54,12 +54,12 @@
         null                          AS    averageRiskWeight
         from RWA_REPORT_RS_PRODUCTTYPECREDICTGROUP
         <where>
-            <if test="model.sDate != null and '' != model.sDate">
-                <![CDATA[    and SDATE >= #{model.sDate}  ]]>
-            </if>
-            <if test="model.eDate != null and '' != model.eDate">
-                <![CDATA[  and EDATE <= #{model.eDate}  ]]>
+            <if test="model.sDate != null and '' != model.sDate and model.eDate != null and '' != model.eDate">
+                <![CDATA[    and substr(data_date,1,6) between replace(#{model.sDate},'-','') and replace(#{model.eDate},'-','') ]]>
             </if>
+<!--            <if test="model.eDate != null and '' != model.eDate">-->
+<!--                <![CDATA[  and substr(data_date,1,6) <= replace(#{model.eDate},'-','')  ]]>-->
+<!--            </if>-->
         </where>
         group by PRODUCT_TYPE,RISK_WEIGHT
         )group by productType,riskWeight
@@ -137,6 +137,12 @@
             <if test="model.productType != null and '' != model.productType">
                 and  PROD_TYPE = #{model.productType}
             </if>
+            <if test="model.sDate != null and '' != model.sDate and model.eDate != null and '' != model.eDate">
+                <![CDATA[    and substr(data_date,1,6) between replace(#{model.sDate},'-','') and replace(#{model.eDate},'-','')  ]]>
+            </if>
+<!--            <if test="model.eDate != null and '' != model.eDate">-->
+<!--                <![CDATA[  and substr(data_date,1,6) <= replace(#{model.eDate},'-','')  ]]>-->
+<!--            </if>-->
             <!--            <if test="model.ruleName != null and '' != model.ruleName">-->
             <!--                and RULE_NAME like concat(concat('%',#{model.ruleName}),'%')-->
             <!--            </if>-->

Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/WithinTableCorporateLoansMapper.xml

@@ -29,7 +29,7 @@
         <where>
             1=1
             <if test="model.term != null and '' != model.term">
-                 and TERM =#{model.term}
+                 and substr(TERM,1,6) =replace(#{model.term},'-','')
             </if>
 <!--            <if test="model.ruleName != null and '' != model.ruleName">-->
 <!--                and RULE_NAME like concat(concat('%',#{model.ruleName}),'%')-->
@@ -113,6 +113,7 @@
             <if test="model.industryClass != null and '' != model.industryClass">
                 and  INDUSTRY_INVEST_CLASS = #{model.industryClass}
             </if>
+            and substr(term,1,6) =substr(replace(#{model.term},'-',''),1,6)
             <!--            <if test="model.ruleName != null and '' != model.ruleName">-->
             <!--                and RULE_NAME like concat(concat('%',#{model.ruleName}),'%')-->
             <!--            </if>-->

Procedure/frontend/projectb/src/pages/product/internal/capitaloccupymonitor.tsx

@@ -151,7 +151,7 @@ const capitaloccupymonitor : React.FC<widowRush> = (prop:widowRush) => {
      }
 
      const selectDetailData = async (formdata : CapitalOccupyMonitorModel) => {
-      const data = await getDetailDataList(formdata);
+      const data = await getDetailDataList(formdata,time1,time2);
       setFormDetailData(data);
      
      }

Procedure/frontend/projectb/src/pages/product/internal/multidimensionalcreditrisk.tsx

@@ -82,14 +82,6 @@ const multidimensionalcreditrisk : React.FC<widowRush> = (prop:widowRush) => {
             dataIndex: 'loanReferenceNo',
             order:-9,
             width:150,
-            render: (_, record) => [
-                <Link to ="/multidimensionalcreditrisk1" onClick={()=>{
-                //   if(record.key !='summary'){
-                //     getDataList(record);
-                //    }
-                }
-                }>{record.loanReferenceNo}</Link >
-              ],
         },
         {
             title: '合同编号',

Procedure/frontend/projectb/src/pages/product/internal/productcreditriskcapitaloccupy.tsx

@@ -27,6 +27,8 @@ const productcreditriskcapitaloccupy : React.FC<widowRush> = (prop:widowRush) =>
     const actionRef = useRef<ActionType>();
     const formRef = useRef<FormInstance<any>>();
     const templateRef = useRef<FormInstance<any>>();
+    const [time1, setTime1] = useState<any>();
+    const [time2, setTime2] = useState<any>();
 
     const [formDetailData, setFormDetailData] = useState<detailInfoListModel[]>();
     // 页面数据
@@ -48,7 +50,7 @@ const productcreditriskcapitaloccupy : React.FC<widowRush> = (prop:widowRush) =>
 
     // 修改查询查询
     const selectDetailData = async (formdata : ProductCreditRiskListModel) => {
-      const data = await getDetailDataList(formdata);
+      const data = await getDetailDataList(formdata,time1,time2);
       setFormDetailData(data);
      
      }
@@ -606,6 +608,8 @@ const productcreditriskcapitaloccupy : React.FC<widowRush> = (prop:widowRush) =>
          rowKey="customerName"
          request={async (formdata:ProductCreditRiskListModel) =>{
            const formDatas = await getDataList(formdata);
+           setTime1(formdata.sDate)
+           setTime2(formdata.eDate)
            // 解构数组（导出用）
            formDataList=[...formDatas];
            setFormDetailData1(formDatas);

Procedure/frontend/projectb/src/pages/product/internal/producttypecreditriskcapitaloccupy.tsx

@@ -32,6 +32,8 @@ const producttypecreditriskcapitaloccupy : React.FC<widowRush> = (prop:widowRush
     // 页面数据
     var formDataList = new Array<ProductTypeCreditRiskListModel>;
     const { fetchDict } = useModel('dict');
+    const [time1, setTime1] = useState<any>();
+    const [time2, setTime2] = useState<any>();
 
     /** 字段关系序号编辑 */
     var dataIndex = 1;
@@ -49,7 +51,7 @@ const producttypecreditriskcapitaloccupy : React.FC<widowRush> = (prop:widowRush
 
     
     const selectDetailData = async (formdata : ProductTypeCreditRiskListModel) => {
-      const data = await getDetailDataList(formdata);
+      const data = await getDetailDataList(formdata,time1,time2);
       setFormDetailData(data);
      
      }
@@ -612,6 +614,8 @@ const producttypecreditriskcapitaloccupy : React.FC<widowRush> = (prop:widowRush
          request={async (formdata:ProductTypeCreditRiskListModel) =>{
           const formDatas = await getDataList(formdata);
           // 解构数组（导出用）
+          setTime1(formdata.sDate)
+          setTime2(formdata.eDate)
           setFormDetailData1(formDatas);
           formDataList=[...formDatas];
           formDatas.forEach(function(erement,index,array){

Procedure/frontend/projectb/src/services/rwa/product/internal/capitaloccupymonitor.ts

@@ -249,8 +249,8 @@ export async function getDataList(body:CapitalOccupyMonitorModel) {
 }
 
 /** 获取页面初始化及条件查询 POST*/
-export async function getDetailDataList(body:CapitalOccupyMonitorModel) {
-  return baseFun.request<detailInfoListModel[]>('/api/product/rwa/internal/CapitalOccupyMonitorAction/getDetailDataList.do',{data: body});
+export async function getDetailDataList(body:CapitalOccupyMonitorModel,sDate:string,eDate:string) {
+  return baseFun.request<detailInfoListModel[]>('/api/product/rwa/internal/CapitalOccupyMonitorAction/getDetailDataList.do',{data: body, params:{sDate,eDate}});
 }
 
 /** 获取页面初始化及条件查询 POST*/

Procedure/frontend/projectb/src/services/rwa/product/internal/productcreditriskcapitaloccupy.ts

@@ -174,8 +174,8 @@ export async function getDataList(body:ProductCreditRiskListModel) {
 }
 
 /** 获取页面初始化及条件查询 POST*/
-export async function getDetailDataList(body:ProductCreditRiskListModel) {
-  return baseFun.request<detailInfoListModel[]>('/api/product/rwa/internal/ProductCreditRiskListAction/getDetailDataList.do',{data: body});
+export async function getDetailDataList(body:ProductCreditRiskListModel,sDate:string,eDate:string) {
+  return baseFun.request<detailInfoListModel[]>('/api/product/rwa/internal/ProductCreditRiskListAction/getDetailDataList.do',{data: body,params:{sDate,eDate}});
 }
 
 

Procedure/frontend/projectb/src/services/rwa/product/internal/producttypecreditriskcapitaloccupy.ts

@@ -174,8 +174,8 @@ export async function getDataList(body:ProductTypeCreditRiskListModel) {
 }
 
 /** 获取页面初始化及条件查询 POST*/
-export async function getDetailDataList(body:ProductTypeCreditRiskListModel) {
-  return baseFun.request<detailInfoListModel[]>('/api/product/rwa/internal/ProductTypeCreditRiskListAction/getDetailDataList.do',{data: body});
+export async function getDetailDataList(body:ProductTypeCreditRiskListModel,sDate:string,eDate:string) {
+  return baseFun.request<detailInfoListModel[]>('/api/product/rwa/internal/ProductTypeCreditRiskListAction/getDetailDataList.do',{data: body,params:{sDate,eDate}});
 }