|
@@ -67,6 +67,10 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
String insertFlag = params.get("insertFlag");//内外部损失存字段初始化 1-第一次创建,要初始化
|
|
|
String tjFlag = params.get("tjFlag");//内外部损失是否提交 1-提交
|
|
|
BigDecimal qualitycosttotal = BigDecimal.ZERO;
|
|
|
+ String ropJson = "";
|
|
|
+ if (StringUtils.isNotEmpty(params.get("dataSource"))) {
|
|
|
+ ropJson = "{\"dataSource\":\"" + params.get("dataSource") + "\"}";
|
|
|
+ }
|
|
|
|
|
|
//要创建的实例
|
|
|
List<QcsMainCostDo> qcsMainCostDoList = new ArrayList<>();
|
|
@@ -109,7 +113,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
qcsMainCostDo1.setBasename(qcsMainCostDo.getBasename());
|
|
|
qcsMainCostDo1.setYearmonth(qcsMainCostDo.getYearmonth());
|
|
|
qcsMainCostDo1.setCosttype("1");
|
|
|
- qcsMainCostDo1.setRoption(params.get("dataSource"));
|
|
|
+ qcsMainCostDo1.setRoption(ropJson);
|
|
|
|
|
|
//明细数据
|
|
|
List<QcsSubjectConfigDo> qcsSubjectConfigDos1 = qcsSubjectConfigDos.stream().filter(s -> s.getSecsubject().equals("预防成本")).collect(Collectors.toList());
|
|
@@ -120,7 +124,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
qcsMainDetailDo.setThrsubject(qcsSubjectConfigDo.getThrsubject());
|
|
|
qcsMainDetailDo.setFousubject(qcsSubjectConfigDo.getFousubject());
|
|
|
qcsMainDetailDo.setSort(qcsSubjectConfigDo.getSort());
|
|
|
- qcsMainDetailDo.setRoption(params.get("dataSource"));
|
|
|
+ qcsMainDetailDo.setRoption(ropJson);
|
|
|
qcsMainDetailDoList.add(qcsMainDetailDo);
|
|
|
}
|
|
|
}
|
|
@@ -144,7 +148,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
qcsMainCostDo2.setBasename(qcsMainCostDo.getBasename());
|
|
|
qcsMainCostDo2.setYearmonth(qcsMainCostDo.getYearmonth());
|
|
|
qcsMainCostDo2.setCosttype("2");
|
|
|
- qcsMainCostDo2.setRoption(params.get("dataSource"));
|
|
|
+ qcsMainCostDo2.setRoption(ropJson);
|
|
|
|
|
|
//明细数据
|
|
|
List<QcsSubjectConfigDo> qcsSubjectConfigDos2 = qcsSubjectConfigDos.stream().filter(s -> s.getSecsubject().equals("鉴定成本")).collect(Collectors.toList());
|
|
@@ -155,7 +159,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
qcsMainDetailDo.setThrsubject(qcsSubjectConfigDo.getThrsubject());
|
|
|
qcsMainDetailDo.setFousubject(qcsSubjectConfigDo.getFousubject());
|
|
|
qcsMainDetailDo.setSort(qcsSubjectConfigDo.getSort());
|
|
|
- qcsMainDetailDo.setRoption(params.get("dataSource"));
|
|
|
+ qcsMainDetailDo.setRoption(ropJson);
|
|
|
qcsMainDetailDoList.add(qcsMainDetailDo);
|
|
|
}
|
|
|
}
|
|
@@ -211,7 +215,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
qcsMainCostDo3.setBasename(qcsMainCostDo.getBasename());
|
|
|
qcsMainCostDo3.setYearmonth(qcsMainCostDo.getYearmonth());
|
|
|
qcsMainCostDo3.setCosttype("3");
|
|
|
- qcsMainCostDo3.setRoption(params.get("dataSource"));
|
|
|
+ qcsMainCostDo3.setRoption(ropJson);
|
|
|
|
|
|
//明细
|
|
|
// QcsLossDetailDo qcsLossDetailDo3 = new QcsLossDetailDo();
|
|
@@ -271,7 +275,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
qcsMainCostDo4.setBasename(qcsMainCostDo.getBasename());
|
|
|
qcsMainCostDo4.setYearmonth(qcsMainCostDo.getYearmonth());
|
|
|
qcsMainCostDo4.setCosttype("4");
|
|
|
- qcsMainCostDo4.setRoption(params.get("dataSource"));
|
|
|
+ qcsMainCostDo4.setRoption(ropJson);
|
|
|
|
|
|
//明细
|
|
|
// QcsLossDetailDo qcsLossDetailDo4 = new QcsLossDetailDo();
|
|
@@ -480,6 +484,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
String costId = SecurityUtil.getUUID();
|
|
|
List<String> hasThrSub = new ArrayList<>();//已存在的三级科目
|
|
|
QcsMainCostDo oldMainCostDo = null;//未提交的旧数据
|
|
|
+ String ropJson = "{\"dataSource\":\"导入\"}";
|
|
|
for (int i = 0; i <= lastRowNum; i++) {
|
|
|
Row row = sheet.getRow(i);
|
|
|
if (ExcelUtils.isRowEmpty(row) || i == 1) {
|
|
@@ -538,7 +543,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
|
|
|
QcsMainDetailDo qcsMainDetailDo = new QcsMainDetailDo();
|
|
|
qcsMainDetailDo.setId(SecurityUtil.getUUID());
|
|
|
- qcsMainDetailDo.setRoption("导入");
|
|
|
+ qcsMainDetailDo.setRoption(ropJson);
|
|
|
qcsMainDetailDo.setMainid(costId);
|
|
|
qcsMainDetailDo.setThrsubject(subjectConfigDos.get(0).getThrsubject());
|
|
|
qcsMainDetailDo.setFousubject(subjectConfigDos.get(0).getFousubject());
|
|
@@ -570,7 +575,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
|
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
|
|
|
qcsMainCostDo.setId(costId);
|
|
|
- qcsMainCostDo.setRoption("导入");
|
|
|
+ qcsMainCostDo.setRoption(ropJson);
|
|
|
qcsMainCostDo.setBaseid(unitId);
|
|
|
qcsMainCostDo.setBasename(sysOrganizationDo.getFullname());
|
|
|
qcsMainCostDo.setYearmonth(format.parse(yearMonth));
|
|
@@ -615,6 +620,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
List<Map<String, String>> hasProTypeLossNos = new ArrayList<>();//已有的项目工号、类别、编号
|
|
|
QcsMainCostDo oldMainCostDo = null;//未提交的旧数据
|
|
|
Integer disSubIndex = 0;//设计变更损失所在列
|
|
|
+ String ropJson = "{\"dataSource\":\"导入\"}";
|
|
|
for (int i = 0; i <= lastRowNum; i++) {
|
|
|
Row row = sheet.getRow(i);
|
|
|
if (ExcelUtils.isRowEmpty(row) || i == 1) {
|
|
@@ -681,7 +687,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
} else {
|
|
|
StringBuilder stringBuilder = new StringBuilder();
|
|
|
QcsLossDetailDo qcsLossDetailDo = new QcsLossDetailDo();
|
|
|
- qcsLossDetailDo.setRoption("导入");
|
|
|
+ qcsLossDetailDo.setRoption(ropJson);
|
|
|
|
|
|
//项目工号
|
|
|
String procode = row.getCell(0).toString().replaceAll("\\s+", "");
|
|
@@ -799,7 +805,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
QcsMdfFormDo mdfFormDo = qcsMdfFormDos.stream().filter(m -> m.getProjectid().equals(qcsLossDetailDo.getProid()) && m.getSourcenumbercode().equals(qcsLossDetailDo.getLossno()) && m.getBasename().equals(finalYearMonth)).findAny().orElse(null);
|
|
|
if (mdfFormDo != null) {
|
|
|
amount = mdfFormDo.getActamount();
|
|
|
- qcsLossDetailDo.setRoption("修改单同步");
|
|
|
+ qcsLossDetailDo.setRoption("{\"dataSource\":\"导入\",\"dataType\":\"修改单同步\"}");
|
|
|
} else {
|
|
|
continue;
|
|
|
}
|
|
@@ -854,7 +860,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
QcsLossDetailDo hasDetailDo = qcsLossDetailDoList.stream().filter(ld -> ld.getProid().equals(qcsMdfFormDo.getProjectid()) && ld.getLossno() != null && ld.getLossno().equals(qcsMdfFormDo.getSourcenumbercode()) && qcsMdfFormDo.getBasename().equals(finalYearMonth1)).findAny().orElse(null);
|
|
|
if (hasDetailDo == null && disSubIndex != 0) {
|
|
|
QcsLossDetailDo lossDetailDo = new QcsLossDetailDo();
|
|
|
- lossDetailDo.setRoption("修改单同步");
|
|
|
+ lossDetailDo.setRoption("{\"dataSource\":\"导入\",\"dataType\":\"修改单同步\"}");
|
|
|
lossDetailDo.setId(SecurityUtil.getUUID());
|
|
|
lossDetailDo.setMainid(costId);
|
|
|
lossDetailDo.setProid(qcsMdfFormDo.getProjectid());
|
|
@@ -872,7 +878,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
|
|
|
|
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
|
|
|
qcsMainCostDo.setId(costId);
|
|
|
- qcsMainCostDo.setRoption("导入");
|
|
|
+ qcsMainCostDo.setRoption(ropJson);
|
|
|
qcsMainCostDo.setBaseid(unitId);
|
|
|
qcsMainCostDo.setBasename(sysOrganizationDo.getFullname());
|
|
|
qcsMainCostDo.setYearmonth(format.parse(yearMonth));
|