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-08-03 17:07:38 +08:00
parent d3480de121
commit 8109487746
5 changed files with 61 additions and 45 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.

91
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java
View File

@ -11,6 +11,8 @@ import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
import com.actionsoft.apps.coe.pal.pal.repository.util.DiagramsUtil;
import com.actionsoft.apps.coe.pal.pal.repository.util.ShapeUtil;
import com.actionsoft.apps.coe.pal.pal.repository.web.CoeProcessLevelWeb;
import com.actionsoft.bpms.cc.Adapter;
import com.actionsoft.bpms.commons.database.RowMap;
import com.actionsoft.bpms.schedule.IJob;
import com.actionsoft.bpms.util.DBSql;
@ -38,9 +40,14 @@ public class SynchronousOrgJob implements IJob {
static List<RowMap> orgdepartmentList;
static int orgindex = 0;
static String parentModelId = "";
static String wsId;
/**
* 同步组织、架构数据
* 更新组织名称/数量，更新岗位名称/数量
* @param jobExecutionContext
* @throws JobExecutionException
*/
@Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@ -137,32 +144,50 @@ public class SynchronousOrgJob implements IJob {
String sql1 = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE wsId='" + wsId + "' and EXT1='" + org.getString("ID") + "'";
String parentPalOrgId1 = DBSql.getString(conn, sql1);
if (StringUtil.isEmpty(parentPalOrgId1)) {
PALRepositoryModelImpl model1 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, org.getString("DEPARTMENTNAME"),
"", 1, parentModelId, "org", true, 1,
id1, false, "org.normal", "0", Integer.valueOf(org.getString("ORDERINDEX")), null,
null, "admin", "admin", nowTime, org.getString("ID"), null,
null, null, null, null, null, null, null, 1);
coeProcessLevel.insert(model1);
createPostData(model1.getId(), org.getString("ID"), model1, conn);
return modelId = model1.getId();
RowMap orgrowMap=DBSql.getMap("SELECT PLNAME FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT1=?",org.getString("ID"));
if(orgrowMap==null){
PALRepositoryModelImpl model1 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, org.getString("DEPARTMENTNAME"),
"", 1, parentModelId, "org", true, 1,
id1, false, "org.normal", "0", Integer.valueOf(org.getString("ORDERINDEX")), null,
null, "admin", "admin", nowTime, org.getString("ID"), null,
null, null, null, null, null, null, null, 1);
coeProcessLevel.insert(model1);
createPostData(model1.getId(), org.getString("ID"), model1, conn);
return modelId = model1.getId();
}else{
String plname=orgrowMap.getString("PLNAME");
if(!plname.equals(org.getString("DEPARTMENTNAME"))){
String updateSql = "UPDATE APP_ACT_COE_PAL_REPOSITORY SET PLNAME=? WHERE ID=?";
DBSql.update(conn, String.format(updateSql, org.getString("DEPARTMENTNAME"), orgrowMap.getString("ID")));
}
}
}
} else {
String parentPalOrgId = getParentPalOrgId(org, conn);
if (StringUtil.isNotEmpty(parentPalOrgId)) {
RowMap orgrowMap=DBSql.getMap("SELECT PLNAME FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT1=?",org.getString("ID"));
if(orgrowMap==null) {
PALRepositoryModelImpl model2 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, org.getString("DEPARTMENTNAME"),
"", 1, getParentPalOrgId(org, conn), "org", true, 1,
id1, false, "org.normal", "0", Integer.valueOf(org.getString("ORDERINDEX")), null,
null, "admin", "admin", nowTime, org.getString("ID"), null,
null, null, null, null, null, null, null, 1);
coeProcessLevel.insert(model2);
PALRepositoryModelImpl model2 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, org.getString("DEPARTMENTNAME"),
"", 1, getParentPalOrgId(org, conn), "org", true, 1,
id1, false, "org.normal", "0", Integer.valueOf(org.getString("ORDERINDEX")), null,
null, "admin", "admin", nowTime, org.getString("ID"), null,
null, null, null, null, null, null, null, 1);
coeProcessLevel.insert(model2);
createPostData(model2.getId(), org.getString("ID"), model2, conn);
return modelId = model2.getId();
createPostData(model2.getId(), org.getString("ID"), model2, conn);
return modelId = model2.getId();
}else{
String plname=orgrowMap.getString("PLNAME");
if(!plname.equals(org.getString("DEPARTMENTNAME"))){
String updateSql = "UPDATE APP_ACT_COE_PAL_REPOSITORY SET PLNAME=? WHERE ID=?";
DBSql.update(conn, String.format(updateSql, org.getString("DEPARTMENTNAME"), orgrowMap.getString("ID")));
}
}
}
@ -187,18 +212,6 @@ public class SynchronousOrgJob implements IJob {
}
public String getParentPallevel(RowMap org, Connection conn) {
String sql = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE wsId='" + wsId + "' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'";
String parentPalOrgId = DBSql.getString(conn, sql);
if (parentPalOrgId.equals("0") || parentPalOrgId.equals("") || parentPalOrgId == null) {
RowMap parentOrg = DBSql.getMap("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID from ORGDEPARTMENT where id = '" + org.getString("PARENTDEPARTMENTID") + "'");
creatNode(parentOrg, conn);
}
return parentPalOrgId;
}
/**
@ -220,12 +233,6 @@ public class SynchronousOrgJob implements IJob {
JSONObject definition = JSONObject.parseObject(define);
JSONObject elements = definition.getJSONObject("elements");
//新建一个uuid
String shapeId = UUIDGener.getObjectId();
//拿到基础结构
JSONObject shape = ShapeUtil.getProcessShapeDefinitionByName("org.normal", "position");
List<RowMap> orgdepartmentList = DBSql.getMaps(conn, "select DISTINCT(POSITION_NAME) from ORGUSER WHERE DEPARTMENTID=?", departmentId);
@ -235,15 +242,15 @@ public class SynchronousOrgJob implements IJob {
for (int i = 0; i < orgdepartmentList.size(); i++) {
//新建一个uuid
String shapeId1 = UUIDGener.getObjectId();
String shapeId = UUIDGener.getObjectId();
//拿到基础结构
JSONObject shape1 = ShapeUtil.getProcessShapeDefinitionByName("org.normal", "position");
JSONObject shape = ShapeUtil.getProcessShapeDefinitionByName("org.normal", "position");
String positionName = orgdepartmentList.get(i).getString("POSITION_NAME");
if (StringUtil.isNotEmpty(positionName)) {
JSONObject newShape = JSONObject.parseObject(shape1.toString());
newShape.put("id", shapeId1);
JSONObject newShape = JSONObject.parseObject(shape.toString());
newShape.put("id", shapeId);
newShape.put("text", positionName);
shapes.add(newShape);

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

@ -2382,6 +2382,10 @@ public class CoeProcessLevelWeb extends ActionWeb {
continue;
}
if (palMethodModel.getId().equals(plModel.getMethodId())) {
/************************分类修改为输入框 by zhaolei*****************************/
macroLibraries.put("classification",I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()));
/************************************end******************************************/
methodIdsb.append("<option selected=\"selected\" value='" + palMethodModel.getId() + "'>" + I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()) + "</option>");
} else {
methodIdsb.append("<option value='" + palMethodModel.getId() + "'>" + I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()) + "</option>");
@ -2431,6 +2435,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
macroLibraries.put("methodIdValue", methodId);
macroLibraries.put("editable", (editable == null || "".equals(editable)) ? "1" : editable);
CoeUserModel userModel = (CoeUserModel) CoeUserDaoFactory.createUser().getInstanceByUserId(_uc.getUID());
return HtmlPageTemplate.merge(CoEConstant.APP_ID, "pal.pl.level.create.htm", macroLibraries);
}

8
com.actionsoft.apps.coe.pal/template/page/pal.pl.level.create.htm
View File

@ -143,10 +143,14 @@
<td><I18N#分类></td>
<td class="tagContentTableTrTd">
<div style="position:relative;">
<select Onchange="autoSave($(this))" data-originvalue='' id='methodId' class="awsui-select" style="width: 450px;">
<!--改为输入框显示-->
<!--<select Onchange="autoSave($(this))" data-originvalue='' id='methodId' class="awsui-select" style="width: 450px;">
<option value="default"><I18N#简单文件分类></option>
<#miselectoption>
</select>
</select>-->
<input class="awsui-textbox" type="text" name="methodId" value='<#classification>' data-originvalue='<#classification>' id="methodId" maxlength="128"/>
</div>
</td>
</tr>

2
com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
View File

@ -794,7 +794,7 @@
<div id="designer">
<div id="shape_panel" class="layout"></div>
<div id="shape_panel_more_shape" style="display:none;">
<input id="moreShapes" type='button' style='height: 24px;width: 80px;margin-top: 4px;line-height: 24px;' class="designer_button" onclick="UI.showShapesManage()" value="更多图形" />
<!--<input id="moreShapes" type='button' style='height: 24px;width: 80px;margin-top: 4px;line-height: 24px;' class="designer_button" onclick="UI.showShapesManage()" value="更多图形" />-->
</div>
<div id="designer_viewport">