获取最新架构赋值
This commit is contained in:
parent
bce486dd1c
commit
3a69ac79e6
Binary file not shown.
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -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,7 +4195,11 @@ 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;
|
||||||
|
if(type.equals("change")){
|
||||||
|
id = paljb.getString("changedFileIdNew");
|
||||||
|
}else{
|
||||||
|
id = paljb.getString("id");
|
||||||
//获取最新要更新版本的id
|
//获取最新要更新版本的id
|
||||||
List<PALRepositoryModel> temp = PALRepositoryCache.getByVersionId(wsId, id);
|
List<PALRepositoryModel> temp = PALRepositoryCache.getByVersionId(wsId, id);
|
||||||
if (temp.size() > 0) {
|
if (temp.size() > 0) {
|
||||||
@ -4205,9 +4209,11 @@ public class ProcessPublishWeb extends ActionWeb {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
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) {
|
||||||
|
|||||||
@ -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 查询权限举证-->
|
||||||
|
|||||||
@ -460,13 +460,14 @@ 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,
|
||||||
|
type:type,
|
||||||
datas:JSON.stringify(data)
|
datas:JSON.stringify(data)
|
||||||
};
|
};
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@ -500,8 +501,12 @@ function selectPublishData(data, type, pageNumber, start) {
|
|||||||
//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");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user