1
0

feat(web): 审查页面增加操作人展示

This commit is contained in:
2024-12-01 11:35:54 +08:00
parent b072b83f80
commit b6418e1e3a
3 changed files with 37 additions and 8 deletions

View File

@@ -178,6 +178,23 @@ export function timeField(field, label, width = 150) {
}
}
/**
* @param {string} field
* @param {string} label
* @param {number} width
*/
export function stringField(field, label, width = undefined) {
let data = {
name: field,
label: label,
className: 'nowrap',
}
if (width) {
data['width'] = width
}
return data
}
/**
* @param {string} field
* @param {string} label

View File

@@ -5,7 +5,9 @@ import {
checkTypeMapping,
crudCommonOptions,
mappingField,
operationField
operationField,
stringField,
timeField
} from "../../components/constants.js";
import {permissionDetailDialog} from "../../components/permission/dialog-permission.js";
@@ -24,12 +26,13 @@ export function tabCheck() {
'reload',
],
columns: [
{
name: 'description',
label: '描述',
},
stringField('description', '描述'),
mappingField('type', '类型', checkTypeMapping),
mappingField('over', '状态', checkOverMapping),
timeField('createdTime', '创建时间'),
stringField('createdUsername', '创建人', 100),
timeField('modifiedTime', '最后修改时间'),
stringField('modifiedUsername', '最后操作人', 100),
operationField('操作', undefined, [
{
visibleOn: '${!over}',

View File

@@ -7,6 +7,7 @@ import com.eshore.gringotts.web.domain.check.service.CheckOrderService;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -27,18 +28,18 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequestMapping("check_order")
public class CheckController implements ListController<CheckController.ListItem> {
public class CheckOrderController implements ListController<CheckOrderController.ListItem> {
private final CheckOrderService checkOrderService;
private final ObjectMapper mapper;
public CheckController(CheckOrderService checkOrderService, Jackson2ObjectMapperBuilder builder) {
public CheckOrderController(CheckOrderService checkOrderService, Jackson2ObjectMapperBuilder builder) {
this.checkOrderService = checkOrderService;
this.mapper = builder.build();
}
@GetMapping("/list")
@Override
public AmisResponse<ImmutableList<CheckController.ListItem>> list() throws Exception {
public AmisResponse<ImmutableList<CheckOrderController.ListItem>> list() throws Exception {
return AmisResponse.responseSuccess(checkOrderService.list().collect(this::toListItem));
}
@@ -50,6 +51,10 @@ public class CheckController implements ListController<CheckController.ListItem>
item.setType(order.getType());
item.setParameters(mapper.readValue(order.getParameters(), new TypeReference<>() {}));
item.setOver(order.getOver());
item.setCreatedUsername(order.getCreatedUser().getUsername());
item.setCreatedTime(order.getCreatedTime());
item.setModifiedUsername(order.getModifiedUser().getUsername());
item.setModifiedTime(order.getModifiedTime());
return item;
}
@@ -67,5 +72,9 @@ public class CheckController implements ListController<CheckController.ListItem>
private CheckOrder.Type type;
private ImmutableMap<String, Object> parameters;
private Boolean over;
private LocalDateTime createdTime;
private String createdUsername;
private LocalDateTime modifiedTime;
private String modifiedUsername;
}
}