From 6c391d600182930913b43e2f63b7d3cfa131cfc2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 14 八月 2024 16:27:58 +0800
Subject: [PATCH] 业务类型创建索引、导出、导入等接口，属性池导入接口调整上传。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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..26e995a 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();
@@ -712,7 +713,7 @@
throw new PLException("500",new String[]{"璇峰嬀閫夎瀵煎嚭鐨勭敓鍛藉懆鏈熸ā鏉�!"});
}
//鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
- exportFileName = Func.isBlank(exportFileName) ? "鐗堟湰瑙勫垯瀵煎嚭_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
+ exportFileName = Func.isBlank(exportFileName) ? "鐢熷懡鍛ㄦ湡瀵煎嚭_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
//璁剧疆鍒楀悕
List<String> columns = this.getCloumns(flag);
@@ -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