后端代码更新

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

@@ -5,6 +5,7 @@ import com.sundata.common.base.BaseAction;
 import com.sundata.product.rwa.parameter.model.FcCommitmentModel;
 import com.sundata.product.rwa.parameter.model.FcLoanModel;
 import com.sundata.product.rwa.parameter.model.GovFinancialAssetCompModel;
+import com.sundata.product.rwa.parameter.model.SovereignModel;
 import com.sundata.product.rwa.parameter.service.FcLoanService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -32,9 +33,17 @@ public class FcLoanAction  extends BaseAction {
         //sql=sql.replace("${","#").replace("}","#");
         //sendData(response,sql );
     }
+    @RequestMapping("/getFcLoan1")
+    public void getFcLoan1(HttpServletRequest request, HttpServletResponse response, @RequestParam String loanReferenceNo){
+
+
+        System.out.println(loanReferenceNo);
+        //sql=sql.replace("${","#").replace("}","#");
+        //sendData(response,sql );
+    }
     @RequestMapping("/exportExcelModel")
     public void exportExcelModel (HttpServletRequest request,
-                                  HttpServletResponse response, @RequestParam String fileName, @RequestBody List<FcLoanModel> fcLoanModelDemoFr)throws IOException {
+                                  HttpServletResponse response, @RequestParam String fileName,@RequestBody List<FcLoanModel> fcLoanModelDemoFr) throws IOException {
         response.setCharacterEncoding("UTF-8");
         response.setContentType("text/html; charset=UTF-8");
         String fileNameModel=fileName+"Model";

Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/model/FcCommitmentModel.java

@@ -1,6 +1,7 @@
 package com.sundata.product.rwa.parameter.model;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 public class FcCommitmentModel {
     private String  balAccount;  // 本金科目号
@@ -12,6 +13,7 @@ public class FcCommitmentModel {
     private String  calcindex;  // 计算实例号
     private String  ccyCd;  // 币种代码
     private String[]  commType;  // 承诺类型
+    private String commTypes;
     private BigDecimal  ctrAmount;  // 合同金额
     private String  custName;  // 客户名称
     private String  custNo;  // 客户编号
@@ -20,7 +22,7 @@ public class FcCommitmentModel {
     private String  finBranchNo;  // 财务机构编号
     private String  loanReferenceNo;  // 债项编号
     private String  matDt;  // 到期日
-    private String[]  mgmtBranchNo;  // 经营机构编号
+    private List<String> mgmtBranchNo;  // 经营机构编号
     private String  onOffFlag;  // 表内外标识
     private String  productName;  // 产品名称
     private String  productNo;  // 产品编号
@@ -30,6 +32,16 @@ public class FcCommitmentModel {
     private String  sdate;  // 起始数据日期
     private String  startDt;  // 生效日
     private String  term;  // 年月
+    private String  custType;  //客户种类
+    private String  ccyCdId;  //
+    private String  commTypeId;  //
+    private String  onOffFlagId;  //
+    private String  bookTypeCdId;  //
+    private String  custTypeId;  //
+    private String  busLineId;  //
+    private String  orgname1;  //
+    private String  orgname2;  //
+
 
     public String getBalAccount() {
         return balAccount;
@@ -75,7 +87,11 @@ public class FcCommitmentModel {
         this.commType = commType;
     }
 
-    public void setMgmtBranchNo(String[] mgmtBranchNo) {
+    public List<String> getMgmtBranchNo() {
+        return mgmtBranchNo;
+    }
+
+    public void setMgmtBranchNo(List<String> mgmtBranchNo) {
         this.mgmtBranchNo = mgmtBranchNo;
     }
 
@@ -240,4 +256,89 @@ public class FcCommitmentModel {
     public void setTerm(String term) {
         this.term = term;
     }
+
+    public String[] getCommType() {
+        return commType;
+    }
+
+
+    public String getCustType() {
+        return custType;
+    }
+
+    public void setCustType(String custType) {
+        this.custType = custType;
+    }
+
+    public String getCcyCdId() {
+        return ccyCdId;
+    }
+
+    public void setCcyCdId(String ccyCdId) {
+        this.ccyCdId = ccyCdId;
+    }
+
+    public String getCommTypeId() {
+        return commTypeId;
+    }
+
+    public void setCommTypeId(String commTypeId) {
+        this.commTypeId = commTypeId;
+    }
+
+    public String getOnOffFlagId() {
+        return onOffFlagId;
+    }
+
+    public void setOnOffFlagId(String onOffFlagId) {
+        this.onOffFlagId = onOffFlagId;
+    }
+
+    public String getBookTypeCdId() {
+        return bookTypeCdId;
+    }
+
+    public void setBookTypeCdId(String bookTypeCdId) {
+        this.bookTypeCdId = bookTypeCdId;
+    }
+
+    public String getCustTypeId() {
+        return custTypeId;
+    }
+
+    public void setCustTypeId(String custTypeId) {
+        this.custTypeId = custTypeId;
+    }
+
+    public String getBusLineId() {
+        return busLineId;
+    }
+
+    public void setBusLineId(String busLineId) {
+        this.busLineId = busLineId;
+    }
+
+    public String getOrgname1() {
+        return orgname1;
+    }
+
+    public void setOrgname1(String orgname1) {
+        this.orgname1 = orgname1;
+    }
+
+    public String getOrgname2() {
+        return orgname2;
+    }
+
+    public void setOrgname2(String orgname2) {
+        this.orgname2 = orgname2;
+    }
+
+    public String getCommTypes() {
+        return commTypes;
+    }
+
+    public void setCommTypes(String commTypes) {
+        this.commTypes = commTypes;
+    }
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/parameter/model/FcLoanModel.java

@@ -61,6 +61,8 @@ public class FcLoanModel {
     private String  custTypeId;
     private String  propDevelProjTypeCdId;
     private String  domDocFlagId;
+    private String  orgname1;
+    private String  orgname2;
 
     public BigDecimal getAccrInt() {
         return accrInt;
@@ -531,4 +533,20 @@ public class FcLoanModel {
     public void setDomDocFlagId(String domDocFlagId) {
         this.domDocFlagId = domDocFlagId;
     }
+
+    public String getOrgname1() {
+        return orgname1;
+    }
+
+    public void setOrgname1(String orgname1) {
+        this.orgname1 = orgname1;
+    }
+
+    public String getOrgname2() {
+        return orgname2;
+    }
+
+    public void setOrgname2(String orgname2) {
+        this.orgname2 = orgname2;
+    }
 }

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

@@ -3,36 +3,67 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundata.product.rwa.parameter.mapper.FcCommitmentMapper">
-    <select id="getFcCommitment"   resultType="com.sundata.product.rwa.parameter.model.FcCommitmentModel">
+    <select id="getFcCommitment"   resultType="com.sundata.product.rwa.parameter.model.FcCommitmentModel" parameterType="java.util.List">
         select
-         BAL_ACCOUNT as balAccount
-        ,BALANCE as balance
-        ,BOOK_TYPE_CD as bookTypeCd
-        ,BP_CUST_NO as bpCustNo
-        ,BUS_LINE as busLine
-        ,BUS_TYPE as busType
-        ,CALCINDEX as calcindex
-        ,CCY_CD as ccyCd
-        ,COMM_TYPE as commType
-        ,CTR_AMOUNT as ctrAmount
-        ,CUST_NAME as custName
-        ,CUST_NO as custNo
-        ,DATA_DATE as dataDate
-        ,EDATE as edate
-        ,FIN_BRANCH_NO as finBranchNo
-        ,LOAN_REFERENCE_NO as loanReferenceNo
-        ,MAT_DT as matDt
-        ,MGMT_BRANCH_NO as mgmtBranchNo
-        ,ON_OFF_FLAG as onOffFlag
-        ,PRODUCT_NAME as productName
-        ,PRODUCT_NO as productNo
-        ,RESERVE as reserve
-        ,RESERVE_ACCOUNT as reserveAccount
-        ,REVOLVING_FLAG as revolvingFlag
-        ,SDATE as sdate
-        ,START_DT as startDt
-        ,TERM as term
-        from  RWA_BUS_IT_FC_COMMITMENT
+        T1.BAL_ACCOUNT as balAccount
+        ,T1.BALANCE as balance
+        ,T1.BOOK_TYPE_CD as bookTypeCd
+        ,T1.BP_CUST_NO as bpCustNo
+        ,T1.BUS_LINE as busLine
+        ,T1.BUS_TYPE as busType
+        ,T1.CALCINDEX as calcindex
+        ,T1.CCY_CD as ccyCd
+        ,T1.COMM_TYPE as commTypes
+        ,T1.CTR_AMOUNT as ctrAmount
+        ,T1.CUST_NAME as custName
+        ,T1.CUST_NO as custNo
+        ,T1.DATA_DATE as dataDate
+        ,T1.EDATE as edate
+        ,T1.FIN_BRANCH_NO as finBranchNo
+        ,T1.LOAN_REFERENCE_NO as loanReferenceNo
+        ,T1.MAT_DT as matDt
+        ,T1.MGMT_BRANCH_NO as mgmtBranchNo
+        ,T1.ON_OFF_FLAG as onOffFlag
+        ,T1.PRODUCT_NAME as productName
+        ,T1.PRODUCT_NO as productNo
+        ,T1.RESERVE as reserve
+        ,T1.RESERVE_ACCOUNT as reserveAccount
+        ,T1.REVOLVING_FLAG as revolvingFlag
+        ,T1.SDATE as sdate
+        ,T1.START_DT as startDt
+        ,T1.TERM as term
+        ,T1.CUST_TYPE as custType
+        ,T2.NOUNNAME as ccyCdId
+        ,T3.NOUNNAME as commTypeId
+        ,T4.NOUNNAME as onOffFlagId
+        ,T5.NOUNNAME as bookTypeCdId
+        ,T6.NOUNNAME as custTypeId -- 客户类型需要改
+        ,T7.NOUNNAME as busLineId
+        ,T8.ORGNAME AS orgname1
+        ,T9.ORGNAME AS orgname2
+        from  RWA_BUS_IT_FC_COMMITMENT T1
+        LEFT JOIN SYS_NOUN  T2
+        ON T1.CCY_CD =T2.NOUNVALUE
+        AND T2.NOUNITEM ='currCd'
+        LEFT JOIN SYS_NOUN  T3
+        ON T1.COMM_TYPE =T3.NOUNVALUE
+        AND T3.NOUNITEM ='COMMITMENT_TYPE'
+        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.CUST_TYPE =T6.NOUNVALUE
+        AND T6.NOUNITEM ='CUST_TYPE_LV01'
+        LEFT JOIN SYS_NOUN  T7
+        ON T1.BUS_LINE =T7.NOUNVALUE
+        AND T7.NOUNITEM ='BUSINESSLINE'
+        LEFT JOIN sys_organization T8
+        ON T8.ORGCODE = T1.FIN_BRANCH_NO
+        LEFT JOIN sys_organization T9
+        ON T1.MGMT_BRANCH_NO = T9.ORGCODE
         where 1=1
         <if test="dataDate !='' and dataDate!=null">
             and DATA_DATE = replace(#{dataDate},'-','')

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

@@ -79,7 +79,7 @@
         AND T5.NOUNSUPER ='ACCOUNT_TYPE'
         LEFT JOIN SYS_NOUN T6
         ON T1.INVEST_INDUSTRY_CD =T6.NOUNVALUE
-        AND t1.NOUNITEM='interIndustry'
+        AND t6.NOUNITEM='interIndustry'
         LEFT JOIN SYS_NOUN T7
         ON T1.INVEST_INDUSTRY_CD_1 =T7.NOUNVALUE
         AND T7.NOUNITEM ='interIndustry'
@@ -101,7 +101,7 @@
         LEFT JOIN sys_organization T13
         ON T13.ORGCODE = T1.FIN_BRANCH_NO
         LEFT JOIN sys_organization T14
-        ON T14.MGMT_BRANCH_NO = T1.FIN_BRANCH_NO
+        ON T1.MGMT_BRANCH_NO = T14.ORGCODE
         where 1=1
         <if test="dataDate !='' and dataDate!=null">
             and DATA_DATE = replace(#{dataDate},'-','')

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/action/DiffconfigListAction.java

@@ -3,7 +3,7 @@ package com.sundata.product.rwa.resultList.action;
 import com.sundata.common.annotation.SysLog;
 import com.sundata.common.base.BaseAction;
 import com.sundata.product.rwa.resultList.model.DiffconfigListModel;
-import com.sundata.product.rwa.resultList.model.ResultListModel;
+import com.sundata.product.rwa.resultList.model.RuleListModel;
 import com.sundata.product.rwa.resultList.service.DiffconfigListService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -11,6 +11,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/product/rwa/resultList/DiffconfigListAction")
@@ -24,13 +29,47 @@ public class DiffconfigListAction extends BaseAction {
     }
     @RequestMapping("/rule_list")
     @SysLog(funcName="适用的总分勾稽规则列表")
-    public void  rule_list (HttpServletRequest request, HttpServletResponse response, @RequestBody ResultListModel resultListModelDemo){
-        sendData(response,diffconfigListservice.rule_list(resultListModelDemo));
+    public void  rule_list (HttpServletRequest request, HttpServletResponse response, @RequestBody RuleListModel RuleListModelDemo){
+        sendData(response,diffconfigListservice.rule_list(RuleListModelDemo));
     }
     @RequestMapping("/rule_list1")
     @SysLog(funcName="总分勾稽规则的选择")
-    public void  rule_list1 (HttpServletRequest request, HttpServletResponse response, @RequestBody ResultListModel resultListModelDemo){
-        sendData(response,diffconfigListservice.rule_list1(resultListModelDemo));
+    public void  rule_list1 (HttpServletRequest request, HttpServletResponse response, @RequestBody RuleListModel RuleListModelDemo){
+        sendData(response,diffconfigListservice.rule_list1(RuleListModelDemo));
+    }
+    @RequestMapping("/diffconfig_deleteone")
+    @SysLog(funcName="总分勾稽规则的删除")
+    public void diffconfig_deleteone(HttpServletRequest request, HttpServletResponse response,@RequestParam String ruleNo){
+        sendData(response,diffconfigListservice.diffconfig_deleteone(ruleNo));
+    }
+
+
+    @RequestMapping("/rule_queryone")
+    @SysLog(funcName="总分勾稽规则的修改")
+    public void rule_queryone(HttpServletRequest request, HttpServletResponse response,@RequestParam String ruleNo){
+
+        sendData(response,diffconfigListservice.rule_queryone(ruleNo));
+    }
+
+
+    @RequestMapping("/diffconfig_addone")
+    @SysLog(funcName="总分勾稽规则的选择")
+    public void  diffconfig_addone (HttpServletRequest request, HttpServletResponse response, @RequestBody DiffconfigListModel diffconfigListModel){
+        sendData(response,diffconfigListservice.diffconfig_addone(diffconfigListModel));
+    }
+
+    @RequestMapping("/diffconfig_addone1")
+    @SysLog(funcName="总分勾稽规则的选择")
+    public void  diffconfig_addone1 (HttpServletRequest request, HttpServletResponse response, @RequestParam String ruleNo, @RequestBody List<RuleListModel> RuleListModelDemo){
+       // RuleListModel model = new RuleListModel();
+//        model.setRuleNo(ruleNo);
+//        RuleListModelDemo.add(model);
+        ArrayList<RuleListModel> arrayList = new ArrayList<>(RuleListModelDemo);
+        for(RuleListModel model :arrayList){
+            model.setRuleNo(ruleNo);
+        }
+
+        sendData(response,diffconfigListservice.diffconfig_addone1(ruleNo,RuleListModelDemo));
     }
 
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/action/ResultListAction.java

@@ -3,6 +3,7 @@ package com.sundata.product.rwa.resultList.action;
 import com.sundata.common.annotation.SysLog;
 import com.sundata.common.base.BaseAction;
 import com.sundata.product.rwa.resultList.model.ResultListModel;
+import com.sundata.product.rwa.resultList.model.RuleListModel;
 import com.sundata.product.rwa.resultList.service.ResultListService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -10,36 +11,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 @RequestMapping("/product/rwa/resultList/ResultListAction")
-public class ResultListAction  extends BaseAction {
+public class ResultListAction extends BaseAction {
     @Autowired
-    private ResultListService resultListservice;
-    @RequestMapping("/rule_list")
-    @SysLog(funcName="总账勾稽配置信息")
-    public void  rule_list (HttpServletRequest request, HttpServletResponse response, @RequestBody ResultListModel resultListModelDemo){
-        sendData(response,resultListservice.rule_list(resultListModelDemo));
+    ResultListService resultListService;
+    @RequestMapping("/result_list")
+    @SysLog(funcName="总账勾稽结果表")
+    public void  result_list (HttpServletRequest request, HttpServletResponse response, @RequestBody ResultListModel ResultListModelDemo){
+        sendData(response,resultListService.result_list(ResultListModelDemo));
     }
-
-    @RequestMapping("/rule_queryone")
-    @SysLog(funcName="总账勾稽配置信息新增/修改")
-    public void  rule_queryone (HttpServletRequest request, HttpServletResponse response, @RequestParam String ruleId){
-        sendData(response,resultListservice.rule_queryone(ruleId));
-    }
-
-    @RequestMapping("/updateResultList")
-    @SysLog(funcName="总账勾稽配置信息作废")
-    public void  updateResultList (HttpServletRequest request, HttpServletResponse response, @RequestParam String ruleId){
-        sendData(response,resultListservice.updateResultList(ruleId));
-
-    }
-
-    @RequestMapping("/rule_addone")
-    @SysLog(funcName="总账勾稽配置信息保存")
-    public void  rule_addone (HttpServletRequest request, HttpServletResponse response, @RequestBody ResultListModel resultListModelDemo){
-        sendData(response,resultListservice.rule_addone(resultListModelDemo));
-    }
-
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/mapper/DiffconfigListMapper.java

@@ -1,12 +1,18 @@
 package com.sundata.product.rwa.resultList.mapper;
 
 import com.sundata.product.rwa.resultList.model.DiffconfigListModel;
-import com.sundata.product.rwa.resultList.model.ResultListModel;
+import com.sundata.product.rwa.resultList.model.RuleListModel;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface DiffconfigListMapper {
     public List<DiffconfigListModel> rule_querylist(DiffconfigListModel diffconfigListModel);
-    public List<ResultListModel> rule_list(ResultListModel ResultListModelDemo);
-    public List<ResultListModel> rule_list1(ResultListModel ResultListModelDemo);
+    public List<RuleListModel> rule_list(RuleListModel RuleListModelDemo);
+    public List<RuleListModel> rule_list1(RuleListModel RuleListModelDemo);
+    Boolean diffconfig_addone (DiffconfigListModel diffconfigListModel) ;
+    void diffconfig_addone1 (@Param("list") List<RuleListModel> RuleListModelDemo) ;
+    void  diffconfig_deleteone(@Param("ruleNo") String ruleNo);
+    public List<Object> rule_querylist1 (@Param("ruleNo") String ruleNo);
+    public List<Object> rule_querylist2 (@Param("ruleNo") String ruleNo);
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/mapper/ResultListMapper.java

@@ -1,14 +1,9 @@
 package com.sundata.product.rwa.resultList.mapper;
 
-
 import com.sundata.product.rwa.resultList.model.ResultListModel;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface ResultListMapper {
-    public List<ResultListModel> rule_list(ResultListModel ResultListModelDemo);
-    public ResultListModel rule_queryone (@Param("ruleId") String ruleId);
-    public void rule_deleteone (@Param("ruleId") String ruleId);
-    boolean rule_addone (ResultListModel ResultListModelDemo);
+    public List<ResultListModel> result_list(ResultListModel ResultListModelDemo);
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/model/ResultListModel.java

@@ -1,62 +1,20 @@
 package com.sundata.product.rwa.resultList.model;
 
-public class ResultListModel {
-    private String  calcindex;   //计算实例号
-    private String  sdate;   //起始数据日期
-    private String  edate;   //截止数据日期
-    private String  term;   //年月
-    private String  dataDate;   //数据日期
-    private String  ruleId;   //规则编号
-    private String  ruleName;   //规则名称
-    private String  glCode;   //总账科目号
-    private String  subjectDesc;   //科目名称
-    private String  subjectNature;   //科目性质
-    private String  subjectState;   //科目状态
-    private String  onoroff;   //表内外标识
-    private String  accountingDirection;   //记账方向(A:实际,D:借方,C:贷方)
-    private String  calcMethod;   //计算方式
-    private String  positiveRiskType;   //正差异风险暴露分类
-    private String  negativeRiskType;   //负差异风险暴露分类
-    private String  positiveOffProjectType;   //正差异表外项目分类
-    private String  negativeOffProjectType;   //负差异表外项目分类
-    private String  stageinId;   //所属阶段
-    private String  subjectSql;   //总账取数规则
-    private String  productSql;   //勾稽明细取数规则
-    private String  yesorno;   //状态
-    private String sundataEditType; // 判断新增还是修改
-    private String ruleNo;
-
-    public String getRuleNo() {
-        return ruleNo;
-    }
-
-    public void setRuleNo(String ruleNo) {
-        this.ruleNo = ruleNo;
-    }
-
-    public String getCalcindex() {
-        return calcindex;
-    }
-
-    public void setCalcindex(String calcindex) {
-        this.calcindex = calcindex;
-    }
-
-    public String getSdate() {
-        return sdate;
-    }
-
-    public void setSdate(String sdate) {
-        this.sdate = sdate;
-    }
+import java.math.BigDecimal;
 
-    public String getEdate() {
-        return edate;
-    }
-
-    public void setEdate(String edate) {
-        this.edate = edate;
-    }
+public class ResultListModel {
+    private String  term;   //数据期次
+    private String  orgcode;   //法人机构
+    private String  subjcode;   //科目代码
+    private String  subjname;   //科目名称
+    private String  ccy;   //币种
+    private BigDecimal  glamt;   //总账科目余额(万元)
+    private BigDecimal ledgartamt;   //勾稽汇总金额(万元)
+    private BigDecimal  differamt;   //核对差异金额(万元)
+    private BigDecimal  differrate;   //核对差异率%
+    private BigDecimal  percthreshold;   //差异容忍度%
+    private String  leartresulttype;   //是否超过容忍度
+    private BigDecimal  offsetdifferamt;   //轧差后核对差异(万元)
 
     public String getTerm() {
         return term;
@@ -66,155 +24,91 @@ public class ResultListModel {
         this.term = term;
     }
 
-    public String getDataDate() {
-        return dataDate;
-    }
-
-    public void setDataDate(String dataDate) {
-        this.dataDate = dataDate;
-    }
-
-    public String getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(String ruleId) {
-        this.ruleId = ruleId;
-    }
-
-    public String getRuleName() {
-        return ruleName;
-    }
-
-    public void setRuleName(String ruleName) {
-        this.ruleName = ruleName;
-    }
-
-    public String getGlCode() {
-        return glCode;
-    }
-
-    public void setGlCode(String glCode) {
-        this.glCode = glCode;
-    }
-
-    public String getSubjectDesc() {
-        return subjectDesc;
-    }
-
-    public void setSubjectDesc(String subjectDesc) {
-        this.subjectDesc = subjectDesc;
-    }
-
-    public String getSubjectNature() {
-        return subjectNature;
-    }
-
-    public void setSubjectNature(String subjectNature) {
-        this.subjectNature = subjectNature;
-    }
-
-    public String getSubjectState() {
-        return subjectState;
-    }
-
-    public void setSubjectState(String subjectState) {
-        this.subjectState = subjectState;
-    }
-
-    public String getOnoroff() {
-        return onoroff;
-    }
-
-    public void setOnoroff(String onoroff) {
-        this.onoroff = onoroff;
-    }
-
-    public String getAccountingDirection() {
-        return accountingDirection;
+    public String getOrgcode() {
+        return orgcode;
     }
 
-    public void setAccountingDirection(String accountingDirection) {
-        this.accountingDirection = accountingDirection;
+    public void setOrgcode(String orgcode) {
+        this.orgcode = orgcode;
     }
 
-    public String getCalcMethod() {
-        return calcMethod;
+    public String getSubjcode() {
+        return subjcode;
     }
 
-    public void setCalcMethod(String calcMethod) {
-        this.calcMethod = calcMethod;
+    public void setSubjcode(String subjcode) {
+        this.subjcode = subjcode;
     }
 
-    public String getPositiveRiskType() {
-        return positiveRiskType;
+    public String getSubjname() {
+        return subjname;
     }
 
-    public void setPositiveRiskType(String positiveRiskType) {
-        this.positiveRiskType = positiveRiskType;
+    public void setSubjname(String subjname) {
+        this.subjname = subjname;
     }
 
-    public String getNegativeRiskType() {
-        return negativeRiskType;
+    public String getCcy() {
+        return ccy;
     }
 
-    public void setNegativeRiskType(String negativeRiskType) {
-        this.negativeRiskType = negativeRiskType;
+    public void setCcy(String ccy) {
+        this.ccy = ccy;
     }
 
-    public String getPositiveOffProjectType() {
-        return positiveOffProjectType;
+    public BigDecimal getGlamt() {
+        return glamt;
     }
 
-    public void setPositiveOffProjectType(String positiveOffProjectType) {
-        this.positiveOffProjectType = positiveOffProjectType;
+    public void setGlamt(BigDecimal glamt) {
+        this.glamt = glamt;
     }
 
-    public String getNegativeOffProjectType() {
-        return negativeOffProjectType;
+    public BigDecimal getLedgartamt() {
+        return ledgartamt;
     }
 
-    public void setNegativeOffProjectType(String negativeOffProjectType) {
-        this.negativeOffProjectType = negativeOffProjectType;
+    public void setLedgartamt(BigDecimal ledgartamt) {
+        this.ledgartamt = ledgartamt;
     }
 
-    public String getStageinId() {
-        return stageinId;
+    public BigDecimal getDifferamt() {
+        return differamt;
     }
 
-    public void setStageinId(String stageinId) {
-        this.stageinId = stageinId;
+    public void setDifferamt(BigDecimal differamt) {
+        this.differamt = differamt;
     }
 
-    public String getSubjectSql() {
-        return subjectSql;
+    public BigDecimal getDifferrate() {
+        return differrate;
     }
 
-    public void setSubjectSql(String subjectSql) {
-        this.subjectSql = subjectSql;
+    public void setDifferrate(BigDecimal differrate) {
+        this.differrate = differrate;
     }
 
-    public String getProductSql() {
-        return productSql;
+    public BigDecimal getPercthreshold() {
+        return percthreshold;
     }
 
-    public void setProductSql(String productSql) {
-        this.productSql = productSql;
+    public void setPercthreshold(BigDecimal percthreshold) {
+        this.percthreshold = percthreshold;
     }
 
-    public String getYesorno() {
-        return yesorno;
+    public String getLeartresulttype() {
+        return leartresulttype;
     }
 
-    public void setYesorno(String yesorno) {
-        this.yesorno = yesorno;
+    public void setLeartresulttype(String leartresulttype) {
+        this.leartresulttype = leartresulttype;
     }
 
-    public String getSundataEditType() {
-        return sundataEditType;
+    public BigDecimal getOffsetdifferamt() {
+        return offsetdifferamt;
     }
 
-    public void setSundataEditType(String sundataEditType) {
-        this.sundataEditType = sundataEditType;
+    public void setOffsetdifferamt(BigDecimal offsetdifferamt) {
+        this.offsetdifferamt = offsetdifferamt;
     }
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/mybatis/DiffconfigListMapper.xml

@@ -26,7 +26,25 @@
         </if>
     </select>
 
-    <select id="rule_list" resultType="com.sundata.product.rwa.resultList.model.ResultListModel">
+    <select id="rule_querylist2" resultType="com.sundata.product.rwa.resultList.model.DiffconfigListModel">
+        select
+        CALCINDEX as calcindex,
+        SDATE as sdate,
+        EDATE as edate,
+        TERM as term,
+        DATA_DATE as dataDate,
+        RULE_NO as ruleNo,
+        RULE_NAME as ruleName,
+        UPPER_LIMIT as upperLimit,
+        LOWER_LIMIT as lowerLimit,
+        INTERVAL_TYPE as intervalType,
+        RULE_AREA_TYPE as ruleAreaType
+        from  RWA_CALC_CONF_DIFFTOLERANCE
+        where 1=1
+            and RULE_NO =#{ruleNo}
+    </select>
+
+    <select id="rule_list" resultType="com.sundata.product.rwa.resultList.model.RuleListModel">
         select
          t2.RULE_ID as ruleId
         ,t2.GL_CODE as glCode
@@ -36,7 +54,17 @@
         on t1.ROLE_LEDGERCHECK_NO= t2.RULE_ID
         where t1.RULE_NO =#{ruleNo}
     </select>
-    <select id="rule_list1" resultType="com.sundata.product.rwa.resultList.model.ResultListModel">
+    <select id="rule_querylist1" resultType="com.sundata.product.rwa.resultList.model.RuleListModel">
+        select
+        t2.RULE_ID as ruleId
+        ,t2.GL_CODE as glCode
+        ,t2.SUBJECT_DESC as subjectDesc
+        from RWA_CALC_CONF_DIFFTOLERANCERANGE t1
+        left join RWA_OBJ_CONF_GL_RECONCILIATION t2
+        on t1.ROLE_LEDGERCHECK_NO= t2.RULE_ID
+        where t1.RULE_NO =#{ruleNo}
+    </select>
+    <select id="rule_list1" resultType="com.sundata.product.rwa.resultList.model.RuleListModel">
         select
         RULE_ID as ruleId
         ,GL_CODE as glCode
@@ -46,4 +74,21 @@
         from RWA_OBJ_CONF_GL_RECONCILIATION t1
         where t1.YESORNO ='1'
     </select>
+
+    <insert id="diffconfig_addone" parameterType="com.sundata.product.rwa.resultList.model.DiffconfigListModel">
+        INSERT INTO RWA_CALC_CONF_DIFFTOLERANCE(CALCINDEX,SDATE,EDATE,TERM,DATA_DATE,RULE_NO,RULE_NAME,UPPER_LIMIT,LOWER_LIMIT,INTERVAL_TYPE,RULE_AREA_TYPE)
+        VALUES(#{calcindex},#{sdate},#{edate},#{term},#{dataDate},#{ruleNo},#{ruleName},#{upperLimit},#{lowerLimit},#{intervalType},#{ruleAreaType})
+    </insert>
+
+    <delete id="diffconfig_deleteone" parameterType="com.sundata.product.rwa.resultList.model.RuleListModel">
+        delete from RWA_CALC_CONF_DIFFTOLERANCERANGE where RULE_NO =#{ruleNo}
+    </delete>
+    <insert id="diffconfig_addone1" parameterType="com.sundata.product.rwa.resultList.model.RuleListModel">
+        INSERT INTO RWA_CALC_CONF_DIFFTOLERANCERANGE(CALCINDEX,SDATE,EDATE,TERM,DATA_DATE,RULE_NO,ROLE_LEDGERCHECK_NO)
+        VALUES
+        <foreach collection="list" item="item" index="index" open="(" separator="),(" close=")">
+           #{item.calcindex},#{item.sdate},#{item.edate},#{item.term},#{item.dataDate},#{item.ruleNo},#{item.ruleId}
+        </foreach>
+
+    </insert>
 </mapper>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/mybatis/ResultListMapper.xml

@@ -3,90 +3,20 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundata.product.rwa.resultList.mapper.ResultListMapper">
-    <select id="rule_list" resultType="com.sundata.product.rwa.resultList.model.ResultListModel">
-    select
-    case when ACCOUNTING_DIRECTION ='A' then '实际'
-         when ACCOUNTING_DIRECTION ='C' then '贷方'
-         when ACCOUNTING_DIRECTION ='D' then '借方'
-         end as accountingDirection,
-    case when CALC_METHOD ='M' then '贷方-借方'
-         when CALC_METHOD ='N' then '借方-贷方'
-         end as calcMethod,
-    CALCINDEX as calcindex,
-    DATA_DATE as dataDate,
-    EDATE as edate,
-    GL_CODE as glCode,
-    NEGATIVE_OFF_PROJECT_TYPE as negativeOffProjectType,
-    NEGATIVE_RISK_TYPE as negativeRiskType,
-    ONOROFF as onoroff,
-    POSITIVE_OFF_PROJECT_TYPE as positiveOffProjectType,
-    POSITIVE_RISK_TYPE as positiveRiskType,
-    PRODUCT_SQL as productSql,
-    case when YESORNO ='0' then '作废' else '生效' end as yesorno,
-    RULE_ID as ruleId,
-    RULE_NAME as ruleName,
-    SDATE as sdate,
-    STAGEIN_ID as stageinId,
-    SUBJECT_DESC as subjectDesc,
-    case when SUBJECT_NATURE ='01' then '本金类科目'
-         when SUBJECT_NATURE ='02' then '利息科目'
-         when SUBJECT_NATURE ='03' then '公允价值类科目'
-         when SUBJECT_NATURE ='04' then '减值类科目'
-         end as subjectNature,
-    SUBJECT_SQL as subjectSql,
-    SUBJECT_STATE as subjectState,
-    TERM as term
-    from RWA_OBJ_CONF_GL_RECONCILIATION
-        where 1=1
-        <if test="ruleId !='' and ruleId!=null">
-            and RULE_ID like concat('%',#{ruleId},'%')
-        </if>
-        <if test="ruleName !='' and ruleName!=null">
-            and RULE_NAME like concat('%',#{ruleName},'%')
-        </if>
-        <if test="glCode !='' and glCode!=null">
-            and GL_CODE like concat('%',#{glCode},'%')
-        </if><if test="subjectDesc !='' and subjectDesc!=null">
-        and SUBJECT_DESC like concat('%',#{subjectDesc},'%')
-    </if>
-        ORDER BY GL_CODE asc
-    </select>
-    <select id="rule_queryone" resultType="com.sundata.product.rwa.resultList.model.ResultListModel">
-        select
-        ACCOUNTING_DIRECTION as accountingDirection,
-        CALC_METHOD as calcMethod,
-        CALCINDEX as calcindex,
-        DATA_DATE as dataDate,
-        EDATE as edate,
-        GL_CODE as glCode,
-        NEGATIVE_OFF_PROJECT_TYPE as negativeOffProjectType,
-        NEGATIVE_RISK_TYPE as negativeRiskType,
-        ONOROFF as onoroff,
-        POSITIVE_OFF_PROJECT_TYPE as positiveOffProjectType,
-        POSITIVE_RISK_TYPE as positiveRiskType,
-        PRODUCT_SQL as productSql,
-        RULE_ID as ruleId,
-        RULE_NAME as ruleName,
-        SDATE as sdate,
-        STAGEIN_ID as stageinId,
-        SUBJECT_DESC as subjectDesc,
-        SUBJECT_NATURE as subjectNature,
-        SUBJECT_SQL as subjectSql,
-        SUBJECT_STATE as subjectState,
+    <select id="result_list" resultType="com.sundata.product.rwa.resultList.model.ResultListModel">
+        select CCY as ccy,
+        DIFFERAMT as differamt,
+        DIFFERRATE as differrate,
+        GLAMT as glamt,
+        LEARTRESULTTYPE as leartresulttype,
+        LEDGARTAMT as ledgartamt,
+        OFFSETDIFFERAMT as offsetdifferamt,
+        ORGCODE as orgcode,
+        PERCTHRESHOLD as percthreshold,
+        SUBJCODE as subjcode,
+        SUBJNAME as subjname,
         TERM as term
-        from RWA_OBJ_CONF_GL_RECONCILIATION
-        where 1=1
-        <if test="ruleId !='' and ruleId !=null">
-            and RULE_ID =#{ruleId}
-        </if>
+        from  RWA_LEART_INS_LEDGRESULT
     </select>
-    <delete id="rule_deleteone" parameterType="com.sundata.product.rwa.resultList.model.ResultListModel">
-        delete from RWA_OBJ_CONF_GL_RECONCILIATION where RULE_ID =#{ruleId}
-    </delete>
-    <insert id="rule_addone" parameterType="com.sundata.product.rwa.resultList.model.ResultListModel">
-        INSERT INTO RWA_OBJ_CONF_GL_RECONCILIATION(CALCINDEX,SDATE,EDATE,TERM,DATA_DATE,RULE_ID,RULE_NAME,GL_CODE,SUBJECT_DESC,SUBJECT_NATURE,SUBJECT_STATE,ONOROFF,ACCOUNTING_DIRECTION,CALC_METHOD,POSITIVE_RISK_TYPE,NEGATIVE_RISK_TYPE,POSITIVE_OFF_PROJECT_TYPE,NEGATIVE_OFF_PROJECT_TYPE,STAGEIN_ID,SUBJECT_SQL,PRODUCT_SQL,YESORNO)
-        VALUES(#{calcindex},#{sdate},#{edate},#{term},#{dataDate},#{ruleId},#{ruleName},#{glCode},#{subjectDesc},#{subjectNature},#{subjectState},#{onoroff},#{accountingDirection},#{calcMethod},#{positiveRiskType},#{negativeRiskType},#{positiveOffProjectType},#{negativeOffProjectType},#{stageinId},#{subjectSql},#{productSql},1)
-    </insert>
-
 
 </mapper>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/service/DiffconfigListService.java

@@ -2,11 +2,16 @@ package com.sundata.product.rwa.resultList.service;
 
 import com.sundata.product.rwa.resultList.mapper.DiffconfigListMapper;
 import com.sundata.product.rwa.resultList.model.DiffconfigListModel;
-import com.sundata.product.rwa.resultList.model.ResultListModel;
+import com.sundata.product.rwa.resultList.model.RuleListModel;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
 @Service
 public class DiffconfigListService {
     @Autowired
@@ -16,12 +21,46 @@ public class DiffconfigListService {
         return diffconfigListMapper.rule_querylist(diffconfigListModel);
     }
 
-    public List<ResultListModel> rule_list(ResultListModel resultListModelDemo){
-        return diffconfigListMapper.rule_list(resultListModelDemo);
+    public List<RuleListModel> rule_list(RuleListModel RuleListModelDemo){
+        return diffconfigListMapper.rule_list(RuleListModelDemo);
+    }
+    public List<RuleListModel> rule_list1(RuleListModel RuleListModelDemo){
+        return diffconfigListMapper.rule_list1(RuleListModelDemo);
+    }
+
+    public String diffconfig_deleteone(String ruleNo){
+        diffconfigListMapper.diffconfig_deleteone(ruleNo);
+        return "删除成功";
+    }
+
+    public Map<String, Object> rule_queryone(String ruleNo){
+         List<Object> result1 = rule_queryone1(ruleNo);
+        List<Object> result2 = rule_queryone2(ruleNo);
+
+        Map<String, Object> results = new HashMap<>();
+        results.put("result1", result1);
+        results.put("result2", result2);
+        return results;
+    }
+    public  List<Object> rule_queryone1(String ruleNo){
+        return diffconfigListMapper.rule_querylist2(ruleNo);
+    }
+    public  List<Object> rule_queryone2(String ruleNo){
+        return diffconfigListMapper.rule_querylist1(ruleNo);
     }
-    public List<ResultListModel> rule_list1(ResultListModel resultListModelDemo){
-        return diffconfigListMapper.rule_list1(resultListModelDemo);
+
+
+    public String diffconfig_addone(DiffconfigListModel diffconfigListModel){
+        diffconfigListMapper.diffconfig_addone(diffconfigListModel);
+        System.out.println(diffconfigListModel);
+        return "新增成功";
     }
 
+    public String diffconfig_addone1(String ruleNo,List<RuleListModel> RuleListModelDemo){
+        diffconfigListMapper.diffconfig_deleteone(ruleNo);
+        diffconfigListMapper.diffconfig_addone1(RuleListModelDemo);
+       // System.out.println(ruleNo+"......"+RuleListModelDemo);
+        return "新增成功";
+    }
 
 }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/service/ResultListService.java

@@ -1,49 +1,16 @@
 package com.sundata.product.rwa.resultList.service;
 
-import com.sundata.common.util.DBExecutor;
-
 import com.sundata.product.rwa.resultList.mapper.ResultListMapper;
 import com.sundata.product.rwa.resultList.model.ResultListModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Objects;
-
 @Service
 public class ResultListService {
     @Autowired
-    ResultListMapper resultListmapper;
-    public List<ResultListModel> rule_list(ResultListModel resultListModelDemo){
-        return resultListmapper.rule_list(resultListModelDemo);
-    }
-
-    public ResultListModel rule_queryone(String ruleId){
-        return resultListmapper.rule_queryone(ruleId);
-    }
-
-    public String updateResultList(String ruleId){
-        DBExecutor.doQuery("update RWA_OBJ_CONF_GL_RECONCILIATION set YESORNO =0 where RULE_ID='"+ruleId+"'");
-        return "修改成功";
-    }
-
-    public String rule_addone(ResultListModel resultListModelDemo){
-        if(Objects.equals(resultListModelDemo.getSundataEditType(), "update")){
-            resultListmapper.rule_deleteone(resultListModelDemo.getRuleId());
-            resultListmapper.rule_addone(resultListModelDemo);
-            return "修改成功";
-        }else {
-            String a = DBExecutor.doQuery("select count(1) from RWA_OBJ_CONF_GL_RECONCILIATION where RULE_ID ='" + resultListModelDemo.getRuleId() + "'");
-
-            if (Integer.valueOf(a) >= 1) {
-                return "规则编号已重复，请重新输入";
-            } else {
-                resultListmapper.rule_deleteone(resultListModelDemo.getRuleId());
-                resultListmapper.rule_addone(resultListModelDemo);
-                return "新增成功";
-            }
-        }
-
+    ResultListMapper resultListMapper;
+    public List<ResultListModel> result_list(ResultListModel ResultListModelDemo){
+        return resultListMapper.result_list(ResultListModelDemo);
     }
 }
-