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

Merge remote-tracking branch 'origin/apps_dev' into apps_dev

Browse Source 
# Conflicts:
#	com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
This commit is contained in:
wangpf 2023-06-07 15:42:36 +08:00
commit 9cdc103056
4 changed files with 83 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -845,4 +845,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);
}
}

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

@ -24,11 +24,10 @@ 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.exception.AWSDataAccessException;
import com.actionsoft.sdk.local.api.BOAPI;
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 com.awspaas.user.apps.yili.reportform.util.RepositoryAttribute;
import org.apache.commons.lang.StringUtils;
import com.actionsoft.apps.coe.pal.constant.CoEConstant;
@ -4334,42 +4333,7 @@ public class ProcessPublishWeb extends ActionWeb {
return ResponseObject.newErrResponse("下载失败，手册不存在").toString();
}
/**
* 获得发布指导dw数据id
*
* @param areaType 区域类型
* @return {@link String}
*/
public String getPublishGuideDwDataId(String areaType){
ResponseObject ro = ResponseObject.newOkResponse();
BO bo = SDK.getBOAPI().query("BO_ACT_PUBLISH_GUIDE").addQuery("AREAID = ", areaType).detail();
if(bo != null){
ro.put("dwId" , bo.getId());
}
return ro.toString();
}
/**
* 获得发布指导配置的所有显示区域的状态
*
* @return {@link String}
*/
public String getPublishGuideStatus(){
ResponseObject ro = ResponseObject.newOkResponse();
//List<BO> publishGuideList = SDK.getBOAPI().query("BO_ACT_PUBLISH_GUIDE").list();
String sql ="SELECT AREAID,STATUS FROM BO_ACT_PUBLISH_GUIDE WHERE 1=?";
List<RowMap> publishGuideStatus = DBSql.getMaps(sql, 1);
ro.put("status",publishGuideStatus);
return ro.toString();
}
/**
* 根据流程模型获取流程清单列表
*
* @param publishFileId 发布文件id
* @param fileName 文件名称
* @return {@link String}
*/
public String getProcessManifest(String publishFileId, String fileName) {
BaseModel defineModel = CoeDesignerAPIManager.getInstance().getDefinition(publishFileId, 0);
String definition = defineModel.getDefinition();
@ -4524,5 +4488,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();
}
}

48
com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js
View File

@ -259,7 +259,8 @@ function initHtml() {
newHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'new\');">新增</button>';
// newHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'new\');">保存</button>';
newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'new\');">删除</button>';
newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-green" onclick="refreshManual('+$("#processInstId").val()+','+"1"+');">重新生成手册</button>';
newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn" onclick="refreshManual('+$("#processInstId").val()+','+"1"+');">重新生成手册</button>';
newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn" onclick="getFiles();">生成附件</button>';
}
//newHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'new\');">新增</button>';
// newHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'new\');">保存</button>';
@ -291,7 +292,8 @@ function initHtml() {
changeHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'change\');">新增</button>';
// changeHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'change\');">保存</button>';
changeHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'change\');">删除</button>';
changeHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-green" onclick="refreshManual(\'+$("#processInstId").val()+"2"+\');">重新生成手册</button>';
changeHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn" onclick="refreshManual(\'+$("#processInstId").val()+"2"+\');">重新生成手册</button>';
changeHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn" onclick="getFiles()">生成附件</button>';
}
//changeHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'change\');">新增</button>';
// changeHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'change\');">保存</button>';
@ -458,7 +460,7 @@ function initPublishData(data, type, pageNumber, start){
// 初始化数据
function selectPublishData(data, type, pageNumber, start) {
debugger;
//渲染到前台的流程架构L1，L2，L3，L4
var param = {
cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs',
@ -1070,7 +1072,8 @@ function initChangedData(changeFileId) {
} else {
$('#report_' + changeFileId).html('无');
}
//获取选中模型数据，更新架构数据
updateFramework(changeTemp[i].changedFileIdNew);
break;
}
}
@ -1121,8 +1124,6 @@ function refreshManual(processInstId,type) {
data : param,
success : function(r) {
if (r.result == 'ok') {
FormToolBarAction.BTN_SAVE();
AWSFormUtil.refreshPage();
}
@ -2586,3 +2587,38 @@ function downloadReport(uuid, taskId) {
}
//刷新页面
function getFiles() {
FormToolBarAction.BTN_SAVE();
AWSFormUtil.refreshPage();
}
//下拉获取最新架构进行赋值操作
function updateFramework(uuid) {
awsui.ajax.request({
type: "POST",
url: "./jd",
async: false,
data: {
sid: sid,
cmd: "com.actionsoft.apps.coe.pal.publisher_publish_updateFramework",
uuid: uuid,
processInstId:processInstId
},
success : function(r) {
if (r.result == "ok") {
var L1 = r.data.data.Process_Architecture_L1;
var L2 = r.data.data.Process_Architecture_L2;
var L3 = r.data.data.Process_Architecture_L3;
var L4 = r.data.data.Process_Architecture_L4;
ui("LEVEL_1_PROCESS_NAME",L1);
ui("LEVEL_2_PROCESS_NAME",L2);
ui("LEVEL_3_PROCESS_NAME",L3);
ui("LEVEL_4_PROCESS_NAME",L4);
}
}
});
}