From f0b8a8d9966d0ccbb23ee8baaedf4ff8ba6060ed Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 08 八月 2024 18:15:42 +0800
Subject: [PATCH] 业务类型新增、修改、删除、查看使用范围、创建视图、一致性检查、一致性检查修复、删除数据、删除数据界面查询、删除全部类型接口上传。

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
index a8e5b77..bbf8729 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
@@ -238,6 +238,7 @@
 				Arrays.stream(bounds).forEach(bound->{
 					OsLifeCycleLineBoundVO boundVO = new OsLifeCycleLineBoundVO();
 					boundVO.setId(bound.id);
+					boundVO.setName(bound.name);
 					boundVO.setCellx(bound.cellx);
 					boundVO.setCelly(bound.celly);
 					boundVO.setCellh(bound.cellh);
@@ -299,7 +300,7 @@
 		lifeCyle.name = lifeCycleVO.getId();
 		lifeCyle.tag = lifeCycleVO.getName();
 		lifeCyle.oid = lifeCycleVO.getOid();
-		String userId = "developer";//WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
+		String userId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
 		lifeCyle.creator = Func.isBlank(lifeCycleVO.getCreator()) ? userId:lifeCycleVO.getCreator();
 		lifeCyle.description = lifeCycleVO.getDescription();
 		lifeCyle.modifier = Func.isBlank(lifeCycleVO.getLastModifier()) ? userId:lifeCycleVO.getLastModifier();
@@ -863,13 +864,24 @@
 					group.setStartStatus(po.getStartStatus());
 					group.setDescription(po.getDescription());
 					groupPOMap.put(key, group);
-
+					//绗竴琛岃捣濮嬬姸鎬侀渶瑕佸崟鐙鐞�
+					if(po.getRowIndex().equals("1")){
+						OsLifeCycleLineBoundVO boundVO = new OsLifeCycleLineBoundVO();
+						boundVO.setName(po.getStartStatus());
+						boundVO.setCellh("30.0");
+						boundVO.setCellw("80.0");
+						boundVO.setCellx(String.valueOf(200+(Integer.parseInt(po.getRowIndex())*60)));
+						boundVO.setCelly(String.valueOf(300+(Integer.parseInt(po.getRowIndex())*60)));
+						boundVO.setCellicon("");
+						defaultBoundList.add(boundVO);
+					}
 					//澶勭悊鐢熷懡鍛ㄦ湡鍥炬爣鐨勯粯璁ょ殑鍧愭爣淇℃伅
 					OsLifeCycleLineBoundVO boundVO = new OsLifeCycleLineBoundVO();
+					boundVO.setName(po.getTargetLifeStatus());
 					boundVO.setCellh("30.0");
 					boundVO.setCellw("80.0");
-					boundVO.setCellx(String.valueOf(200+(Integer.parseInt(po.getRowIndex())*60)));
-					boundVO.setCelly(String.valueOf(300+(Integer.parseInt(po.getRowIndex())*60)));
+					boundVO.setCellx(String.valueOf(250+(Integer.parseInt(po.getRowIndex())*60)));
+					boundVO.setCelly(String.valueOf(350+(Integer.parseInt(po.getRowIndex())*60)));
 					boundVO.setCellicon("");
 					defaultBoundList.add(boundVO);
 				}

--
Gitblit v1.9.3