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

增加架构首页cmd/编号工具类增加工程制度标准

Browse Source
This commit is contained in:
zhal 2024-07-10 17:38:21 +08:00
parent 2d1667b2a9
commit f7245555df
5 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar
View File

Binary file not shown.

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

@ -450,6 +450,20 @@ public class PublisherController {
}
/**
* 打开流程详情页面
*
* @param me
* @param uuid
* @return
*/
@Mapping("com.actionsoft.apps.coe.pal.publisher_publish_file_open_home_page")
public String openPublishFilePageHomePage(UserContext me, String uuid, String taskId) {
return PALRepositoryQueryAPIManager.getInstance().getPublishPortalHomePageHtml(me, uuid, taskId, false);
}
/**
* 打开流程详情页面 (移动端)
*

26
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/util/ProcesNumberUtil.java
View File

@ -52,7 +52,7 @@ public class ProcesNumberUtil {
RowMap result = DBSql.getMap(String.format(querySql, levelCode, regionCode));
//如果没有就新增
if (result == null) {
String sql = "insert into BO_ACT_PROCESSNUMBER (ID,LEVELNUM,REGIONCODE,PROCESS_NUMBERS,SYSTEM_NUMBERS,FORM_NUMBERS) values ('%s', '%s', '%s', %s, %s, %s)";
String sql = "insert into BO_ACT_PROCESSNUMBER (ID,LEVELNUM,REGIONCODE,PROCESS_NUMBERS,SYSTEM_NUMBERS,FORM_NUMBERS,ENGINEERING_NUMBERS) values ('%s', '%s', '%s', %s, %s, %s,%s)";
String id = UUIDGener.getUUID();
DBSql.update(String.format(sql, id, levelCode, regionCode, 1, 1, 1));
return "001";
@ -72,7 +72,7 @@ public class ProcesNumberUtil {
RowMap result = DBSql.getMap(String.format(querySql, levelCode, regionCode));
//如果没有就新增
if (result == null) {
String sql = "insert into BO_ACT_PROCESSNUMBER (ID,LEVELNUM,REGIONCODE,PROCESS_NUMBERS,SYSTEM_NUMBERS,FORM_NUMBERS) values ('%s', '%s', '%s', %s, %s, %s)";
String sql = "insert into BO_ACT_PROCESSNUMBER (ID,LEVELNUM,REGIONCODE,PROCESS_NUMBERS,SYSTEM_NUMBERS,FORM_NUMBERS,ENGINEERING_NUMBERS) values ('%s', '%s', '%s', %s, %s, %s,%s)";
String id = UUIDGener.getUUID();
DBSql.update(String.format(sql, id, levelCode, regionCode, 1, 1, 1));
return "001";
@ -85,9 +85,27 @@ public class ProcesNumberUtil {
} else if (nowNum >= 10 && nowNum < 100) {
return "0" + nowNum;
}
}else if(plcategory.contains("engineering")){
//表单编号
String querySql = "select ID,ENGINEERING_NUMBERS from BO_ACT_PROCESSNUMBER where LEVELNUM = '%s' and REGIONCODE='%s'";
RowMap result = DBSql.getMap(String.format(querySql, levelCode, regionCode));
//如果没有就新增
if (result == null) {
String sql = "insert into BO_ACT_PROCESSNUMBER (ID,LEVELNUM,REGIONCODE,PROCESS_NUMBERS,SYSTEM_NUMBERS,FORM_NUMBERS,ENGINEERING_NUMBERS) values ('%s', '%s', '%s', %s, %s, %s,%s)";
String id = UUIDGener.getUUID();
DBSql.update(String.format(sql, id, levelCode, regionCode, 1, 1, 1,nowNum + 1));
return "001";
}
nowNum = result.getInt("ENGINEERING_NUMBERS");
String updateSql = "update BO_ACT_PROCESSNUMBER set ENGINEERING_NUMBERS=%s where ID='%s'";
DBSql.update(String.format(updateSql, nowNum + 1, result.getString("ID")));
if (nowNum < 10) {
return "00" + nowNum;
} else if (nowNum >= 10 && nowNum < 100) {
return "0" + nowNum;
}
}
return nowNum + "";
}
@ -232,6 +250,7 @@ public class ProcesNumberUtil {
if (rowMap != null) {
String plcategory = rowMap.getString("PLMETHODID");
String plvers = rowMap.getString("PLVER");
String number = getProcessNum(levelnum, orgCode, plcategory);
if (plcategory.contains("process") && !plcategory.equals("process.scheme")) {
name = "/P" + number;
@ -364,6 +383,7 @@ public class ProcesNumberUtil {
if (rowMap != null) {
String plcategory = rowMap.getString("PLMETHODID");
String plvers = rowMap.getString("PLVER");
String number = getProcessNum(levelnum, orgCode, plcategory);
if (plcategory.contains("process") && !plcategory.equals("process.scheme")) {

6
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java
View File

@ -135,14 +135,14 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute
if(whether_propaganda_plan.equals("1")){
ProcessInstance processInstance = SDK.getProcessAPI().createProcessInstance("obj_11aeee27b9a54a428aa42a05376ee81d", ext.getUserContext().getUID(), "关于" + bo_act_coe_publish.getString("PROCESS_TITLE") + "文件的宣贯任务");
SDK.getProcessAPI().start(processInstance);
ProcessInstance processInstance = SDK.getProcessAPI().createProcessInstance("obj_11aeee27b9a54a428aa42a05376ee81d", ext.getUserContext().getUID(), bo_act_coe_publish.getString("PROCESS_TITLE") + "文件的宣贯任务");
BO boRecordData=new BO();
boRecordData.set("PROCESS_NAME",bo_act_coe_publish.getString("PROCESS_TITLE"));
SDK.getBOAPI().create("BO_ACT_DOCUMENT_PUBLICITY_TASK", boRecordData, processInstance.getId(), "");
SDK.getProcessAPI().start(processInstance);
//发送OA待办
TaskInstance taskInstance= SDK.getTaskAPI().getInstanceById(processInstance.getStartTaskInstId());
sendOaPending(taskInstance,processInstance,ext);

7
com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple_L4gcbz.js
View File

@ -1616,7 +1616,7 @@ function queryBatchReport(data) {
// 创建流程手册
function createReport(category, method, uuid, taskId) {
if ((method == 'control.policy' || method == 'data.form' || method.indexOf('process.') > -1) && method != 'default') {
if ((method == 'control.policy' || method == 'data.form' || method.indexOf('process.') > -1) && method != 'default' || method == 'engineering.standard') {
var param = {
sid : sid,
cmd : "com.actionsoft.apps.coe.pal.publisher_output_pr_report_create",
@ -1647,7 +1647,7 @@ function createBatchReport(data, createTime) {
var ids = [];
for (var i = 0; i < data.length; i++) {
var temp = data[i];
if ((temp.methodId == 'control.policy' || temp.methodId == 'data.form' || temp.methodId.indexOf('process.') > -1) && temp.methodId != 'default') {
if ((temp.methodId == 'control.policy' || temp.methodId == 'data.form' || temp.methodId.indexOf('process.') > -1 || temp.methodId == 'engineering.standard' ) && temp.methodId != 'default') {
ids.push(temp.publishFileId);
}
}
@ -1722,6 +1722,9 @@ function getOutputName(category, method) {
if (method.indexOf('process.') > -1) {
return '流程手册';
}
if (method=="engineering.standard") {
return '工程制度标准手册';
}
return '手册';
}