vue打包
This commit is contained in:
parent
6443ac3e81
commit
21cd546de3
Binary file not shown.
@ -3502,7 +3502,7 @@ public class ProcessPublishWeb extends ActionWeb {
|
|||||||
if (fileList != null && fileList.size() > 0)
|
if (fileList != null && fileList.size() > 0)
|
||||||
for (UpfileModel upfileModel : fileList){
|
for (UpfileModel upfileModel : fileList){
|
||||||
String type = upfileModel.getType();
|
String type = upfileModel.getType();
|
||||||
if(methodId.contains("control") || methodId.contains("process")){
|
if(!methodId.equals("control.policy") && methodId.contains("process") && !methodId.equals("engineering.standard")){
|
||||||
if ("s".equals(upfileModel.getType())) {
|
if ("s".equals(upfileModel.getType())) {
|
||||||
JSONObject jb = new JSONObject();
|
JSONObject jb = new JSONObject();
|
||||||
//按照附件编号排序
|
//按照附件编号排序
|
||||||
@ -4582,6 +4582,8 @@ public class ProcessPublishWeb extends ActionWeb {
|
|||||||
return ro.toString();
|
return ro.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 全部根据中文去找
|
* 全部根据中文去找
|
||||||
* 根据表单内容 获取权限矩阵的审批人
|
* 根据表单内容 获取权限矩阵的审批人
|
||||||
@ -4609,13 +4611,13 @@ public class ProcessPublishWeb extends ActionWeb {
|
|||||||
|
|
||||||
//查询区域流程
|
//查询区域流程
|
||||||
List<RowMap> adaptRowMap = DBSql.getMaps("select ADAPT_REGION_NAME from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? ", level1, level2, level3);
|
List<RowMap> adaptRowMap = DBSql.getMaps("select ADAPT_REGION_NAME from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? ", level1, level2, level3);
|
||||||
if(adaptRowMap.size()==1){
|
if(adaptRowMap.size()>0){
|
||||||
ro.put("ADAPT_REGION_NAME",adaptRowMap.get(0).getString("ADAPT_REGION_NAME"));
|
ro.put("ADAPT_REGION_NAME",adaptRowMap.get(0).getString("ADAPT_REGION_NAME"));
|
||||||
}
|
}
|
||||||
|
|
||||||
//查询产品流程
|
//查询产品流程
|
||||||
List<RowMap> applicableRowMap = DBSql.getMaps("select APPLICABLE_PRODUCT from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? ", level1, level2, level3);
|
List<RowMap> applicableRowMap = DBSql.getMaps("select APPLICABLE_PRODUCT from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? ", level1, level2, level3);
|
||||||
if(adaptRowMap.size()==1){
|
if(adaptRowMap.size()>0){
|
||||||
ro.put("APPLICABLE_PRODUCT",applicableRowMap.get(0).getString("APPLICABLE_PRODUCT"));
|
ro.put("APPLICABLE_PRODUCT",applicableRowMap.get(0).getString("APPLICABLE_PRODUCT"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4624,20 +4626,19 @@ public class ProcessPublishWeb extends ActionWeb {
|
|||||||
//l1 l2 l3 l4 保存到表里
|
//l1 l2 l3 l4 保存到表里
|
||||||
DBSql.update(String.format("update BO_ACT_COE_PUBLISH set LEVEL_1_PROCESS_NAME='%s',LEVEL_2_PROCESS_NAME='%s',LEVEL_3_PROCESS_NAME='%s',LEVEL_4_PROCESS_NAME='%s' where BINDID='%s'", level1, level2, level3, level4, bindid));
|
DBSql.update(String.format("update BO_ACT_COE_PUBLISH set LEVEL_1_PROCESS_NAME='%s',LEVEL_2_PROCESS_NAME='%s',LEVEL_3_PROCESS_NAME='%s',LEVEL_4_PROCESS_NAME='%s' where BINDID='%s'", level1, level2, level3, level4, bindid));
|
||||||
String sql = "select AUDITOR1,AUDITOR_NO_1,L1_SP,AUDITOR2,AUDITOR_NO_2,L2_SP,AUDITOR3,AUDITOR_NO_3,L3_SP,AUDITOR4,AUDITOR_NO_4,L4_SP from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s' and LEVEL_4_PROCESS_NAME='%s' and ORGNAME='%s' and ADAPT_REGION_NAME='%s' and APPLICABLE_PRODUCT='%s'";
|
String sql = "select AUDITOR1,AUDITOR_NO_1,L1_SP,AUDITOR2,AUDITOR_NO_2,L2_SP,AUDITOR3,AUDITOR_NO_3,L3_SP,AUDITOR4,AUDITOR_NO_4,L4_SP from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s' and LEVEL_4_PROCESS_NAME='%s' and ORGNAME='%s' and ADAPT_REGION_NAME='%s' and APPLICABLE_PRODUCT='%s'";
|
||||||
System.out.println(company+region+product);
|
|
||||||
RowMap result = DBSql.getMap(String.format(sql, level1, level2, level3, level4, company, region, product));
|
RowMap result = DBSql.getMap(String.format(sql, level1, level2, level3, level4, company, region, product));
|
||||||
ResponseObject ro = ResponseObject.newOkResponse();
|
ResponseObject ro = ResponseObject.newOkResponse();
|
||||||
ro.put("data", result == null ? "" : result);
|
ro.put("data", result == null ? "" : result);
|
||||||
|
|
||||||
//查询区域流程
|
//查询区域流程
|
||||||
List<RowMap> adaptRowMap = DBSql.getMaps("select ADAPT_REGION_NAME from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND LEVEL_4_PROCESS_NAME=? ", level1, level2, level3,level4);
|
List<RowMap> adaptRowMap = DBSql.getMaps("select ADAPT_REGION_NAME from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND LEVEL_4_PROCESS_NAME=? ", level1, level2, level3,level4);
|
||||||
if(adaptRowMap.size()==1){
|
if(adaptRowMap.size()>0){
|
||||||
ro.put("ADAPT_REGION_NAME",adaptRowMap.get(0).getString("ADAPT_REGION_NAME"));
|
ro.put("ADAPT_REGION_NAME",adaptRowMap.get(0).getString("ADAPT_REGION_NAME"));
|
||||||
}
|
}
|
||||||
|
|
||||||
//查询产品流程
|
//查询产品流程
|
||||||
List<RowMap> applicableRowMap = DBSql.getMaps("select APPLICABLE_PRODUCT from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND LEVEL_4_PROCESS_NAME=? ", level1, level2, level3,level4);
|
List<RowMap> applicableRowMap = DBSql.getMaps("select APPLICABLE_PRODUCT from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND LEVEL_4_PROCESS_NAME=? ", level1, level2, level3,level4);
|
||||||
if(adaptRowMap.size()==1){
|
if(adaptRowMap.size()>0){
|
||||||
ro.put("APPLICABLE_PRODUCT",applicableRowMap.get(0).getString("APPLICABLE_PRODUCT"));
|
ro.put("APPLICABLE_PRODUCT",applicableRowMap.get(0).getString("APPLICABLE_PRODUCT"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4646,6 +4647,60 @@ public class ProcessPublishWeb extends ActionWeb {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public String getApproveInfoByUnit(UserContext me, String level1, String level2, String level3, String level4, String company, String region, String product, String bindid) {
|
||||||
|
|
||||||
|
ProcessInstance processInstance = SDK.getProcessAPI().getInstanceById(bindid);
|
||||||
|
if (processInstance.getProcessDefId().equals("obj_fb1c7a54b98b412187388c8bab407362") || processInstance.getProcessDefId().equals("obj_5609e1d265dc4e7094c617f20be353dd") ) {
|
||||||
|
//l1 l2 l3 l4 保存到表里
|
||||||
|
DBSql.update(String.format("update BO_ACT_COE_PUBLISH set LEVEL_1_PROCESS_NAME='%s',LEVEL_2_PROCESS_NAME='%s',LEVEL_3_PROCESS_NAME='%s' where BINDID='%s'", level1, level2, level3, bindid));
|
||||||
|
String sql = "select AUDITOR1,AUDITOR_NO_1,L1_SP,AUDITOR2,AUDITOR_NO_2,L2_SP,AUDITOR3,AUDITOR_NO_3,L3_SP from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s' and ORGNAME='%s' and ADAPT_REGION_NAME='%s' and APPLICABLE_PRODUCT='%s'";
|
||||||
|
RowMap result = DBSql.getMap(String.format(sql, level1, level2, level3, company, region, product));
|
||||||
|
ResponseObject ro = ResponseObject.newOkResponse();
|
||||||
|
ro.put("data", result == null ? "" : result);
|
||||||
|
|
||||||
|
|
||||||
|
//查询区域流程
|
||||||
|
List<RowMap> adaptRowMap = DBSql.getMaps("select ADAPT_REGION_NAME from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND ADAPT_NAME_THE_COMPANY=?", level1, level2, level3,region);
|
||||||
|
if(adaptRowMap.size()>0){
|
||||||
|
ro.put("ADAPT_REGION_NAME",adaptRowMap.get(0).getString("ADAPT_REGION_NAME"));
|
||||||
|
}
|
||||||
|
|
||||||
|
//查询产品流程
|
||||||
|
List<RowMap> applicableRowMap = DBSql.getMaps("select APPLICABLE_PRODUCT from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND ADAPT_NAME_THE_COMPANY=? ", level1, level2, level3,region);
|
||||||
|
if(adaptRowMap.size()>0){
|
||||||
|
ro.put("APPLICABLE_PRODUCT",applicableRowMap.get(0).getString("APPLICABLE_PRODUCT"));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ro.toString();
|
||||||
|
} else {
|
||||||
|
//l1 l2 l3 l4 保存到表里
|
||||||
|
DBSql.update(String.format("update BO_ACT_COE_PUBLISH set LEVEL_1_PROCESS_NAME='%s',LEVEL_2_PROCESS_NAME='%s',LEVEL_3_PROCESS_NAME='%s',LEVEL_4_PROCESS_NAME='%s' where BINDID='%s'", level1, level2, level3, level4, bindid));
|
||||||
|
String sql = "select AUDITOR1,AUDITOR_NO_1,L1_SP,AUDITOR2,AUDITOR_NO_2,L2_SP,AUDITOR3,AUDITOR_NO_3,L3_SP,AUDITOR4,AUDITOR_NO_4,L4_SP from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s' and LEVEL_4_PROCESS_NAME='%s' and ORGNAME='%s' and ADAPT_REGION_NAME='%s' and APPLICABLE_PRODUCT='%s'";
|
||||||
|
RowMap result = DBSql.getMap(String.format(sql, level1, level2, level3, level4, company, region, product));
|
||||||
|
ResponseObject ro = ResponseObject.newOkResponse();
|
||||||
|
ro.put("data", result == null ? "" : result);
|
||||||
|
|
||||||
|
//查询区域流程
|
||||||
|
List<RowMap> adaptRowMap = DBSql.getMaps("select ADAPT_REGION_NAME from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND LEVEL_4_PROCESS_NAME=? AND ORGNAME=?", level1, level2, level3,level4,company);
|
||||||
|
if(adaptRowMap.size()>0){
|
||||||
|
ro.put("ADAPT_REGION_NAME",adaptRowMap.get(0).getString("ADAPT_REGION_NAME"));
|
||||||
|
}
|
||||||
|
|
||||||
|
//查询产品流程
|
||||||
|
List<RowMap> applicableRowMap = DBSql.getMaps("select APPLICABLE_PRODUCT from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND LEVEL_4_PROCESS_NAME=? AND ORGNAME=?", level1, level2, level3,level4,company);
|
||||||
|
if(adaptRowMap.size()>0){
|
||||||
|
ro.put("APPLICABLE_PRODUCT",applicableRowMap.get(0).getString("APPLICABLE_PRODUCT"));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ro.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 录入权限矩阵的时候,获取默认的单位信息和单位编码~
|
* 录入权限矩阵的时候,获取默认的单位信息和单位编码~
|
||||||
*
|
*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user