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

处理代码冲突

Browse Source
This commit is contained in:
wangpf 2023-06-07 15:50:30 +08:00
parent b61529beee
commit 7a4b003ede
2 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java
View File

@ -4,8 +4,6 @@ import java.util.HashMap;
import com.actionsoft.apps.AppsConst;
import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager;
import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager;
import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
import com.actionsoft.apps.coe.pal.publisher.client.web.ProcessPublishClientWeb;
import com.actionsoft.apps.coe.pal.publisher.client.web.ProcessPublishWeb;
import com.actionsoft.bpms.commons.htmlframework.HtmlPageTemplate;
@ -845,4 +843,16 @@ public class PublisherController {
}
/**
* 发布变更流程：下拉获取最新架构进行赋值
* @param me
* @param plId
* @return
*/
@Mapping("com.actionsoft.apps.coe.pal.publisher_publish_updateFramework")
public String updateFramework(UserContext me,String uuid,String processInstId) {
ProcessPublishWeb web = new ProcessPublishWeb(me);
return web.updateFramework(uuid,processInstId);
}
}

34
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
View File

@ -1,7 +1,6 @@
package com.actionsoft.apps.coe.pal.publisher.client.web;
import java.io.File;
import java.sql.Array;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@ -23,12 +22,8 @@ import java.util.stream.Collectors;
import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager;
import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
import com.actionsoft.apps.coe.pal.system.util.StringUtil;
import com.actionsoft.sdk.local.api.BOAPI;
import com.actionsoft.exception.AWSDataAccessException;
import com.actionsoft.sdk.local.api.BOQueryAPI;
import com.actionsoft.sdk.local.api.internal.BOQueryAPIImpl;
import com.gbasedbt.msg.sql1;
import com.gbasedbt.msg.sql2;
import org.apache.commons.lang.StringUtils;
import com.actionsoft.apps.coe.pal.constant.CoEConstant;
@ -4524,5 +4519,32 @@ public class ProcessPublishWeb extends ActionWeb {
}
/**
* 发布变更版本流程-根据下拉选择获取最新架构数据赋值到发布表单中
* @return
*/
public String updateFramework(String uuid,String processInstId){
boolean iswrong = false;
JSONObject result = new JSONObject();
if(processInstId==null){
return ResponseObject.newErrResponse("流程实例未找到").toString();
}
ResponseObject ro = ResponseObject.newOkResponse();
try {
//ID获取L1 L2 L3的值
List<RowMap> resulttmp = DBSql.getMaps(String.format("select PROPERTYID,PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PROPERTYID in ('Process_Architecture_L1','Process_Architecture_L2','Process_Architecture_L3','Process_Architecture_L4') AND PLID='%s'", uuid));
for (RowMap tmp : resulttmp) {
String key = tmp.getString("PROPERTYID");
String value = tmp.getString("PROPERTYVALUE");
result.put(key, value);
}
ro.put("data", result);
ro.put("info", iswrong);
} catch (AWSDataAccessException e) {
e.printStackTrace();
}
return ro.toString();
}
}