root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 流程历史查看

Browse Source
This commit is contained in:
周俊杰
2024-05-29 13:37:42 +08:00
parent fc521f7580
commit a4478902dd
5 changed files with 250 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java
View File

@@ -2,17 +2,22 @@ package org.nl.wms.flow_manage.flow.controller.execution;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import org.nl.wms.early_manage.service.early_dtl.dao.AlmEarlyDtl;
import org.nl.wms.flow_manage.flow.service.deployment.IActReProcdefService;
import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService;
import org.nl.wms.flow_manage.flow.service.execution.IFlowOperationService;
import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution;
import org.nl.wms.flow_manage.flow.service.execution.dto.ExecutionQuery;
import org.nl.wms.flow_manage.flow.service.execution.dto.StartProcessInstanceVo;
import org.nl.wms.flow_manage.flow.service.history.IActHiExecutionService;
import org.nl.wms.flow_manage.flow.service.history.dao.ActHiExecution;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -20,6 +25,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
/*
* @author ZZQ
@@ -36,8 +42,11 @@ public class ExecutionController {
@Autowired
private IActRuExecutionService executionService;
@Autowired
private IActHiExecutionService iActHiExecutionService;
@Autowired
private IActReProcdefService procdefService;
@GetMapping
public ResponseEntity<Object> getAll(ExecutionQuery query, PageQuery page) {
return new ResponseEntity<>(executionService.getAll(query, page), HttpStatus.OK);
@@ -67,6 +76,23 @@ public class ExecutionController {
}
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping("/dtl/{id}")
public ResponseEntity<Object> getDtl(@PathVariable String proc_inst_id) {
List<ActHiExecution> list = iActHiExecutionService.list(new LambdaQueryWrapper<ActHiExecution>().eq(ActHiExecution::getProc_inst_id, proc_inst_id));
JSONArray array = new JSONArray();
for (ActHiExecution actHiExecution : list) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("proc_inst_id", actHiExecution.getProc_inst_id());
jsonObject.put("activity_name", actHiExecution.getActivity_name());
jsonObject.put("update_time", actHiExecution.getUpdate_time());
jsonObject.put("form_id", actHiExecution.getForm_id());
jsonObject.put("form_type", actHiExecution.getForm_type());
jsonObject.put("form_data", actHiExecution.getForm_data());
array.add(jsonObject);
}
return new ResponseEntity<>(array, HttpStatus.OK);
}
@PostMapping(value = "/open")
public ResponseEntity<Object> getBpmnByModelId(JSONObject form) {

4
wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
View File

@@ -7,7 +7,7 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3307}/${DB_NAME:zjhs_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
username: ${DB_USER:root}
password: ${DB_PWD:123456}
@@ -155,4 +155,4 @@ sa-token:
schedulerFile: /Users/mima0000/Desktop/scheduler.xml
lucene:
index:
path: E:\lms\lucene\index
path: D:\lms\lucene\index