更新科目字典

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

@@ -12,7 +12,7 @@ public class ResultListModel {
     private BigDecimal ledgartamt;   //勾稽汇总金额(万元)
     private BigDecimal  differamt;   //核对差异金额(万元)
     private BigDecimal  differrate;   //核对差异率%
-    private BigDecimal  percthreshold;   //差异容忍度%
+    private String  percthreshold;   //差异容忍度%
     private String  leartresulttype;   //是否超过容忍度
     private BigDecimal  offsetdifferamt;   //轧差后核对差异(万元)
     private String[] subjcodes;
@@ -97,11 +97,11 @@ public class ResultListModel {
         this.differrate = differrate;
     }
 
-    public BigDecimal getPercthreshold() {
+    public String getPercthreshold() {
         return percthreshold;
     }
 
-    public void setPercthreshold(BigDecimal percthreshold) {
+    public void setPercthreshold(String percthreshold) {
         this.percthreshold = percthreshold;
     }
 

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

@@ -35,22 +35,18 @@
     </select>
 
     <select id="kmsj"  resultType="com.sundata.admin.nounmanage.model.DictContent">
-        SELECT  gl_code AS id,subject_desc AS text,subject_code AS PARENTID FROM (
-        SELECT T1.gl_code AS gl_code,T1.subject_desc AS subject_desc ,T3.subject_code AS  subject_code FROM RWA_OBJ_CONF_GL_RECONCILIATION T1
-        LEFT JOIN rwa_cbs_gl_ac_subject T2
-        ON T1.gl_code = T2.subject_code
-        LEFT JOIN rwa_cbs_gl_ac_subject T3
-        ON T2.control_subject = T3.subject_code
+        select subject_code as id ,subject_desc as text ,control_subject as parentid from(
+        SELECT DISTINCT ba.subject_code ,ba.subject_desc ,ba.control_subject
+        FROM rwa_cbs_gl_ac_subject ba
+        inner JOIN RWA_OBJ_CONF_GL_RECONCILIATION bb ON bb.gl_code=ba.subject_code
+        INNER JOIN rwa_cbs_gl_ac_subject bc ON ba.control_subject=bc.subject_code
         UNION ALL
-        SELECT DISTINCT subject_code2 AS gl_code,subject_desc2 AS subject_desc ,NULL AS subject_code FROM (
-        SELECT t1.subject_code AS subject_code1 , t1.subject_desc AS subject_desc1,t2.subject_code AS subject_code2,t2.subject_desc AS subject_desc2 FROM rwa_cbs_gl_ac_subject t1
-        LEFT JOIN rwa_cbs_gl_ac_subject t2
-        ON t2.subject_code = t1.control_subject
-        WHERE t1.subject_code IN (SELECT gl_code FROM RWA_OBJ_CONF_GL_RECONCILIATION  )
-        ORDER BY t1.subject_code asc
+        SELECT DISTINCT bc.subject_code ,bc.subject_desc ,bc.control_subject
+        FROM rwa_cbs_gl_ac_subject ba
+        inner JOIN RWA_OBJ_CONF_GL_RECONCILIATION bb ON bb.gl_code=ba.subject_code
+        INNER JOIN rwa_cbs_gl_ac_subject bc ON ba.control_subject=bc.subject_code
         ) t
-        ) t
-        ORDER BY CAST (t.gl_code AS int)  asc
+        order by subject_code asc
     </select>
 
 </mapper>

Procedure/frontend/projectb/src/pages/rwa_data_check/result_list.tsx

@@ -79,12 +79,12 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
         { title : '科目代码',
         dataIndex : 'subjcode',
         search:false,
-        valueType:'treeSelect',
-        request:()=>fetchDict('@kmsj'),
-        fieldProps: {
-          treeDefaultExpandAll: true,
-          treeCheckable:true,
-         },
+        // valueType:'treeSelect',
+        // request:()=>fetchDict('@kmsj'),
+        // fieldProps: {
+        //   treeDefaultExpandAll: true,
+        //   treeCheckable:true,
+        //  },
         width : 150
         },
         { title : '科目代码',

Procedure/frontend/projectb/src/services/rwa/result_list.ts

@@ -20,7 +20,7 @@ differamt : number;
 //核对差异率%
 differrate : number;
 //差异容忍度%
-percthreshold : number;
+percthreshold : String;
 //是否超过容忍度
 leartresulttype : String;
 //轧差后核对差异(万元)