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

fix: 81551 企标计划立项--复审自动发起的修订--默认标准等级分类、授权部门没有带出 caihaohan 42 minutes ago

Browse Source
This commit is contained in:
mzaxd
2024-01-31 16:12:14 +08:00
parent ad3e0a15aa
commit aa064303b6
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+2 -8
View File
@@ -250,13 +250,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
} }
private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) { private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) {
Map<String, Object> es = commonService.getByIdAndModule(null, TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "2", standardNo); Map<String, Object> es = commonService.getByIdAndModule(null, TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "1", standardNo);
// 找到当前企标的所有授权部门
LambdaQueryWrapper<EnterpriseStandardAuthDept> adWrapper = new LambdaQueryWrapper<>();
adWrapper.eq(EnterpriseStandardAuthDept::getStandardId, es.get(FieldCommon.ID));
String authDeptIds = esAdService.list(adWrapper).stream()
.map(EnterpriseStandardAuthDept::getAuthDept)
.distinct().collect(Collectors.joining(","));
// 获取当前年份 // 获取当前年份
Calendar date = Calendar.getInstance(); Calendar date = Calendar.getInstance();
String curYearNumber = String.valueOf(date.get(Calendar.YEAR)); String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
@@ -279,7 +273,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
.setStandardPromoter((String) es.get(FieldCommon.STANDARD_PROMOTER)) .setStandardPromoter((String) es.get(FieldCommon.STANDARD_PROMOTER))
.setCooperationUnit((String) es.get(FieldCommon.COOPERATION_UNIT)) .setCooperationUnit((String) es.get(FieldCommon.COOPERATION_UNIT))
.setEnStandardClassification((String) es.get(FieldCommon.GRADE_CLASSIFICATION)) .setEnStandardClassification((String) es.get(FieldCommon.GRADE_CLASSIFICATION))
.setAuthDept(authDeptIds); .setAuthDept((String) es.get(FieldCommon.AUTH_DEPT));
} }
@Override @Override
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+9
View File
@@ -160,6 +160,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
@Resource @Resource
private PartNameService partNameService; private PartNameService partNameService;
@Resource
private ILawsEnterpriseStandardService esService;
/** /**
* @Author: liao * @Author: liao
* @Date: 2023/8/23 16:57 * @Date: 2023/8/23 16:57
@@ -1146,6 +1149,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
if (StringUtils.isBlank(id) && StringUtils.isBlank(standardNumber)) { if (StringUtils.isBlank(id) && StringUtils.isBlank(standardNumber)) {
throw new JeroBootException(ResultCommon.EMPTY_COMMON, "id和标准号不能同时为空"); throw new JeroBootException(ResultCommon.EMPTY_COMMON, "id和标准号不能同时为空");
} }
if (StrUtil.isBlank(id) && module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
// 根据标准号获取id
LambdaQueryWrapper<LawsEnterpriseStandard> esWrapper = new LambdaQueryWrapper<>();
esWrapper.eq(LawsEnterpriseStandard::getStandardNumber, standardNumber);
id = esService.list(esWrapper).get(0).getId();
}
// 获取要操作的表名 // 获取要操作的表名
String tableName = TableNameEnum.getTableName(module); String tableName = TableNameEnum.getTableName(module);
// 获取全部字段 // 获取全部字段