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

废止流程过滤架构图/多行显示比例调整/pal打包

Browse Source
This commit is contained in:
zhal 2022-10-20 15:26:29 +08:00
parent eec46bd9bd
commit fdef468c5a
4 changed files with 19 additions and 19 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.

33
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousPortJob.java
View File

@ -10,6 +10,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.actionsoft.apps.coe.pal.pal.repository.upfile.web.UpfileWeb; import com.actionsoft.apps.coe.pal.pal.repository.upfile.web.UpfileWeb;
import okhttp3.OkHttpClient;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException; import org.quartz.JobExecutionException;
@ -88,7 +89,7 @@ public class SynchronousPortJob implements IJob {
Connection open = DBSql.open(); Connection open = DBSql.open();
try { try {
orgdepartmentList = DBSql.getMaps(open, "select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT where Closed=0 "); orgdepartmentList = DBSql.getMaps(open, "SELECT DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT where Closed=0 ");
RowMap parentModel=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLNAME='内蒙古伊利实业集团股份有限公司' and PLMETHODID='org.normal'"); RowMap parentModel=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLNAME='内蒙古伊利实业集团股份有限公司' and PLMETHODID='org.normal'");
@ -183,16 +184,16 @@ public class SynchronousPortJob implements IJob {
coeProcessLevel.insert(model1); coeProcessLevel.insert(model1);
createPostData(model1.getId(), org.getString("ID"), model1, conn); createPostData(model1.getId(), org.getString("ID"), model1, conn);
return modelId = model1.getId(); return modelId = model1.getId();
}/* else { } else {
PALRepositoryModelImpl model = (PALRepositoryModelImpl) coeProcessLevel.getInstance(orgrowMap.getString("ID")); PALRepositoryModelImpl model = (PALRepositoryModelImpl) coeProcessLevel.getInstance(orgrowMap.getString("ID"));
String plname = orgrowMap.getString("PLNAME"); /* String plname = orgrowMap.getString("PLNAME");
if (!plname.equals(org.getString("DEPARTMENTNAME"))) { if (!plname.equals(org.getString("DEPARTMENTNAME"))) {
String updateSql = "UPDATE APP_ACT_COE_PAL_REPOSITORY SET PLNAME=? WHERE ID=? AND PLMETHODID='org.normal'"; String updateSql = "UPDATE APP_ACT_COE_PAL_REPOSITORY SET PLNAME=? WHERE ID=? AND PLMETHODID='org.normal'";
DBSql.update(conn, String.format(updateSql, org.getString("DEPARTMENTNAME"), orgrowMap.getString("ID"))); DBSql.update(conn, String.format(updateSql, org.getString("DEPARTMENTNAME"), orgrowMap.getString("ID")));
} }*/
createPostData(model.getId(), org.getString("ID"), model, conn); createPostData(model.getId(), org.getString("ID"), model, conn);
}*/ }
} }
@ -212,18 +213,19 @@ public class SynchronousPortJob implements IJob {
null, null, null, null, null, null, null, 1); null, null, null, null, null, null, null, 1);
coeProcessLevel.insert(model2); coeProcessLevel.insert(model2);
createPostData(model2.getId(), org.getString("ID"), model2, conn); createPostData(model2.getId(), org.getString("ID"), model2, conn);
return modelId = model2.getId(); return modelId = model2.getId();
}/*else{ }else{
PALRepositoryModelImpl model = (PALRepositoryModelImpl)coeProcessLevel.getInstance(orgrowMap.getString("ID")); PALRepositoryModelImpl model = (PALRepositoryModelImpl)coeProcessLevel.getInstance(orgrowMap.getString("ID"));
String plname=orgrowMap.getString("PLNAME"); /* String plname=orgrowMap.getString("PLNAME");
if(!plname.equals(org.getString("DEPARTMENTNAME"))){ if(!plname.equals(org.getString("DEPARTMENTNAME"))){
String updateSql = "UPDATE APP_ACT_COE_PAL_REPOSITORY SET PLNAME=? WHERE ID=? AND PLMETHODID='org.normal'"; String updateSql = "UPDATE APP_ACT_COE_PAL_REPOSITORY SET PLNAME=? WHERE ID=? AND PLMETHODID='org.normal'";
DBSql.update(conn, String.format(updateSql, org.getString("DEPARTMENTNAME"), orgrowMap.getString("ID"))); DBSql.update(conn, String.format(updateSql, org.getString("DEPARTMENTNAME"), orgrowMap.getString("ID")));
} }*/
createPostData(orgrowMap.getString("ID"), org.getString("ID"), model, conn); createPostData(orgrowMap.getString("ID"), org.getString("ID"), model, conn);
}*/ }
} }
@ -261,26 +263,27 @@ public class SynchronousPortJob implements IJob {
Map<String, String> idRelationMap = new HashMap<>(); Map<String, String> idRelationMap = new HashMap<>();
System.out.println("departmentId==================="+departmentId);
List<RowMap> orgdepartmentList = DBSql.getMaps(conn, "select DESCR,DEPTNAME from BO_EU_ORG_POSTS WHERE DEPTID=? AND DESCR IS NOT NULL ", departmentId);
List<RowMap> orgdepartmentList = DBSql.getMaps(conn, "select distinct(DESCR),DEPTNAME from BO_EU_ORG_POSTS WHERE DEPTID=? AND DESCR IS NOT NULL ", departmentId);
JSONArray shapes = new JSONArray(); JSONArray shapes = new JSONArray();
if (orgdepartmentList.size() > 0) { if (orgdepartmentList.size() > 0) {
for (int i = 0; i < orgdepartmentList.size(); i++) { for (int i = 0; i < orgdepartmentList.size(); i++) {
boolean flag=true; boolean flag=true;
String positionName = orgdepartmentList.get(i).getString("DESCR"); String positionName = orgdepartmentList.get(i).getString("DESCR");
String deptname = orgdepartmentList.get(i).getString("DEPTNAME"); String deptname = orgdepartmentList.get(i).getString("DEPTNAME");
//新建一个uuid //新建一个uuid
String shapeId = UUIDGener.getObjectId(); String shapeId = UUIDGener.getObjectId();
//拿到基础结构 //拿到基础结构
JSONObject shape = ShapeUtil.getProcessShapeDefinitionByName("org.normal", "position"); JSONObject shape = ShapeUtil.getProcessShapeDefinitionByName("org.normal", "position");
//查询模型形状 //查询模型形状
PALRepositoryModel parentModel = PALRepositoryCache.getCache().get(uuid); PALRepositoryModel parentModel = PALRepositoryCache.getCache().get(uuid);
@ -289,19 +292,17 @@ public class SynchronousPortJob implements IJob {
List<Map<String, Object>> fileElements = CoeDesignerUtil.getShapeMessageJson4(uuid); List<Map<String, Object>> fileElements = CoeDesignerUtil.getShapeMessageJson4(uuid);
if (fileElements.size() > 0) { if (fileElements.size() > 0) {
for (Map<String, Object> shape2 : fileElements) { for (Map<String, Object> shape2 : fileElements) {
List result = new ArrayList();
if (positionName.equals(shape2.get("name").toString().trim())) {
if (positionName.equals(shape2.get("name"))) {
flag = false; flag = false;
} }
} }
if (flag == true) { if (flag == true) {
System.out.println("uuid==============="+uuid); System.out.println("uuid==============="+uuid);
System.out.println("部门名称为=================" + deptname); System.out.println("部门名称为=================" + deptname);
System.out.println("新建岗位为==================" + positionName); System.out.println("新建岗位为==================" + positionName);

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

@ -2645,7 +2645,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
requiredSpan = "<span class='required'></span>"; requiredSpan = "<span class='required'></span>";
} }
if ("textarea".equals(type)) { if ("textarea".equals(type)) {
input = "<textarea class=\"awsui-textbox\" title="+inputValue+" style=\"height:30px;\" name=\"" + id + "\" id=\"" + id + "\" isRequired='" + isRequired + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' onclick=\"openTextareaDialog($(this), '" + attributeModel.getNewTitle() + "', " + readonly + ");\" >" + inputValue + "</textarea>"; input = "<textarea class=\"awsui-textbox\" title="+inputValue+" style=\"height:60px;\" name=\"" + id + "\" id=\"" + id + "\" isRequired='" + isRequired + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' onclick=\"openTextareaDialog($(this), '" + attributeModel.getNewTitle() + "', " + readonly + ");\" >" + inputValue + "</textarea>";
} else if ("select".equals(type) || "select_m".equals(type)) { } else if ("select".equals(type) || "select_m".equals(type)) {
if (readonly) { if (readonly) {
input = "<input type='text' inputType='" + type + "' objid='" + id + "' name='attribute_name_input_" + id + "' readonly=true " + " id='" + id + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' class='awsui-combobox' value='" + inputValue + "'></input>"; input = "<input type='text' inputType='" + type + "' objid='" + id + "' name='attribute_name_input_" + id + "' readonly=true " + " id='" + id + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' class='awsui-combobox' value='" + inputValue + "'></input>";
@ -2668,7 +2668,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
input = "<input class=\"awsui-textbox\" autocomplete='off' id=\"" + id + "\" name=\"dateTimePicker\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" placeholder='" + desc + "' data-originvalue='" + inputValue + "' value='" + inputValue + "' isRequired='" + isRequired + "' onblur='saveContent($(this));'>" + "</input>"; input = "<input class=\"awsui-textbox\" autocomplete='off' id=\"" + id + "\" name=\"dateTimePicker\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" placeholder='" + desc + "' data-originvalue='" + inputValue + "' value='" + inputValue + "' isRequired='" + isRequired + "' onblur='saveContent($(this));'>" + "</input>";
}else if ("table".equals(type)){ }else if ("table".equals(type)){
//判断如果table不为准确json格式，则手动输入 //判断如果table不为准确json格式，则手动输入
boolean falgtrue = getJSONType(jsonValue); boolean falgtrue = getJSONType(jsonValue);
String attrRef = attributeModel.getRef(); String attrRef = attributeModel.getRef();
@ -8794,7 +8793,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
} }
} }
// 设置画布大小 // 设置画布大小
DiagramsUtil.setDiagramHeightWidth(definition, newElements); DiagramsUtil.setDiagramHeightWidth(definition, newElements);
defineModel.setDefinition(definition.toString()); defineModel.setDefinition(definition.toString());

1
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessListWeb.java
View File

@ -63,6 +63,7 @@ public class CoeProcessListWeb extends ActionWeb {
macroLibraries.put("condition", condition); macroLibraries.put("condition", condition);
macroLibraries.put("processCount", CoeProcessLevelDaoFacotory.createCoeProcessLevel().getCoeProcessLevelByWsId(wsId).size()); macroLibraries.put("processCount", CoeProcessLevelDaoFacotory.createCoeProcessLevel().getCoeProcessLevelByWsId(wsId).size());
String html = getToolbarHtml(wsId); String html = getToolbarHtml(wsId);
macroLibraries.put("html", html); macroLibraries.put("html", html);
return HtmlPageTemplate.merge(CoEConstant.APP_ID, "pal.pl.list.portal.htm", macroLibraries); return HtmlPageTemplate.merge(CoEConstant.APP_ID, "pal.pl.list.portal.htm", macroLibraries);