流程描述

product
17602169347 2 years ago
parent 2d26a75dcd
commit a5c6e40674

@ -64,7 +64,7 @@
<select id="getWaitList" parameterType="String" resultMap="WaitList"> <select id="getWaitList" parameterType="String" resultMap="WaitList">
SELECT o.F_Id AS F_Id, t.F_ProcessId, t.F_EnCode, t.F_FullName, t.F_FlowUrgent, t.F_FlowId , t.F_FlowCode ,t.F_FlowName, t.F_FlowCategory, SELECT o.F_Id AS F_Id, t.F_ProcessId, t.F_EnCode, t.F_FullName, t.F_FlowUrgent, t.F_FlowId , t.F_FlowCode ,t.F_FlowName, t.F_FlowCategory,
t.F_StartTime, t.F_EndTime, t.F_ThisStep, n.F_Id as F_ThisStepId, t.F_Status, t.F_Completion, t.F_CreatorUserId, o.F_CreatorTime, o.F_HandleId, t.F_LastModifyUserId, t.F_StartTime, t.F_EndTime, t.F_ThisStep, n.F_Id as F_ThisStepId, t.F_Status, t.F_Completion, t.F_CreatorUserId, o.F_CreatorTime, o.F_HandleId, t.F_LastModifyUserId,
t.F_LastModifyTime, n.F_NodePropertyJson,o.F_Description,o.F_NodeName,t.F_FlowVersion FROM flow_taskoperator o left join flow_task t on o.F_TaskId = t.F_Id left join flow_tasknode n on o.F_TaskNodeId = n.F_Id t.F_LastModifyTime, n.F_NodePropertyJson,o.F_Description,t.F_Description paymentDescription,o.F_NodeName,t.F_FlowVersion FROM flow_taskoperator o left join flow_task t on o.F_TaskId = t.F_Id left join flow_tasknode n on o.F_TaskNodeId = n.F_Id
WHERE 1=1 AND o.F_Completion = 0 AND t.F_Status = 1 AND o.F_State = '0' ${sql} WHERE 1=1 AND o.F_Completion = 0 AND t.F_Status = 1 AND o.F_State = '0' ${sql}
</select> </select>

@ -55,4 +55,6 @@ public class FlowBeforeListVO {
@ApiModelProperty(value = "版本") @ApiModelProperty(value = "版本")
private String flowVersion; private String flowVersion;
@ApiModelProperty(value = "付款申请描述")
private String paymentDescription;
} }

@ -42,4 +42,5 @@ public class FlowTaskListModel {
private String description; private String description;
private String flowVersion; private String flowVersion;
private Integer taskStatus; private Integer taskStatus;
private String paymentDescription;
} }

@ -1382,6 +1382,7 @@ public class FlowTaskNewServiceImpl implements FlowTaskNewService {
taskEntity.setFlowType(engine.getType()); taskEntity.setFlowType(engine.getType());
taskEntity.setFlowCategory(engine.getCategory()); taskEntity.setFlowCategory(engine.getCategory());
taskEntity.setFlowForm(engine.getFormData()); taskEntity.setFlowForm(engine.getFormData());
taskEntity.setDescription(flowModel.getFormData().get("documentNo") + "-" + flowModel.getFormData().get("num") + "-" + flowModel.getFormData().get("ramount").toString());
taskEntity.setFlowTemplateJson(engine.getFlowTemplateJson()); taskEntity.setFlowTemplateJson(engine.getFlowTemplateJson());
taskEntity.setFlowVersion(engine.getVersion()); taskEntity.setFlowVersion(engine.getVersion());
taskEntity.setStatus(FlowStatusEnum.save.getMessage().equals(flowModel.getStatus()) ? FlowTaskStatusEnum.Draft.getCode() : FlowTaskStatusEnum.Handle.getCode()); taskEntity.setStatus(FlowStatusEnum.save.getMessage().equals(flowModel.getStatus()) ? FlowTaskStatusEnum.Draft.getCode() : FlowTaskStatusEnum.Handle.getCode());

@ -222,7 +222,7 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
//关键字(流程名称、流程编码) //关键字(流程名称、流程编码)
String keyWord = paginationFlowTask.getKeyword() != null ? paginationFlowTask.getKeyword() : null; String keyWord = paginationFlowTask.getKeyword() != null ? paginationFlowTask.getKeyword() : null;
if (!StringUtils.isEmpty(keyWord)) { if (!StringUtils.isEmpty(keyWord)) {
dbSql.append(" AND (t.F_EnCode like '%" + keyWord + "%' or t.F_FullName like '%" + keyWord + "%') "); dbSql.append(" AND (t.F_EnCode like '%" + keyWord + "%' or t.F_FullName like '%" + keyWord + "%' or t.F_Description like '%" + keyWord + "%') ");
} }
//日期范围近7天、近1月、近3月、自定义 //日期范围近7天、近1月、近3月、自定义
String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null; String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;

@ -73,6 +73,7 @@
</div> </div>
<JNPF-table v-loading="listLoading" :data="list"> <JNPF-table v-loading="listLoading" :data="list">
<el-table-column prop="fullName" label="流程标题" show-overflow-tooltip min-width="150" /> <el-table-column prop="fullName" label="流程标题" show-overflow-tooltip min-width="150" />
<el-table-column prop="paymentDescription" label="流程描述" min-width="200" />
<el-table-column prop="flowName" label="所属流程" width="130" /> <el-table-column prop="flowName" label="所属流程" width="130" />
<el-table-column prop="startTime" label="发起时间" width="130" <el-table-column prop="startTime" label="发起时间" width="130"
:formatter="jnpf.tableDateFormat" /> :formatter="jnpf.tableDateFormat" />

Loading…
Cancel
Save