From 7cd95368eae84ab2b3443fb4acf2768f568783b9 Mon Sep 17 00:00:00 2001 From: zoujiangtao Date: Thu, 17 Jul 2025 11:34:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9=EF=BC=9A?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=BC=96=E5=88=B6=E8=B0=83=E6=95=B4=E5=8D=95?= =?UTF-8?q?=EF=BC=88=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=EF=BC=9A=E5=8D=95?= =?UTF-8?q?=E6=AC=A1=E8=B0=83=E6=95=B4=E5=A4=9A=E4=B8=AA=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=A7=91=E7=9B=AE=EF=BC=89=20=E6=97=B6=E9=97=B4=EF=BC=9A2025-0?= =?UTF-8?q?7-17=2011=EF=BC=9A34=20=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E9=82=B9=E6=B1=9F=E6=B6=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/sys/mservice/PlanningService.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/PlanningService.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/PlanningService.java index 331f094..5b0a029 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/PlanningService.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/PlanningService.java @@ -1,30 +1,27 @@ package shkd.sys.sys.mservice; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.logging.Log; import kd.bos.logging.LogFactory; +import kd.bos.login.actions.SerializationUtils; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.tmc.fpm.business.dataproc.query.ReportDataQParam; import kd.tmc.fpm.business.dataproc.query.ReportDataQResult; import kd.tmc.fpm.business.dataproc.save.ReportDataSDKService; -import kd.bos.login.actions.SerializationUtils; import kd.tmc.fpm.business.dataproc.save.domain.*; -import kd.tmc.fpm.business.dataproc.save.ReportDataSaveObject; import kd.tmc.fpm.business.domain.enums.AmountUnit; import kd.tmc.fpm.business.domain.enums.ReportProcessStatus; import kd.tmc.fpm.business.domain.enums.ReportStatus; import kd.tmc.fpm.business.domain.enums.TemplateMetricType; import kd.tmc.fpm.business.domain.service.FpmOperateResult; import kd.tmc.fpm.common.enums.AdjustTypeEnum; -import microsoft.exchange.webservices.data.core.service.response.ResponseObject; - import java.math.BigDecimal; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; /** @@ -123,7 +120,7 @@ public class PlanningService { * @return */ public static FpmResponse planAdjustment(String adjustReason, String orgCode, String periodCode, String entryPeriodCode, JSONArray adjustProjects) { - logger.info("计划调整服务入参:adjustReason={},orgCode={},periodCode={},subjectCode={},entryPeriodCode={},amount={}", adjustReason, orgCode, periodCode, entryPeriodCode, adjustProjects); + logger.info("计划调整服务入参:adjustReason={},orgCode={},periodCode={},entryPeriodCode={},adjustProjects={}", adjustReason, orgCode, periodCode, entryPeriodCode, adjustProjects); ReportAdjustBillBatchSaveDTO reportAdjustBillBatchSaveDTO = new ReportAdjustBillBatchSaveDTO(); reportAdjustBillBatchSaveDTO.setSystemCode("SYS-005");// 体系编码 @@ -140,20 +137,20 @@ public class PlanningService { ArrayList reportAdjustDataSaveDTOS = new ArrayList<>(); for (Object adjustProject : adjustProjects) { - HashMap adjustProjectHashMap = (HashMap) adjustProject; - // 计划科目 - Object subjectCode = adjustProjectHashMap.get("subjectCode"); - // 调整金额 - Object amount = adjustProjectHashMap.get("amount"); + JSONObject adjustProjectJson = (JSONObject) adjustProject; + String subjectCode = adjustProjectJson.getString("subjectCode"); + String amount = adjustProjectJson.getString("amount"); + + logger.info("计划科目:{},调整金额:{}", subjectCode, amount); ReportAdjustDataSaveDTO reportAdjustDataSaveDTO = new ReportAdjustDataSaveDTO(); // reportAdjustDataSaveDTO.setAdjustReason();// 维度组合下每一行的调整原因 // reportAdjustDataSaveDTO.setAmountUnit();// 单位 reportAdjustDataSaveDTO.setCurrencyCode("CNY");// 币别 code - reportAdjustDataSaveDTO.setSubjectCode(subjectCode.toString());// 计划科目 + reportAdjustDataSaveDTO.setSubjectCode(subjectCode);// 计划科目 reportAdjustDataSaveDTO.setTemplateCode("FIX-013");// 调整数据所属编制表的模板编码 // reportAdjustDataSaveDTO.setCompanyCode();// 公司code - reportAdjustDataSaveDTO.setCurrentAdjustAmt(new BigDecimal(amount.toString()));// 本次调整金额 + reportAdjustDataSaveDTO.setCurrentAdjustAmt(new BigDecimal(amount));// 本次调整金额 // reportAdjustDataSaveDTO.setCustom1Code();// 自定义维度1值code // reportAdjustDataSaveDTO.setCustom2Code();// 自定义维度2值code // reportAdjustDataSaveDTO.setCustom3Code();// 自定义维度3值code