diff --git a/src/main/java/cn/palmte/work/model/ActTaskDefRepository.java b/src/main/java/cn/palmte/work/model/ActTaskDefRepository.java index d22b971..7f1e4ec 100644 --- a/src/main/java/cn/palmte/work/model/ActTaskDefRepository.java +++ b/src/main/java/cn/palmte/work/model/ActTaskDefRepository.java @@ -32,4 +32,10 @@ public interface ActTaskDefRepository extends JpaRepository @Transactional @Query(value = "update ACT_HI_TASKINST a SET a.ASSIGNEE_=? WHERE PROC_INST_ID_=? AND ID_=?", nativeQuery = true) int updateHiTaskAssign(String assign, String procInsId, String taskId); + + + @Modifying + @Transactional + @Query(value = "update act_re_procdef SET DESCRIPTION_=? WHERE ID_=?", nativeQuery = true) + int updateProcDefDesc(String des, String procDefId); } diff --git a/src/main/java/cn/palmte/work/pojo/ActProcDef.java b/src/main/java/cn/palmte/work/pojo/ActProcDef.java index 026c656..43f4734 100644 --- a/src/main/java/cn/palmte/work/pojo/ActProcDef.java +++ b/src/main/java/cn/palmte/work/pojo/ActProcDef.java @@ -15,5 +15,6 @@ public class ActProcDef { private String dgrmResourceName; private Date deployTime; private int suspensionState; + private String desc; } diff --git a/src/main/java/cn/palmte/work/service/ActModelService.java b/src/main/java/cn/palmte/work/service/ActModelService.java index c2bb30a..1b7b8fe 100644 --- a/src/main/java/cn/palmte/work/service/ActModelService.java +++ b/src/main/java/cn/palmte/work/service/ActModelService.java @@ -6,6 +6,9 @@ import cn.palmte.work.model.ActTaskDef; import cn.palmte.work.model.ActTaskDefRepository; import cn.palmte.work.pojo.ActModel; import cn.palmte.work.utils.InterfaceUtil; +import cn.palmte.work.utils.StrKit; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.activiti.bpmn.converter.BpmnXMLConverter; @@ -52,7 +55,7 @@ public class ActModelService { String select = "a.ID_ as id,a.REV_ as rev,a.NAME_ as modelName,a.KEY_ as procDefKey,a.CREATE_TIME_ as createdTime,a.LAST_UPDATE_TIME_ as lastUpdatedTime"; QueryHelper queryHelper = new QueryHelper(select, " act_re_model a"); String name = searchInfo.get("name"); - queryHelper.addCondition(StringUtils.isNotEmpty(name), "(a.NAME_=? or a.KEY_=?)", name, name); + queryHelper.addCondition(StringUtils.isNotEmpty(name), "(a.NAME_ like ? or a.KEY_ like ?)", "'%" + name + "%'", "'%" + name + "%'"); queryHelper.addOrderProperty("a.LAST_UPDATE_TIME_", false); return pagination.paginate(queryHelper.getSql(), ActModel.class, pageNumber, pageSize); } @@ -115,6 +118,9 @@ public class ActModelService { */ public void deploy(String modelId) throws Exception { Model modelData = repositoryService.getModel(modelId); + JSONObject metaInfo = JSON.parseObject(modelData.getMetaInfo()); + String description = metaInfo.getString("description"); + ObjectNode modelNode = (ObjectNode) new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelData.getId())); byte[] bpmnBytes = null; BpmnJsonConverter jsonConverter = new BpmnJsonConverter(); @@ -175,6 +181,11 @@ public class ActModelService { actTaskDef.setLastUpdatedTime(new Date()); } + //更新流程定义的描述 + if(StrKit.notBlank(description)){ + actTaskDefRepository.updateProcDefDesc(description, processDefinition.getId()); + } + actTaskDefRepository.save(taskList); logger.info("deploy success: deploymentId:{}, procDefName:{}, procDefKey:{}", deployment.getId(), processDefinition.getName(), processDefinition.getKey()); diff --git a/src/main/java/cn/palmte/work/service/ActProcDefService.java b/src/main/java/cn/palmte/work/service/ActProcDefService.java index 57ec9f1..9e8a536 100644 --- a/src/main/java/cn/palmte/work/service/ActProcDefService.java +++ b/src/main/java/cn/palmte/work/service/ActProcDefService.java @@ -37,10 +37,10 @@ public class ActProcDefService { public Page list(ConcurrentHashMap searchInfo, int pageNumber, int pageSize) { String select = "select p.ID_ as id,p.NAME_ as procName,p.KEY_ as procKey,p.VERSION_ as version,p.DEPLOYMENT_ID_ as deploymentId,p.RESOURCE_NAME_ as resourceName,\n" + - " p.DGRM_RESOURCE_NAME_ as dgrmResourceName,p.SUSPENSION_STATE_ as suspensionState, d.DEPLOY_TIME_ as deployTime "; + " p.DGRM_RESOURCE_NAME_ as dgrmResourceName,p.SUSPENSION_STATE_ as suspensionState, d.DEPLOY_TIME_ as deployTime, p.DESCRIPTION_ as `desc` "; QueryHelper queryHelper = new QueryHelper(select, " act_re_procdef p LEFT JOIN act_re_deployment d on p.DEPLOYMENT_ID_ = d.ID_"); String name = searchInfo.get("name"); - queryHelper.addCondition(StringUtils.isNotEmpty(name), "(p.NAME_=? or p.KEY_=?)", name, name); + queryHelper.addCondition(StringUtils.isNotEmpty(name), "(p.NAME_ like ? or p.KEY_ like ?)", "'%" + name + "%'", "'%" + name + "%'"); queryHelper.addOrderProperty("d.DEPLOY_TIME_", false); return pagination.paginate(queryHelper.getSql(), ActProcDef.class, pageNumber, pageSize); } @@ -83,7 +83,7 @@ public class ActProcDefService { if (1 == status) { repositoryService.activateProcessDefinitionById(procDefId, true, null); } else { - repositoryService.suspendProcessDefinitionById(procDefId, true, null); + repositoryService.suspendProcessDefinitionById(procDefId, false, null); } } } diff --git a/src/main/resources/templates/admin/act_model_list.ftl b/src/main/resources/templates/admin/act_model_list.ftl index 34d0d1d..608193c 100644 --- a/src/main/resources/templates/admin/act_model_list.ftl +++ b/src/main/resources/templates/admin/act_model_list.ftl @@ -74,9 +74,7 @@
- <#if list.procDefKey == 'saleContract' - || list.procDefKey == 'businessPurchase' - > + <#if list.procDefKey! !='estimate' && list.procDefKey! !='budget' && list.procDefKey! !='settle' && list.procDefKey! !='final'>
- <#--
-
-
Modal 标题 - × -
-
- -
-
-
--> +
@@ -59,10 +50,11 @@ 流程id 流程名称 流程标识 + 流程描述 版本 - 预览 - <#--激活/挂起--> 部署时间 + 预览 + 状态 操作 @@ -71,12 +63,16 @@ <#list pager.list as list> - + <#if list.procKey! !='estimate' && list.procKey! !='budget' && list.procKey! !='settle' && list.procKey! !='final'> + + ${list.id!} ${list.procName!} ${list.procKey!} + ${list.desc!} ${list.version!} + <#if list.deployTime??>${list.deployTime?datetime} - - <#-- +
- <#–1激活 2挂起–> + <#--1激活 2挂起--> checked/>
- --> - <#if list.deployTime??>${list.deployTime?datetime} +