|
|
@@ -118,7 +118,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
|
|
|
.eq(PatentSplitMessage::getTenantId, personnelVO.getTenantId());
|
|
|
haveSplitWrapper.orderByDesc(PatentSplitMessage::getCreateTime);
|
|
|
List<PatentSplitMessage> patentSplitMessages = patentSplitMessageService.list(haveSplitWrapper);
|
|
|
- //如果查询到原本拆分信息则复制
|
|
|
+ //如果查询到原本拆分信息则复制
|
|
|
if (patentSplitMessages.size() > 0) {
|
|
|
PatentSplitMessage doneMessage = patentSplitMessages.get(0);
|
|
|
//根据报告id和专利号查询特征
|
|
|
@@ -133,13 +133,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
|
|
|
}
|
|
|
);
|
|
|
allFeatures = new ArrayList<>(features);
|
|
|
- //保存拆分记录
|
|
|
- patentSplitMessage = new PatentSplitMessage();
|
|
|
- patentSplitMessage.setPatentNo(patentNo);
|
|
|
- patentSplitMessage.setProjectId(projectId);
|
|
|
- patentSplitMessage.setTenantId(personnelVO.getTenantId());
|
|
|
- patentSplitMessage.setCreateId(personnelVO.getId());
|
|
|
- patentSplitMessage.insert();
|
|
|
+
|
|
|
}
|
|
|
//查询不到则新建
|
|
|
else {
|
|
|
@@ -171,11 +165,14 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
|
|
|
allFeatures.addAll(featureList);
|
|
|
}
|
|
|
}
|
|
|
- //更新拆分信息
|
|
|
- patentSplitMessage.setCreateTime(new Date());
|
|
|
- patentSplitMessage.setCreateId(personnelVO.getId());
|
|
|
- patentSplitMessage.updateById();
|
|
|
}
|
|
|
+ //保存拆分记录
|
|
|
+ patentSplitMessage = new PatentSplitMessage();
|
|
|
+ patentSplitMessage.setPatentNo(patentNo);
|
|
|
+ patentSplitMessage.setProjectId(projectId);
|
|
|
+ patentSplitMessage.setTenantId(personnelVO.getTenantId());
|
|
|
+ patentSplitMessage.setCreateId(personnelVO.getId());
|
|
|
+ patentSplitMessage.insert();
|
|
|
}
|
|
|
}
|
|
|
//当重拆时新建
|
lwhhszx