获取预算中存在利润表中不存在的科目 调整

mjava-zhixingtongde/src/main/java/com/malk/zhixingtongde/service/impl/ZxtdReportServiceImpl.java

@@ -3409,19 +3409,29 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
             Profit totalProfit=new Profit(PROFIT_CLASSIFYS[i]+(i==0?"合计":"小计"));
             if(dataMap.containsKey(PROFIT_CLASSIFYS[i])){
                 //获取预算中存在 利润表中不存在的科目
-                List<Map> data = (List<Map>) ydClient.queryData(YDParam.builder()
-                        .formUuid(_matchFormUuid("BUDGET"))
-                        .searchCondition(JSON.toJSONString(UtilMap.map("selectField_lp7ze5jk, selectField_lptilhxv, dateField_lp83xrh9, selectField_lz9oy86p", PROFIT_CLASSIFYS[i], "季度", dateParam, "是")))
-                        .build(), YDConf.FORM_QUERY.retrieve_list).getData();
-                for (Map datum : data) {
-                    Map map = (Map) datum.get("formData");
-                    String subject = map.get("selectField_lp7ze5jm").toString();
-                    if (!dataMap.get(PROFIT_CLASSIFYS[i]).containsKey(subject)){
-                        Profit profit = new Profit(subject);
-                        dataMap.get(PROFIT_CLASSIFYS[i]).put(subject,profit);
+                if ("收入".equals(PROFIT_CLASSIFYS[i])){
+                    List<Map> data = getYdFormDataList(_matchFormUuid("INCOME_BUDGET"), JSON.toJSONString(UtilMap.map("selectField_lp83xrhc, selectField_lptilhxv, dateField_lp83xrh9, selectField_lz9oy86p", PROFIT_CLASSIFYS[i], "季度", dateParam, "是")), YDConf.FORM_QUERY.retrieve_list);
+                    for (Map datum : data) {
+                        Map map = (Map) datum.get("formData");
+                        String subject = map.get("selectField_lpax809x").toString();
+                        if (!dataMap.get(PROFIT_CLASSIFYS[i]).containsKey(subject)){
+                            Profit profit = new Profit(subject);
+                            dataMap.get(PROFIT_CLASSIFYS[i]).put(subject,profit);
 
+                        }
+                    }
+                }else {
+                    List<Map> data = getYdFormDataList(_matchFormUuid("BUDGET"), JSON.toJSONString(UtilMap.map("selectField_lp7ze5jk, selectField_lptilhxv, dateField_lp7ze5kc, selectField_lz9oy86p", PROFIT_CLASSIFYS[i], "季度", dateParam, "是")), YDConf.FORM_QUERY.retrieve_list);
+                    for (Map datum : data) {
+                        Map map = (Map) datum.get("formData");
+                        String subject = map.get("selectField_lp7ze5jm").toString();
+                        if (!dataMap.get(PROFIT_CLASSIFYS[i]).containsKey(subject)){
+                            Profit profit = new Profit(subject);
+                            dataMap.get(PROFIT_CLASSIFYS[i]).put(subject,profit);
+                        }
                     }
                 }
+
                 for (String str:dataMap.get(PROFIT_CLASSIFYS[i]).keySet()){
                     List<Map> budgetList = new ArrayList<>();