diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index 8c5e48866..637345b40 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
@@ -22,6 +22,7 @@
+
@@ -57,7 +58,7 @@
pli.verify_duty_id,
pli.design_flow_status as design_flow_task_status,
pli.verify_flow_status as verify_flow_task_status,
- pli.id,
+ pli.id as project_laws_inventory_id,
(
select
pi.acti_proc_inst_id
@@ -160,7 +161,7 @@
pli.verify_duty_id,
pli.design_flow_status as design_flow_task_status,
pli.verify_flow_status as verify_flow_task_status,
- pli.id,
+ pli.id as project_laws_inventory_id,
(
select
pi.acti_proc_inst_id
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
index 595666470..1c8f39185 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
@@ -214,6 +214,7 @@ public class NcrTrackServiceImpl extends ServiceImpl
trackVO.getProjectLibraryId(),
trackVO.getProjectLawsInventoryId(),
FlowTypeEnum.SJFHXSHLC.getValue());
+ ncrTrackVOTemp.setFlowStatus(designFlowTaskStatus);
trackVOList.add(ncrTrackVOTemp);
}
//PreHomo确认
@@ -254,6 +255,7 @@ public class NcrTrackServiceImpl extends ServiceImpl
trackVO.getProjectLibraryId(),
trackVO.getProjectLawsInventoryId(),
FlowTypeEnum.YZFHXSCLC.getValue());
+ ncrTrackVOTemp.setFlowStatus(verifyFlowTaskStatus);
trackVOList.add(ncrTrackVOTemp);
}
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
index 7ea36ec83..4482a77b7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
@@ -156,6 +156,8 @@ public class NcrTrackVO implements Serializable {
//排序字段
private String orderByField;
+ private String flowStatus;
+