QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准解读流程): 完善

Browse Source
This commit is contained in:
yjz
2024-07-15 20:46:38 +08:00
parent a6fa7c5175
commit 24f71ff051
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
+12 -3
View File
@@ -245,6 +245,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
for (ProcessStandardInterpretClauseSublist standardInterpretClauseSublist :
processStandardInterpretClauseSublistList) {
LawsDocumentSplit lawsDocumentSplit = new LawsDocumentSplit();
// 属性拷贝
BeanUtils.copyProperties(standardInterpretClauseSublist, lawsDocumentSplit);
LawsDomesticStandard lawsDomesticStandard =
lawsDomesticStandardService.getById(standardInterpretClauseSublist.getClauseId());
if (!Objects.isNull(lawsDomesticStandard)){
@@ -263,7 +265,6 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
}else {
lawsDocumentSplit.setId(standardInterpretClauseSublist.getClauseId());
}
BeanUtils.copyProperties(standardInterpretClauseSublist, lawsDocumentSplit);
lawsDocumentSplit.setItemNum(null);
lawsDocumentSplit.setItemTitle(null);
lawsDocumentSplit.setItemContent(null);
@@ -433,10 +434,12 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
standardInterpretClauseSublist.getKeywords()));
first.setKeyController(mergeString(first.getKeyController(),
standardInterpretClauseSublist.getKeyController()));
first.setRelatedDepartment(mergeString(first.getRelatedDepartment(),
standardInterpretClauseSublist.getRelatedDepartment()));
first.setResponsibleDepartment(mergeString(first.getResponsibleDepartment(),
standardInterpretClauseSublist.getResponsibleDepartment()));
first.setResponsibleModule(mergeString(first.getResponsibleModule(),
standardInterpretClauseSublist.getResponsibleModule()));
first.setRelatedDepartment(mergeString(first.getRelatedDepartment(),
standardInterpretClauseSublist.getRelatedDepartment()));
first.setRelatedModule(mergeString(first.getRelatedModule(),
standardInterpretClauseSublist.getRelatedModule()));
first.setApplications(mergeString(first.getApplications(),
@@ -451,6 +454,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
standardInterpretClauseSublist.getNewCerImplementDate()));
first.setNewProductionImplementation(mergeString(first.getNewProductionImplementation(),
standardInterpretClauseSublist.getNewProductionImplementation()));
first.setRegistrationDate(mergeString(first.getRegistrationDate(),
standardInterpretClauseSublist.getRegistrationDate()));
first.setEnterpriseStandard(mergeString(first.getEnterpriseStandard(),
standardInterpretClauseSublist.getEnterpriseStandard()));
first.setTechnicalSpecificationDesignGuide(
@@ -472,6 +477,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
standardInterpretClauseSublist.getKeyTechnologyDecompositionTable()));
first.setOtherDocumentsTemplates(mergeString(first.getOtherDocumentsTemplates(),
standardInterpretClauseSublist.getOtherDocumentsTemplates()));
first.setInvestigationStage(mergeString(first.getInvestigationStage(),
standardInterpretClauseSublist.getInvestigationStage()));
first.setP3(mergeString(first.getP3(),
standardInterpretClauseSublist.getP3()));
first.setP5(mergeString(first.getP5(),
@@ -509,6 +516,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
data.setConfigurationRequirements(toDistinct(data.getConfigurationRequirements()));
data.setNewCerImplementDate(toDistinct(data.getNewCerImplementDate()));
data.setNewProductionImplementation(toDistinct(data.getNewProductionImplementation()));
data.setRegistrationDate(toDistinct(data.getRegistrationDate()));
data.setEnterpriseStandard(toDistinct(data.getEnterpriseStandard()));
data.setTechnicalSpecificationDesignGuide(toDistinct(data.getTechnicalSpecificationDesignGuide()));
data.setDrawingTemplate(toDistinct(data.getDrawingTemplate()));
@@ -518,6 +526,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
data.setDfema(toDistinct(data.getDfema()));
data.setKeyTechnologyDecompositionTable(toDistinct(data.getKeyTechnologyDecompositionTable()));
data.setOtherDocumentsTemplates(toDistinct(data.getOtherDocumentsTemplates()));
data.setInvestigationStage(toDistinct(data.getInvestigationStage()));
data.setP3(toDistinct(data.getP3()));
data.setP5(toDistinct(data.getP5()));
}