增加房地产日期判断。

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mapper/RealEstateMapper.java

@@ -10,7 +10,7 @@ public interface RealEstateMapper {
 
     List<RealEstateModel> selectDataList(@Param("model") RealEstateModel model);
 
-    List<RealEstateModel> selectDataList1();
+    List<RealEstateModel> selectDataList1(@Param("date") String date);
     Object selectRowData(@Param("model") RealEstateModel model);
 
     boolean deleteRows(Object o);

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/mybatis/RealEstateMapper.xml

@@ -33,6 +33,7 @@
         from RWA_BDM_BUS_ITM_FC_REALTY_LOAN T1
         LEFT JOIN RIM_APM_RWA_BS_FC_LOAN_CMS_ENT T2
         ON T1.LOAN_REFERENCE_NO = T2.DEBTITEM_NO
+        and t2.data_date = #{model.dataDate}
         <where>
             <if test="model.loanReferenceNo != null and '' != model.loanReferenceNo">
                 and T1.LOAN_REFERENCE_NO like concat(concat('%',#{model.loanReferenceNo}),'%')
@@ -64,7 +65,8 @@
         WHERE T1.INDUSTRY_INVEST_GROUP ='K701'
         AND T1.PROD_NO IN ('1050','1030030','106010')
         AND COALESCE(T1.CLIENT_NO,'0') !='20170924000016'
-        AND T2.ISRECOMBINE IS NULL OR T2.ISRECOMBINE = ''
+        AND (T2.ISRECOMBINE IS NULL OR T2.ISRECOMBINE = '')
+        AND T1.DATA_DATE = #{date}
     </select>
 
     <!-- 修改数据 -->
@@ -114,7 +116,6 @@
     <insert id="createDetailData" parameterType="com.sundata.product.rwa.rwacalcconfigdataparam.model.RealEstateModel">
         insert into RWA_BDM_BUS_ITM_FC_REALTY_LOAN
         (
-        CALCINDEX,
         SDATE,
         EDATE,
         TERM,
@@ -130,10 +131,9 @@
         BP_CUST_NO
         )
         SELECT
-        #{model.calcIndex} as CALCINDEX,
-        #{model.startDate} as SDATE,
-        #{model.endDate} as EDATE,
-        #{model.term} as TERM,
+        #{model.dataDate} as SDATE,
+        #{model.dataDate} as EDATE,
+        substr(#{model.dataDate},1,6) as TERM,
         #{model.dataDate} as DATA_DATE,
         t1.LOAN_REFERENCE_NO as LOAN_REFERENCE_NO,
         t2.CLIENT_NO as CUST_NO,
@@ -144,9 +144,10 @@
         t2.OVERDUE_DAYS as OVERDUE_DAYS,
         t1.ISRECOMBINE as ISRECOMBINE,
         t2.CORE_CLIENT_NO as BP_CUST_NO
-        FROM ( SELECT  #{model.loanReferenceNo} AS LOAN_REFERENCE_NO ,#{model.custName} AS CUST_NAME, #{model.productName} AS PRODUCT_NAME , #{model.isrecombine} AS ISRECOMBINE FROM dual) t1
+        FROM ( SELECT  #{model.loanReferenceNo} AS LOAN_REFERENCE_NO ,#{model.custName} AS CUST_NAME, #{model.productName} AS PRODUCT_NAME , substr(#{model.isrecombine},1,1) AS ISRECOMBINE FROM dual) t1
         LEFT JOIN RIM_APM_RWA_BS_FC_LOAN_CMS_ENT t2
         ON t1.LOAN_REFERENCE_NO =t2.DEBTITEM_NO
+        AND DATA_DATE = #{model.dataDate}
         WHERE T2.INDUSTRY_INVEST_GROUP ='K701'
         AND T2.PROD_NO IN ('1050','1030030','106010')
         AND COALESCE(T2.CLIENT_NO,'0') !='20170924000016'

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/service/RealEstateService.java

@@ -49,11 +49,20 @@ public class RealEstateService extends BaseService<RptDefineModel> {
     }
 
     public List<RealEstateModel> selectDataList(RealEstateModel model) {
+        String date_date =  DBExecutor.doQuery ("SELECT MAX(DATA_DATE) FROM RIM_APM_RWA_BS_FC_LOAN_CMS_ENT");
+        if("".equals(date_date)){
+            date_date = "20991231";
+            model.setDataDate(date_date);
+        }
         return realEstateMapper.selectDataList(model);
     }
 
     public List<RealEstateModel> selectDataList1() {
-        return realEstateMapper.selectDataList1();
+         String date =  DBExecutor.doQuery ("SELECT MAX(DATA_DATE) FROM RIM_APM_RWA_BS_FC_LOAN_CMS_ENT");
+         if("".equals(date)){
+             date = "20991231";
+         }
+        return realEstateMapper.selectDataList1(date);
     }
 
     public Object selectRowData(RealEstateModel model) {
@@ -149,7 +158,7 @@ public class RealEstateService extends BaseService<RptDefineModel> {
             // 向数据库批量插入
             flag = realEstateMapper.createDetailData(model);
             if (!flag) {
-                String err = "数据库插入异常!";
+                String err = "数据库插入格式不标准!";
                 log.error(err);
                 throw new BusinessException(err);
             }