发布绩效修改/校验判断
This commit is contained in:
parent
9e7a4a5d72
commit
c6fbb2fc6c
Binary file not shown.
@ -420,17 +420,6 @@ public class PublisherController {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取字表数据
|
||||
* @param me
|
||||
* @param processInstId
|
||||
* @return
|
||||
*/
|
||||
@Mapping("com.actionsoft.apps.coe.pal.publisher_data_query_getFile")
|
||||
public String getPublisherDataGetFile(UserContext me, String processInstId, String wsId) {
|
||||
ProcessPublishWeb web = new ProcessPublishWeb(me);
|
||||
return web.getPublisherDataGetFile(processInstId, wsId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否开启三员管理
|
||||
|
||||
@ -107,7 +107,7 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
|
||||
//获取关联模型id
|
||||
String relationFileId=JSONObject.parseObject(propertyModel.getPropertyValue()).getString("relationFileId");
|
||||
//获取关联表单模型id
|
||||
List<Map<String, Object>> fileElements;
|
||||
List<Map<String, Object>> fileElements ;
|
||||
if(UtilString.isNotEmpty(relationFileId)){
|
||||
|
||||
int len=relationFileId.split(",").length;
|
||||
@ -118,17 +118,19 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
|
||||
if(splitRelationFileId.length>0){
|
||||
|
||||
for(int i=0;i<splitRelationFileId.length;i++) {
|
||||
fileElements = CoeDesignerUtil.getShapeMessageJson4(splitRelationFileId[i]);
|
||||
|
||||
PALRepositoryModel onemodel = PALRepositoryCache.getCache().get(splitRelationFileId[i]);
|
||||
|
||||
|
||||
|
||||
if(onemodel!=null) {
|
||||
boolean isUse = onemodel.isUse();
|
||||
boolean publish = onemodel.isPublish();
|
||||
//如果状态是未发布
|
||||
if (isUse == true && publish == false) {
|
||||
|
||||
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
|
||||
|
||||
if(onemodel.getMethodId().equals("data.form")) {
|
||||
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
|
||||
}
|
||||
RowMap publishNrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_N T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.PUBLISHFILEID=T2.ID WHERE T1.BINDID=? AND T1.PUBLISHFILEID=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[i]);
|
||||
|
||||
|
||||
@ -149,8 +151,11 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
|
||||
boolean isPublishV=versions.get(k).isPublish();
|
||||
|
||||
if(isUseV==true && isPublishV==false) {
|
||||
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
|
||||
|
||||
if(onemodel.getMethodId().equals("data.form")) {
|
||||
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
|
||||
|
||||
}
|
||||
RowMap publishCrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_C T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.CHANGEDFILEIDNEW=T2.ID WHERE T1.BINDID=? AND T1.CHANGEDFILEIDNEW=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);
|
||||
|
||||
|
||||
@ -172,8 +177,9 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
|
||||
boolean isPublishV=versions.get(k).isPublish();
|
||||
|
||||
if(isUseV==true && isPublishV==false) {
|
||||
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
|
||||
|
||||
if(onemodel.getMethodId().equals("data.form")) {
|
||||
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
|
||||
}
|
||||
RowMap publishCrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_C T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.CHANGEDFILEIDNEW=T2.ID WHERE T1.BINDID=? AND T1.CHANGEDFILEIDNEW=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);
|
||||
|
||||
|
||||
@ -187,7 +193,8 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(onemodel.getMethodId().equals("data.form")){
|
||||
fileElements = CoeDesignerUtil.getShapeMessageJson4(splitRelationFileId[i]);
|
||||
|
||||
for (Map<String, Object> shape : fileElements) {
|
||||
String tempShapeId = shape.get("id").toString();
|
||||
@ -209,6 +216,9 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -59,6 +59,12 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements
|
||||
}
|
||||
if (bolistC != null) {
|
||||
for (BO boC : bolistC) {
|
||||
|
||||
|
||||
//绩效模型中数据模型回填流程编号
|
||||
updateMAProcessNumber(boC.get("CHANGEDFILEIDNEW").toString(), param.getUserContext(), bo.get("WSID").toString(), boC.getString("PUBLISH_NUMBER"), nowTime);
|
||||
|
||||
|
||||
//修改流程文件的发布属性
|
||||
repositoryDao.updatePublishStatusAndDate("C", boC.get("CHANGEDFILEIDNEW").toString(), boC.get("CHANGEFILEID").toString(), model.getPublishDate());
|
||||
}
|
||||
@ -127,34 +133,52 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements
|
||||
String getid = attributesJsonArray.getJSONObject(i).getString("id");
|
||||
String value = attributesJsonArray.getJSONObject(i).getString("value");
|
||||
|
||||
//回填绩效编号操作
|
||||
if (getid.equals("Process_performance_indicator_Number")) {
|
||||
|
||||
//获取当前MA绩效最新排序数值
|
||||
BO performanceNumberBO = SDK.getBOAPI().query("BO_EU_PERFORMANCE_NUMBER").addQuery("PERFORMANCE_TYPE=", "control.ma").addQuery("PROCESS_NUMBER=", value).detail();
|
||||
BO performanceNuRecord = SDK.getBOAPI().query("BO_EU_PERFORMANCE_NU_RECORD").addQuery("PROCESS_NUMBER=", value).addQuery("WHETHERCOMPLETE=", "1").addQuery("PERFORMANCE_TYPE=","L1L3流程绩效").detail();
|
||||
|
||||
if (performanceNuRecord == null) {
|
||||
|
||||
//回填绩效编号操作
|
||||
if (getid.equals("Process_performance_indicator_Number")) {
|
||||
|
||||
//获取当前MA绩效最新排序数值
|
||||
BO performanceNumberBO = SDK.getBOAPI().query("BO_EU_PERFORMANCE_NUMBER").addQuery("PERFORMANCE_TYPE=", "control.ma").addQuery("PROCESS_NUMBER=", value).detail();
|
||||
|
||||
if (performanceNumberBO != null) {
|
||||
currentnumber = Integer.valueOf(performanceNumberBO.getString("CURRENTNUMBER"));
|
||||
} else {
|
||||
BO performanceBo = new BO();
|
||||
performanceBo.set("PROCESS_NUMBER", value);
|
||||
performanceBo.set("CURRENTNUMBER", 1);
|
||||
performanceBo.set("PERFORMANCE_TYPE", "control.ma");
|
||||
SDK.getBOAPI().create("BO_EU_PERFORMANCE_NUMBER", performanceBo, performNumberProcess.getId(), "");
|
||||
currentnumber = 0;
|
||||
}
|
||||
currentnumber++;
|
||||
|
||||
attributesJsonArray.getJSONObject(i).put("value", value + "." + currentnumber);
|
||||
|
||||
if (performanceNumberBO != null) {
|
||||
performanceNumberBO.set("CURRENTNUMBER", currentnumber);
|
||||
} else {
|
||||
performanceNumberBO = SDK.getBOAPI().query("BO_EU_PERFORMANCE_NUMBER").addQuery("PERFORMANCE_TYPE=", "control.ma").addQuery("PROCESS_NUMBER=", value).detail();
|
||||
}
|
||||
|
||||
recordBO.set("PROCESS_PERFORMANCE_IND_NUM", value + "." + currentnumber);
|
||||
SDK.getBOAPI().update("BO_EU_PERFORMANCE_NUMBER", performanceNumberBO);
|
||||
|
||||
|
||||
ProcessInstance processrecordInst = SDK.getProcessAPI().createBOProcessInstance("obj_5afd2f44bf754d47a241211b3219e716", uc.getUID(), "指标绩效记录数据插入");
|
||||
|
||||
BO recordNumberBo = new BO();
|
||||
recordNumberBo.set("PROCESS_NUMBER", value + "." + currentnumber);
|
||||
recordNumberBo.set("PERFORMANCE_TYPE", "L1L3流程绩效");
|
||||
recordNumberBo.set("ORIGINALNUMBER", value);
|
||||
recordNumberBo.set("WHETHERCOMPLETE", "1");
|
||||
SDK.getBOAPI().create("BO_EU_PERFORMANCE_NU_RECORD", recordNumberBo, processrecordInst.getId(), "");
|
||||
|
||||
if (performanceNumberBO != null) {
|
||||
currentnumber = Integer.valueOf(performanceNumberBO.getString("CURRENTNUMBER"));
|
||||
} else {
|
||||
BO performanceBo = new BO();
|
||||
performanceBo.set("PROCESS_NUMBER", value);
|
||||
performanceBo.set("CURRENTNUMBER", 1);
|
||||
performanceBo.set("PERFORMANCE_TYPE", "control.ma");
|
||||
SDK.getBOAPI().create("BO_EU_PERFORMANCE_NUMBER", performanceBo, performNumberProcess.getId(), "");
|
||||
currentnumber = 0;
|
||||
}
|
||||
currentnumber++;
|
||||
|
||||
attributesJsonArray.getJSONObject(i).put("value", value + "." + currentnumber);
|
||||
|
||||
if (performanceNumberBO != null) {
|
||||
performanceNumberBO.set("CURRENTNUMBER", currentnumber);
|
||||
} else {
|
||||
performanceNumberBO = SDK.getBOAPI().query("BO_EU_PERFORMANCE_NUMBER").addQuery("PERFORMANCE_TYPE=", "control.ma").addQuery("PROCESS_NUMBER=", value).detail();
|
||||
}
|
||||
SDK.getBOAPI().update("BO_EU_PERFORMANCE_NUMBER", performanceNumberBO);
|
||||
recordBO.set("PROCESS_PERFORMANCE_IND_NUM", value + "." + currentnumber);
|
||||
}
|
||||
|
||||
//插入绩效指标库操作
|
||||
if (getid.equals("Number_of_the_associated_flow_file")) {//关联流程文件编号
|
||||
@ -200,24 +224,24 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements
|
||||
}
|
||||
|
||||
if (getid.equals("The_upstream_indicators")) {//上游指标
|
||||
if(UtilString.isNotEmpty(value)){
|
||||
String The_upstream_indicatorsValue=value.substring(value.indexOf('"')+1,value.lastIndexOf('"'));
|
||||
if (UtilString.isNotEmpty(value)) {
|
||||
String The_upstream_indicatorsValue = value.substring(value.indexOf('"') + 1, value.lastIndexOf('"'));
|
||||
|
||||
RowMap rowMap=DBSql.getMap("SELECT RELATIONSHAPETEXT FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE FILEID=? AND RELATIONSHAPEID=?",publishFileId,The_upstream_indicatorsValue);
|
||||
RowMap rowMap = DBSql.getMap("SELECT RELATIONSHAPETEXT FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE FILEID=? AND RELATIONSHAPEID=?", publishFileId, The_upstream_indicatorsValue);
|
||||
recordBO.set("THE_UPSTREAM_INDICATORS_ID", The_upstream_indicatorsValue);
|
||||
if(rowMap!=null){
|
||||
recordBO.set("THE_UPSTREAM_INDICATORS",rowMap.getString("RELATIONSHAPETEXT"));
|
||||
if (rowMap != null) {
|
||||
recordBO.set("THE_UPSTREAM_INDICATORS", rowMap.getString("RELATIONSHAPETEXT"));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (getid.equals("Downstream_target")) {//下游指标
|
||||
if(UtilString.isNotEmpty(value)){
|
||||
String Downstream_target=value.substring(value.indexOf('"')+1,value.lastIndexOf('"'));
|
||||
RowMap rowMap=DBSql.getMap("SELECT RELATIONSHAPETEXT FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE FILEID=? AND RELATIONSHAPEID=?",publishFileId,Downstream_target);
|
||||
if (UtilString.isNotEmpty(value)) {
|
||||
String Downstream_target = value.substring(value.indexOf('"') + 1, value.lastIndexOf('"'));
|
||||
RowMap rowMap = DBSql.getMap("SELECT RELATIONSHAPETEXT FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE FILEID=? AND RELATIONSHAPEID=?", publishFileId, Downstream_target);
|
||||
recordBO.set("DOWNSTREAM_TARGET_ID", Downstream_target);
|
||||
if(rowMap!=null){
|
||||
recordBO.set("DOWNSTREAM_TARGET",rowMap.getString("RELATIONSHAPETEXT"));
|
||||
if (rowMap != null) {
|
||||
recordBO.set("DOWNSTREAM_TARGET", rowMap.getString("RELATIONSHAPETEXT"));
|
||||
}
|
||||
}
|
||||
|
||||
@ -241,9 +265,11 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements
|
||||
//发布时间
|
||||
recordBO.set("PUBDATE", publishDate);
|
||||
|
||||
SDK.getBOAPI().create("BO_EU_PER_IND_LIB", recordBO, processInst.getId(), "");
|
||||
}
|
||||
}
|
||||
}
|
||||
SDK.getBOAPI().create("BO_EU_PER_IND_LIB", recordBO, processInst.getId(), "");
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -822,10 +822,10 @@ function addProcess(type) {
|
||||
return;
|
||||
} else {
|
||||
//三员管理隐藏手册创建时间
|
||||
if (!checkCreateReportTime() && !isHighSecurity) {
|
||||
/*if (!checkCreateReportTime() && !isHighSecurity) {
|
||||
$.simpleAlert('请选择创建流程手册的时间', 'info');
|
||||
return;
|
||||
}
|
||||
}*/
|
||||
disabledButton();
|
||||
setTimeout(function() {
|
||||
// 获取说明内容
|
||||
|
||||
Loading…
Reference in New Issue
Block a user