diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index f5850525..8792a309 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -1290,7 +1290,7 @@ public class TaskServiceImpl implements ITaskService { } // 通用的标签设置方法 - private void setTagField(TagReq tagReq, String tagValue, String tagName, + private void setTagField(TagReq tagReq, String tagValue, String tagName,String tagCode, BiConsumer tagSetter, BiConsumer tagNameSetter, BiConsumer tagCodeSetter) { @@ -1300,21 +1300,24 @@ public class TaskServiceImpl implements ITaskService { if (tagName != null) { tagNameSetter.accept(tagReq, tagName); } + if (tagCode != null) { + tagCodeSetter.accept(tagReq, tagCode); + } } private void fillTaskTagReq(List newTaskList) { for (SpdmNewTaskVo spdmNewTaskVo : newTaskList) { TagReq tagReq = new TagReq(); - setTagField(tagReq, spdmNewTaskVo.getNewTag1(), spdmNewTaskVo.getTag1(), TagReq::setTag1, TagReq::setTag1Name, TagReq::setTag1Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag2(), spdmNewTaskVo.getTag2(), TagReq::setTag2, TagReq::setTag2Name, TagReq::setTag2Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag3(), spdmNewTaskVo.getTag3(), TagReq::setTag3, TagReq::setTag3Name, TagReq::setTag3Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag4(), spdmNewTaskVo.getTag4(), TagReq::setTag4, TagReq::setTag4Name, TagReq::setTag4Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag5(), spdmNewTaskVo.getTag5(), TagReq::setTag5, TagReq::setTag5Name, TagReq::setTag5Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag6(), spdmNewTaskVo.getTag6(), TagReq::setTag6, TagReq::setTag6Name, TagReq::setTag6Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag7(), spdmNewTaskVo.getTag7(), TagReq::setTag7, TagReq::setTag7Name, TagReq::setTag7Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag8(), spdmNewTaskVo.getTag8(), TagReq::setTag8, TagReq::setTag8Name,TagReq::setTag8Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag9(), spdmNewTaskVo.getTag9(), TagReq::setTag9, TagReq::setTag9Name, TagReq::setTag9Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag10(), spdmNewTaskVo.getTag10(), TagReq::setTag10, TagReq::setTag10Name, TagReq::setTag10Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag1(), spdmNewTaskVo.getTag1(),spdmNewTaskVo.getTag1Code(), TagReq::setTag1, TagReq::setTag1Name, TagReq::setTag1Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag2(), spdmNewTaskVo.getTag2(), spdmNewTaskVo.getTag2Code(),TagReq::setTag2, TagReq::setTag2Name, TagReq::setTag2Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag3(), spdmNewTaskVo.getTag3(), spdmNewTaskVo.getTag3Code(),TagReq::setTag3, TagReq::setTag3Name, TagReq::setTag3Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag4(), spdmNewTaskVo.getTag4(), spdmNewTaskVo.getTag4Code(),TagReq::setTag4, TagReq::setTag4Name, TagReq::setTag4Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag5(), spdmNewTaskVo.getTag5(), spdmNewTaskVo.getTag5Code(),TagReq::setTag5, TagReq::setTag5Name, TagReq::setTag5Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag6(), spdmNewTaskVo.getTag6(), spdmNewTaskVo.getTag6Code(),TagReq::setTag6, TagReq::setTag6Name, TagReq::setTag6Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag7(), spdmNewTaskVo.getTag7(), spdmNewTaskVo.getTag7Code(),TagReq::setTag7, TagReq::setTag7Name, TagReq::setTag7Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag8(), spdmNewTaskVo.getTag8(), spdmNewTaskVo.getTag8Code(),TagReq::setTag8, TagReq::setTag8Name,TagReq::setTag8Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag9(), spdmNewTaskVo.getTag9(), spdmNewTaskVo.getTag9Code(),TagReq::setTag9, TagReq::setTag9Name, TagReq::setTag9Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag10(), spdmNewTaskVo.getTag10(), spdmNewTaskVo.getTag10Code(),TagReq::setTag10, TagReq::setTag10Name, TagReq::setTag10Code); tagReq.setTaskId(spdmNewTaskVo.getUuid()); tagReq.setTaskName(spdmNewTaskVo.getTaskName()); tagReq.setTaskCode(spdmNewTaskVo.getTaskCode());