diff --git a/src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataAndRecordDTO.java b/src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataAndRecordDTO.java index acca850..8b7c919 100644 --- a/src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataAndRecordDTO.java +++ b/src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataAndRecordDTO.java @@ -8,6 +8,7 @@ import java.util.ArrayList; public class ActivitiDataAndRecordDTO { private String approvalStatus; private String processTitle; + private String modelName; private ArrayList activitiDataDTOS; private ArrayList activitiRecordDTOS; diff --git a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java index 91112f9..790eac2 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java @@ -847,6 +847,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService { ArrayList arrayList1 = new ArrayList<>(dtos); EngineReviewListPojo engineReviewListPojos = sw.buildFromDatasource("xdap_app_223770822127386625") .eq("id", approvalId).doQueryFirst(EngineReviewListPojo.class); + activitiDataAndRecordDTO.setModelName(engineReviewListPojos.getModelName()); activitiDataAndRecordDTO.setApprovalStatus(engineReviewListPojos.getStatusDescription()); activitiDataAndRecordDTO.setProcessTitle(engineReviewListPojos.getProcessTopic()); activitiDataAndRecordDTO.setActivitiRecordDTOS(arrayList1);