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

阅览调整

Browse Source
This commit is contained in:
zhal 2022-08-24 10:47:52 +08:00
parent 1fb1abc02b
commit 109a9c401d
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
View File

@ -2995,7 +2995,7 @@ public class CoEPALController {
/** /**
* 弹窗新建角色图形创建相应图形 * 创建角色/绩效/表单模型
* @param me * @param me
* @param * @param
* @return * @return

3
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/publish/dao/PublishListHistory.java
View File

@ -452,7 +452,8 @@ public final class PublishListHistory extends DaoObject<PublishListHistoryModel>
* @return * @return
*/ */
public String getLastPublishTaskIdByModelId(String repositoryId) { public String getLastPublishTaskIdByModelId(String repositoryId) {
String sql = "SELECT pl.TASKID FROM APP_ACT_COE_PAL_PUBLISH p, APP_ACT_COE_PAL_PUBLISH_LIST pl WHERE pl.pid = p.id AND pl.palrepositoryid = ? ORDER BY publishdate DESC"; //String sql = "SELECT pl.TASKID FROM APP_ACT_COE_PAL_PUBLISH p, APP_ACT_COE_PAL_PUBLISH_LIST pl WHERE pl.pid = p.id AND pl.palrepositoryid = ? ORDER BY publishdate DESC";
String sql="SELECT TASKID FROM BO_ACT_COE_PUBLISH_N where PUBLISHFILEID=?";
String taskId = DBSql.getObject(sql, new RowMapper<String>() { String taskId = DBSql.getObject(sql, new RowMapper<String>() {
@Override @Override
public String mapRow(ResultSet rs, int arg1) throws SQLException { public String mapRow(ResultSet rs, int arg1) throws SQLException {

18
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
View File

@ -2880,13 +2880,17 @@ public class CoeDesignerWeb extends ActionWeb {
if ("process".equals(plModel.getMethodCategory()) && !UtilString.isEmpty(taskId) && !"submit_create".equals(taskId) && !"new".equals(taskId) && !"change".equals(taskId)) { if ("process".equals(plModel.getMethodCategory()) && !UtilString.isEmpty(taskId) && !"submit_create".equals(taskId) && !"new".equals(taskId) && !"change".equals(taskId)) {
macroLibraries.put("outputFileName", plModel.getName() + ".doc"); macroLibraries.put("outputFileName", plModel.getName() + ".doc");
macroLibraries.put("taskId", taskId); macroLibraries.put("taskId", taskId);
// 压缩包名称 和 手册模板 if(UtilString.isNotEmpty(taskId)){
OutputTaskModel taskModel = new OutputTask().getTaskReportById(taskId); // 压缩包名称 和 手册模板
// 压缩包名称 OutputTaskModel taskModel = new OutputTask().getTaskReportById(taskId);
macroLibraries.put("taskName", taskModel.getTaskName() + ".zip");
OutputAppProfile appFile = OutputAppManager.getProfile(taskModel.getProfileId()); // 压缩包名称
// 手册模板（com.actionsoft.apps.coe.pal.output.pr） macroLibraries.put("taskName", taskModel.getTaskName() + ".zip");
macroLibraries.put("taskProfile", appFile.getAppContext().getId()); OutputAppProfile appFile = OutputAppManager.getProfile(taskModel.getProfileId());
// 手册模板（com.actionsoft.apps.coe.pal.output.pr）
macroLibraries.put("taskProfile", appFile.getAppContext().getId());
}
} }
String type = CoeDesignerConstant.DESIGNER_DIFINITION_DEFAULT; String type = CoeDesignerConstant.DESIGNER_DIFINITION_DEFAULT;

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

@ -8496,10 +8496,18 @@ public class CoeProcessLevelWeb extends ActionWeb {
defineModel.setCreateHistory(false); defineModel.setCreateHistory(false);
} }
String define = defineModel.getDefinition(); String define = defineModel.getDefinition();
JSONObject definition = JSONObject.parseObject(define); JSONObject definition = JSONObject.parseObject(define);
JSONObject elements = definition.getJSONObject("elements"); JSONObject elements = definition.getJSONObject("elements");
Iterator<String> ite = elements.keySet().iterator();
while (ite.hasNext()) {
String key = ite.next();
JSONObject shape = elements.getJSONObject(key);
String name = shape.getString("name");
}
//新建一个uuid //新建一个uuid
String shapeId = UUIDGener.getObjectId(); String shapeId = UUIDGener.getObjectId();
@ -8518,7 +8526,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
for (PALMethodAttributeModel attributeModel : attributeModels) { for (PALMethodAttributeModel attributeModel : attributeModels) {
//todo：根据importProperty的类型获取具体保存数据值 //todo：根据importProperty的类型获取具体保存数据值
JSONObject arributeObj = new JSONObject(); JSONObject arributeObj = new JSONObject();
arributeObj.put("key", attributeModel.getKey()); arributeObj.put("key", attributeModel.getKey());
arributeObj.put("isRequired", attributeModel.getIsRequired()); arributeObj.put("isRequired", attributeModel.getIsRequired());
@ -8544,7 +8551,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
} }
} }
//shape.put("dataAttributes", dataAttributes);
/************************************************文件属性*********************************************************/ /************************************************文件属性*********************************************************/