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

获取最新架构赋值

Browse Source
This commit is contained in:
zhal 2023-06-07 18:01:10 +08:00
parent bce486dd1c
commit 3a69ac79e6
5 changed files with 62 additions and 50 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.

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

@ -756,9 +756,9 @@ public class PublisherController {
* @return * @return
*/ */
@Mapping("com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs") @Mapping("com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs")
public String getPublishNameByJs(UserContext me,String processInstId,String wsId,String datas){ public String getPublishNameByJs(UserContext me,String processInstId,String wsId,String type,String datas){
ProcessPublishWeb publishWeb = new ProcessPublishWeb(me); ProcessPublishWeb publishWeb = new ProcessPublishWeb(me);
return publishWeb.getLevelByData(me,wsId,datas); return publishWeb.getLevelByData(me,wsId,type,datas);
} }

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

@ -4187,7 +4187,7 @@ public class ProcessPublishWeb extends ActionWeb {
* @param datas * @param datas
* @return * @return
*/ */
public String getLevelByData(UserContext me, String wsId, String datas) { public String getLevelByData(UserContext me, String wsId,String type,String datas) {
ResponseObject ro = ResponseObject.newOkResponse(); ResponseObject ro = ResponseObject.newOkResponse();
JSONArray palarr = JSON.parseArray(datas); JSONArray palarr = JSON.parseArray(datas);
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
@ -4195,19 +4195,25 @@ public class ProcessPublishWeb extends ActionWeb {
boolean iswrong = false; boolean iswrong = false;
for (int i = 0; i < palarr.size(); i++) { for (int i = 0; i < palarr.size(); i++) {
JSONObject paljb = palarr.getJSONObject(i); JSONObject paljb = palarr.getJSONObject(i);
String id = paljb.getString("id"); String id;
//获取最新要更新版本的id if(type.equals("change")){
List<PALRepositoryModel> temp = PALRepositoryCache.getByVersionId(wsId, id); id = paljb.getString("changedFileIdNew");
if (temp.size() > 0) { }else{
for (PALRepositoryModel palRepositoryModel : temp) { id = paljb.getString("id");
if (!palRepositoryModel.isPublish() && !palRepositoryModel.isStop()) { //获取最新要更新版本的id
id = palRepositoryModel.getId(); List<PALRepositoryModel> temp = PALRepositoryCache.getByVersionId(wsId, id);
if (temp.size() > 0) {
for (PALRepositoryModel palRepositoryModel : temp) {
if (!palRepositoryModel.isPublish() && !palRepositoryModel.isStop()) {
id = palRepositoryModel.getId();
}
} }
} }
} }
String methodId = paljb.getString("methodId"); String methodId = paljb.getString("methodId");
PALRepositoryModel model = PALRepositoryCache.getCache().get(id); PALRepositoryModel model = PALRepositoryCache.getCache().get(id);
//ID获取L1 L2 L3的值 //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'", id)); 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'", id));
for (RowMap tmp : resulttmp) { for (RowMap tmp : resulttmp) {

1
com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/action.xml
View File

@ -448,6 +448,7 @@
<cmd-bean name="com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs"> <cmd-bean name="com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs">
<param name="processInstId"/> <param name="processInstId"/>
<param name="wsId"/> <param name="wsId"/>
<param name="type"/>
<param name="datas"/> <param name="datas"/>
</cmd-bean> </cmd-bean>
<!--by bzp 查询权限举证--> <!--by bzp 查询权限举证-->

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

@ -460,48 +460,53 @@ function initPublishData(data, type, pageNumber, start){
// 初始化数据 // 初始化数据
function selectPublishData(data, type, pageNumber, start) { function selectPublishData(data, type, pageNumber, start) {
debugger;
//渲染到前台的流程架构L1，L2，L3，L4 //渲染到前台的流程架构L1，L2，L3，L4
var param = { var param = {
cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs', cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs',
processInstId: processInstId, processInstId: processInstId,
wsId : wsId, wsId : wsId,
sid: sid, sid: sid,
datas:JSON.stringify(data) type:type,
}; datas:JSON.stringify(data)
$.ajax({ };
url : "./jd", $.ajax({
type : "POST", url : "./jd",
dataType : "JSON", type : "POST",
async : true, dataType : "JSON",
data : param, async : true,
success : function(r) { data : param,
var info = r.data.info; success : function(r) {
var L1 = r.data.data.Process_Architecture_L1; var info = r.data.info;
var L2 = r.data.data.Process_Architecture_L2; var L1 = r.data.data.Process_Architecture_L1;
var L3 = r.data.data.Process_Architecture_L3; var L2 = r.data.data.Process_Architecture_L2;
var L4 = r.data.data.Process_Architecture_L4; var L3 = r.data.data.Process_Architecture_L3;
var L1old = ui("LEVEL_1_PROCESS_NAME"); var L4 = r.data.data.Process_Architecture_L4;
var L2old = ui("LEVEL_2_PROCESS_NAME"); var L1old = ui("LEVEL_1_PROCESS_NAME");
var L3old = ui("LEVEL_3_PROCESS_NAME"); var L2old = ui("LEVEL_2_PROCESS_NAME");
var L4old = ui("LEVEL_4_PROCESS_NAME"); var L3old = ui("LEVEL_3_PROCESS_NAME");
ui("LEVEL_1_PROCESS_NAME",L1); var L4old = ui("LEVEL_4_PROCESS_NAME");
ui("LEVEL_2_PROCESS_NAME",L2); ui("LEVEL_1_PROCESS_NAME",L1);
ui("LEVEL_3_PROCESS_NAME",L3); ui("LEVEL_2_PROCESS_NAME",L2);
ui("LEVEL_4_PROCESS_NAME",L4); ui("LEVEL_3_PROCESS_NAME",L3);
showlist(data, type, pageNumber, start); ui("LEVEL_4_PROCESS_NAME",L4);
//发起请求把审批人查询出来~ showlist(data, type, pageNumber, start);
queryapprove(); //发起请求把审批人查询出来~
ui("ADAPT_NAME_THE_COMPANY",""), queryapprove();
ui("ADAPT_REGION_NAME",""), ui("ADAPT_NAME_THE_COMPANY",""),
ui("APPLICABLE_PRODUCT",""), ui("ADAPT_REGION_NAME",""),
$("#publisher_dialog").dialog("close"); ui("APPLICABLE_PRODUCT",""),
//展示未发布过的流程 $("#publisher_dialog").dialog("close");
//data = r.data.is_not_publish_data; //展示未发布过的流程
} //data = r.data.is_not_publish_data;
}); }
});
} }
//by bzp //by bzp
function queryapprove(){ function queryapprove(){
var level1 =ui("LEVEL_1_PROCESS_NAME"); var level1 =ui("LEVEL_1_PROCESS_NAME");