伊利集成，数据看板，模型阅览代码上传
This commit is contained in:
parent
d83318f519
commit
db44418195
@ -1,9 +1,7 @@
|
|||||||
package com.awspaas.user.apps.docview;
|
package com.awspaas.user.apps.docview;
|
||||||
|
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -16,7 +14,6 @@ import com.actionsoft.bpms.commons.htmlframework.HtmlPageTemplate;
|
|||||||
import com.actionsoft.bpms.org.cache.UserMapCache;
|
import com.actionsoft.bpms.org.cache.UserMapCache;
|
||||||
import com.actionsoft.bpms.org.model.DepartmentModel;
|
import com.actionsoft.bpms.org.model.DepartmentModel;
|
||||||
import com.actionsoft.bpms.org.model.UserMapModel;
|
import com.actionsoft.bpms.org.model.UserMapModel;
|
||||||
import com.actionsoft.bpms.org.model.UserModel;
|
|
||||||
import com.actionsoft.bpms.server.UserContext;
|
import com.actionsoft.bpms.server.UserContext;
|
||||||
import com.actionsoft.bpms.server.bind.annotation.Controller;
|
import com.actionsoft.bpms.server.bind.annotation.Controller;
|
||||||
import com.actionsoft.bpms.server.bind.annotation.Mapping;
|
import com.actionsoft.bpms.server.bind.annotation.Mapping;
|
||||||
@ -47,8 +44,6 @@ public class DocumentsToReadController {
|
|||||||
*/
|
*/
|
||||||
@Mapping("com.yili.apps.pal.read_page")
|
@Mapping("com.yili.apps.pal.read_page")
|
||||||
public String getView(String sid, String viewType) throws ParseException {
|
public String getView(String sid, String viewType) throws ParseException {
|
||||||
|
|
||||||
|
|
||||||
UserContext uc = UserContext.fromSessionId(sid);
|
UserContext uc = UserContext.fromSessionId(sid);
|
||||||
String uid = uc.getUID();
|
String uid = uc.getUID();
|
||||||
Map<String, Object> map = new LinkedHashMap<String, Object>();
|
Map<String, Object> map = new LinkedHashMap<String, Object>();
|
||||||
@ -65,7 +60,7 @@ public class DocumentsToReadController {
|
|||||||
setArrayWfc(fileId, jsonArray, uid);
|
setArrayWfc(fileId, jsonArray, uid);
|
||||||
//三个都不为空
|
//三个都不为空
|
||||||
} else if (UtilString.isNotEmpty(orgPerm) && UtilString.isNotEmpty(postPerm)&& UtilString.isNotEmpty(levelPerm)) {
|
} else if (UtilString.isNotEmpty(orgPerm) && UtilString.isNotEmpty(postPerm)&& UtilString.isNotEmpty(levelPerm)) {
|
||||||
if ((getOrgPerm(orgPerm, uc) || getPostPerm(postPerm, uc)) && getLevelPerm(levelPerm, uc)) {
|
if ((getOrgPerm(orgPerm, uc) && getLevelPerm(levelPerm, uc))|| getPostPerm(postPerm, uc) ) {
|
||||||
setArrayWfc(fileId, jsonArray, uid);
|
setArrayWfc(fileId, jsonArray, uid);
|
||||||
}
|
}
|
||||||
// 职级为空时
|
// 职级为空时
|
||||||
@ -83,7 +78,7 @@ public class DocumentsToReadController {
|
|||||||
// 组织为空时
|
// 组织为空时
|
||||||
} else if (UtilString.isNotEmpty(postPerm) && UtilString.isNotEmpty(levelPerm)
|
} else if (UtilString.isNotEmpty(postPerm) && UtilString.isNotEmpty(levelPerm)
|
||||||
&& UtilString.isEmpty(orgPerm)) {
|
&& UtilString.isEmpty(orgPerm)) {
|
||||||
if (getPostPerm(postPerm, uc) && getLevelPerm(levelPerm, uc)) {
|
if (getPostPerm(postPerm, uc) || getLevelPerm(levelPerm, uc)) {
|
||||||
setArrayWfc(fileId, jsonArray, uid);
|
setArrayWfc(fileId, jsonArray, uid);
|
||||||
}
|
}
|
||||||
// 组织、岗位为空时
|
// 组织、岗位为空时
|
||||||
@ -117,7 +112,6 @@ public class DocumentsToReadController {
|
|||||||
}
|
}
|
||||||
return HtmlPageTemplate.merge("com.awspaas.user.apps.docview", html, map);
|
return HtmlPageTemplate.merge("com.awspaas.user.apps.docview", html, map);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setArrayWfc(String fileId,JSONArray jsonArray,String uid) {
|
private void setArrayWfc(String fileId,JSONArray jsonArray,String uid) {
|
||||||
String sqlAll = "SELECT * FROM BO_EU_PAL_DOC_VIEW WHERE ID = '"+fileId+"'";
|
String sqlAll = "SELECT * FROM BO_EU_PAL_DOC_VIEW WHERE ID = '"+fileId+"'";
|
||||||
List<RowMap> map1 = DBSql.getMaps(sqlAll);
|
List<RowMap> map1 = DBSql.getMaps(sqlAll);
|
||||||
@ -203,7 +197,33 @@ public class DocumentsToReadController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// 获取待阅
|
||||||
|
public JSONArray getWFC_bak(JSONArray jsonArray, List<RowMap> maps, String uid) {
|
||||||
|
for (RowMap rowMap : maps) {
|
||||||
|
String id = rowMap.getString("FILEID");
|
||||||
|
String fileName = rowMap.getString("FILENAME");
|
||||||
|
System.err.println("=======uid========>"+uid);
|
||||||
|
System.err.println("=======fileName========>"+fileName);
|
||||||
|
String read = DBSql.getString("SELECT ID FROM BO_ACT_DATAID WHERE READSTATE = '未读' AND TITLE LIKE '%"+fileName+"%' AND USER_ID = ?",new Object[] {uid});
|
||||||
|
System.err.println("===========read=========="+read);
|
||||||
|
if(UtilString.isNotEmpty(read)) {
|
||||||
|
JSONObject jsonObject = new JSONObject();
|
||||||
|
String fileUrl = rowMap.getString("FILEURL");
|
||||||
|
String fileCreateDate = rowMap.getString("FILECREATEDATE");
|
||||||
|
jsonObject.put("fileName", fileName);
|
||||||
|
jsonObject.put("id", id);
|
||||||
|
jsonObject.put("fileUrl", fileUrl);
|
||||||
|
jsonObject.put("uid", uid);
|
||||||
|
jsonObject.put("fileCreateDate", fileCreateDate);
|
||||||
|
jsonArray.add(jsonObject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return jsonArray;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// 获取待阅
|
// 获取待阅
|
||||||
public JSONArray getWFC(JSONArray jsonArray, List<RowMap> maps, String uid) {
|
public JSONArray getWFC(JSONArray jsonArray, List<RowMap> maps, String uid) {
|
||||||
for (RowMap rowMap : maps) {
|
for (RowMap rowMap : maps) {
|
||||||
@ -252,7 +272,7 @@ public class DocumentsToReadController {
|
|||||||
String levelPerm = bo.getString("READINGSCOPE_LEVEL");
|
String levelPerm = bo.getString("READINGSCOPE_LEVEL");
|
||||||
String fileId = bo.getString("ID");
|
String fileId = bo.getString("ID");
|
||||||
String isFullCompany = bo.getString("ISFULLCOMPANY");
|
String isFullCompany = bo.getString("ISFULLCOMPANY");
|
||||||
if ("1".equals(isFullCompany)) {
|
if ("1".equals(isFullCompany)||"admin".equals(uid)) {
|
||||||
setArrayWfh(fileId, jsonArray, uid);
|
setArrayWfh(fileId, jsonArray, uid);
|
||||||
} else if (UtilString.isNotEmpty(orgPerm) && UtilString.isNotEmpty(postPerm)
|
} else if (UtilString.isNotEmpty(orgPerm) && UtilString.isNotEmpty(postPerm)
|
||||||
&& UtilString.isNotEmpty(levelPerm)) {
|
&& UtilString.isNotEmpty(levelPerm)) {
|
||||||
@ -307,25 +327,51 @@ public class DocumentsToReadController {
|
|||||||
}
|
}
|
||||||
return HtmlPageTemplate.merge("com.awspaas.user.apps.docview", html, map);
|
return HtmlPageTemplate.merge("com.awspaas.user.apps.docview", html, map);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取已阅
|
||||||
|
public JSONArray getWFH_bak(JSONArray jsonArray, List<RowMap> maps, String uid) {
|
||||||
|
for (RowMap rowMap : maps) {
|
||||||
|
String id = rowMap.getString("FILEID");
|
||||||
|
String fileName = rowMap.getString("FILENAME");
|
||||||
|
RowMap map = DBSql.getMap("SELECT * FROM BO_ACT_DATAID WHERE READSTATE = '已读' AND TITLE LIKE '%"+fileName+"%' AND USER_ID = '"+uid+"'");
|
||||||
|
if(map!=null) {
|
||||||
|
JSONObject jsonObject = new JSONObject();
|
||||||
|
String fileUrl = rowMap.getString("FILEURL");
|
||||||
|
String fileCreateDate = rowMap.getString("FILECREATEDATE");
|
||||||
|
jsonObject.put("fileName", fileName);
|
||||||
|
jsonObject.put("id", id);
|
||||||
|
jsonObject.put("fileUrl", fileUrl);
|
||||||
|
jsonObject.put("uid", uid);
|
||||||
|
jsonObject.put("fileCreateDate", fileCreateDate);
|
||||||
|
jsonArray.add(jsonObject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return jsonArray;
|
||||||
|
|
||||||
|
}
|
||||||
// 获取已阅
|
// 获取已阅
|
||||||
public JSONArray getWFH(JSONArray jsonArray, List<RowMap> maps, String uid) {
|
public JSONArray getWFH(JSONArray jsonArray, List<RowMap> maps, String uid) {
|
||||||
|
|
||||||
for (RowMap rowMap : maps) {
|
for (RowMap rowMap : maps) {
|
||||||
String id = rowMap.getString("FILEID");
|
try {
|
||||||
String sqlt = "SELECT * FROM BO_EU_PAL_RECORD WHERE FILEID = ? AND READFILENAME =?";
|
String id = rowMap.getString("FILEID");
|
||||||
RowMap mapt = DBSql.getMap(sqlt, new Object[] { id, uid });
|
String sqlt = "SELECT * FROM BO_EU_PAL_RECORD WHERE FILEID = ? AND READFILENAME =?";
|
||||||
if (mapt != null) {
|
RowMap mapt = DBSql.getMap(sqlt, new Object[] { id, uid });
|
||||||
JSONObject jsonObject = new JSONObject();
|
if (mapt != null) {
|
||||||
String fileName = rowMap.getString("FILENAME");
|
JSONObject jsonObject = new JSONObject();
|
||||||
String fileUrl = rowMap.getString("FILEURL");
|
String fileName = rowMap.getString("FILENAME");
|
||||||
String fileCreateDate = rowMap.getString("FILECREATEDATE");
|
String fileUrl = rowMap.getString("FILEURL");
|
||||||
jsonObject.put("fileName", fileName);
|
String fileCreateDate = rowMap.getString("FILECREATEDATE");
|
||||||
jsonObject.put("id", id);
|
jsonObject.put("fileName", fileName);
|
||||||
jsonObject.put("fileUrl", fileUrl);
|
jsonObject.put("id", id);
|
||||||
jsonObject.put("uid", uid);
|
jsonObject.put("fileUrl", fileUrl);
|
||||||
jsonObject.put("fileCreateDate", fileCreateDate);
|
jsonObject.put("uid", uid);
|
||||||
jsonArray.add(jsonObject);
|
jsonObject.put("fileCreateDate", fileCreateDate);
|
||||||
|
jsonArray.add(jsonObject);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
// TODO: handle exception
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -6,6 +6,7 @@ import com.actionsoft.bpms.commons.htmlframework.HtmlPageTemplate;
|
|||||||
import com.actionsoft.bpms.server.bind.annotation.Controller;
|
import com.actionsoft.bpms.server.bind.annotation.Controller;
|
||||||
import com.actionsoft.bpms.server.bind.annotation.Mapping;
|
import com.actionsoft.bpms.server.bind.annotation.Mapping;
|
||||||
import com.actionsoft.bpms.util.DBSql;
|
import com.actionsoft.bpms.util.DBSql;
|
||||||
|
import com.actionsoft.bpms.util.UtilString;
|
||||||
import com.actionsoft.sdk.local.SDK;
|
import com.actionsoft.sdk.local.SDK;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
@ -29,7 +30,7 @@ public class GetmeritsController {
|
|||||||
@Mapping("com.awspaas.user.apps.integration.controller.GetmeritsController.getMetritsFirst")
|
@Mapping("com.awspaas.user.apps.integration.controller.GetmeritsController.getMetritsFirst")
|
||||||
public JSONObject getMetritsFirst(String sid,String departname){
|
public JSONObject getMetritsFirst(String sid,String departname){
|
||||||
JSONObject result = new JSONObject(new LinkedHashMap<>());
|
JSONObject result = new JSONObject(new LinkedHashMap<>());
|
||||||
List list = new ArrayList(new LinkedList());
|
ArrayList<String> list = new ArrayList<String>(new LinkedList<String>());
|
||||||
list.add(0,"");
|
list.add(0,"");
|
||||||
list.add(1,"L1流程架构");
|
list.add(1,"L1流程架构");
|
||||||
list.add(2,"绩效指标");
|
list.add(2,"绩效指标");
|
||||||
@ -46,22 +47,25 @@ public class GetmeritsController {
|
|||||||
List<BO> list1 = SDK.getBOAPI().query("BO_EU_LCJG", true).addQuery("JG_NAME=", "战略流程").orderByCreated().asc().list();
|
List<BO> list1 = SDK.getBOAPI().query("BO_EU_LCJG", true).addQuery("JG_NAME=", "战略流程").orderByCreated().asc().list();
|
||||||
for (BO bo:list1
|
for (BO bo:list1
|
||||||
) {
|
) {
|
||||||
|
if(bo!=null&&UtilString.isNotEmpty(bo.getString("LC_NAME"))&&bo.getString("LC_NAME").contains(" ")) {
|
||||||
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
||||||
String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
// String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
||||||
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
||||||
System.out.println("L1-L3下的名称前的数字是>>>>>>"+num_name);
|
System.out.println("L1-L3下的名称前的数字是>>>>>>"+num_name);
|
||||||
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
||||||
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where PLNAME = '" + bo.getString("LC_NAME") + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
RowMap maps = DBSql.getMap(sql);
|
RowMap map = DBSql.getMap(sql);
|
||||||
jsonObject_se.put("id",maps.getString("ID"));
|
if(map!=null) {
|
||||||
|
jsonObject_se.put("id",map.getString("ID"));
|
||||||
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name + "%'");
|
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name + "%'");
|
||||||
jsonObject_name.put("name",string);
|
jsonObject_name.put("name",string);
|
||||||
num1.add(jsonObject_name);
|
num1.add(jsonObject_name);
|
||||||
secondcont.add(jsonObject_se);
|
secondcont.add(jsonObject_se);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
json_first.put("secondcont",secondcont);
|
json_first.put("secondcont",secondcont);
|
||||||
json_first.put("num1",num1);
|
json_first.put("num1",num1);
|
||||||
|
|
||||||
@ -75,19 +79,24 @@ public class GetmeritsController {
|
|||||||
List<BO> list1_second = SDK.getBOAPI().query("BO_EU_LCJG", true).addQuery("JG_NAME=", "运营流程").orderByCreated().asc().list();
|
List<BO> list1_second = SDK.getBOAPI().query("BO_EU_LCJG", true).addQuery("JG_NAME=", "运营流程").orderByCreated().asc().list();
|
||||||
for (BO bo:list1_second
|
for (BO bo:list1_second
|
||||||
) {
|
) {
|
||||||
|
if(bo!=null&&UtilString.isNotEmpty(bo.getString("LC_NAME"))&&bo.getString("LC_NAME").contains(" ")) {
|
||||||
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
||||||
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where PLNAME = '" + bo.getString("LC_NAME") + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
RowMap maps = DBSql.getMap(sql);
|
//String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
jsonObject_se.put("id",maps.getString("ID"));
|
RowMap map = DBSql.getMap(sql);
|
||||||
String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
if(map!=null) {
|
||||||
|
jsonObject_se.put("id",map.getString("ID"));
|
||||||
|
//String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
||||||
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
||||||
|
|
||||||
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name + "%'");
|
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name + "%'");
|
||||||
jsonObject_name.put("name",string);
|
jsonObject_name.put("name",string);
|
||||||
num1_second.add(jsonObject_name);
|
num1_second.add(jsonObject_name);
|
||||||
secondcont_second.add(jsonObject_se);
|
secondcont_second.add(jsonObject_se);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
json_second.put("secondcont",secondcont_second);
|
json_second.put("secondcont",secondcont_second);
|
||||||
@ -107,19 +116,25 @@ public class GetmeritsController {
|
|||||||
List<BO> list1_thrid = SDK.getBOAPI().query("BO_EU_LCJG", true).addQuery("JG_NAME=", "支持流程").orderByCreated().asc().list();
|
List<BO> list1_thrid = SDK.getBOAPI().query("BO_EU_LCJG", true).addQuery("JG_NAME=", "支持流程").orderByCreated().asc().list();
|
||||||
for (BO bo:list1_thrid
|
for (BO bo:list1_thrid
|
||||||
) {
|
) {
|
||||||
|
if(bo!=null&&UtilString.isNotEmpty(bo.getString("LC_NAME"))&&bo.getString("LC_NAME").contains(" ")) {
|
||||||
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
||||||
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where PLNAME = '" + bo.getString("LC_NAME") + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
RowMap maps = DBSql.getMap(sql);
|
//String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
jsonObject_se.put("id",maps.getString("ID"));
|
RowMap map = DBSql.getMap(sql);
|
||||||
String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
|
||||||
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
if(map!=null) {
|
||||||
|
jsonObject_se.put("id",map.getString("ID"));
|
||||||
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name+ "%'");
|
//String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
||||||
jsonObject_name.put("name",string);
|
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
||||||
num1_thrid.add(jsonObject_name);
|
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name+ "%'");
|
||||||
secondcont_thrid.add(jsonObject_se);
|
jsonObject_name.put("name",string);
|
||||||
|
num1_thrid.add(jsonObject_name);
|
||||||
|
secondcont_thrid.add(jsonObject_se);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
json_thrid.put("secondcont",secondcont_thrid);
|
json_thrid.put("secondcont",secondcont_thrid);
|
||||||
@ -143,18 +158,24 @@ public class GetmeritsController {
|
|||||||
) {
|
) {
|
||||||
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
||||||
String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
if(bo!=null&&UtilString.isNotEmpty(bo.getString("LC_NAME"))&&bo.getString("LC_NAME").contains(" ")) {
|
||||||
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
//String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
||||||
|
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
||||||
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
|
||||||
|
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where PLNAME = '" + bo.getString("LC_NAME") + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
RowMap maps = DBSql.getMap(sql);
|
//String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
jsonObject_se.put("id",maps.getString("ID"));
|
RowMap map = DBSql.getMap(sql);
|
||||||
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name + "%' and NDICATOR_USER_DEFINED_LABEL = '"+departname+"'");
|
if(map!=null) {
|
||||||
jsonObject_name.put("name",string);
|
jsonObject_se.put("id",map.getString("ID"));
|
||||||
num1.add(jsonObject_name);
|
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name + "%' and NDICATOR_USER_DEFINED_LABEL = '"+departname+"'");
|
||||||
secondcont.add(jsonObject_se);
|
jsonObject_name.put("name",string);
|
||||||
|
num1.add(jsonObject_name);
|
||||||
|
secondcont.add(jsonObject_se);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
json_first.put("secondcont",secondcont);
|
json_first.put("secondcont",secondcont);
|
||||||
@ -170,21 +191,27 @@ public class GetmeritsController {
|
|||||||
List<BO> list1_second = SDK.getBOAPI().query("BO_EU_LCJG", true).addQuery("JG_NAME=", "运营流程").orderByCreated().asc().list();
|
List<BO> list1_second = SDK.getBOAPI().query("BO_EU_LCJG", true).addQuery("JG_NAME=", "运营流程").orderByCreated().asc().list();
|
||||||
for (BO bo:list1_second
|
for (BO bo:list1_second
|
||||||
) {
|
) {
|
||||||
|
if(bo!=null&&UtilString.isNotEmpty(bo.getString("LC_NAME"))&&bo.getString("LC_NAME").contains(" ")) {
|
||||||
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
||||||
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where PLNAME = '" + bo.getString("LC_NAME") + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
RowMap maps = DBSql.getMap(sql);
|
//String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
jsonObject_se.put("id",maps.getString("ID"));
|
|
||||||
String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
|
||||||
|
RowMap map = DBSql.getMap(sql);
|
||||||
|
if(map!=null) {
|
||||||
|
jsonObject_se.put("id",map.getString("ID"));
|
||||||
|
//String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
||||||
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
||||||
|
|
||||||
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name + "%' and NDICATOR_USER_DEFINED_LABEL = '"+departname+"'");
|
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name + "%' and NDICATOR_USER_DEFINED_LABEL = '"+departname+"'");
|
||||||
jsonObject_name.put("name",string);
|
jsonObject_name.put("name",string);
|
||||||
num1_second.add(jsonObject_name);
|
num1_second.add(jsonObject_name);
|
||||||
secondcont_second.add(jsonObject_se);
|
secondcont_second.add(jsonObject_se);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
json_second.put("secondcont",secondcont_second);
|
json_second.put("secondcont",secondcont_second);
|
||||||
json_second.put("num1",num1_second);
|
json_second.put("num1",num1_second);
|
||||||
|
|
||||||
@ -202,19 +229,23 @@ public class GetmeritsController {
|
|||||||
List<BO> list1_thrid = SDK.getBOAPI().query("BO_EU_LCJG", true).addQuery("JG_NAME=", "支持流程").orderByCreated().asc().list();
|
List<BO> list1_thrid = SDK.getBOAPI().query("BO_EU_LCJG", true).addQuery("JG_NAME=", "支持流程").orderByCreated().asc().list();
|
||||||
for (BO bo:list1_thrid
|
for (BO bo:list1_thrid
|
||||||
) {
|
) {
|
||||||
|
if(bo!=null&&UtilString.isNotEmpty(bo.getString("LC_NAME"))&&bo.getString("LC_NAME").contains(" ")) {
|
||||||
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_se = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_name = new JSONObject(new LinkedHashMap<>());
|
||||||
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
jsonObject_se.put("name",bo.getString("LC_NAME"));
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where PLNAME = '" + bo.getString("LC_NAME") + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
RowMap maps = DBSql.getMap(sql);
|
//String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '"+bo.getString("LC_NAME")+"' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
jsonObject_se.put("id",maps.getString("ID"));
|
RowMap map = DBSql.getMap(sql);
|
||||||
String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
if(map!=null) {
|
||||||
|
jsonObject_se.put("id",map.getString("ID"));
|
||||||
|
//String name = bo.getString("LC_NAME").substring(bo.getString("LC_NAME").indexOf(" ")+1,bo.getString("LC_NAME").length());
|
||||||
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
String num_name = bo.getString("LC_NAME").substring(0,bo.getString("LC_NAME").indexOf(" ")-1);
|
||||||
|
|
||||||
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name + "%' and NDICATOR_USER_DEFINED_LABEL = '"+departname+"'");
|
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '" +num_name + "%' and NDICATOR_USER_DEFINED_LABEL = '"+departname+"'");
|
||||||
jsonObject_name.put("name",string);
|
jsonObject_name.put("name",string);
|
||||||
num1_thrid.add(jsonObject_name);
|
num1_thrid.add(jsonObject_name);
|
||||||
secondcont_thrid.add(jsonObject_se);
|
secondcont_thrid.add(jsonObject_se);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
json_thrid.put("secondcont",secondcont_thrid);
|
json_thrid.put("secondcont",secondcont_thrid);
|
||||||
@ -247,17 +278,15 @@ public class GetmeritsController {
|
|||||||
@Mapping("com.awspaas.user.apps.integration.controller.GetmeritsController.getFirst")
|
@Mapping("com.awspaas.user.apps.integration.controller.GetmeritsController.getFirst")
|
||||||
public JSONArray getFirst(String sid,String plid,String name,String departname){
|
public JSONArray getFirst(String sid,String plid,String name,String departname){
|
||||||
JSONArray jsonArray = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray = new JSONArray(new LinkedList<>());
|
||||||
if (StringUtils.isNotEmpty(departname)){
|
|
||||||
String sql_parent = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = '"+plid+"' order by PLORDERINDEX asc";
|
String sql_parent = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = '"+plid+"' order by PLORDERINDEX asc";
|
||||||
List<RowMap> maps1 = DBSql.getMaps(sql_parent);
|
List<RowMap> maps1 = DBSql.getMaps(sql_parent);
|
||||||
for (RowMap rowMap: maps1) {
|
for (RowMap rowMap: maps1) {
|
||||||
JSONObject jsonObject = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject = new JSONObject(new LinkedHashMap<>());
|
||||||
jsonObject.put("text",rowMap.getString("PLNAME"));
|
jsonObject.put("text",rowMap.getString("PLNAME"));
|
||||||
jsonObject.put("href","#");
|
jsonObject.put("href","#");
|
||||||
String PLname = rowMap.getString("PLNAME").substring(rowMap.getString("PLNAME").indexOf(" ")+1,rowMap.getString("PLNAME").length());
|
//String PLname = rowMap.getString("PLNAME").substring(rowMap.getString("PLNAME").indexOf(" ")+1,rowMap.getString("PLNAME").length());
|
||||||
String num_name = rowMap.getString("PLNAME").substring(0,rowMap.getString("PLNAME").indexOf(" "));
|
String num_name = rowMap.getString("PLNAME").substring(0,rowMap.getString("PLNAME").indexOf(" "));
|
||||||
|
//String names = name.substring(name.indexOf(" ")+1,name.length());
|
||||||
String names = name.substring(name.indexOf(" ")+1,name.length());
|
|
||||||
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '"+num_name+"%' AND NDICATOR_USER_DEFINED_LABEL = '" + departname + "'");
|
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '"+num_name+"%' AND NDICATOR_USER_DEFINED_LABEL = '" + departname + "'");
|
||||||
jsonObject.put("num",string);
|
jsonObject.put("num",string);
|
||||||
JSONArray jsonArray1 = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray1 = new JSONArray(new LinkedList<>());
|
||||||
@ -285,8 +314,13 @@ public class GetmeritsController {
|
|||||||
String PLname2 = map.getString("PLNAME").substring(map.getString("PLNAME").indexOf(" ")+1,map.getString("PLNAME").length());
|
String PLname2 = map.getString("PLNAME").substring(map.getString("PLNAME").indexOf(" ")+1,map.getString("PLNAME").length());
|
||||||
String names2 = rowmap.getString("PLNAME").substring(rowmap.getString("PLNAME").indexOf(" ")+1,rowmap.getString("PLNAME").length());
|
String names2 = rowmap.getString("PLNAME").substring(rowmap.getString("PLNAME").indexOf(" ")+1,rowmap.getString("PLNAME").length());
|
||||||
String num_name2 = map.getString("PLNAME").substring(0,map.getString("PLNAME").indexOf(" "));
|
String num_name2 = map.getString("PLNAME").substring(0,map.getString("PLNAME").indexOf(" "));
|
||||||
|
String stringss = "";
|
||||||
String stringss = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '%"+num_name2+"' AND NDICATOR_USER_DEFINED_LABEL = '" + departname + "'");
|
if (StringUtils.isNotEmpty(departname)){
|
||||||
|
stringss = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '%"+num_name2+"' AND NDICATOR_USER_DEFINED_LABEL = '" + departname + "'");
|
||||||
|
}else {
|
||||||
|
stringss = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '%"+num_name2+"' ");
|
||||||
|
|
||||||
|
}
|
||||||
jsonObject2.put("num",stringss);
|
jsonObject2.put("num",stringss);
|
||||||
jsonArray2.add(jsonObject2);
|
jsonArray2.add(jsonObject2);
|
||||||
}
|
}
|
||||||
@ -299,60 +333,7 @@ public class GetmeritsController {
|
|||||||
|
|
||||||
|
|
||||||
return jsonArray;
|
return jsonArray;
|
||||||
}else {
|
|
||||||
|
|
||||||
String sql_parent = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = '"+plid+"' order by PLORDERINDEX asc";
|
|
||||||
List<RowMap> maps1 = DBSql.getMaps(sql_parent);
|
|
||||||
for (RowMap rowMap: maps1) {
|
|
||||||
JSONObject jsonObject = new JSONObject(new LinkedHashMap<>());
|
|
||||||
jsonObject.put("text",rowMap.getString("PLNAME"));
|
|
||||||
jsonObject.put("href","#");
|
|
||||||
String PLname = rowMap.getString("PLNAME").substring(rowMap.getString("PLNAME").indexOf(" ")+1,rowMap.getString("PLNAME").length());
|
|
||||||
String num_name = rowMap.getString("PLNAME").substring(0,rowMap.getString("PLNAME").indexOf(" "));
|
|
||||||
|
|
||||||
String names = name.substring(name.indexOf(" ")+1,name.length());
|
|
||||||
String string = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '"+num_name+"%'");
|
|
||||||
jsonObject.put("num",string);
|
|
||||||
JSONArray jsonArray1 = new JSONArray(new LinkedList<>());
|
|
||||||
String sql_parent11 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = '"+rowMap.getString("ID")+"' order by PLORDERINDEX asc";
|
|
||||||
List<RowMap> maps111 = DBSql.getMaps(sql_parent11);
|
|
||||||
for (RowMap rowmap: maps111) {
|
|
||||||
JSONObject jsonObject1 = new JSONObject(new LinkedHashMap<>());
|
|
||||||
jsonObject1.put("text",rowmap.getString("PLNAME"));
|
|
||||||
jsonObject1.put("href","#");
|
|
||||||
String PLname1 = rowmap.getString("PLNAME").substring(rowmap.getString("PLNAME").indexOf(" ")+1,rowmap.getString("PLNAME").length());
|
|
||||||
String names1 = rowMap.getString("PLNAME").substring(rowMap.getString("PLNAME").indexOf(" ")+1,rowMap.getString("PLNAME").length());
|
|
||||||
String num_name1 = rowmap.getString("PLNAME").substring(0,rowmap.getString("PLNAME").indexOf(" "));
|
|
||||||
|
|
||||||
String strings = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '%"+num_name1+"%' ");
|
|
||||||
jsonObject1.put("num",strings);
|
|
||||||
jsonArray1.add(jsonObject1);
|
|
||||||
String sql_parent111 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = '"+rowmap.getString("ID")+"' order by PLORDERINDEX asc";
|
|
||||||
List<RowMap> maps1111 = DBSql.getMaps(sql_parent111);
|
|
||||||
JSONArray jsonArray2 = new JSONArray(new LinkedList<>());
|
|
||||||
for (RowMap map:maps1111
|
|
||||||
) {
|
|
||||||
JSONObject jsonObject2 = new JSONObject(new LinkedHashMap<>());
|
|
||||||
jsonObject2.put("text",map.getString("PLNAME"));
|
|
||||||
jsonObject2.put("href","#");
|
|
||||||
String PLname2 = map.getString("PLNAME").substring(map.getString("PLNAME").indexOf(" ")+1,map.getString("PLNAME").length());
|
|
||||||
String names2 = rowmap.getString("PLNAME").substring(rowmap.getString("PLNAME").indexOf(" ")+1,rowmap.getString("PLNAME").length());
|
|
||||||
String num_name2 = map.getString("PLNAME").substring(0,map.getString("PLNAME").indexOf(" "));
|
|
||||||
|
|
||||||
String stringss = DBSql.getString("select count(*) from BO_EU_PER_IND_LIB where SYNCHRONOUS_HOME like '%"+num_name2+"' ");
|
|
||||||
jsonObject2.put("num",stringss);
|
|
||||||
jsonArray2.add(jsonObject2);
|
|
||||||
}
|
|
||||||
//jsonObject1.put("nodes",jsonArray2);
|
|
||||||
}
|
|
||||||
jsonObject.put("nodes",jsonArray1);
|
|
||||||
jsonArray.add(jsonObject);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return jsonArray;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mapping("com.awspaas.user.apps.integration.controller.GetmeritsController.getsecondDepartname")
|
@Mapping("com.awspaas.user.apps.integration.controller.GetmeritsController.getsecondDepartname")
|
||||||
@ -370,24 +351,24 @@ public class GetmeritsController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mapping("com.awspaas.user.apps.integration.controller.GetmeritsController.getL1Process")
|
@Mapping("com.awspaas.user.apps.integration.controller.GetmeritsController.getL1Process")
|
||||||
public JSONObject getL1Process(String sid){
|
public JSONObject getL1Process(String sid) {
|
||||||
JSONObject result = new JSONObject();
|
JSONObject result = new JSONObject();
|
||||||
JSONArray jsonArray = new JSONArray();
|
JSONArray jsonArray = new JSONArray();
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where PLMETHODID ='process.framework' and PLLEVEL = '1' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> maps = DBSql.getMaps(sql); int i=0;
|
List<RowMap> maps = DBSql.getMaps(sql);
|
||||||
for (RowMap rowMap:maps
|
int i = 0;
|
||||||
) {
|
for (RowMap rowMap : maps) {
|
||||||
JSONObject jsonObject = new JSONObject();
|
JSONObject jsonObject = new JSONObject();
|
||||||
jsonObject.put("termsKey",rowMap.getString("ID"));
|
jsonObject.put("termsKey", rowMap.getString("ID"));
|
||||||
jsonObject.put("termsVal",rowMap.getString("PLNAME"));
|
jsonObject.put("termsVal", rowMap.getString("PLNAME"));
|
||||||
jsonArray.add(jsonObject);
|
jsonArray.add(jsonObject);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
result.put("result","ok");
|
result.put("result", "ok");
|
||||||
result.put("fileTypes",jsonArray);
|
result.put("fileTypes", jsonArray);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mapping("com.awspaas.user.apps.integration.controller.GetmeritsController.getTable2Data")
|
@Mapping("com.awspaas.user.apps.integration.controller.GetmeritsController.getTable2Data")
|
||||||
public JSONObject getTable2Data(String sid,String plname,String departname) {
|
public JSONObject getTable2Data(String sid,String plname,String departname) {
|
||||||
@ -395,18 +376,14 @@ public class GetmeritsController {
|
|||||||
JSONArray jsonArray_content = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray_content = new JSONArray(new LinkedList<>());
|
||||||
|
|
||||||
if (departname.equals("全部")){
|
if (departname.equals("全部")){
|
||||||
|
//String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '" + plname + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc");
|
||||||
|
String id = DBSql.getString("select * from APP_ACT_COE_PAL_REPOSITORY where PLNAME = '" + plname + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc");
|
||||||
|
|
||||||
|
|
||||||
String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '" + plname + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 这是L1的流程绩效数据汇总
|
* 这是L1的流程绩效数据汇总
|
||||||
*/
|
*/
|
||||||
JSONObject jsonObject1 = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject1 = new JSONObject(new LinkedHashMap<>());
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where ID = '" + id + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
RowMap map = DBSql.getMap(sql);
|
RowMap map = DBSql.getMap(sql);
|
||||||
jsonObject1.put("leftname", "L1流程绩效指标");
|
jsonObject1.put("leftname", "L1流程绩效指标");
|
||||||
JSONArray jsonArray1 = new JSONArray();
|
JSONArray jsonArray1 = new JSONArray();
|
||||||
@ -444,7 +421,8 @@ public class GetmeritsController {
|
|||||||
/**
|
/**
|
||||||
* L2流程数据汇总
|
* L2流程数据汇总
|
||||||
*/
|
*/
|
||||||
String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = '" + id + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
|
|
||||||
List<RowMap> maps = DBSql.getMaps(sqls);
|
List<RowMap> maps = DBSql.getMaps(sqls);
|
||||||
|
|
||||||
@ -525,8 +503,9 @@ public class GetmeritsController {
|
|||||||
String[] plid = dleass.split(",");
|
String[] plid = dleass.split(",");
|
||||||
for (String ikds:plid
|
for (String ikds:plid
|
||||||
) {
|
) {
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试','8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
System.out.println("===========ikds==========="+ikds);
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = " + ikds + " and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试','8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
String name2 = rowmaps.getString("PLNAME").substring(rowmaps.getString("PLNAME").indexOf(" ") + 1);
|
String name2 = rowmaps.getString("PLNAME").substring(rowmaps.getString("PLNAME").indexOf(" ") + 1);
|
||||||
@ -551,7 +530,8 @@ public class GetmeritsController {
|
|||||||
|
|
||||||
for (String ikds:plid
|
for (String ikds:plid
|
||||||
) {
|
) {
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = " + ikds + " and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
|
|
||||||
@ -575,9 +555,8 @@ public class GetmeritsController {
|
|||||||
jsonObject_secondcont3.put("name", jsonArray_name3);
|
jsonObject_secondcont3.put("name", jsonArray_name3);
|
||||||
|
|
||||||
int r=0;
|
int r=0;
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID in (" + dleass + ") and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID in (" + dleass + ") AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID in (" + dleass + ") AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
String name2 = rowmaps.getString("PLNAME").substring(rowmaps.getString("PLNAME").indexOf(" ") + 1);
|
String name2 = rowmaps.getString("PLNAME").substring(rowmaps.getString("PLNAME").indexOf(" ") + 1);
|
||||||
@ -616,19 +595,14 @@ public class GetmeritsController {
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
}else {
|
}else {
|
||||||
|
//String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '" + plname + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc");
|
||||||
|
String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where PLNAME = '" + plname + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '" + plname + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 这是L1的流程绩效数据汇总
|
* 这是L1的流程绩效数据汇总
|
||||||
*/
|
*/
|
||||||
JSONObject jsonObject1 = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject1 = new JSONObject(new LinkedHashMap<>());
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where ID = '"+id+"' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
RowMap map = DBSql.getMap(sql);
|
RowMap map = DBSql.getMap(sql);
|
||||||
jsonObject1.put("leftname", "L1流程绩效指标");
|
jsonObject1.put("leftname", "L1流程绩效指标");
|
||||||
JSONArray jsonArray1 = new JSONArray();
|
JSONArray jsonArray1 = new JSONArray();
|
||||||
@ -666,7 +640,8 @@ public class GetmeritsController {
|
|||||||
/**
|
/**
|
||||||
* L2流程数据汇总
|
* L2流程数据汇总
|
||||||
*/
|
*/
|
||||||
String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = '" + id + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
|
//String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
|
||||||
List<RowMap> maps = DBSql.getMaps(sqls);
|
List<RowMap> maps = DBSql.getMaps(sqls);
|
||||||
|
|
||||||
@ -747,8 +722,8 @@ public class GetmeritsController {
|
|||||||
String[] plid = dleass.split(",");
|
String[] plid = dleass.split(",");
|
||||||
for (String ikds:plid
|
for (String ikds:plid
|
||||||
) {
|
) {
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = "+ikds+" and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
String name2 = rowmaps.getString("PLNAME").substring(rowmaps.getString("PLNAME").indexOf(" ") + 1);
|
String name2 = rowmaps.getString("PLNAME").substring(rowmaps.getString("PLNAME").indexOf(" ") + 1);
|
||||||
@ -773,8 +748,8 @@ public class GetmeritsController {
|
|||||||
|
|
||||||
for (String ikds:plid
|
for (String ikds:plid
|
||||||
) {
|
) {
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = "+ikds+" and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
|
|
||||||
for (RowMap rowmaps : mapss
|
for (RowMap rowmaps : mapss
|
||||||
@ -798,8 +773,8 @@ public class GetmeritsController {
|
|||||||
|
|
||||||
int r=0;
|
int r=0;
|
||||||
|
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID in (" + dleass + ") AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID in (" + dleass + ") AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID in (" + dleass + ") and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
String name2 = rowmaps.getString("PLNAME").substring(rowmaps.getString("PLNAME").indexOf(" ") + 1);
|
String name2 = rowmaps.getString("PLNAME").substring(rowmaps.getString("PLNAME").indexOf(" ") + 1);
|
||||||
@ -1330,9 +1305,11 @@ public class GetmeritsController {
|
|||||||
/**
|
/**
|
||||||
* 这个是L1流程绩效指标数据汇总
|
* 这个是L1流程绩效指标数据汇总
|
||||||
*/
|
*/
|
||||||
String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '" + plname + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc");
|
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '" + plname + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc");
|
||||||
|
String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where PLNAME ='"+plname+"' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc");
|
||||||
|
//String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where ID ='"+id+"' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
RowMap map = DBSql.getMap(sql);
|
RowMap map = DBSql.getMap(sql);
|
||||||
JSONObject jsonObject_L1 = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_L1 = new JSONObject(new LinkedHashMap<>());
|
||||||
jsonObject_L1.put("levels_name","L1流程绩效指标");
|
jsonObject_L1.put("levels_name","L1流程绩效指标");
|
||||||
@ -1359,8 +1336,8 @@ public class GetmeritsController {
|
|||||||
* 这是L2流程绩效指标汇总
|
* 这是L2流程绩效指标汇总
|
||||||
*/
|
*/
|
||||||
|
|
||||||
String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = '" + id + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> maps = DBSql.getMaps(sqls);
|
List<RowMap> maps = DBSql.getMaps(sqls);
|
||||||
|
|
||||||
String ids = "";
|
String ids = "";
|
||||||
@ -1429,7 +1406,9 @@ public class GetmeritsController {
|
|||||||
int y=0;
|
int y=0;
|
||||||
for (String ikds:plid
|
for (String ikds:plid
|
||||||
) {
|
) {
|
||||||
String sqls3_1 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
|
||||||
|
String sqls3_1 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = '" + id + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
|
//String sqls3_1 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapsss = DBSql.getMaps(sqls3_1);
|
List<RowMap> mapsss = DBSql.getMaps(sqls3_1);
|
||||||
for (RowMap rowmaps : mapsss) {
|
for (RowMap rowmaps : mapsss) {
|
||||||
String name2s = rowmaps.getString("PLNAME").substring(0, rowmaps.getString("PLNAME").indexOf(" "));
|
String name2s = rowmaps.getString("PLNAME").substring(0, rowmaps.getString("PLNAME").indexOf(" "));
|
||||||
@ -1485,8 +1464,8 @@ public class GetmeritsController {
|
|||||||
) {
|
) {
|
||||||
JSONObject jsonObject_child_content_3_last = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_child_content_3_last = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONArray jsonArray_child_content_3_last = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray_child_content_3_last = new JSONArray(new LinkedList<>());
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select ID from APP_ACT_COE_PAL_REPOSITORY where ID ='"+id+"' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
/**
|
/**
|
||||||
@ -1544,8 +1523,8 @@ public class GetmeritsController {
|
|||||||
for (String ikds:plid
|
for (String ikds:plid
|
||||||
) {
|
) {
|
||||||
JSONObject jsonObject_L3_name = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_L3_name = new JSONObject(new LinkedHashMap<>());
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID ="+ikds+" and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
JSONArray jsonArray_content_1 = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray_content_1 = new JSONArray(new LinkedList<>());
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
@ -1577,7 +1556,8 @@ public class GetmeritsController {
|
|||||||
int r=0;
|
int r=0;
|
||||||
for (String ikds:plid
|
for (String ikds:plid
|
||||||
) {
|
) {
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID ="+ikds+" and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
String name2s = rowmaps.getString("PLNAME").substring(0,rowmaps.getString("PLNAME").indexOf(" "));
|
String name2s = rowmaps.getString("PLNAME").substring(0,rowmaps.getString("PLNAME").indexOf(" "));
|
||||||
@ -1635,8 +1615,8 @@ public class GetmeritsController {
|
|||||||
) {
|
) {
|
||||||
|
|
||||||
JSONArray jsonArray_child_content_3 = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray_child_content_3 = new JSONArray(new LinkedList<>());
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID ="+ikds+" and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
linkedList.add(mapss.size());
|
linkedList.add(mapss.size());
|
||||||
u++;
|
u++;
|
||||||
@ -1680,8 +1660,8 @@ public class GetmeritsController {
|
|||||||
) {
|
) {
|
||||||
JSONObject jsonObject_child_content_3_last = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_child_content_3_last = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONArray jsonArray_child_content_3_last = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray_child_content_3_last = new JSONArray(new LinkedList<>());
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID ="+ikds+" and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
/**
|
/**
|
||||||
@ -1736,9 +1716,10 @@ public class GetmeritsController {
|
|||||||
/**
|
/**
|
||||||
* 这个是L1流程绩效指标数据汇总
|
* 这个是L1流程绩效指标数据汇总
|
||||||
*/
|
*/
|
||||||
String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '" + plname + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc");
|
//String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLNAME = '" + plname + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc");
|
||||||
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String id = DBSql.getString("select ID from APP_ACT_COE_PAL_REPOSITORY where PLNAME = '" + plname + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc");
|
||||||
|
//String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLPARENTID = 'process' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sql = "select * from APP_ACT_COE_PAL_REPOSITORY where ID ='"+id+"' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
RowMap map = DBSql.getMap(sql);
|
RowMap map = DBSql.getMap(sql);
|
||||||
JSONObject jsonObject_L1 = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_L1 = new JSONObject(new LinkedHashMap<>());
|
||||||
jsonObject_L1.put("levels_name","L1流程绩效指标");
|
jsonObject_L1.put("levels_name","L1流程绩效指标");
|
||||||
@ -1765,8 +1746,8 @@ public class GetmeritsController {
|
|||||||
* 这是L2流程绩效指标汇总
|
* 这是L2流程绩效指标汇总
|
||||||
*/
|
*/
|
||||||
|
|
||||||
String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = '" + id + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> maps = DBSql.getMaps(sqls);
|
List<RowMap> maps = DBSql.getMaps(sqls);
|
||||||
|
|
||||||
String ids = "";
|
String ids = "";
|
||||||
@ -1836,8 +1817,8 @@ public class GetmeritsController {
|
|||||||
String[] plid = dleass.split(",");
|
String[] plid = dleass.split(",");
|
||||||
|
|
||||||
int y=0;
|
int y=0;
|
||||||
|
String sqls3_1 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = '" + id + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
String sqls3_1 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3_1 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapsss = DBSql.getMaps(sqls3_1);
|
List<RowMap> mapsss = DBSql.getMaps(sqls3_1);
|
||||||
for (RowMap rowmaps : mapsss) {
|
for (RowMap rowmaps : mapsss) {
|
||||||
String name2s = rowmaps.getString("PLNAME").substring(0, rowmaps.getString("PLNAME").indexOf(" "));
|
String name2s = rowmaps.getString("PLNAME").substring(0, rowmaps.getString("PLNAME").indexOf(" "));
|
||||||
@ -1892,8 +1873,8 @@ public class GetmeritsController {
|
|||||||
) {
|
) {
|
||||||
JSONObject jsonObject_child_content_3_last = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_child_content_3_last = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONArray jsonArray_child_content_3_last = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray_child_content_3_last = new JSONArray(new LinkedList<>());
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND ID = '" + id + "' AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where ID = '" + id + "' and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
/**
|
/**
|
||||||
@ -1951,8 +1932,8 @@ public class GetmeritsController {
|
|||||||
for (String ikds:plid
|
for (String ikds:plid
|
||||||
) {
|
) {
|
||||||
JSONObject jsonObject_L3_name = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_L3_name = new JSONObject(new LinkedHashMap<>());
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = " + ikds + " and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
JSONArray jsonArray_content_1 = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray_content_1 = new JSONArray(new LinkedList<>());
|
||||||
if (mapss.size()==0){
|
if (mapss.size()==0){
|
||||||
@ -1985,7 +1966,8 @@ public class GetmeritsController {
|
|||||||
int r=0;
|
int r=0;
|
||||||
for (String ikds:plid
|
for (String ikds:plid
|
||||||
) {
|
) {
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = " + ikds + " and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
String name2s = rowmaps.getString("PLNAME").substring(0,rowmaps.getString("PLNAME").indexOf(" "));
|
String name2s = rowmaps.getString("PLNAME").substring(0,rowmaps.getString("PLNAME").indexOf(" "));
|
||||||
@ -2039,8 +2021,8 @@ public class GetmeritsController {
|
|||||||
) {
|
) {
|
||||||
|
|
||||||
JSONArray jsonArray_child_content_3 = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray_child_content_3 = new JSONArray(new LinkedList<>());
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = " + ikds + " and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
linkedList.add(mapss.size());
|
linkedList.add(mapss.size());
|
||||||
u++;
|
u++;
|
||||||
@ -2077,8 +2059,8 @@ public class GetmeritsController {
|
|||||||
) {
|
) {
|
||||||
JSONObject jsonObject_child_content_3_last = new JSONObject(new LinkedHashMap<>());
|
JSONObject jsonObject_child_content_3_last = new JSONObject(new LinkedHashMap<>());
|
||||||
JSONArray jsonArray_child_content_3_last = new JSONArray(new LinkedList<>());
|
JSONArray jsonArray_child_content_3_last = new JSONArray(new LinkedList<>());
|
||||||
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
//String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where CREATEUSER = 'admin' AND PLPARENTID = "+ikds+" AND PLCATEGORY = 'process'and PLMETHODID ='process.framework' and PLNAME not in ('流程架构图','测试用','GMY-截图用','sx批量测试' ,'8.2培训使用','用户练习使用','YX测试分部','yx测试人员','yx测试部','流程架构测试') and PLPARENTID not in ('63ff93c6-2f27-4851-a396-6830c428db2e', 'c84f497a-4de3-4404-86e8-cd5af71c3b47','94dabf55-b032-4316-a4c3-00b83763da09', '36ac7cdd-a361-4bd3-9511-c03c1b3627a4','84e534b4-e51a-4874-9ff1-8a0206d9e0c5', '98bd5917-7563-4b29-b775-815e91d9864c','f07da63c-3423-4c1e-ae75-b323c6a69093', '79cb4c35-d2f7-4c43-a7db-44038b557eac','7ad79a73-a497-417a-a5ec-d4c9fd45061c', '42c09260-c1d3-44b7-ac3d-f8280e04c294') order by PLORDERINDEX asc";
|
||||||
|
String sqls3 = "select * from APP_ACT_COE_PAL_REPOSITORY where PLPARENTID = " + ikds + " and PLMETHODID ='process.framework' and EXT5 = '1' order by PLORDERINDEX asc";
|
||||||
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
List<RowMap> mapss = DBSql.getMaps(sqls3);
|
||||||
for (RowMap rowmaps : mapss) {
|
for (RowMap rowmaps : mapss) {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -70,7 +70,7 @@ public class TaskListener extends ProcessPubicListener {
|
|||||||
@Override
|
@Override
|
||||||
public void call(String eventName, TaskInstance taskInstance, ProcessExecutionContext pec) {
|
public void call(String eventName, TaskInstance taskInstance, ProcessExecutionContext pec) {
|
||||||
|
|
||||||
System.out.println("eventName>>>>>>>>>>"+eventName);
|
//System.out.println("eventName>>>>>>>>>>"+eventName);
|
||||||
/**
|
/**
|
||||||
* 手动作废 增加 开始节点作废删除更新OA待办问题
|
* 手动作废 增加 开始节点作废删除更新OA待办问题
|
||||||
* 后台管理员删除流程 process_before_delete 时候删除 更新OA为已办
|
* 后台管理员删除流程 process_before_delete 时候删除 更新OA为已办
|
||||||
@ -109,7 +109,7 @@ public class TaskListener extends ProcessPubicListener {
|
|||||||
if(PublicEventConst.TASK_CREATE.equals(eventName)&&taskInstance.getTitle().contains("(重新激活)")) {
|
if(PublicEventConst.TASK_CREATE.equals(eventName)&&taskInstance.getTitle().contains("(重新激活)")) {
|
||||||
String sql = "select * from WFC_TASK where PROCESSINSTID = '"+pec.getProcessInstance().getId()+"' and TASKSTATE = '1' AND PARENTTASKINSTID = '00000000-0000-0000-0000-000000000000'";
|
String sql = "select * from WFC_TASK where PROCESSINSTID = '"+pec.getProcessInstance().getId()+"' and TASKSTATE = '1' AND PARENTTASKINSTID = '00000000-0000-0000-0000-000000000000'";
|
||||||
RowMap map = DBSql.getMap(sql);
|
RowMap map = DBSql.getMap(sql);
|
||||||
System.out.println("重新激活后的数据>>>>>>>>>>>>>"+map);
|
//System.out.println("重新激活后的数据>>>>>>>>>>>>>"+map);
|
||||||
if (map!=null){
|
if (map!=null){
|
||||||
ProcessDefinition processDef = pec.getProcessDef();
|
ProcessDefinition processDef = pec.getProcessDef();
|
||||||
if(null!=processDef) {
|
if(null!=processDef) {
|
||||||
@ -134,7 +134,7 @@ public class TaskListener extends ProcessPubicListener {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println("按钮名称是>>>>>>>>>>>"+actionName);
|
//System.out.println("按钮名称是>>>>>>>>>>>"+actionName);
|
||||||
/**
|
/**
|
||||||
* 任务删除,需要更新之前说有的历史节点的任务信息
|
* 任务删除,需要更新之前说有的历史节点的任务信息
|
||||||
*/
|
*/
|
||||||
@ -161,7 +161,7 @@ public class TaskListener extends ProcessPubicListener {
|
|||||||
} else if (PublicEventConst.TASK_DELETE.equals(eventName) || taskInstance.getControlState() == "delete") {
|
} else if (PublicEventConst.TASK_DELETE.equals(eventName) || taskInstance.getControlState() == "delete") {
|
||||||
if (actionName == ""||actionName.equals("作废")||actionName.equals("收回沟通任务")||(actionName.equals("传阅")&& PublicEventConst.TASK_READ.equals(eventName))||actionName.equals("激活")) {
|
if (actionName == ""||actionName.equals("作废")||actionName.equals("收回沟通任务")||(actionName.equals("传阅")&& PublicEventConst.TASK_READ.equals(eventName))||actionName.equals("激活")) {
|
||||||
try {
|
try {
|
||||||
System.out.println("按钮名称的相关数据>>>>>>>>>>>"+actionName);
|
//System.out.println("按钮名称的相关数据>>>>>>>>>>>"+actionName);
|
||||||
component.readOa(taskInstance.getId());
|
component.readOa(taskInstance.getId());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|||||||
@ -26,6 +26,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.upfile.web.UpfileWeb;
|
|||||||
import com.actionsoft.apps.coe.pal.util.HighSecurityUtil;
|
import com.actionsoft.apps.coe.pal.util.HighSecurityUtil;
|
||||||
import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
|
import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
|
||||||
import com.actionsoft.bpms.bo.engine.BO;
|
import com.actionsoft.bpms.bo.engine.BO;
|
||||||
|
import com.actionsoft.bpms.bpmn.engine.model.run.delegate.HistoryTaskInstance;
|
||||||
import com.actionsoft.bpms.bpmn.engine.model.run.delegate.ProcessInstance;
|
import com.actionsoft.bpms.bpmn.engine.model.run.delegate.ProcessInstance;
|
||||||
import com.actionsoft.bpms.bpmn.engine.model.run.delegate.TaskInstance;
|
import com.actionsoft.bpms.bpmn.engine.model.run.delegate.TaskInstance;
|
||||||
import com.actionsoft.bpms.client.form.UserTaskFormsWeb;
|
import com.actionsoft.bpms.client.form.UserTaskFormsWeb;
|
||||||
@ -254,8 +255,7 @@ public class TaskController {
|
|||||||
List<BO> lists = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_C", true).addQuery("BINDID=", processInstId).orderByCreated().asc().list();
|
List<BO> lists = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_C", true).addQuery("BINDID=", processInstId).orderByCreated().asc().list();
|
||||||
List<BO> list_stop = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_S", true).addQuery("BINDID=", processInstId).orderByCreated().asc().list();
|
List<BO> list_stop = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_S", true).addQuery("BINDID=", processInstId).orderByCreated().asc().list();
|
||||||
int num = 1;
|
int num = 1;
|
||||||
|
//发布
|
||||||
//发布
|
|
||||||
if (list.size()>0) {
|
if (list.size()>0) {
|
||||||
//System.out.println("这个是更新的架构数据");
|
//System.out.println("这个是更新的架构数据");
|
||||||
for (BO bo : list) {
|
for (BO bo : list) {
|
||||||
@ -438,7 +438,7 @@ public class TaskController {
|
|||||||
jsonArray.add(jsonObject);
|
jsonArray.add(jsonObject);
|
||||||
|
|
||||||
String sql_upfile ="select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '"+bo.get("CHANGEDFILEIDNEW")+"'" + ") ORDER BY CREATETIME ASC";
|
String sql_upfile ="select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '"+bo.get("CHANGEDFILEIDNEW")+"'" + ") ORDER BY CREATETIME ASC";
|
||||||
String methodId = DBSql.getString("select PLMETHODID from APP_ACT_COE_PAL_REPOSITORY where ID= '"+bo.getString("PUBLISHFILEID")+"'");
|
String methodId = DBSql.getString("select PLMETHODID from APP_ACT_COE_PAL_REPOSITORY where ID= '"+bo.getString("CHANGEDFILEIDNEW")+"'");
|
||||||
if(UtilString.isNotEmpty(methodId)) {
|
if(UtilString.isNotEmpty(methodId)) {
|
||||||
if(methodId.equals("control.policy")) {
|
if(methodId.equals("control.policy")) {
|
||||||
sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '"+bo.get("CHANGEDFILEIDNEW")+"') AND FILETYPE = 'f' ORDER BY CREATETIME ASC";
|
sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '"+bo.get("CHANGEDFILEIDNEW")+"') AND FILETYPE = 'f' ORDER BY CREATETIME ASC";
|
||||||
@ -516,71 +516,41 @@ public class TaskController {
|
|||||||
|
|
||||||
String portalUrl = SDK.getPortalAPI().getPortalUrl();
|
String portalUrl = SDK.getPortalAPI().getPortalUrl();
|
||||||
String url = portalUrl + "/r/or?cmd=com.yili_process_page&processInstId=" + processInstId + "&taskInstId=" + taskInstId;
|
String url = portalUrl + "/r/or?cmd=com.yili_process_page&processInstId=" + processInstId + "&taskInstId=" + taskInstId;
|
||||||
JSONObject jsonObject = new JSONObject();
|
|
||||||
|
|
||||||
jsonObject.put("action", "read");
|
|
||||||
|
|
||||||
HttpClientUtils httpClientUtil = new HttpClientUtils();
|
HttpClientUtils httpClientUtil = new HttpClientUtils();
|
||||||
// String s = httpClientUtil.SendPreview("http://10.119.22.207:80/services/service_lcglpt?wsdl", jsonObject);
|
// String s = httpClientUtil.SendPreview("http://10.119.22.207:80/services/service_lcglpt?wsdl", jsonObject);
|
||||||
|
ProcessInstance instanceById = SDK.getProcessAPI().getInstanceById(processInstId);
|
||||||
BO bo_act_coe_publish = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH", true).addQuery("BINDID=", processInstId).addQuery("OPTIONTYPE IS NOT NULL",null).detail();
|
BO bo_act_coe_publish = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH", true).addQuery("BINDID=", processInstId).addQuery("OPTIONTYPE IS NOT NULL",null).detail();
|
||||||
List<BO> bo_act_dataid = SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=", processInstId).list();
|
List<BO> bo_act_dataid = SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=", processInstId).addQuery("USER_ID=", usercode).list();
|
||||||
|
if (bo_act_dataid.size()>0) {
|
||||||
if (bo_act_dataid != null) {
|
for (BO bo : bo_act_dataid) {
|
||||||
try {
|
JSONObject jsonObject = new JSONObject();
|
||||||
|
jsonObject.put("action", "read");
|
||||||
if (SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=", processInstId).addQuery("USER_ID=",usercode).detail()!=null){
|
jsonObject.put("status","1");
|
||||||
|
jsonObject.put("dataid", bo.getString("DATAID"));
|
||||||
String dataid = SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=", processInstId).addQuery("USER_ID=",usercode).detail().getString("DATAID");
|
String xmlStr = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:web=\"webservices.yili.weaver.com.cn\">\n" +
|
||||||
jsonObject.put("dataid", dataid);
|
" <soapenv:Header/>" +
|
||||||
}else {
|
" <soapenv:Body>" +
|
||||||
jsonObject.put("dataid", "");
|
" <web:service>" +
|
||||||
}
|
" <web:in0>" +
|
||||||
|
"<![CDATA[" + jsonObject + "]]>" +
|
||||||
}catch (Exception e){
|
" </web:in0>" +
|
||||||
|
" </web:service>" +
|
||||||
|
" </soapenv:Body>" +
|
||||||
|
"</soapenv:Envelope>";
|
||||||
|
HttpClient client = new HttpClient();
|
||||||
|
int timeout = 10000;
|
||||||
|
String readurl = SDK.getAppAPI().getProperty("com.awspaas.user.apps.yili.integration", "readurl");
|
||||||
|
String s = UtilUrl.doPostSoap(readurl, xmlStr, "");
|
||||||
|
//System.err.println(instanceById.getTitle()+"OA待阅PC端阅读返回=======>"+s);
|
||||||
|
String nums = DBSql.getString("select READNUM from BO_EU_PAL_READ_LOG where PROCESSID = '" + processInstId + "'");
|
||||||
|
if (UtilString.isNotEmpty(nums)){
|
||||||
|
Integer read_num = Integer.valueOf(nums);
|
||||||
|
read_num+=1;
|
||||||
|
DBSql.update("update BO_EU_PAL_READ_LOG set READNUM = '"+read_num+"' where PROCESSID = '"+processInstId+"'");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
jsonObject.put("status","1");
|
|
||||||
String xmlStr = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:web=\"webservices.yili.weaver.com.cn\">\n" +
|
|
||||||
" <soapenv:Header/>" +
|
|
||||||
" <soapenv:Body>" +
|
|
||||||
" <web:service>" +
|
|
||||||
" <web:in0>" +
|
|
||||||
"<![CDATA[" + jsonObject + "]]>" +
|
|
||||||
" </web:in0>" +
|
|
||||||
" </web:service>" +
|
|
||||||
" </soapenv:Body>" +
|
|
||||||
"</soapenv:Envelope>";
|
|
||||||
//HttpClientUtil httpClientUtil = new HttpClientUtil();
|
|
||||||
//System.out.println("HttpClient 发送SOAP请求");
|
|
||||||
HttpClient client = new HttpClient();
|
|
||||||
int timeout = 10000;
|
|
||||||
String readurl = SDK.getAppAPI().getProperty("com.awspaas.user.apps.yili.integration", "readurl");
|
|
||||||
PostMethod postMethod = new PostMethod(readurl);
|
|
||||||
// 设置连接超时
|
|
||||||
client.getHttpConnectionManager().getParams().setConnectionTimeout(timeout);
|
|
||||||
// 设置读取时间超时
|
|
||||||
client.getHttpConnectionManager().getParams().setSoTimeout(timeout);
|
|
||||||
// 然后把Soap请求数据添加到PostMethod中
|
|
||||||
RequestEntity requestEntity = new StringRequestEntity(xmlStr, "text/xml", "UTF-8");
|
|
||||||
// 设置请求体
|
|
||||||
postMethod.setRequestEntity(requestEntity);
|
|
||||||
int status = client.executeMethod(postMethod);
|
|
||||||
// 打印请求状态码
|
|
||||||
//System.out.println("status:" + status);
|
|
||||||
// 获取响应体输入流
|
|
||||||
//System.out.println("xmlstr=================" + xmlStr);
|
|
||||||
InputStream is = postMethod.getResponseBodyAsStream();
|
|
||||||
//System.out.println("s=================+s" + new String(ByteStreams.toByteArray(is)));
|
|
||||||
////System.out.println("s==============>>>>>>>>>>>"+s);
|
|
||||||
String nums = DBSql.getString("select READNUM from BO_EU_PAL_READ_LOG where PROCESSID = '" + processInstId + "'");
|
|
||||||
if (UtilString.isNotEmpty(nums)){
|
|
||||||
|
|
||||||
Integer read_num = Integer.valueOf(nums);
|
|
||||||
read_num+=1;
|
|
||||||
DBSql.update("update BO_EU_PAL_READ_LOG set READNUM = '"+read_num+"' where PROCESSID = '"+processInstId+"'");
|
|
||||||
}
|
|
||||||
|
|
||||||
//}
|
//}
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
@ -593,9 +563,6 @@ public class TaskController {
|
|||||||
|
|
||||||
@Mapping("com.yili_process_page_phone")
|
@Mapping("com.yili_process_page_phone")
|
||||||
public String processPhone(UserContext me, RequestParams params) throws SQLException {
|
public String processPhone(UserContext me, RequestParams params) throws SQLException {
|
||||||
|
|
||||||
// System.out.println("params>>>>>>>>>>>>"+params.get("userid"));
|
|
||||||
// System.out.println("UserContext>>>>>>>>>>>>"+me.getUID());
|
|
||||||
String userMobile = me.getDeviceType();
|
String userMobile = me.getDeviceType();
|
||||||
Connection conn = DBSql.open();
|
Connection conn = DBSql.open();
|
||||||
JSONArray jsonArray = new JSONArray();
|
JSONArray jsonArray = new JSONArray();
|
||||||
@ -1108,56 +1075,78 @@ public class TaskController {
|
|||||||
+ taskInstId;
|
+ taskInstId;
|
||||||
String mobileurl = portalUrl + "/r/or?cmd=com.yili_process_page_phone&processInstId=" + processInstId
|
String mobileurl = portalUrl + "/r/or?cmd=com.yili_process_page_phone&processInstId=" + processInstId
|
||||||
+ "&taskInstId=" + taskInstId;
|
+ "&taskInstId=" + taskInstId;
|
||||||
JSONObject jsonObject = new JSONObject();
|
HttpClientUtils httpClientUtil = new HttpClientUtils();
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
List<BO> bo_act_dataid = SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=", processInstId)
|
||||||
String sql = "SELECT * FROM WFC_PROCESS WHERE ID ='" + processInstId + "'";
|
.addQuery("USER_ID=", usercode).list();
|
||||||
List<RowMap> rowMaps = DBSql.getMaps(conn, sql);
|
if (bo_act_dataid.size() > 0) {
|
||||||
if (rowMaps.size() == 1) {
|
for (BO bo : bo_act_dataid) {
|
||||||
|
JSONObject jsonObject = new JSONObject();
|
||||||
jsonObject.put("action", "read");
|
jsonObject.put("status", "1");
|
||||||
// jsonObject.put("dept",me.getDepartmentModel().getNo());
|
jsonObject.put("action", "read");
|
||||||
// jsonObject.put("user",me.getUID());
|
jsonObject.put("dataid", bo.getString("DATAID"));
|
||||||
// jsonObject.put("remark","");
|
String xmlStr = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:web=\"webservices.yili.weaver.com.cn\">\n"
|
||||||
jsonObject.put("status", "1");
|
+ " <soapenv:Header/>" + " <soapenv:Body>" + " <web:service>"
|
||||||
// jsonObject.put("pcurl",url);
|
+ " <web:in0>" + "<![CDATA[" + jsonObject + "]]>" + " </web:in0>"
|
||||||
// jsonObject.put("mobileurl",mobileurl);
|
+ " </web:service>" + " </soapenv:Body>" + "</soapenv:Envelope>";
|
||||||
try {
|
int timeout = 10000;
|
||||||
BO bo_act_dataid = SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=", processInstId)
|
String readurl = SDK.getAppAPI().getProperty("com.awspaas.user.apps.yili.integration", "readurl");
|
||||||
.addQuery("USER_ID=", usercode).detail();
|
String s = UtilUrl.doPostSoap(readurl, xmlStr, "");
|
||||||
if (bo_act_dataid != null) {
|
//System.err.println(instanceById.getTitle()+"_OA待阅移动端阅读返回=======>"+s);
|
||||||
jsonObject.put("dataid", bo_act_dataid.getString("DATAID"));
|
String nums = DBSql.getString(
|
||||||
|
"select READNUM from BO_EU_PAL_READ_LOG where PROCESSID = '" + processInstId + "'");
|
||||||
|
if (UtilString.isNotEmpty(nums)) {
|
||||||
|
Integer read_num = Integer.valueOf(nums);
|
||||||
|
read_num += 1;
|
||||||
|
DBSql.update("update BO_EU_PAL_READ_LOG set READNUM = '" + read_num + "' where PROCESSID = '"
|
||||||
|
+ processInstId + "'");
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// jsonObject.put("userList","00345531");
|
|
||||||
HttpClientUtils httpClientUtil = new HttpClientUtils();
|
|
||||||
// String s =
|
|
||||||
// httpClientUtil.SendPreview("http://10.119.22.207:80/services/service_lcglpt?wsdl",
|
|
||||||
// jsonObject);
|
|
||||||
|
|
||||||
String xmlStr = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:web=\"webservices.yili.weaver.com.cn\">\n"
|
|
||||||
+ " <soapenv:Header/>" + " <soapenv:Body>" + " <web:service>" + " <web:in0>"
|
|
||||||
+ "<![CDATA[" + jsonObject + "]]>" + " </web:in0>" + " </web:service>"
|
|
||||||
+ " </soapenv:Body>" + "</soapenv:Envelope>";
|
|
||||||
// HttpClientUtil httpClientUtil = new HttpClientUtil();
|
|
||||||
String readurl = SDK.getAppAPI().getProperty("com.awspaas.user.apps.yili.integration", "readurl");
|
|
||||||
|
|
||||||
String s = UtilUrl.doPostSoap(readurl, xmlStr, "");
|
|
||||||
// System.out.println("s==============>>>>>>>>>>>"+s);
|
|
||||||
|
|
||||||
}
|
|
||||||
String nums = DBSql
|
|
||||||
.getString("select READNUM from BO_EU_PAL_READ_LOG where PROCESSID = '" + processInstId + "'");
|
|
||||||
if (UtilString.isNotEmpty(nums)) {
|
|
||||||
|
|
||||||
Integer read_num = Integer.valueOf(nums);
|
|
||||||
read_num += 1;
|
|
||||||
DBSql.update("update BO_EU_PAL_READ_LOG set READNUM = '" + read_num + "' where PROCESSID = '"
|
|
||||||
+ processInstId + "'");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* JSONObject jsonObject = new JSONObject(); SimpleDateFormat sdf = new
|
||||||
|
* SimpleDateFormat("yyyy-MM-dd"); String sql =
|
||||||
|
* "SELECT * FROM WFC_PROCESS WHERE ID ='" + processInstId + "'"; List<RowMap>
|
||||||
|
* rowMaps = DBSql.getMaps(conn, sql); if (rowMaps.size() == 1) {
|
||||||
|
*
|
||||||
|
* jsonObject.put("action", "read"); //
|
||||||
|
* jsonObject.put("dept",me.getDepartmentModel().getNo()); //
|
||||||
|
* jsonObject.put("user",me.getUID()); // jsonObject.put("remark","");
|
||||||
|
* jsonObject.put("status", "1"); // jsonObject.put("pcurl",url); //
|
||||||
|
* jsonObject.put("mobileurl",mobileurl); try { BO bo_act_dataid =
|
||||||
|
* SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=",
|
||||||
|
* processInstId) .addQuery("USER_ID=", usercode).detail(); if (bo_act_dataid !=
|
||||||
|
* null) { jsonObject.put("dataid", bo_act_dataid.getString("DATAID")); } }
|
||||||
|
* catch (Exception e) {
|
||||||
|
*
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
* // jsonObject.put("userList","00345531"); HttpClientUtils httpClientUtil =
|
||||||
|
* new HttpClientUtils(); // String s = // httpClientUtil.SendPreview(
|
||||||
|
* "http://10.119.22.207:80/services/service_lcglpt?wsdl", // jsonObject);
|
||||||
|
*
|
||||||
|
* String xmlStr =
|
||||||
|
* "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:web=\"webservices.yili.weaver.com.cn\">\n"
|
||||||
|
* + " <soapenv:Header/>" + " <soapenv:Body>" + " <web:service>" +
|
||||||
|
* " <web:in0>" + "<![CDATA[" + jsonObject + "]]>" +
|
||||||
|
* " </web:in0>" + " </web:service>" + " </soapenv:Body>" +
|
||||||
|
* "</soapenv:Envelope>"; // HttpClientUtil httpClientUtil = new
|
||||||
|
* HttpClientUtil(); String readurl =
|
||||||
|
* SDK.getAppAPI().getProperty("com.awspaas.user.apps.yili.integration",
|
||||||
|
* "readurl");
|
||||||
|
*
|
||||||
|
* String s = UtilUrl.doPostSoap(readurl, xmlStr, ""); //
|
||||||
|
* System.out.println("s==============>>>>>>>>>>>"+s);
|
||||||
|
*
|
||||||
|
* } String nums = DBSql
|
||||||
|
* .getString("select READNUM from BO_EU_PAL_READ_LOG where PROCESSID = '" +
|
||||||
|
* processInstId + "'"); if (UtilString.isNotEmpty(nums)) {
|
||||||
|
*
|
||||||
|
* Integer read_num = Integer.valueOf(nums); read_num += 1;
|
||||||
|
* DBSql.update("update BO_EU_PAL_READ_LOG set READNUM = '" + read_num +
|
||||||
|
* "' where PROCESSID = '" + processInstId + "'"); }
|
||||||
|
*/
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@ -35,6 +35,7 @@ public class FileManagementController {
|
|||||||
@Mapping(value = "com.awspaas.user.apps.yili.reportform.service.FileManagementService_queryTerms5",
|
@Mapping(value = "com.awspaas.user.apps.yili.reportform.service.FileManagementService_queryTerms5",
|
||||||
desc = "制度管理看板筛选条件 文件类型、发布单位、所属领域")
|
desc = "制度管理看板筛选条件 文件类型、发布单位、所属领域")
|
||||||
public String queryTerms5(UserContext uc, RequestParams params) {
|
public String queryTerms5(UserContext uc, RequestParams params) {
|
||||||
|
System.err.println("=======制度管理看板筛选条件 文件类型、发布单位、所属领域========");
|
||||||
return new FileManagementService(uc).queryTerms5(uc, params);
|
return new FileManagementService(uc).queryTerms5(uc, params);
|
||||||
}
|
}
|
||||||
@Mapping(value = "com.awspaas.user.apps.yili.reportform.service.FileManagementService_fileStatistics",
|
@Mapping(value = "com.awspaas.user.apps.yili.reportform.service.FileManagementService_fileStatistics",
|
||||||
@ -64,7 +65,8 @@ public class FileManagementController {
|
|||||||
public String queryTerms6(UserContext uc, RequestParams params) {
|
public String queryTerms6(UserContext uc, RequestParams params) {
|
||||||
String queryTerms6Val = null;
|
String queryTerms6Val = null;
|
||||||
try {
|
try {
|
||||||
queryTerms6Val = new FileManagementService(uc).queryTerms6(uc, params);
|
System.err.println("=======文件发布时间分布筛选条件：发布单位、所属领域========");
|
||||||
|
queryTerms6Val = new FileManagementService(uc).queryTerms5(uc, params);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
SDK.getLogAPI().consoleErr("queryTerms6异常");
|
SDK.getLogAPI().consoleErr("queryTerms6异常");
|
||||||
}
|
}
|
||||||
@ -80,7 +82,8 @@ public class FileManagementController {
|
|||||||
public String queryTerms7(UserContext uc, RequestParams params) {
|
public String queryTerms7(UserContext uc, RequestParams params) {
|
||||||
String queryTerms7Val = null;
|
String queryTerms7Val = null;
|
||||||
try {
|
try {
|
||||||
queryTerms7Val = new FileManagementService(uc).queryTerms7(uc, params);
|
System.err.println("=======引用情况分析筛选条件：发布单位、所属领域、文件类型========");
|
||||||
|
queryTerms7Val = new FileManagementService(uc).queryTerms5(uc, params);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
SDK.getLogAPI().consoleErr("queryTerms7异常");
|
SDK.getLogAPI().consoleErr("queryTerms7异常");
|
||||||
}
|
}
|
||||||
|
|||||||
@ -66,13 +66,7 @@ public class ProcessPubController {
|
|||||||
@Mapping(value = "com.awspaas.user.apps.yili.reportform.service.ProcessPubService_processCONND",
|
@Mapping(value = "com.awspaas.user.apps.yili.reportform.service.ProcessPubService_processCONND",
|
||||||
desc = "流程连接度分析")
|
desc = "流程连接度分析")
|
||||||
public String processCONND(UserContext uc, RequestParams params) {
|
public String processCONND(UserContext uc, RequestParams params) {
|
||||||
String processCONNDVal = null;
|
return new ProcessPubService(uc).processCONND(uc,params);
|
||||||
try {
|
|
||||||
processCONNDVal = new ProcessPubService(uc).processCONND(uc,params);
|
|
||||||
} catch (Exception e) {
|
|
||||||
SDK.getLogAPI().consoleErr("processCONND异常");
|
|
||||||
}
|
|
||||||
return processCONNDVal;
|
|
||||||
}
|
}
|
||||||
@Mapping(value = "com.awspaas.user.apps.yili.reportform.service.ProcessPubService_processCONNDDetail",
|
@Mapping(value = "com.awspaas.user.apps.yili.reportform.service.ProcessPubService_processCONNDDetail",
|
||||||
desc = "事业部、职能部门流程连接度有前后置和无前后置占比")
|
desc = "事业部、职能部门流程连接度有前后置和无前后置占比")
|
||||||
|
|||||||
@ -73,6 +73,14 @@ public class SynFileStateJob implements IJob {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//刷新状态
|
||||||
|
if(palRepositoryModel.isStop()) {
|
||||||
|
count += DBSql.update("UPDATE APP_ACT_COE_PAL_REPOSITORY SET EXT5 = '0' WHERE ID = '"+id+"'");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
long end = System.currentTimeMillis();
|
long end = System.currentTimeMillis();
|
||||||
|
|||||||
@ -105,7 +105,7 @@ public class SyncData implements IJob {
|
|||||||
SDK.getLogAPI().consoleInfo("节点底表长度：" + nodeIdList.size());
|
SDK.getLogAPI().consoleInfo("节点底表长度：" + nodeIdList.size());
|
||||||
//系统字段
|
//系统字段
|
||||||
String uuId = SDK.getRuleAPI().executeAtScript("@uuid()");
|
String uuId = SDK.getRuleAPI().executeAtScript("@uuid()");
|
||||||
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
|
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
||||||
//遍历总文件集合
|
//遍历总文件集合
|
||||||
for (PALRepositoryModel fileModel : palTotalList) {
|
for (PALRepositoryModel fileModel : palTotalList) {
|
||||||
List<Map<String, Object>> nodeElements = new ArrayList<>();
|
List<Map<String, Object>> nodeElements = new ArrayList<>();
|
||||||
@ -256,6 +256,7 @@ public class SyncData implements IJob {
|
|||||||
JSONObject effective_date = fileAttrJsonMap.get("Drafted_and_revised_date");
|
JSONObject effective_date = fileAttrJsonMap.get("Drafted_and_revised_date");
|
||||||
if (null != effective_date && !effective_date.equals("")) {
|
if (null != effective_date && !effective_date.equals("")) {
|
||||||
String pubDateString = effective_date.getString("text");
|
String pubDateString = effective_date.getString("text");
|
||||||
|
|
||||||
if (null != pubDateString && !pubDateString.equals("")) {
|
if (null != pubDateString && !pubDateString.equals("")) {
|
||||||
if (CheckUtil.isDate(pubDateString)) {
|
if (CheckUtil.isDate(pubDateString)) {
|
||||||
Date parse = null;
|
Date parse = null;
|
||||||
@ -264,6 +265,7 @@ public class SyncData implements IJob {
|
|||||||
} catch (ParseException e) {
|
} catch (ParseException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
sdf1.format(parse);
|
||||||
PUBDATETIME = sdf1.format(parse);
|
PUBDATETIME = sdf1.format(parse);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -386,6 +388,14 @@ public class SyncData implements IJob {
|
|||||||
dataMap.put("SUPPORTFILE", SUPPORTFILE);
|
dataMap.put("SUPPORTFILE", SUPPORTFILE);
|
||||||
dataMap.put("POLICYTYPE", POLICYTYPE);
|
dataMap.put("POLICYTYPE", POLICYTYPE);
|
||||||
oldFileDataMaps.add(dataMap);
|
oldFileDataMaps.add(dataMap);
|
||||||
|
DBSql.update("UPDATE BO_EU_PAL_FILE1 SET"
|
||||||
|
+ " PLNAME=:PLNAME, PLLEVEL=:PLLEVEL, PLPARENTID=:PLPARENTID, PLORDERINDEX=:PLORDERINDEX, PLCATEGORY=:PLCATEGORY, "
|
||||||
|
+ " PLMETHODID=:PLMETHODID, FILEVERSION=:FILEVERSION, CREATEPER=:CREATEPER, MODIFYPER=:MODIFYPER, "
|
||||||
|
+ " PUBDEPT=:PUBDEPT, PUBDATETIME=:PUBDATETIME, FILESTATE=:FILESTATE, VIEWCOUNT=:VIEWCOUNT, L1ID=:L1ID, "
|
||||||
|
+ " L2ID=:L2ID, L3ID=:L3ID, LEADPROCESS=:LEADPROCESS, REARPROCESS=:REARPROCESS, PROCESSKPI=:PROCESSKPI, "
|
||||||
|
+ " RELEVANTFILE=:RELEVANTFILE, SUPPORTFILE=:SUPPORTFILE, POLICYTYPE=:POLICYTYPE, "
|
||||||
|
+ " CREATEDATETIME=:CREATEDATETIME, MODIFYDATETIME=:MODIFYDATETIME, FILEUSESTATE=:FILEUSESTATE, UPDATEDATE=:UPDATEDATE "
|
||||||
|
+ " WHERE FILEID=:FILEID", dataMap);
|
||||||
} else {
|
} else {
|
||||||
dataMap = new HashMap<>();
|
dataMap = new HashMap<>();
|
||||||
uuId = SDK.getRuleAPI().executeAtScript("@uuid()");
|
uuId = SDK.getRuleAPI().executeAtScript("@uuid()");
|
||||||
@ -417,6 +427,12 @@ public class SyncData implements IJob {
|
|||||||
dataMap.put("SUPPORTFILE", SUPPORTFILE);
|
dataMap.put("SUPPORTFILE", SUPPORTFILE);
|
||||||
dataMap.put("POLICYTYPE", POLICYTYPE);
|
dataMap.put("POLICYTYPE", POLICYTYPE);
|
||||||
newFileDataMaps.add(dataMap);
|
newFileDataMaps.add(dataMap);
|
||||||
|
DBSql.update("INSERT INTO BO_EU_PAL_FILE1"
|
||||||
|
+ " (ID, FILEID, PLNAME, PLLEVEL, PLPARENTID, PLORDERINDEX, PLCATEGORY, PLMETHODID, FILEVERSION, CREATEPER, MODIFYPER, PUBDEPT, PUBDATETIME, "
|
||||||
|
+ " FILESTATE, VIEWCOUNT, L1ID, L2ID, L3ID, LEADPROCESS, REARPROCESS, PROCESSKPI, RELEVANTFILE, SUPPORTFILE, POLICYTYPE, FILEUSESTATE, CREATEDATETIME, MODIFYDATETIME ) "
|
||||||
|
+ " VALUES(:uuId, :FILEID, :PLNAME, :PLLEVEL, :PLPARENTID, :PLORDERINDEX, :PLCATEGORY, :PLMETHODID, "
|
||||||
|
+ " :FILEVERSION, :CREATEPER, :MODIFYPER, :PUBDEPT, :PUBDATETIME, :FILESTATE, :VIEWCOUNT, :L1ID, :L2ID, "
|
||||||
|
+ " :L3ID, :LEADPROCESS, :REARPROCESS, :PROCESSKPI, :RELEVANTFILE, :SUPPORTFILE, :POLICYTYPE, :FILEUSESTATE, :CREATEDATETIME, :MODIFYDATETIME)", dataMap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -452,30 +468,10 @@ public class SyncData implements IJob {
|
|||||||
dataMap = new HashMap<>();
|
dataMap = new HashMap<>();
|
||||||
dataMap.put("FILEID", fileIdOfList);
|
dataMap.put("FILEID", fileIdOfList);
|
||||||
delFileDataMaps.add(dataMap);
|
delFileDataMaps.add(dataMap);
|
||||||
|
DBSql.update("DELETE FROM BO_EU_PAL_FILE1 WHERE FILEID=:FILEID", dataMap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (null != oldFileDataMaps && !oldFileDataMaps.isEmpty()) {
|
|
||||||
DBSql.batchUpdate("UPDATE BO_EU_PAL_FILE1 SET"
|
|
||||||
+ " PLNAME=:PLNAME, PLLEVEL=:PLLEVEL, PLPARENTID=:PLPARENTID, PLORDERINDEX=:PLORDERINDEX, PLCATEGORY=:PLCATEGORY, "
|
|
||||||
+ " PLMETHODID=:PLMETHODID, FILEVERSION=:FILEVERSION, CREATEPER=:CREATEPER, MODIFYPER=:MODIFYPER, "
|
|
||||||
+ " PUBDEPT=:PUBDEPT, PUBDATETIME=:PUBDATETIME, FILESTATE=:FILESTATE, VIEWCOUNT=:VIEWCOUNT, L1ID=:L1ID, "
|
|
||||||
+ " L2ID=:L2ID, L3ID=:L3ID, LEADPROCESS=:LEADPROCESS, REARPROCESS=:REARPROCESS, PROCESSKPI=:PROCESSKPI, "
|
|
||||||
+ " RELEVANTFILE=:RELEVANTFILE, SUPPORTFILE=:SUPPORTFILE, POLICYTYPE=:POLICYTYPE, "
|
|
||||||
+ " CREATEDATETIME=:CREATEDATETIME, MODIFYDATETIME=:MODIFYDATETIME, FILEUSESTATE=:FILEUSESTATE, UPDATEDATE=:UPDATEDATE "
|
|
||||||
+ " WHERE FILEID=:FILEID", oldFileDataMaps);
|
|
||||||
}
|
|
||||||
if (null != newFileDataMaps && !newFileDataMaps.isEmpty()) {
|
|
||||||
DBSql.batchUpdate("INSERT INTO BO_EU_PAL_FILE1"
|
|
||||||
+ " (ID, FILEID, PLNAME, PLLEVEL, PLPARENTID, PLORDERINDEX, PLCATEGORY, PLMETHODID, FILEVERSION, CREATEPER, MODIFYPER, PUBDEPT, PUBDATETIME, "
|
|
||||||
+ " FILESTATE, VIEWCOUNT, L1ID, L2ID, L3ID, LEADPROCESS, REARPROCESS, PROCESSKPI, RELEVANTFILE, SUPPORTFILE, POLICYTYPE, FILEUSESTATE, CREATEDATETIME, MODIFYDATETIME ) "
|
|
||||||
+ " VALUES(:uuId, :FILEID, :PLNAME, :PLLEVEL, :PLPARENTID, :PLORDERINDEX, :PLCATEGORY, :PLMETHODID, "
|
|
||||||
+ " :FILEVERSION, :CREATEPER, :MODIFYPER, :PUBDEPT, :PUBDATETIME, :FILESTATE, :VIEWCOUNT, :L1ID, :L2ID, "
|
|
||||||
+ " :L3ID, :LEADPROCESS, :REARPROCESS, :PROCESSKPI, :RELEVANTFILE, :SUPPORTFILE, :POLICYTYPE, :FILEUSESTATE, :CREATEDATETIME, :MODIFYDATETIME)", newFileDataMaps);
|
|
||||||
}
|
|
||||||
if (null != delFileDataMaps && !delFileDataMaps.isEmpty()) {
|
|
||||||
DBSql.batchUpdate("DELETE FROM BO_EU_PAL_FILE1 WHERE FILEID=:FILEID", delFileDataMaps);
|
|
||||||
}
|
|
||||||
SDK.getLogAPI().consoleInfo("新增文件" + newFileDataMaps.size());
|
SDK.getLogAPI().consoleInfo("新增文件" + newFileDataMaps.size());
|
||||||
SDK.getLogAPI().consoleInfo("修改文件" + oldFileDataMaps.size());
|
SDK.getLogAPI().consoleInfo("修改文件" + oldFileDataMaps.size());
|
||||||
SDK.getLogAPI().consoleInfo("删除文件" + delFileDataMaps.size());
|
SDK.getLogAPI().consoleInfo("删除文件" + delFileDataMaps.size());
|
||||||
|
|||||||
@ -1,22 +1,26 @@
|
|||||||
package com.awspaas.user.apps.yili.reportform.job;
|
package com.awspaas.user.apps.yili.reportform.job;
|
||||||
|
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
|
|
||||||
import com.actionsoft.bpms.commons.database.RowMap;
|
|
||||||
import com.actionsoft.bpms.schedule.IJob;
|
|
||||||
import com.actionsoft.bpms.util.DBSql;
|
|
||||||
import com.actionsoft.sdk.local.SDK;
|
|
||||||
import com.awspaas.user.apps.yili.reportform.util.GetNodesUtil;
|
|
||||||
import org.quartz.DisallowConcurrentExecution;
|
|
||||||
import org.quartz.JobExecutionContext;
|
|
||||||
import org.quartz.JobExecutionException;
|
|
||||||
|
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.text.NumberFormat;
|
import java.text.NumberFormat;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.*;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.quartz.DisallowConcurrentExecution;
|
||||||
|
import org.quartz.JobExecutionContext;
|
||||||
|
import org.quartz.JobExecutionException;
|
||||||
|
|
||||||
|
import com.actionsoft.bpms.commons.database.RowMap;
|
||||||
|
import com.actionsoft.bpms.schedule.IJob;
|
||||||
|
import com.actionsoft.bpms.util.DBSql;
|
||||||
|
import com.actionsoft.sdk.local.SDK;
|
||||||
|
import com.awspaas.user.apps.yili.reportform.util.GetNodesUtil;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author:Lizj
|
* @author:Lizj
|
||||||
|
|||||||
@ -28,11 +28,10 @@ import com.actionsoft.bpms.server.UserContext;
|
|||||||
import com.actionsoft.bpms.util.DBSql;
|
import com.actionsoft.bpms.util.DBSql;
|
||||||
import com.actionsoft.bpms.util.UtilString;
|
import com.actionsoft.bpms.util.UtilString;
|
||||||
import com.actionsoft.sdk.local.SDK;
|
import com.actionsoft.sdk.local.SDK;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.awspaas.user.apps.yili.reportform.util.GetNodesUtil;
|
import com.awspaas.user.apps.yili.reportform.util.GetNodesUtil;
|
||||||
import com.awspaas.user.apps.yili.reportform.util.RepositoryAttribute;
|
|
||||||
import com.awspaas.user.apps.yili.reportform.util.TreeUtil;
|
import com.awspaas.user.apps.yili.reportform.util.TreeUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author:Lizj
|
* @author:Lizj
|
||||||
@ -227,6 +226,7 @@ public class DataViewService extends ActionWeb {
|
|||||||
List<RowMap> nodeRowMaps = DBSql.getMaps(
|
List<RowMap> nodeRowMaps = DBSql.getMaps(
|
||||||
"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE5 WHERE POST LIKE '%"
|
"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE5 WHERE POST LIKE '%"
|
||||||
+ positionName + "%'");
|
+ positionName + "%'");
|
||||||
|
System.out.println("=========nodeRowMaps========>"+nodeRowMaps);
|
||||||
for (RowMap nodeRowMap : nodeRowMaps) {
|
for (RowMap nodeRowMap : nodeRowMaps) {
|
||||||
String plId = nodeRowMap.getString("PLID");
|
String plId = nodeRowMap.getString("PLID");
|
||||||
RowMap fileRowMap = DBSql.getMap(
|
RowMap fileRowMap = DBSql.getMap(
|
||||||
@ -1053,12 +1053,14 @@ public class DataViewService extends ActionWeb {
|
|||||||
List<RowMap> fileRowMaps = null;
|
List<RowMap> fileRowMaps = null;
|
||||||
String sid = _uc.getSessionId();
|
String sid = _uc.getSessionId();
|
||||||
String deptString = params.get("dept");
|
String deptString = params.get("dept");
|
||||||
|
JSONArray json = new JSONArray();
|
||||||
System.err.println("======deptString===="+deptString);
|
if (UtilString.isNotEmpty(deptString)) {
|
||||||
|
json = JSONArray.fromObject(deptString);
|
||||||
|
}
|
||||||
String fileType = params.get("fileType");
|
String fileType = params.get("fileType");
|
||||||
ArrayList<String> deptIDList = new ArrayList<>();
|
ArrayList<String> deptIDList = new ArrayList<>();
|
||||||
ArrayList<String> deptIDList2 = new ArrayList<>();
|
ArrayList<String> deptIDList2 = new ArrayList<>();
|
||||||
String sql = "SELECT ID AS FILEID,PLNAME,PLPARENTID,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' AND (PLMETHODID='process.epc' OR PLMETHODID='control.policy' OR PLMETHODID='process.flowchart')";
|
String sql = "SELECT ID AS FILEID,PLNAME,PLPARENTID,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = 1 AND EXT5 = '1' AND PLMETHODID in ('process.epc','control.policy','process.flowchart')";
|
||||||
ArrayList<RowMap> fileHandleRowMaps = new ArrayList<>();
|
ArrayList<RowMap> fileHandleRowMaps = new ArrayList<>();
|
||||||
Map<String, Object> reFileMap = new HashMap<>();
|
Map<String, Object> reFileMap = new HashMap<>();
|
||||||
RowMap reFileRowMap = new RowMap(reFileMap);
|
RowMap reFileRowMap = new RowMap(reFileMap);
|
||||||
@ -1104,9 +1106,9 @@ public class DataViewService extends ActionWeb {
|
|||||||
sqlParm = "'" + deptString.replace("[", "").replace("]", "") + "'";
|
sqlParm = "'" + deptString.replace("[", "").replace("]", "") + "'";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}else {
|
} else {
|
||||||
if (UtilString.isNotEmpty(deptString)) {
|
if (UtilString.isNotEmpty(deptString) && json.size() < 450) {
|
||||||
if (deptString.contains(",")) {
|
if (deptString.contains(",")) {
|
||||||
StringBuffer sbu = new StringBuffer();
|
StringBuffer sbu = new StringBuffer();
|
||||||
net.sf.json.JSONArray jsonArry = net.sf.json.JSONArray.fromObject(deptString);
|
net.sf.json.JSONArray jsonArry = net.sf.json.JSONArray.fromObject(deptString);
|
||||||
@ -1128,47 +1130,48 @@ public class DataViewService extends ActionWeb {
|
|||||||
sqlParm = "'" + deptString.replace("[", "").replace("]", "") + "'";
|
sqlParm = "'" + deptString.replace("[", "").replace("]", "") + "'";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
String sqltt = "SELECT ID AS FILEID,PLNAME,PLPARENTID,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' AND EXT6 IN (" + sqlParm + ") AND (PLMETHODID='process.epc' OR PLMETHODID='control.policy' OR PLMETHODID='process.flowchart')";
|
List<RowMap> maps = null;
|
||||||
List<RowMap> maps = DBSql.getMaps(sqltt);
|
if (json.size() < 450) {
|
||||||
|
String sqltt = "SELECT ID AS FILEID,PLNAME,PLPARENTID,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = 1 AND EXT5 = '1' AND EXT6 IN ("
|
||||||
|
+ sqlParm + ") AND PLMETHODID in ('process.epc','control.policy','process.flowchart')";
|
||||||
|
maps = DBSql.getMaps(sqltt);
|
||||||
|
} else {
|
||||||
|
String sqltt = "SELECT ID AS FILEID,PLNAME,PLPARENTID,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' AND EXT6 IS NOT NULL AND PLMETHODID in ('process.epc','control.policy','process.flowchart')";
|
||||||
|
maps = DBSql.getMaps(sqltt);
|
||||||
|
}
|
||||||
for (RowMap rowMap : maps) {
|
for (RowMap rowMap : maps) {
|
||||||
String id = rowMap.getString("FILEID");
|
String id = rowMap.getString("FILEID");
|
||||||
PALRepositoryModel model = PALRepositoryCache.getCache().get(id);
|
PALRepositoryModel model = PALRepositoryCache.getCache().get(id);
|
||||||
if (model != null) {
|
if (model != null) {
|
||||||
try {
|
try {
|
||||||
Integer PLLEVEL = model.getLevel();
|
Integer PLLEVEL = model.getLevel();
|
||||||
String methodId = model.getMethodId();
|
String methodId = model.getMethodId();
|
||||||
// 默认添加所在部门的所有文件
|
// 默认添加所在部门的所有文件
|
||||||
fileHandleRowMaps.add(rowMap);
|
fileHandleRowMaps.add(rowMap);
|
||||||
if ("process.epc".equals(methodId) || "process.flowchart".equals(methodId)) {
|
|
||||||
// 支持文件
|
|
||||||
getArrt("support_files", model, dempId, PLLEVEL, reFileRowMap, fileHandleRowMaps);
|
|
||||||
// 相关文件
|
|
||||||
getArrt("R_relevant_flies", model, dempId, PLLEVEL, reFileRowMap,
|
|
||||||
fileHandleRowMaps);
|
|
||||||
} else if ("control.policy".equals(methodId)) {
|
|
||||||
// 支持文件
|
|
||||||
getArrt("support_files", model, dempId, PLLEVEL, reFileRowMap, fileHandleRowMaps);
|
|
||||||
// 相关文件
|
|
||||||
getArrt("related_files", model, dempId, PLLEVEL, reFileRowMap, fileHandleRowMaps);
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
if ("process.epc".equals(methodId) || "process.flowchart".equals(methodId)) {
|
||||||
|
// 支持文件
|
||||||
System.err.println("==有问题的模型===>" + model.getName());
|
getArrt("support_files", model, dempId, PLLEVEL, reFileRowMap, fileHandleRowMaps);
|
||||||
// TODO: handle exception
|
// 相关文件
|
||||||
|
getArrt("R_relevant_flies", model, dempId, PLLEVEL, reFileRowMap, fileHandleRowMaps);
|
||||||
|
} else if ("control.policy".equals(methodId)) {
|
||||||
|
// 支持文件
|
||||||
|
getArrt("support_files", model, dempId, PLLEVEL, reFileRowMap, fileHandleRowMaps);
|
||||||
|
// 相关文件
|
||||||
|
getArrt("related_files", model, dempId, PLLEVEL, reFileRowMap, fileHandleRowMaps);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
|
||||||
|
System.err.println("==有问题的模型===>" + model.getName());
|
||||||
|
// TODO: handle exception
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@ -1333,15 +1336,60 @@ public class DataViewService extends ActionWeb {
|
|||||||
fileMap.put("nodeType", nodeType);
|
fileMap.put("nodeType", nodeType);
|
||||||
fileMaps.add(fileMap);
|
fileMaps.add(fileMap);
|
||||||
}
|
}
|
||||||
// System.err.println("=====fileMaps=====>" + fileMaps);
|
|
||||||
|
if (json.size() > 450) {
|
||||||
|
Integer fileTotal = 0;
|
||||||
|
Integer processFile = 0;
|
||||||
|
Integer policyFile = 0;
|
||||||
|
Integer guideFile = 0;
|
||||||
|
Integer formFile = 0;
|
||||||
|
HashMap<String, Object> fileSortMap = new HashMap<>();
|
||||||
|
// List<RowMap> fileRowMaps = DBSql.getMaps( "SELECT
|
||||||
|
// FILEID,PLMETHODID,POLICYTYPE FROM BO_EU_PAL_FILE1 WHERE FILESTATE='1'");
|
||||||
|
List<RowMap> fileRowMapss = DBSql.getMaps(
|
||||||
|
"SELECT ID AS FILEID,EXT6 AS PUBDEPT,PLMETHODID,EXT5 AS FILESTATE,EXT3 AS POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = '1' AND EXT5 = '1' AND PLMETHODID in ('process.epc','process.flowchart','control.policy','data.form')");
|
||||||
|
// List<RowMap> fileRowMaps = DBSql.getMaps( "SELECT
|
||||||
|
// FILEID,PLMETHODID,POLICYTYPE FROM BO_EU_PAL_FILE1 WHERE FILESTATE='1'");
|
||||||
|
if (null != fileRowMapss && !fileRowMapss.isEmpty()) {
|
||||||
|
for (RowMap fileRowMap : fileRowMapss) {
|
||||||
|
if (fileRowMap.getString("PLMETHODID").equals("process.epc")
|
||||||
|
|| fileRowMap.getString("PLMETHODID").equals("process.flowchart")) {
|
||||||
|
fileTotal += 1;
|
||||||
|
processFile += 1;
|
||||||
|
} else if (fileRowMap.getString("PLMETHODID").equals("control.policy")) {
|
||||||
|
if ("I/O_L4".equals(fileRowMap.getString("POLICYTYPE"))) {
|
||||||
|
guideFile += 1;
|
||||||
|
} else {
|
||||||
|
policyFile += 1;
|
||||||
|
|
||||||
|
}
|
||||||
|
fileTotal += 1;
|
||||||
|
} else if (fileRowMap.getString("PLMETHODID").equals("data.form")) {
|
||||||
|
fileTotal += 1;
|
||||||
|
formFile += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// System.err.println("=====fileMaps=====>" + fileMaps);
|
||||||
|
filesCount = new LinkedHashMap<>();
|
||||||
|
filesCount.put("processFileNum", processFile);
|
||||||
|
filesCount.put("policyFileNum", policyFile);
|
||||||
|
filesCount.put("guideFileNum", guideFile);
|
||||||
|
filesCount.put("formFileNum", formFile);
|
||||||
|
ro.put("filesCount", filesCount);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// System.err.println("=====fileMaps=====>" + fileMaps);
|
||||||
|
filesCount = new LinkedHashMap<>();
|
||||||
|
filesCount.put("processFileNum", processFileNum);
|
||||||
|
filesCount.put("policyFileNum", policyFileNum);
|
||||||
|
filesCount.put("guideFileNum", guideFileNum);
|
||||||
|
filesCount.put("formFileNum", formFileNum);
|
||||||
|
ro.put("filesCount", filesCount);
|
||||||
|
|
||||||
|
}
|
||||||
List<Map> fileTreeNodes = TreeUtil.buildTree("0", fileMaps, "process", "frame", null, null);
|
List<Map> fileTreeNodes = TreeUtil.buildTree("0", fileMaps, "process", "frame", null, null);
|
||||||
filesCount = new LinkedHashMap<>();
|
|
||||||
filesCount.put("processFileNum", processFileNum);
|
|
||||||
filesCount.put("policyFileNum", policyFileNum);
|
|
||||||
filesCount.put("guideFileNum", guideFileNum);
|
|
||||||
filesCount.put("formFileNum", formFileNum);
|
|
||||||
ro.put("fileMaps", fileTreeNodes);
|
ro.put("fileMaps", fileTreeNodes);
|
||||||
ro.put("filesCount", filesCount);
|
|
||||||
return ro.toString();
|
return ro.toString();
|
||||||
} else {
|
} else {
|
||||||
filesCount = new LinkedHashMap<>();
|
filesCount = new LinkedHashMap<>();
|
||||||
@ -1467,7 +1515,7 @@ public class DataViewService extends ActionWeb {
|
|||||||
PALRepositoryModel reFileModel = PALRepositoryCache.getCache().get(supportFileId);
|
PALRepositoryModel reFileModel = PALRepositoryCache.getCache().get(supportFileId);
|
||||||
if (reFileModel != null) {
|
if (reFileModel != null) {
|
||||||
String PLMETHODID = reFileModel.getMethodId();
|
String PLMETHODID = reFileModel.getMethodId();
|
||||||
if (PLMETHODID.equals("data.form")) {
|
if (PLMETHODID.equals("data.form")&&reFileModel.isPublish()) {
|
||||||
HashMap<String, Object> reFileMap = new HashMap<>();
|
HashMap<String, Object> reFileMap = new HashMap<>();
|
||||||
reFileMap.put("FILEID", supportFileId);
|
reFileMap.put("FILEID", supportFileId);
|
||||||
reFileMap.put("PLNAME", reFileModel.getName());
|
reFileMap.put("PLNAME", reFileModel.getName());
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -164,118 +164,221 @@ public class FileManagementService2 extends ActionWeb {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @methodName:
|
* @methodName:
|
||||||
* @param:
|
* @param:
|
||||||
* @return:
|
* @return:
|
||||||
* @description:制度管理看板
|
* @description:制度管理看板
|
||||||
* @auther: Lizj
|
* @auther: Lizj
|
||||||
* @date: 2022/6/27 16:52
|
* @date: 2022/6/27 16:52
|
||||||
*/
|
*/
|
||||||
public String fileStatistics(UserContext uc, RequestParams params) {
|
public String fileStatistics(UserContext uc, RequestParams params) {
|
||||||
ResponseObject ro = ResponseObject.newOkResponse();
|
ResponseObject ro = ResponseObject.newOkResponse();
|
||||||
String fileType = params.get("fileType");
|
String fileType = params.get("fileType");
|
||||||
String unit = params.get("unit");
|
String unit = params.get("unit");
|
||||||
String field = params.get("field");
|
String field = params.get("field");
|
||||||
ArrayList<String> deptIDList = new ArrayList<>();
|
if((UtilString.isNotEmpty(fileType)&&"all".equals(unit))||UtilString.isNotEmpty(fileType)&&"all".equals(field)) {
|
||||||
ArrayList<Map> fieldList = new ArrayList<>();
|
unit = "";
|
||||||
List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PUBDEPT,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'");
|
field = "";
|
||||||
ArrayList<RowMap> fileHandleMaps = new ArrayList<>();
|
}
|
||||||
if (null!=fileType && !fileType.equals("")) {
|
if((UtilString.isNotEmpty(unit)&&"all".equals(fileType))||UtilString.isNotEmpty(unit)&&"all".equals(field)) {
|
||||||
fileHandleMaps = new ArrayList<>();
|
fileType = "";
|
||||||
if (fileType.equals("processFile")) {
|
field = "";
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
}
|
||||||
if (fileRowMap.getString("PLMETHODID").equals("process.epc") || fileRowMap.getString("PLMETHODID").equals("process.flowchart")) {
|
if((UtilString.isNotEmpty(field)&&"all".equals(fileType))||UtilString.isNotEmpty(field)&&"all".equals(unit)) {
|
||||||
fileHandleMaps.add(fileRowMap);
|
fileType = "";
|
||||||
}
|
unit = "";
|
||||||
}
|
}
|
||||||
}
|
ArrayList<String> deptIDList = new ArrayList<>();
|
||||||
if (fileType.equals("policyFile")) {
|
ArrayList<Map> fieldList = new ArrayList<>();
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
List<RowMap> fileRowMaps = DBSql.getMaps(
|
||||||
if (fileRowMap.getString("PLMETHODID").equals("control.policy") && (fileRowMap.getString("POLICYTYPE").equals("regulation") || null==fileRowMap.getString("POLICYTYPE") || fileRowMap.getString("POLICYTYPE").equals(""))) {
|
"SELECT ID AS FILEID,EXT6 AS PUBDEPT,PLPARENTID,PLMETHODID,EXT3 AS POLICYTYPE,EXT5 AS FILESTATE,ISSTOP,ISAPPROVAL,ISPUBLISH FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLMETHODID in ('process.epc','process.flowchart','control.policy','data.form')");
|
||||||
fileHandleMaps.add(fileRowMap);
|
ArrayList<RowMap> fileHandleMaps = new ArrayList<>();
|
||||||
}
|
if (null != fileType && !fileType.equals("")) {
|
||||||
}
|
fileHandleMaps = new ArrayList<>();
|
||||||
}
|
if (fileType.equals("totalFile") || fileType.equals("all")) {
|
||||||
if (fileType.equals("guideFile")) {
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
if ("1".equals(fileRowMap.getString("FILESTATE"))) {
|
||||||
if (fileRowMap.getString("PLMETHODID").equals("control.policy") && fileRowMap.getString("POLICYTYPE").equals("I/O_L4")) {
|
fileHandleMaps.add(fileRowMap);
|
||||||
fileHandleMaps.add(fileRowMap);
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (fileType.equals("formFile")) {
|
if (fileType.equals("processFile")) {
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
if (fileRowMap.getString("PLMETHODID").equals("data.form")) {
|
if ("1".equals(fileRowMap.getString("ISPUBLISH")) && "1".equals(fileRowMap.getString("FILESTATE"))
|
||||||
fileHandleMaps.add(fileRowMap);
|
&& fileRowMap.getString("PLMETHODID").equals("process.epc")
|
||||||
}
|
|| fileRowMap.getString("PLMETHODID").equals("process.flowchart")) {
|
||||||
}
|
fileHandleMaps.add(fileRowMap);
|
||||||
}
|
}
|
||||||
fileRowMaps = fileHandleMaps;
|
}
|
||||||
}
|
}
|
||||||
if (null!=unit && !unit.equals("")) {
|
if (fileType.equals("policyFile")) {
|
||||||
fileHandleMaps = new ArrayList<>();
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
deptIDList = new ArrayList<String>();
|
if ("1".equals(fileRowMap.getString("ISPUBLISH")) && "1".equals(fileRowMap.getString("FILESTATE"))
|
||||||
deptIDList = GetNodesUtil.getChildDept(unit, deptIDList);
|
&& fileRowMap.getString("PLMETHODID").equals("control.policy")
|
||||||
for (String deptID : deptIDList) {
|
&& !fileRowMap.getString("POLICYTYPE").equals("I/O_L4")) {
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
fileHandleMaps.add(fileRowMap);
|
||||||
if (fileRowMap.getString("PUBDEPT").contains(deptID)) {
|
}
|
||||||
fileHandleMaps.add(fileRowMap);
|
}
|
||||||
}
|
}
|
||||||
}
|
if (fileType.equals("guideFile")) {
|
||||||
}
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
fileRowMaps = fileHandleMaps;
|
if ("1".equals(fileRowMap.getString("ISPUBLISH")) && "1".equals(fileRowMap.getString("FILESTATE"))
|
||||||
}
|
&& fileRowMap.getString("POLICYTYPE").equals("I/O_L4")) {
|
||||||
if (null!=field && !field.equals("")) {
|
fileHandleMaps.add(fileRowMap);
|
||||||
fileHandleMaps = new ArrayList<>();
|
}
|
||||||
fieldList = new ArrayList<Map>();
|
}
|
||||||
fieldList = GetNodesUtil.getChildFrame(field,"", fieldList);
|
}
|
||||||
for (Map fieldMap : fieldList) {
|
if (fileType.equals("formFile")) {
|
||||||
String fieldID = String.valueOf(fieldMap.get("FRAMEID"));
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
if ("1".equals(fileRowMap.getString("ISPUBLISH")) && "1".equals(fileRowMap.getString("FILESTATE"))
|
||||||
if (fileRowMap.getString("PLPARENTID").equals(fieldID)) {
|
&& fileRowMap.getString("PLMETHODID").equals("data.form")) {
|
||||||
fileHandleMaps.add(fileRowMap);
|
fileHandleMaps.add(fileRowMap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fileRowMaps = fileHandleMaps;
|
fileRowMaps = fileHandleMaps;
|
||||||
}
|
}
|
||||||
//文件状态：已发布、审批中、已失效 查阅总数
|
String sql = "SELECT count(*) FROM BO_EU_USER_LOGIN_LOG WHERE LOGTYPE = '3'";
|
||||||
Integer publishedCount = 0;
|
String count = DBSql.getString(sql);
|
||||||
Integer inApprovalCount = 0;
|
if (null != unit && !unit.equals("")) {
|
||||||
Integer expiredCount = 0;
|
if ("all".equals(unit)) {
|
||||||
Integer consultCount = 0;
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
if (null!=fileRowMaps && fileRowMaps.isEmpty()==false) {
|
fileHandleMaps.add(fileRowMap);
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
}
|
||||||
String fileState = fileRowMap.getString("FILESTATE");
|
} else {
|
||||||
Integer VIEWCOUNT = fileRowMap.getInt("VIEWCOUNT");
|
String name = SDK.getORGAPI().getDepartmentById(unit).getName();
|
||||||
if (fileState.equals("1")) {
|
String sql2 = "SELECT count(*) FROM BO_EU_USER_LOGIN_LOG WHERE instr（USERDEPTNAME，'" + name + "'）>0 ";
|
||||||
publishedCount += 1;
|
count = DBSql.getString(sql2);
|
||||||
}
|
fileHandleMaps = new ArrayList<>();
|
||||||
if (fileState.equals("2")) {
|
deptIDList = new ArrayList<String>();
|
||||||
inApprovalCount += 1;
|
deptIDList = GetNodesUtil.getChildDept(unit, deptIDList);
|
||||||
}
|
for (String deptID : deptIDList) {
|
||||||
if (fileState.equals("3")) {
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
expiredCount += 1;
|
if (fileRowMap.getString("PUBDEPT").contains(deptID)) {
|
||||||
}
|
fileHandleMaps.add(fileRowMap);
|
||||||
consultCount += VIEWCOUNT;
|
}
|
||||||
}
|
}
|
||||||
ro.put("publishedCount",publishedCount);
|
}
|
||||||
ro.put("inApprovalCount",inApprovalCount);
|
|
||||||
ro.put("expiredCount",expiredCount);
|
}
|
||||||
ro.put("consultCount",consultCount);
|
fileRowMaps = fileHandleMaps;
|
||||||
} else {
|
}
|
||||||
ro.ok("暂无文件");
|
if (null != field && !field.equals("")) {
|
||||||
publishedCount = 0;
|
|
||||||
inApprovalCount = 0;
|
if ("all".equals(field)) {
|
||||||
expiredCount = 0;
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
consultCount = 0;
|
fileHandleMaps.add(fileRowMap);
|
||||||
ro.put("publishedCount",publishedCount);
|
}
|
||||||
ro.put("inApprovalCount",inApprovalCount);
|
} else {
|
||||||
ro.put("expiredCount",expiredCount);
|
fileHandleMaps = new ArrayList<>();
|
||||||
ro.put("consultCount",consultCount);
|
fieldList = new ArrayList<Map>();
|
||||||
}
|
fieldList = GetNodesUtil.getChildFrame(field, "", fieldList);
|
||||||
return ro.toString();
|
for (Map fieldMap : fieldList) {
|
||||||
}
|
String fieldID = String.valueOf(fieldMap.get("FRAMEID"));
|
||||||
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
|
if (fileRowMap.getString("PLPARENTID").equals(fieldID)) {
|
||||||
|
fileHandleMaps.add(fileRowMap);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
fileRowMaps = fileHandleMaps;
|
||||||
|
}
|
||||||
|
// 文件状态：已发布、审批中、已失效 查阅总数
|
||||||
|
Integer publishedCount = 0;
|
||||||
|
Integer inApprovalCount = 0;
|
||||||
|
Integer expiredCount = 0;
|
||||||
|
Integer consultCount = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ExecutorService service = Executors.newFixedThreadPool(1);
|
||||||
|
* service.execute(new Runnable() {
|
||||||
|
*
|
||||||
|
* @Override public void run() { } });
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (null != fileRowMaps && fileRowMaps.isEmpty() == false) {
|
||||||
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
|
String isStop = fileRowMap.getString("ISSTOP");
|
||||||
|
String isPublish = fileRowMap.getString("FILESTATE");
|
||||||
|
String isAppoval = fileRowMap.getString("ISAPPROVAL");
|
||||||
|
String publis = fileRowMap.getString("ISPUBLISH");
|
||||||
|
if ("1".equals(publis) && "1".equals(isPublish)) {
|
||||||
|
publishedCount += 1;
|
||||||
|
}
|
||||||
|
if ("1".equals(isAppoval)) {
|
||||||
|
inApprovalCount++;
|
||||||
|
}
|
||||||
|
if ("1".equals(isStop)) {
|
||||||
|
expiredCount += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (UtilString.isNotEmpty(fileType)) {
|
||||||
|
if (fileType.equals("processFile")) {
|
||||||
|
expiredCount = Integer.parseInt(DBSql.getString(
|
||||||
|
"SELECT count(*) FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISSTOP ='1' AND PLMETHODID in ('process.epc','process.flowchart')"));
|
||||||
|
}
|
||||||
|
if (fileType.equals("policyFile")) {
|
||||||
|
expiredCount = Integer.parseInt(DBSql.getString(
|
||||||
|
"SELECT count(*) FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISSTOP ='1' AND EXT3 != 'I/O_L4' AND PLMETHODID ='control.policy'"));
|
||||||
|
}
|
||||||
|
if (fileType.equals("guideFile")) {
|
||||||
|
expiredCount = Integer.parseInt(DBSql.getString(
|
||||||
|
"SELECT count(*) FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISSTOP ='1' AND EXT3 = 'I/O_L4' AND PLMETHODID ='control.policy'"));
|
||||||
|
}
|
||||||
|
if (fileType.equals("formFile")) {
|
||||||
|
expiredCount = Integer.parseInt(DBSql.getString(
|
||||||
|
"SELECT count(*) FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISSTOP ='1' AND PLMETHODID ='data.form'"));
|
||||||
|
}
|
||||||
|
if(fileType.equals("totalFile")) {
|
||||||
|
expiredCount = Integer.parseInt(DBSql.getString(
|
||||||
|
"SELECT count(*) FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISSTOP ='1'"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (UtilString.isNotEmpty(fileType)) {
|
||||||
|
if (fileType.equals("processFile")) {
|
||||||
|
inApprovalCount = Integer.parseInt(DBSql.getString(
|
||||||
|
"SELECT count(*) FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISAPPROVAL ='1' AND PLMETHODID in ('process.epc','process.flowchart')"));
|
||||||
|
}
|
||||||
|
if (fileType.equals("policyFile")) {
|
||||||
|
inApprovalCount = Integer.parseInt(DBSql.getString(
|
||||||
|
"SELECT count(*) FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISAPPROVAL ='1' AND EXT3 != 'I/O_L4' AND PLMETHODID ='control.policy'"));
|
||||||
|
}
|
||||||
|
if (fileType.equals("guideFile")) {
|
||||||
|
inApprovalCount = Integer.parseInt(DBSql.getString(
|
||||||
|
"SELECT count(*) FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISAPPROVAL ='1' AND EXT3 = 'I/O_L4' AND PLMETHODID ='control.policy'"));
|
||||||
|
}
|
||||||
|
if (fileType.equals("formFile")) {
|
||||||
|
inApprovalCount = Integer.parseInt(DBSql.getString(
|
||||||
|
"SELECT count(*) FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISAPPROVAL ='1' AND PLMETHODID ='data.form'"));
|
||||||
|
}
|
||||||
|
if(fileType.equals("totalFile")) {
|
||||||
|
inApprovalCount = Integer.parseInt(DBSql.getString(
|
||||||
|
"SELECT count(*) FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISAPPROVAL ='1'"));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
ro.put("publishedCount", publishedCount);
|
||||||
|
ro.put("inApprovalCount", inApprovalCount);
|
||||||
|
ro.put("expiredCount", expiredCount);
|
||||||
|
ro.put("consultCount", count);
|
||||||
|
} else {
|
||||||
|
ro.ok("暂无文件");
|
||||||
|
publishedCount = 0;
|
||||||
|
inApprovalCount = 0;
|
||||||
|
expiredCount = 0;
|
||||||
|
consultCount = 0;
|
||||||
|
ro.put("publishedCount", publishedCount);
|
||||||
|
ro.put("inApprovalCount", inApprovalCount);
|
||||||
|
ro.put("expiredCount", expiredCount);
|
||||||
|
ro.put("consultCount", consultCount);
|
||||||
|
}
|
||||||
|
return ro.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -51,11 +51,31 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
public String processTotalCount(UserContext uc, RequestParams params) {
|
public String processTotalCount(UserContext uc, RequestParams params) {
|
||||||
ResponseObject ro = ResponseObject.newOkResponse();
|
ResponseObject ro = ResponseObject.newOkResponse();
|
||||||
//流程、制度总数、覆盖率
|
//流程、制度总数、覆盖率
|
||||||
Integer bpmn2TotalNum = DBSql.getInt("SELECT COUNTOFGROUP AS bpmn2TotalNum FROM BO_EU_PAL_FILE_GROUPCOUNT WHERE GROUPIDMAIN='bpmn2TotalNum'", "bpmn2TotalNum");
|
// Integer bpmn2TotalNum = DBSql.getInt("SELECT COUNTOFGROUP AS bpmn2TotalNum FROM BO_EU_PAL_FILE_GROUPCOUNT WHERE GROUPIDMAIN='bpmn2TotalNum'", "bpmn2TotalNum");
|
||||||
Integer policyTotalNum = DBSql.getInt("SELECT COUNTOFGROUP AS policyTotalNum FROM BO_EU_PAL_FILE_GROUPCOUNT WHERE GROUPIDMAIN='policyTotalNum'", "policyTotalNum");
|
//Integer policyTotalNum = DBSql.getInt("SELECT COUNTOFGROUP AS policyTotalNum FROM BO_EU_PAL_FILE_GROUPCOUNT WHERE GROUPIDMAIN='policyTotalNum'", "policyTotalNum");
|
||||||
String coverageTotal = DBSql.getString("SELECT COUNTOFGROUP AS coverageTotal FROM BO_EU_PAL_FILE_GROUPCOUNT WHERE GROUPIDMAIN='coveragePoCTotal'", "coverageTotal");
|
String coverageTotal = DBSql.getString("SELECT COUNTOFGROUP AS coverageTotal FROM BO_EU_PAL_FILE_GROUPCOUNT WHERE GROUPIDMAIN='coveragePoCTotal'", "coverageTotal");
|
||||||
ro.put("bpmn2TotalNum", bpmn2TotalNum);
|
|
||||||
ro.put("policyTotalNum", policyTotalNum);
|
Integer processFile = 0;
|
||||||
|
Integer policyFile = 0;
|
||||||
|
//List<RowMap> fileRowMaps = DBSql.getMaps( "SELECT FILEID,PLMETHODID,POLICYTYPE FROM BO_EU_PAL_FILE1 WHERE FILESTATE='1'");
|
||||||
|
List<RowMap> fileRowMaps = DBSql.getMaps("SELECT ID AS FILEID,EXT6 AS PUBDEPT,PLMETHODID,EXT5 AS FILESTATE,EXT3 AS POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = '1' AND EXT5 = '1' AND PLMETHODID in ('process.epc','process.flowchart','control.policy','data.form')");
|
||||||
|
//List<RowMap> fileRowMaps = DBSql.getMaps( "SELECT FILEID,PLMETHODID,POLICYTYPE FROM BO_EU_PAL_FILE1 WHERE FILESTATE='1'");
|
||||||
|
if (null!=fileRowMaps && !fileRowMaps.isEmpty()) {
|
||||||
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
|
if (fileRowMap.getString("PLMETHODID").equals("process.epc") || fileRowMap.getString("PLMETHODID").equals("process.flowchart")) {
|
||||||
|
processFile += 1;
|
||||||
|
} else if (fileRowMap.getString("PLMETHODID").equals("control.policy")) {
|
||||||
|
if(!"I/O_L4".equals(fileRowMap.getString("POLICYTYPE"))) {
|
||||||
|
policyFile += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ro.put("bpmn2TotalNum", processFile);
|
||||||
|
ro.put("policyTotalNum", policyFile);
|
||||||
ro.put("coverage", coverageTotal);
|
ro.put("coverage", coverageTotal);
|
||||||
return ro.toString();
|
return ro.toString();
|
||||||
}
|
}
|
||||||
@ -503,40 +523,58 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
*/
|
*/
|
||||||
public String processCONND(UserContext uc, RequestParams params) {
|
public String processCONND(UserContext uc, RequestParams params) {
|
||||||
ResponseObject ro = ResponseObject.newOkResponse();
|
ResponseObject ro = ResponseObject.newOkResponse();
|
||||||
|
|
||||||
String unit = params.get("unit");
|
String unit = params.get("unit");
|
||||||
String field = params.get("field");
|
String field = params.get("field");
|
||||||
|
if(UtilString.isNotEmpty(unit)&&"all".contains(field)) {
|
||||||
|
field = "";
|
||||||
|
}
|
||||||
//获取文件list
|
//获取文件list
|
||||||
ArrayList<String> deptIDList = new ArrayList<>();
|
ArrayList<String> deptIDList = new ArrayList<>();
|
||||||
ArrayList<Map> fieldList = new ArrayList<>();
|
ArrayList<Map> fieldList = new ArrayList<>();
|
||||||
List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PUBDEPT,LEADPROCESS,REARPROCESS FROM BO_EU_PAL_FILE1 WHERE FILESTATE='1' AND PLMETHODID='process.epc'");
|
// List<RowMap> fileRowMaps = DBSql.getMaps("SELECT ID AS FILEID,EXT6 AS PUBDEPT FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = '1' AND EXT5 = '1' AND PLMETHODID in ('process.epc','process.flowchart','control.policy','data.form')");
|
||||||
|
List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PLPARENTID,PUBDEPT,LEADPROCESS,REARPROCESS FROM BO_EU_PAL_FILE1 WHERE FILESTATE='1' AND PLMETHODID='process.epc'");
|
||||||
ArrayList<RowMap> fileHandleMaps = new ArrayList<>();
|
ArrayList<RowMap> fileHandleMaps = new ArrayList<>();
|
||||||
|
if(UtilString.isNotEmpty(unit)||UtilString.isNotEmpty(field)) {
|
||||||
if (null!=unit && !unit.equals("")) {
|
if (UtilString.isNotEmpty(unit)) {
|
||||||
fileHandleMaps = new ArrayList<>();
|
if("all".equals(unit)) {
|
||||||
deptIDList = new ArrayList<String>();
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
deptIDList = GetNodesUtil.getChildDept(unit, deptIDList);
|
fileHandleMaps.add(fileRowMap);
|
||||||
for (String deptID : deptIDList) {
|
}
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
}else {
|
||||||
if (fileRowMap.getString("PUBDEPT").contains(deptID)) {
|
|
||||||
fileHandleMaps.add(fileRowMap);
|
fileHandleMaps = new ArrayList<>();
|
||||||
}
|
deptIDList = new ArrayList<String>();
|
||||||
}
|
deptIDList = GetNodesUtil.getChildDept(unit, deptIDList);
|
||||||
}
|
for (String deptID : deptIDList) {
|
||||||
fileRowMaps = fileHandleMaps;
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
|
if (fileRowMap.getString("PUBDEPT").contains(deptID)) {
|
||||||
|
fileHandleMaps.add(fileRowMap);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fileRowMaps = fileHandleMaps;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (null!=field && !field.equals("")) {
|
if (UtilString.isNotEmpty(field)) {
|
||||||
fileHandleMaps = new ArrayList<>();
|
if("all".equals(field)) {
|
||||||
fieldList = new ArrayList<Map>();
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
fieldList = GetNodesUtil.getChildFrame(field,"", fieldList);
|
fileHandleMaps.add(fileRowMap);
|
||||||
for (Map fieldMap : fieldList) {
|
}
|
||||||
String fieldID = String.valueOf(fieldMap.get("FRAMEID"));
|
}else {
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
fileHandleMaps = new ArrayList<>();
|
||||||
if (fileRowMap.getString("PLPARENTID").equals(fieldID)) {
|
fieldList = new ArrayList<Map>();
|
||||||
fileHandleMaps.add(fileRowMap);
|
fieldList = GetNodesUtil.getChildFrame(field,"", fieldList);
|
||||||
}
|
for (Map fieldMap : fieldList) {
|
||||||
}
|
String fieldID = String.valueOf(fieldMap.get("FRAMEID"));
|
||||||
}
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
fileRowMaps = fileHandleMaps;
|
if (fileRowMap.getString("PLPARENTID").equals(fieldID)) {
|
||||||
|
fileHandleMaps.add(fileRowMap);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fileRowMaps = fileHandleMaps;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//查询流程前后置前后置情况
|
//查询流程前后置前后置情况
|
||||||
@ -547,7 +585,6 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
Integer noprepostNum = 0;
|
Integer noprepostNum = 0;
|
||||||
NumberFormat numberformat = NumberFormat.getInstance();
|
NumberFormat numberformat = NumberFormat.getInstance();
|
||||||
numberformat.setMaximumFractionDigits(2);
|
numberformat.setMaximumFractionDigits(2);
|
||||||
|
|
||||||
if (null != fileRowMaps && !fileRowMaps.isEmpty()) {
|
if (null != fileRowMaps && !fileRowMaps.isEmpty()) {
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
for (RowMap fileRowMap : fileRowMaps) {
|
||||||
fileTotalNum += 1;
|
fileTotalNum += 1;
|
||||||
@ -583,12 +620,17 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
postRatio = "0";
|
postRatio = "0";
|
||||||
noprepostRatio = "0";
|
noprepostRatio = "0";
|
||||||
}
|
}
|
||||||
|
|
||||||
ro.put("prepostRatio", prepostRatio);
|
ro.put("prepostRatio", prepostRatio);
|
||||||
ro.put("preRatio", preRatio);
|
ro.put("preRatio", preRatio);
|
||||||
ro.put("postRatio", postRatio);
|
ro.put("postRatio", postRatio);
|
||||||
ro.put("noprepostRatio", noprepostRatio);
|
ro.put("noprepostRatio", noprepostRatio);
|
||||||
|
|
||||||
|
}else {
|
||||||
|
List<BO> list = SDK.getBOAPI().query("BO_EU_FILE_OPERATIONNODE").addQuery("TYPE = ", "流程连接度分析").list();
|
||||||
|
for (BO bo : list) {
|
||||||
|
ro.put(bo.getString("NAME"), bo.getString("NODEDATA"));
|
||||||
|
}
|
||||||
|
}
|
||||||
return ro.toString();
|
return ro.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -602,120 +644,11 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
*/
|
*/
|
||||||
public String processCONNDDetail(UserContext uc, RequestParams params) {
|
public String processCONNDDetail(UserContext uc, RequestParams params) {
|
||||||
ResponseObject ro = ResponseObject.newOkResponse();
|
ResponseObject ro = ResponseObject.newOkResponse();
|
||||||
ArrayList<String> deptIDList = new ArrayList<>();
|
List<BO> list = SDK.getBOAPI().query("BO_EU_FILE_OPERATIONNODE").addQuery("TYPE = ", "流程连接度-前后置占比").list();
|
||||||
ArrayList<Map> bdPrepostRatioMaps = new ArrayList<>();
|
for (BO bo : list) {
|
||||||
ArrayList<Map> bdNoprepostRatioMaps = new ArrayList<>();
|
ro.put(bo.getString("NAME"), bo.getString("NODEDATA"));
|
||||||
ArrayList<Map> fdPrepostRatioMaps = new ArrayList<>();
|
|
||||||
ArrayList<Map> fdNoprepostRatioMaps = new ArrayList<>();
|
|
||||||
HashMap<String, Object> ratioMap = new HashMap<>();
|
|
||||||
//事业部和职能部门ID，名称 list
|
|
||||||
List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PUBDEPT,LEADPROCESS,REARPROCESS FROM BO_EU_PAL_FILE1 WHERE FILESTATE='1' AND PLMETHODID='process.epc'");
|
|
||||||
List<RowMap> BDInfoMaps = DBSql.getMaps("SELECT DEPTID,DEPTNAME,ABBREVIATION,DEPTTYPE FROM BO_EU_DEPT_ABBREVIATION WHERE DEPTTYPE='BD'");
|
|
||||||
List<RowMap> FDInfoMaps = DBSql.getMaps("SELECT DEPTID,DEPTNAME,ABBREVIATION,DEPTTYPE FROM BO_EU_DEPT_ABBREVIATION WHERE DEPTTYPE='FD'");
|
|
||||||
|
|
||||||
//文件总数量，有前后置流程数量、无前后置流程数量
|
}
|
||||||
Integer fileTotalNum = 0;
|
|
||||||
Integer prepostNum = 0;
|
|
||||||
Integer noprepostNum = 0;
|
|
||||||
//有前后置占比、无前后置占比
|
|
||||||
NumberFormat numberformat = NumberFormat.getInstance();
|
|
||||||
numberformat.setMaximumFractionDigits(2);
|
|
||||||
String prepostRatio = null;
|
|
||||||
String noprepostRatio = null;
|
|
||||||
|
|
||||||
if (null!=BDInfoMaps && !BDInfoMaps.isEmpty()) {
|
|
||||||
for (RowMap bdInfoMap : BDInfoMaps) {
|
|
||||||
fileTotalNum = 0;
|
|
||||||
prepostNum = 0;
|
|
||||||
noprepostNum = 0;
|
|
||||||
String bdDeptID = bdInfoMap.getString("DEPTID");
|
|
||||||
deptIDList = new ArrayList<String>();
|
|
||||||
deptIDList = GetNodesUtil.getChildDept(bdDeptID, deptIDList);
|
|
||||||
if (null!=deptIDList && !deptIDList.isEmpty()) {
|
|
||||||
for (String deptID : deptIDList) {
|
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
|
||||||
if (fileRowMap.getString("PUBDEPT").contains(deptID)) {
|
|
||||||
fileTotalNum += 1;
|
|
||||||
String LEADPROCESS = fileRowMap.getString("LEADPROCESS");
|
|
||||||
String REARPROCESS = fileRowMap.getString("REARPROCESS");
|
|
||||||
if (LEADPROCESS.equals("1") && REARPROCESS.equals("1")) {
|
|
||||||
prepostNum += 1;
|
|
||||||
}
|
|
||||||
if (LEADPROCESS.equals("0") && REARPROCESS.equals("0")) {
|
|
||||||
noprepostNum += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (fileTotalNum!=0) {
|
|
||||||
prepostRatio = numberformat.format((float) prepostNum / (float) fileTotalNum * 100);
|
|
||||||
noprepostRatio = numberformat.format((float) noprepostNum / (float) fileTotalNum * 100);
|
|
||||||
} else {
|
|
||||||
prepostRatio = "0";
|
|
||||||
noprepostRatio = "0";
|
|
||||||
}
|
|
||||||
ratioMap = new HashMap<>();
|
|
||||||
ratioMap.put("deptID",bdDeptID);
|
|
||||||
ratioMap.put("deptName",bdInfoMap.getString("ABBREVIATION"));
|
|
||||||
ratioMap.put("ratio",prepostRatio);
|
|
||||||
bdPrepostRatioMaps.add(ratioMap);
|
|
||||||
ratioMap = new HashMap<>();
|
|
||||||
ratioMap.put("deptID",bdDeptID);
|
|
||||||
ratioMap.put("deptName",bdInfoMap.getString("ABBREVIATION"));
|
|
||||||
ratioMap.put("ratio",noprepostRatio);
|
|
||||||
bdNoprepostRatioMaps.add(ratioMap);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (null!=FDInfoMaps && !FDInfoMaps.isEmpty()) {
|
|
||||||
for (RowMap fdInfoMap : FDInfoMaps) {
|
|
||||||
fileTotalNum = 0;
|
|
||||||
prepostNum = 0;
|
|
||||||
noprepostNum = 0;
|
|
||||||
String fdDeptID = fdInfoMap.getString("DEPTID");
|
|
||||||
deptIDList = new ArrayList<String>();
|
|
||||||
deptIDList = GetNodesUtil.getChildDept(fdDeptID, deptIDList);
|
|
||||||
if (null!=deptIDList && !deptIDList.isEmpty()) {
|
|
||||||
for (String deptID : deptIDList) {
|
|
||||||
for (RowMap fileRowMap : fileRowMaps) {
|
|
||||||
if (fileRowMap.getString("PUBDEPT").contains(deptID)) {
|
|
||||||
fileTotalNum += 1;
|
|
||||||
String LEADPROCESS = fileRowMap.getString("LEADPROCESS");
|
|
||||||
String REARPROCESS = fileRowMap.getString("REARPROCESS");
|
|
||||||
if (LEADPROCESS.equals("1") && REARPROCESS.equals("1")) {
|
|
||||||
prepostNum += 1;
|
|
||||||
}
|
|
||||||
if (LEADPROCESS.equals("0") && REARPROCESS.equals("0")) {
|
|
||||||
noprepostNum += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (fileTotalNum!=0) {
|
|
||||||
prepostRatio = numberformat.format((float) prepostNum / (float) fileTotalNum * 100);
|
|
||||||
noprepostRatio = numberformat.format((float) noprepostNum / (float) fileTotalNum * 100);
|
|
||||||
} else {
|
|
||||||
prepostRatio = "0";
|
|
||||||
noprepostRatio = "0";
|
|
||||||
}
|
|
||||||
ratioMap = new HashMap<>();
|
|
||||||
ratioMap.put("deptID",fdDeptID);
|
|
||||||
ratioMap.put("deptName",fdInfoMap.getString("ABBREVIATION"));
|
|
||||||
ratioMap.put("ratio",prepostRatio);
|
|
||||||
fdPrepostRatioMaps.add(ratioMap);
|
|
||||||
ratioMap = new HashMap<>();
|
|
||||||
ratioMap.put("deptID",fdDeptID);
|
|
||||||
ratioMap.put("deptName",fdInfoMap.getString("ABBREVIATION"));
|
|
||||||
ratioMap.put("ratio",noprepostRatio);
|
|
||||||
fdNoprepostRatioMaps.add(ratioMap);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ro.put("BDY", bdPrepostRatioMaps);
|
|
||||||
ro.put("BDN", bdNoprepostRatioMaps);
|
|
||||||
ro.put("FDY", fdPrepostRatioMaps);
|
|
||||||
ro.put("FDN", fdNoprepostRatioMaps);
|
|
||||||
|
|
||||||
return ro.toString();
|
return ro.toString();
|
||||||
}
|
}
|
||||||
@ -747,18 +680,65 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
commentMapsOfField.add(commentMap);
|
commentMapsOfField.add(commentMap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (null!=deptMaps && !deptMaps.isEmpty()) {
|
/*
|
||||||
for (RowMap deptMap : deptMaps) {
|
* if (null!=deptMaps && !deptMaps.isEmpty()) { for (RowMap deptMap : deptMaps)
|
||||||
String deptID = deptMap.getString("GROUPIDEXT2");
|
* { String deptID = deptMap.getString("GROUPIDEXT2"); String deptName =
|
||||||
String deptName = deptMap.getString("ABBREVIATION");
|
* deptMap.getString("ABBREVIATION"); Integer commentCount =
|
||||||
Integer commentCount = deptMap.getInt("COUNTOFGROUP");
|
* deptMap.getInt("COUNTOFGROUP"); commentMap = new HashMap<String, Object>();
|
||||||
commentMap = new HashMap<String, Object>();
|
* commentMap.put("deptID", deptID); commentMap.put("deptName", deptName);
|
||||||
commentMap.put("deptID", deptID);
|
* commentMap.put("commentCount", commentCount);
|
||||||
commentMap.put("deptName", deptName);
|
* commentMapsOfDept.add(commentMap); } }
|
||||||
commentMap.put("commentCount", commentCount);
|
*/
|
||||||
commentMapsOfDept.add(commentMap);
|
|
||||||
}
|
List<RowMap> BDInfoMaps = DBSql.getMaps(
|
||||||
|
"SELECT DEPTID,DEPTNAME,ABBREVIATION,DEPTTYPE FROM BO_EU_DEPT_ABBREVIATION WHERE DEPTTYPE='BD'");
|
||||||
|
List<RowMap> FDInfoMaps = DBSql.getMaps(
|
||||||
|
"SELECT DEPTID,DEPTNAME,ABBREVIATION,DEPTTYPE FROM BO_EU_DEPT_ABBREVIATION WHERE DEPTTYPE='FD'");
|
||||||
|
for (RowMap rowMap : BDInfoMaps) {
|
||||||
|
String depId = rowMap.getString("DEPTID");
|
||||||
|
String depName = rowMap.getString("ABBREVIATION");
|
||||||
|
String sql = "SELECT * FROM APP_ACT_PAL_DATA_REPLY ";
|
||||||
|
List<RowMap> maps = DBSql.getMaps(sql);
|
||||||
|
int count =0;
|
||||||
|
for (RowMap rowMap2 : maps) {
|
||||||
|
String user = rowMap2.getString("REPLYER");
|
||||||
|
String departmentId = SDK.getORGAPI().getUser(user).getDepartmentId();
|
||||||
|
String pathIdOfCache = SDK.getORGAPI().getDepartmentById(departmentId).getPathIdOfCache();
|
||||||
|
if(pathIdOfCache.contains(depId)) {
|
||||||
|
count ++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
commentMap = new HashMap<String, Object>();
|
||||||
|
commentMap.put("deptID", depId);
|
||||||
|
commentMap.put("deptName", depName);
|
||||||
|
commentMap.put("commentCount", count);
|
||||||
|
commentMapsOfDept.add(commentMap);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (RowMap rowMap : FDInfoMaps) {
|
||||||
|
String depId = rowMap.getString("DEPTID");
|
||||||
|
String depName = rowMap.getString("ABBREVIATION");
|
||||||
|
String sql = "SELECT * FROM APP_ACT_PAL_DATA_REPLY ";
|
||||||
|
List<RowMap> maps = DBSql.getMaps(sql);
|
||||||
|
int count =0;
|
||||||
|
for (RowMap rowMap2 : maps) {
|
||||||
|
String user = rowMap2.getString("REPLYER");
|
||||||
|
String departmentId = SDK.getORGAPI().getUser(user).getDepartmentId();
|
||||||
|
String pathIdOfCache = SDK.getORGAPI().getDepartmentById(departmentId).getPathIdOfCache();
|
||||||
|
if(pathIdOfCache.contains(depId)) {
|
||||||
|
count ++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
commentMap = new HashMap<String, Object>();
|
||||||
|
commentMap.put("deptID", depId);
|
||||||
|
commentMap.put("deptName", depName);
|
||||||
|
commentMap.put("commentCount", count);
|
||||||
|
commentMapsOfDept.add(commentMap);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/* Collections.sort(commentMapsOfField, (map1, map2) -> {
|
/* Collections.sort(commentMapsOfField, (map1, map2) -> {
|
||||||
Integer value1 = (Integer) map1.get("commentCount");
|
Integer value1 = (Integer) map1.get("commentCount");
|
||||||
Integer value2 = (Integer) map2.get("commentCount");
|
Integer value2 = (Integer) map2.get("commentCount");
|
||||||
@ -769,7 +749,6 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
Integer value2 = (Integer) map2.get("commentCount");
|
Integer value2 = (Integer) map2.get("commentCount");
|
||||||
return value2.compareTo(value1);
|
return value2.compareTo(value1);
|
||||||
});*/
|
});*/
|
||||||
|
|
||||||
ro.put("commentOfField", commentMapsOfField);
|
ro.put("commentOfField", commentMapsOfField);
|
||||||
ro.put("commentOfDept", commentMapsOfDept);
|
ro.put("commentOfDept", commentMapsOfDept);
|
||||||
return ro.toString();
|
return ro.toString();
|
||||||
@ -1164,7 +1143,7 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
HashMap<String, Object> fieldDataMap = new HashMap<>();
|
HashMap<String, Object> fieldDataMap = new HashMap<>();
|
||||||
ArrayList<Map> fieldDataMaps = new ArrayList<>();
|
ArrayList<Map> fieldDataMaps = new ArrayList<>();
|
||||||
//测试用固定年份，之后用下边@公式
|
//测试用固定年份，之后用下边@公式
|
||||||
Integer nowYear = 2021;
|
Integer nowYear = 2022;
|
||||||
//Integer nowYear = LocalDate.now().getYear();
|
//Integer nowYear = LocalDate.now().getYear();
|
||||||
String ELDSKey = params.get("ELDSKey");
|
String ELDSKey = params.get("ELDSKey");
|
||||||
if (null == ELDSKey || ELDSKey.equals("") || ELDSKey.equals("total")) {
|
if (null == ELDSKey || ELDSKey.equals("") || ELDSKey.equals("total")) {
|
||||||
@ -1389,7 +1368,6 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
ro.put("deptTreeNodes", deptTreeNodes);
|
ro.put("deptTreeNodes", deptTreeNodes);
|
||||||
ro.put("fieldTreeNodes", fieldTreeNodes);
|
ro.put("fieldTreeNodes", fieldTreeNodes);
|
||||||
long end = System.currentTimeMillis();
|
long end = System.currentTimeMillis();
|
||||||
System.out.println("======加载筛选框用时=====>"+(end-start)/1000);
|
|
||||||
return ro.toString();
|
return ro.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1405,6 +1383,11 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
ResponseObject ro = ResponseObject.newOkResponse();
|
ResponseObject ro = ResponseObject.newOkResponse();
|
||||||
String unit = params.get("unit");
|
String unit = params.get("unit");
|
||||||
String field = params.get("field");
|
String field = params.get("field");
|
||||||
|
System.out.println("==========unit========>"+unit);
|
||||||
|
System.out.println("=========field=========>"+field);
|
||||||
|
if(UtilString.isNotEmpty(unit)&&"all".contains(field)) {
|
||||||
|
field = "";
|
||||||
|
}
|
||||||
ArrayList<String> deptIDList = new ArrayList<>();
|
ArrayList<String> deptIDList = new ArrayList<>();
|
||||||
ArrayList<Map> fieldList = new ArrayList<>();
|
ArrayList<Map> fieldList = new ArrayList<>();
|
||||||
NumberFormat numberformat = NumberFormat.getInstance();
|
NumberFormat numberformat = NumberFormat.getInstance();
|
||||||
@ -1776,7 +1759,7 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
Integer operationOLNodeNum = 0;
|
Integer operationOLNodeNum = 0;
|
||||||
String operationNodeRate = "0";
|
String operationNodeRate = "0";
|
||||||
String operationOLNodeRate = "0";
|
String operationOLNodeRate = "0";
|
||||||
if(UtilString.isNotEmpty(field)) {
|
if(null!=field) {
|
||||||
if (null!=field && !field.equals("")) {
|
if (null!=field && !field.equals("")) {
|
||||||
if("all".equals(field)) {
|
if("all".equals(field)) {
|
||||||
for (RowMap fileRowMap : nodeRowMaps) {
|
for (RowMap fileRowMap : nodeRowMaps) {
|
||||||
@ -1914,9 +1897,6 @@ public class ProcessPubService extends ActionWeb {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return ro.toString();
|
return ro.toString();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -124,8 +124,9 @@ public class ToPageService extends ActionWeb {
|
|||||||
*/
|
*/
|
||||||
public String frameView (UserContext uc, RequestParams params) {
|
public String frameView (UserContext uc, RequestParams params) {
|
||||||
ResponseObject ro = ResponseObject.newOkResponse();
|
ResponseObject ro = ResponseObject.newOkResponse();
|
||||||
//String frameID = params.get("frameID");
|
|
||||||
String fileType = params.get("fileType");
|
String fileType = params.get("fileType");
|
||||||
|
System.out.println("======fileType======"+fileType);
|
||||||
|
System.out.println("======frameIDtoFrameView======"+frameIDtoFrameView);
|
||||||
if (null!=frameIDtoFrameView && !frameIDtoFrameView.equals("")) {
|
if (null!=frameIDtoFrameView && !frameIDtoFrameView.equals("")) {
|
||||||
//SDK.getLogAPI().consoleInfo("当前架构ID1"+frameID);
|
//SDK.getLogAPI().consoleInfo("当前架构ID1"+frameID);
|
||||||
SDK.getLogAPI().consoleInfo("当前架构ID全局"+frameIDtoFrameView);
|
SDK.getLogAPI().consoleInfo("当前架构ID全局"+frameIDtoFrameView);
|
||||||
@ -138,6 +139,7 @@ public class ToPageService extends ActionWeb {
|
|||||||
String path = "";
|
String path = "";
|
||||||
PALRepositoryModel model = null;
|
PALRepositoryModel model = null;
|
||||||
String taskId="";
|
String taskId="";
|
||||||
|
System.out.println("========frameRowMap========"+frameRowMap);
|
||||||
if (null!=frameRowMap && !frameRowMap.isEmpty()) {
|
if (null!=frameRowMap && !frameRowMap.isEmpty()) {
|
||||||
fileMap = new HashMap<String, Object>();
|
fileMap = new HashMap<String, Object>();
|
||||||
nodeType = "frame";
|
nodeType = "frame";
|
||||||
@ -148,7 +150,9 @@ public class ToPageService extends ActionWeb {
|
|||||||
fileMap.put("TLEVEL", frameRowMap.getString("FRAMELEVEL"));
|
fileMap.put("TLEVEL", frameRowMap.getString("FRAMELEVEL"));
|
||||||
fileMap.put("nodeType", nodeType);
|
fileMap.put("nodeType", nodeType);
|
||||||
fileMaps.add(fileMap);
|
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 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);
|
||||||
|
System.out.println("========fileRowMaps1========>"+fileRowMaps.size());
|
||||||
ArrayList<RowMap> fileHandleRowMaps = new ArrayList<>();
|
ArrayList<RowMap> fileHandleRowMaps = new ArrayList<>();
|
||||||
Map<String, Object> reFileMap = new HashMap<>();
|
Map<String, Object> reFileMap = new HashMap<>();
|
||||||
RowMap reFileRowMap = new RowMap(reFileMap);
|
RowMap reFileRowMap = new RowMap(reFileMap);
|
||||||
@ -181,7 +185,7 @@ public class ToPageService extends ActionWeb {
|
|||||||
}
|
}
|
||||||
fileRowMaps.addAll(fileHandleRowMaps);
|
fileRowMaps.addAll(fileHandleRowMaps);
|
||||||
}
|
}
|
||||||
|
System.out.println("========fileRowMaps2========>"+fileRowMaps.size());
|
||||||
if (null!=fileType && !fileType.equals("")) {
|
if (null!=fileType && !fileType.equals("")) {
|
||||||
fileHandleRowMaps = new ArrayList<>();
|
fileHandleRowMaps = new ArrayList<>();
|
||||||
if (null!=fileRowMaps && !fileRowMaps.isEmpty()) {
|
if (null!=fileRowMaps && !fileRowMaps.isEmpty()) {
|
||||||
@ -191,6 +195,7 @@ public class ToPageService extends ActionWeb {
|
|||||||
fileHandleRowMaps.add(fileRowMap);
|
fileHandleRowMaps.add(fileRowMap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
System.out.println("========fileHandleRowMaps3========>"+fileHandleRowMaps.size());
|
||||||
if (fileType.equals("policyFile")) {
|
if (fileType.equals("policyFile")) {
|
||||||
if (fileRowMap.getString("PLMETHODID").equals("control.policy") && (fileRowMap.getString("POLICYTYPE").equals("regulation") || null==fileRowMap.getString("POLICYTYPE") || fileRowMap.getString("POLICYTYPE").equals(""))) {
|
if (fileRowMap.getString("PLMETHODID").equals("control.policy") && (fileRowMap.getString("POLICYTYPE").equals("regulation") || null==fileRowMap.getString("POLICYTYPE") || fileRowMap.getString("POLICYTYPE").equals(""))) {
|
||||||
fileHandleRowMaps.add(fileRowMap);
|
fileHandleRowMaps.add(fileRowMap);
|
||||||
@ -267,6 +272,8 @@ public class ToPageService extends ActionWeb {
|
|||||||
}
|
}
|
||||||
List<Map> fileTreeNodes = TreeUtil.buildTree("1",fileMaps,null,"frame",null,null);
|
List<Map> fileTreeNodes = TreeUtil.buildTree("1",fileMaps,null,"frame",null,null);
|
||||||
ro.put("fileMaps",fileTreeNodes);
|
ro.put("fileMaps",fileTreeNodes);
|
||||||
|
System.err.println("============fileMaps============"+fileMaps);
|
||||||
|
System.err.println("============fileTreeNodes=========="+fileTreeNodes);
|
||||||
return ro.toString();
|
return ro.toString();
|
||||||
} else {
|
} else {
|
||||||
ro.ok("暂无文件");
|
ro.ok("暂无文件");
|
||||||
@ -283,6 +290,7 @@ public class ToPageService extends ActionWeb {
|
|||||||
} else {
|
} else {
|
||||||
ro.ok("未传入有效架构ID");
|
ro.ok("未传入有效架构ID");
|
||||||
}
|
}
|
||||||
|
|
||||||
return ro.toString();
|
return ro.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import java.util.regex.Pattern;
|
|||||||
*/
|
*/
|
||||||
public class CheckUtil {
|
public class CheckUtil {
|
||||||
public static boolean isDate(String date) {
|
public static boolean isDate(String date) {
|
||||||
DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
DateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
||||||
// 使用严格的解析
|
// 使用严格的解析
|
||||||
sdf.setLenient(false);
|
sdf.setLenient(false);
|
||||||
try {
|
try {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user