yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

手册修改/发布部门排序优化

Browse Source
This commit is contained in:
zhal 2023-09-15 00:55:08 +08:00
parent 76d9ff76eb
commit 7a7ec7ef04
7 changed files with 110 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

66
com.actionsoft.apps.coe.pal/manifest.xml
View File

File diff suppressed because one or more lines are too long

2
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java
View File

@ -446,7 +446,7 @@ public class OutputWordUtil {
//添加表格
Table table = section.addTable(true);
table.resetCells(data.length + 1, header.length);
//table.autoFit(AutoFitBehaviorType.Auto_Fit_To_Window);
table.autoFit(AutoFitBehaviorType.Auto_Fit_To_Window);
TableRow row = table.getRows().get(0);
row.isHeader(true);
row.setHeightType(TableRowHeightType.Exactly);

3
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java
View File

@ -1512,7 +1512,7 @@ public class PALRepositoryQueryAPIManager {
return result;
}
/**PAL名称重名校验uuid
/**
* @param context
* @param wsId
* @param pid
@ -1548,6 +1548,7 @@ public class PALRepositoryQueryAPIManager {
}
/**************************************************** 获取流程树 **********************************************************/
/**

28
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
View File

@ -2795,14 +2795,28 @@ public class DesignerRelationShapeWeb extends ActionWeb {
map.put("treeData", treeData);
/******************************自定义排序******************************************************/
if (depjsonArray.size() > 0 && depjsonArray.getJSONObject(0).getString("timestamp") != null) {
depjsonArray.sort(Comparator.comparing(st -> ((JSONObject) st).getString("timestamp")));
JSONObject jo = new JSONObject(new LinkedHashMap());
for (int b = 0; b < depjsonArray.size(); b++) {
JSONObject onedata = depjsonArray.getJSONObject(b);
jo.put(onedata.getString("id"), onedata);
System.out.println("depjsonArray==================="+depjsonArray);
if (depjsonArray.size() > 0 ) {
boolean containsJSONObject = true;
for(int i=0;i<depjsonArray.size();i++){
JSONObject jsonObject = depjsonArray.getJSONObject(i);
if (!jsonObject.containsKey("timestamp")) {
containsJSONObject=false;
}
}
map.put("checkedList", jo);
if(containsJSONObject==true){
depjsonArray.sort(Comparator.comparing(st -> ((JSONObject) st).getString("timestamp")));
JSONObject jo = new JSONObject(new LinkedHashMap());
for (int b = 0; b < depjsonArray.size(); b++) {
JSONObject onedata = depjsonArray.getJSONObject(b);
jo.put(onedata.getString("id"), onedata);
}
map.put("checkedList", jo);
}else{
map.put("checkedList", o);
}
} else {
map.put("checkedList", o);
}

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java
View File

@ -114,8 +114,8 @@ public class RepositoryTreeUtil {
if (model != null) palObject.put("dutyUserName", model.getUserName());
}
String sqls = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PROPERTYNAME = '文件编码' and PLID = '"+palModel.getId()+"'";
palObject.put("stopNumber", DBSql.getString(sqls));
//String sqls = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PROPERTYNAME = '文件编码' and PLID = '"+palModel.getId()+"'";
//palObject.put("stopNumber", DBSql.getString(sqls));
// if (professionalIcon) {
if (false) {
palObject.put("icon", "../apps/" + CoEConstant.APP_ID + "/img/method/" + palModel.getMethodId() + "/16.png");

87
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -2609,13 +2609,18 @@ public class CoeProcessLevelWeb extends ActionWeb {
DepartmentModel dept = SDK.getORGAPI().getDepartmentById(object.getString("id"));
if (dept != null && !filter.contains(dept.getId())) {
if(object.getString("timestamp")!=null){
/*if(object.getString("timestamp")!=null){
depjsonArray.add(object);
}else{
object.put("name", dept.getName());
filter.add(dept.getId());
dataArr.add(object);
}
}*/
depjsonArray.add(object);
object.put("name", dept.getName());
filter.add(dept.getId());
dataArr.add(object);
}
}
@ -2647,36 +2652,44 @@ public class CoeProcessLevelWeb extends ActionWeb {
}
}
}
if(depjsonArray.size()>0 && depjsonArray.getJSONObject(0).getString("timestamp")!=null){
depjsonArray.sort(Comparator.comparing(st ->((JSONObject)st).getString("timestamp")));
JSONArray dataArr2 = new JSONArray();
Set<String> filter1 = new HashSet<String>();// 去重记录
for(int t=0;t<depjsonArray.size();t++){
if ("department".equals(depjsonArray.getJSONObject(t).getString("type"))) {
DepartmentModel dept = SDK.getORGAPI().getDepartmentById(depjsonArray.getJSONObject(t).getString("id"));
if (dept != null && !filter1.contains(dept.getId())) {
filter1.add(dept.getId());
dataArr2.add(depjsonArray.get(t));
}
}
boolean containsJSONObject = true;
for(int i=0;i<depjsonArray.size();i++){
JSONObject jsonObject = depjsonArray.getJSONObject(i);
if (!jsonObject.containsKey("timestamp")) {
containsJSONObject=false;
}
// 数据组合
List<String> valueList = new ArrayList<>();
for (int i = 0; i < dataArr2.size(); i++) {
valueList.add(dataArr2.getJSONObject(i).getString("name"));
}
inputValue = StringUtils.join(valueList, ",");
}else {
// 数据组合
List<String> valueList = new ArrayList<>();
for (int i = 0; i < dataArr.size(); i++) {
valueList.add(dataArr.getJSONObject(i).getString("name"));
}
inputValue = StringUtils.join(valueList, ",");
}
if(containsJSONObject==true){
depjsonArray.sort(Comparator.comparing(st ->((JSONObject)st).getString("timestamp")));
JSONArray dataArr2 = new JSONArray();
Set<String> filter1 = new HashSet<String>();// 去重记录
for(int t=0;t<depjsonArray.size();t++){
if ("department".equals(depjsonArray.getJSONObject(t).getString("type"))) {
DepartmentModel dept = SDK.getORGAPI().getDepartmentById(depjsonArray.getJSONObject(t).getString("id"));
if (dept != null && !filter1.contains(dept.getId())) {
filter1.add(dept.getId());
dataArr2.add(depjsonArray.get(t));
}
}
}
// 数据组合
List<String> valueList = new ArrayList<>();
for (int i = 0; i < dataArr2.size(); i++) {
valueList.add(dataArr2.getJSONObject(i).getString("name"));
}
inputValue = StringUtils.join(valueList, ",");
}else{
// 数据组合
List<String> valueList = new ArrayList<>();
for (int i = 0; i < dataArr.size(); i++) {
valueList.add(dataArr.getJSONObject(i).getString("name"));
}
inputValue = StringUtils.join(valueList, ",");
}
@ -9505,14 +9518,14 @@ public class CoeProcessLevelWeb extends ActionWeb {
ro.put("sb", sb);
return ro.toString();
}
SDK.getLogAPI().consoleInfo("form>>>>>>>>>>>" + from);
SDK.getLogAPI().consoleInfo("to>>>>>>>>>>>" + to);
//SDK.getLogAPI().consoleInfo("form>>>>>>>>>>>" + from);
//SDK.getLogAPI().consoleInfo("to>>>>>>>>>>>" + to);
String from_id = from.getString("id");
String to_id = to.getString("id");
if (UtilString.isEmpty(from_id) && UtilString.isEmpty(to_id)) {
sb.append("<span>连线校验<span><br/>");
sb6.append("出入线未与其他形状进行关联,请查看模型");
sb6.append("校验未通过,请检查模型是否都已连线!");
sb6.append("校验未通过,请检查模型活动之间是否都已连线!");
sb.append(sb6);
ro.put("result", "error");
ro.put("sb", sb);
@ -9542,8 +9555,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
//System.out.println("m的值>>>>>>>>>>>" + ms);
}
System.out.println("剩余的list是什么>>>>>>>>>>" + list_linker.toString());
//System.out.println("linker>>>>>>>>>>>>" + list_linker.size());
//System.out.println("剩余的list是什么>>>>>>>>>>" + list_linker.toString());
//连线校验增加体术语句
if (list_linker.size() > 0) {
sb.append("<span>连线校验<span><br/>");
@ -9551,14 +9563,17 @@ public class CoeProcessLevelWeb extends ActionWeb {
list_linker) {
String name = jsonObjects.getString(d);
if(StringUtils.isNotEmpty(name)){
sb6.append(name);
sb6.append("【"+name+"】").append(",");
}
}
if (sb6.length() > 0) {
sb6.deleteCharAt(sb6.length() - 1);
}
sb6.append("校验未通过,请检查模型是否都已连线!");
sb.append(sb6);
}
System.out.println("sb>>>>>>>>>>>" + sb);
//System.out.println("sb>>>>>>>>>>>" + sb);
}
/***************************************************数据属性校验*************************************************/