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
This commit is contained in:
wangpf 2023-06-08 10:48:00 +08:00
commit 5571bba060
9 changed files with 81 additions and 68 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
*/
@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);
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
* @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();
JSONArray palarr = JSON.parseArray(datas);
JSONObject result = new JSONObject();
@ -4195,19 +4195,25 @@ public class ProcessPublishWeb extends ActionWeb {
boolean iswrong = false;
for (int i = 0; i < palarr.size(); i++) {
JSONObject paljb = palarr.getJSONObject(i);
String id = paljb.getString("id");
//获取最新要更新版本的id
List<PALRepositoryModel> temp = PALRepositoryCache.getByVersionId(wsId, id);
if (temp.size() > 0) {
for (PALRepositoryModel palRepositoryModel : temp) {
if (!palRepositoryModel.isPublish() && !palRepositoryModel.isStop()) {
id = palRepositoryModel.getId();
String id;
if(type.equals("change")){
id = paljb.getString("changedFileIdNew");
}else{
id = paljb.getString("id");
//获取最新要更新版本的id
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");
PALRepositoryModel model = PALRepositoryCache.getCache().get(id);
//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));
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">
<param name="processInstId"/>
<param name="wsId"/>
<param name="type"/>
<param name="datas"/>
</cmd-bean>
<!--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) {
debugger;
//渲染到前台的流程架构L1，L2，L3，L4
var param = {
cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs',
processInstId: processInstId,
wsId : wsId,
sid: sid,
datas:JSON.stringify(data)
};
$.ajax({
url : "./jd",
type : "POST",
dataType : "JSON",
async : true,
data : param,
success : function(r) {
var info = r.data.info;
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;
var L1old = ui("LEVEL_1_PROCESS_NAME");
var L2old = ui("LEVEL_2_PROCESS_NAME");
var L3old = ui("LEVEL_3_PROCESS_NAME");
var L4old = ui("LEVEL_4_PROCESS_NAME");
ui("LEVEL_1_PROCESS_NAME",L1);
ui("LEVEL_2_PROCESS_NAME",L2);
ui("LEVEL_3_PROCESS_NAME",L3);
ui("LEVEL_4_PROCESS_NAME",L4);
showlist(data, type, pageNumber, start);
//发起请求把审批人查询出来~
queryapprove();
ui("ADAPT_NAME_THE_COMPANY",""),
ui("ADAPT_REGION_NAME",""),
ui("APPLICABLE_PRODUCT",""),
$("#publisher_dialog").dialog("close");
//展示未发布过的流程
//data = r.data.is_not_publish_data;
}
});
//渲染到前台的流程架构L1，L2，L3，L4
var param = {
cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs',
processInstId: processInstId,
wsId : wsId,
sid: sid,
type:type,
datas:JSON.stringify(data)
};
$.ajax({
url : "./jd",
type : "POST",
dataType : "JSON",
async : true,
data : param,
success : function(r) {
var info = r.data.info;
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;
var L1old = ui("LEVEL_1_PROCESS_NAME");
var L2old = ui("LEVEL_2_PROCESS_NAME");
var L3old = ui("LEVEL_3_PROCESS_NAME");
var L4old = ui("LEVEL_4_PROCESS_NAME");
ui("LEVEL_1_PROCESS_NAME",L1);
ui("LEVEL_2_PROCESS_NAME",L2);
ui("LEVEL_3_PROCESS_NAME",L3);
ui("LEVEL_4_PROCESS_NAME",L4);
showlist(data, type, pageNumber, start);
//发起请求把审批人查询出来~
queryapprove();
ui("ADAPT_NAME_THE_COMPANY",""),
ui("ADAPT_REGION_NAME",""),
ui("APPLICABLE_PRODUCT",""),
$("#publisher_dialog").dialog("close");
//展示未发布过的流程
//data = r.data.is_not_publish_data;
}
});
}
//by bzp
function queryapprove(){
var level1 =ui("LEVEL_1_PROCESS_NAME");

BIN
com.awspaas.user.apps.yili.reportform/lib/com.awspaas.user.apps.yili.reportform.jar
View File

Binary file not shown.

6
com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/job/SynFileStateJob.java
View File

@ -3,6 +3,7 @@ package com.awspaas.user.apps.yili.reportform.job;
import java.util.List;
import java.util.Map;
import com.sun.xml.internal.bind.v2.model.core.ID;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@ -52,14 +53,15 @@ public class SynFileStateJob implements IJob {
} catch (Exception e) {
// TODO: handle exception
}
// String methodId = palRepositoryModel.getMethodId();
String plVersionId = palRepositoryModel.getVersionId();
String sqly = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLVERSIONID = '" + plVersionId + "'";
List<RowMap> maps = DBSql.getMaps(sqly);
if (maps.size() > 1) {
String sqlu = "SELECT ID FROM (SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLVERSIONID = '"
+ plVersionId + "' AND ISPUBLISH ='1' ORDER BY PLVER DESC ) WHERE ROWNUM<2";
String palId = DBSql.getString(sqlu);

4
com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java
View File

@ -1328,10 +1328,10 @@ public class DataViewService extends ActionWeb {
fileMap.put("PUBDATETIME", fileRowMap.getString("PUBDATETIME"));
fileMap.put("path", path);
fileMap.put("ORDERINDEX", fileRowMap.getString("PLORDERINDEX"));
String sqlsss = "SELECT PLLEVEL FROM APP_ACT_COE_PAL_REPOSITORY_1124 WHERE ID = '"
/*String sqlsss = "SELECT PLLEVEL FROM APP_ACT_COE_PAL_REPOSITORY_1124 WHERE ID = '"
+ fileRowMap.getString("FILEID") + "'";
String leve = DBSql.getString(sqlsss);
fileMap.put("TLEVEL", leve);
fileMap.put("TLEVEL", leve);*/
fileMap.put("nodeType", nodeType);
fileMaps.add(fileMap);
}

27
com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/ToPageService.java
View File

@ -25,6 +25,7 @@ import com.awspaas.user.apps.yili.reportform.util.TreeUtil;
import java.sql.Connection;
import java.util.*;
import java.util.stream.Collectors;
import static com.awspaas.user.apps.yili.reportform.util.TaskUtil.getLastPublishTaskIdByModelId;
import static java.util.stream.Collectors.collectingAndThen;
@ -132,7 +133,6 @@ public class ToPageService extends ActionWeb {
public String frameView (UserContext uc, RequestParams params) {
ResponseObject ro = ResponseObject.newOkResponse();
String fileType = params.get("fileType");
System.out.println("======fileType======" + fileType);
System.out.println("======frameIDtoFrameView======" + frameIDtoFrameView);
if (null != frameIDtoFrameView && !frameIDtoFrameView.equals("")) {
//SDK.getLogAPI().consoleInfo("当前架构ID1"+frameID);
@ -141,34 +141,32 @@ public class ToPageService extends ActionWeb {
HashMap<String, Object> fileMap = new HashMap<>();
ArrayList<Map> fileMaps = new ArrayList<>();
String nodeType = null;
RowMap frameRowMap = DBSql.getMap("SELECT FRAMEID,FRAMEPARENTID,FRAMENAME,FRAMEORDERINDEX,FRAMELEVEL FROM BO_EU_PAL_FRAME WHERE FRAMEID=?", sqlParams);
//RowMap frameRowMap = DBSql.getMap("SELECT FRAMEID,FRAMEPARENTID,FRAMENAME,FRAMEORDERINDEX,FRAMELEVEL FROM BO_EU_PAL_FRAME WHERE FRAMEID=?", sqlParams);
RowMap frameRowMap = DBSql.getMap("SELECT ID,PLPARENTID,PLNAME,PLORDERINDEX,PLLEVEL FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND PLMETHODID='process.framework'", sqlParams);
String sid = _uc.getSessionId();
String path = "";
PALRepositoryModel model = null;
String taskId = "";
System.out.println("========frameRowMap========" + frameRowMap);
if (null != frameRowMap && !frameRowMap.isEmpty()) {
fileMap = new HashMap<String, Object>();
nodeType = "frame";
fileMap.put("ID", frameRowMap.getString("FRAMEID"));
fileMap.put("PARENTID", frameRowMap.getString("FRAMEPARENTID"));
fileMap.put("name", frameRowMap.getString("FRAMENAME"));
fileMap.put("ORDERINDEX", frameRowMap.getString("FRAMEORDERINDEX"));
fileMap.put("TLEVEL", frameRowMap.getString("FRAMELEVEL"));
fileMap.put("ID", frameRowMap.getString("ID"));
fileMap.put("PARENTID", frameRowMap.getString("PLPARENTID"));
fileMap.put("name", frameRowMap.getString("PLNAME"));
fileMap.put("ORDERINDEX", frameRowMap.getString("PLORDERINDEX"));
fileMap.put("TLEVEL", frameRowMap.getString("PLLEVEL"));
fileMap.put("nodeType", nodeType);
fileMaps.add(fileMap);
//List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PUBDEPT,PLPARENTID,PLMETHODID,POLICYTYPE,FILESTATE,VIEWCOUNT FROM BO_EU_PAL_FILE1 WHERE PLMETHODID='process.epc' OR PLMETHODID='process.flowchart' OR PLMETHODID='control.policy' OR PLMETHODID='data.form'");
//List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PLPARENTID,PLNAME,PLMETHODID,SUPPORTFILE,PUBDEPT,PUBDATETIME,PLORDERINDEX,PLLEVEL,POLICYTYPE FROM BO_EU_PAL_FILE1 WHERE PLPARENTID=? AND FILESTATE='1' AND (PLMETHODID='process.epc' OR PLMETHODID='process.flowchart' OR PLMETHODID='control.policy') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
//List<RowMap> fileRowMaps = DBSql.getMaps("SELECT ID AS FILEID,PLPARENTID,PLNAME,PLMETHODID,PLVERSIONID,PLORDERINDEX,PLLEVEL,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLPARENTID=? AND ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' AND (PLMETHODID='process.epc' OR PLMETHODID='control.policy' OR PLMETHODID='process.flowchart') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
List<RowMap> fileRowMaps = DBSql.getMaps("SELECT ID AS FILEID,PLPARENTID,PLNAME,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLPARENTID=? AND ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' AND (PLMETHODID='process.epc' OR PLMETHODID='control.policy' OR PLMETHODID='process.flowchart') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
System.out.println("fileRowMaps============" + fileRowMaps);
ArrayList<RowMap> fileHandleRowMaps = new ArrayList<>();
Map<String, Object> reFileMap = new HashMap<>();
RowMap reFileRowMap = new RowMap(reFileMap);
@ -186,7 +184,6 @@ public class ToPageService extends ActionWeb {
if (propertyModel.getPropertyId().equals("support_files")) {
String propertyValue = propertyModel.getPropertyValue();
if (UtilString.isNotEmpty(propertyValue)) {
System.out.println("酷酷酷酷酷酷酷酷1");
String relationFileId = JSONObject.parseObject(propertyModel.getPropertyValue()).getString("relationFileId");
if(UtilString.isNotEmpty(relationFileId)){
PALRepositoryModel reFileModel = PALRepositoryCache.getCache().get(relationFileId);
@ -197,7 +194,6 @@ public class ToPageService extends ActionWeb {
reFileMap.put("PLNAME", reFileModel.getName());
reFileMap.put("PLPARENTID", FILEID);
reFileMap.put("PLMETHODID", PLMETHODID);
System.out.println("111111111");
PALRepositoryPropertyDao dao = new PALRepositoryPropertyDao();
List<PALRepositoryPropertyModel> propertys = dao.getPropertysByPlid(FILEID, null);
@ -306,6 +302,9 @@ public class ToPageService extends ActionWeb {
}
fileMaps.add(fileMap);
}
System.out.println("fileMaps============"+fileMaps);
List<Map> fileTreeNodes = TreeUtil.buildTree("1", fileMaps, null, "frame", null, null);
ro.put("fileMaps", fileTreeNodes);
System.err.println("============fileMaps============" + fileMaps);