ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 81770 年度制修订计划--导入--列表变更状态应该都是新增

Browse Source
This commit is contained in:
mzaxd
2024-02-05 15:06:00 +08:00
parent f1617554c9
commit 6a43980db5
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+1 -3
View File
@@ -547,15 +547,13 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
String curYearNumber = String.valueOf(date.get(Calendar.YEAR)); String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
item.setDecadeCode(curYearNumber); item.setDecadeCode(curYearNumber);
} }
// 设置变更状态 制定是新增 修订是变更
item.setChangeStatus(ESPChangeType.ADD.getValue());
} else { } else {
item.setChangeStatus(ESPChangeType.CHANGE.getValue());
List<LawsEnterpriseStandard> esList = esMap.get(item.getOriginEnStandardNo()); List<LawsEnterpriseStandard> esList = esMap.get(item.getOriginEnStandardNo());
if (esList != null && !esList.isEmpty()) { if (esList != null && !esList.isEmpty()) {
item.setOriginEnStandardName(esList.get(0).getStandardName()); item.setOriginEnStandardName(esList.get(0).getStandardName());
} }
} }
item.setChangeStatus(ESPChangeType.ADD.getValue());
}); });
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+1 -3
View File
@@ -450,15 +450,13 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
String curYearNumber = String.valueOf(date.get(Calendar.YEAR)); String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
item.setDecadeCode(curYearNumber); item.setDecadeCode(curYearNumber);
} }
// 设置变更状态 制定是新增 修订是变更
item.setChangeStatus(ESPChangeType.ADD.getValue());
} else { } else {
item.setChangeStatus(ESPChangeType.CHANGE.getValue());
List<LawsEnterpriseStandard> esList = esMap.get(item.getOriginEnStandardNo()); List<LawsEnterpriseStandard> esList = esMap.get(item.getOriginEnStandardNo());
if (esList != null && !esList.isEmpty()) { if (esList != null && !esList.isEmpty()) {
item.setOriginEnStandardName(esList.get(0).getStandardName()); item.setOriginEnStandardName(esList.get(0).getStandardName());
} }
} }
item.setChangeStatus(ESPChangeType.ADD.getValue());
}); });
} }