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

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

Browse Source
This commit is contained in:
mzaxd
2024-01-31 15:29:35 +08:00
parent dd6865783c
commit f31447820b
1 changed files with 14 additions and 2 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
+14 -2
View File
@@ -29,8 +29,10 @@ import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessNodeLinkService;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
@@ -98,6 +100,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
@Resource
private TranslationAspect translationAspect;
@Resource
private EnterpriseStandardAuthDeptService esAdService;
@Override
public void startProcess(InitChangeDataVO initChangeData) {
// 发起的时候校验标准编号是是否重复
@@ -246,6 +251,12 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) {
Map<String, Object> es = commonService.getByIdAndModule(null, TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "2", 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();
String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
@@ -262,12 +273,13 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
.setStandardCategoryCode((String) es.get(FieldCommon.STANDARD_CATEGORY_CODE))
.setCompilationDescription((String) es.get(FieldCommon.COMP_ILLUSTRATION))
.setComponentName((String) es.get(FieldCommon.PART_NAME))
.setAuthDept((String) es.get(FieldCommon.AUTH_DEPT))
.setMainDraftingUser((String) es.get(FieldCommon.MAIN_DRAFTING_USER))
.setMainDraftingUnit((String) es.get(FieldCommon.MAIN_DRAFTING_UNIT))
.setMainDraftingUnitResponsiblePerson((String) es.get(FieldCommon.MAIN_DRAFTING_UNIT_RESPONSIBLE_PERSON))
.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))
.setAuthDept(authDeptIds);
}
@Override