|
@@ -3,13 +3,11 @@ package com.rongwei.bscommon.sys.service.impl;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.ArrayUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.aspose.cells.*;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
-import com.rongwei.bscommon.sys.config.api.ResponseVO;
|
|
|
import com.rongwei.bscommon.sys.dao.LuckysheetDao;
|
|
|
import com.rongwei.bscommon.sys.feign.LuckySheetService;
|
|
|
import com.rongwei.bscommon.sys.service.*;
|
|
@@ -822,7 +820,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
|
|
|
//解析数据
|
|
|
Map<String, JSONObject> rowMap = cellMerge2Row(prjTitle, celldatas);
|
|
|
//保存
|
|
|
- saveSummaryDataByRow(rowMap, summaryDataBo);
|
|
|
+ assembleSaveSummaryData(rowMap, summaryDataBo);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -832,7 +830,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
|
|
|
* @param rowMap
|
|
|
* @param summaryDataBo
|
|
|
*/
|
|
|
- private void saveSummaryDataByRow(Map<String, JSONObject> rowMap, SaveSummaryDataBo summaryDataBo) {
|
|
|
+ private void assembleSaveSummaryData(Map<String, JSONObject> rowMap, SaveSummaryDataBo summaryDataBo) {
|
|
|
|
|
|
List<ZhcxProjectRectifyDo> mainList = new ArrayList<>();
|
|
|
List<ZhcxProjectRectifyMachineDo> slaveList = new ArrayList<>();
|