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