feat(accident): 添加填报人字段并优化导出功能
- 在 AccidentExportCO 和 EventExportCO 中添加填报人字段 - 调整 Excel 导出列索引顺序,报出日期移至第 17 列 - 为填报人字段添加 ExcelProperty 注解支持导出 - 更新 AccidentRepositoryImpl 中的分页查询逻辑 - 移除 AccidentController 中的多余空行以优化代码格式master
parent
1dfefd6cd3
commit
88641a3762
|
|
@ -7,6 +7,7 @@ import com.alibaba.cola.dto.PageResponse;
|
||||||
import com.alibaba.cola.dto.Response;
|
import com.alibaba.cola.dto.Response;
|
||||||
import com.alibaba.cola.dto.SingleResponse;
|
import com.alibaba.cola.dto.SingleResponse;
|
||||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||||
|
import com.jjb.saas.framework.event.producer.RemoteEventPublisher;
|
||||||
import com.zcloud.accident.api.AccidentServiceI;
|
import com.zcloud.accident.api.AccidentServiceI;
|
||||||
import com.zcloud.accident.command.convertor.AccidentExportConvertor;
|
import com.zcloud.accident.command.convertor.AccidentExportConvertor;
|
||||||
import com.zcloud.accident.command.convertor.EventExportConvertor;
|
import com.zcloud.accident.command.convertor.EventExportConvertor;
|
||||||
|
|
@ -46,7 +47,6 @@ public class AccidentController {
|
||||||
private final AccidentServiceI accidentService;
|
private final AccidentServiceI accidentService;
|
||||||
private final AccidentExportConvertor accidentExportConvertor;
|
private final AccidentExportConvertor accidentExportConvertor;
|
||||||
private final EventExportConvertor eventExportConvertor;
|
private final EventExportConvertor eventExportConvertor;
|
||||||
|
|
||||||
@ApiOperation("新增")
|
@ApiOperation("新增")
|
||||||
@PostMapping("/save")
|
@PostMapping("/save")
|
||||||
public SingleResponse<AccidentCO> add(@Validated @RequestBody AccidentAddCmd cmd) {
|
public SingleResponse<AccidentCO> add(@Validated @RequestBody AccidentAddCmd cmd) {
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,13 @@ public class AccidentExportCO {
|
||||||
@ColumnWidth(20)
|
@ColumnWidth(20)
|
||||||
private String measures;
|
private String measures;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "填报人")
|
||||||
|
@ExcelProperty(value = "填报人", index = 16)
|
||||||
|
@ColumnWidth(20)
|
||||||
|
private String reportUser;
|
||||||
|
|
||||||
@ApiModelProperty(value = "报出日期")
|
@ApiModelProperty(value = "报出日期")
|
||||||
@ExcelProperty(value = "报出日期", index = 16)
|
@ExcelProperty(value = "报出日期", index = 17)
|
||||||
@ColumnWidth(20)
|
@ColumnWidth(20)
|
||||||
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime reportDate;
|
private LocalDateTime reportDate;
|
||||||
|
|
|
||||||
|
|
@ -98,8 +98,13 @@ public class EventExportCO {
|
||||||
@ColumnWidth(20)
|
@ColumnWidth(20)
|
||||||
private String measures;
|
private String measures;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "填报人")
|
||||||
|
@ExcelProperty(value = "填报人", index = 16)
|
||||||
|
@ColumnWidth(20)
|
||||||
|
private String reportUser;
|
||||||
|
|
||||||
@ApiModelProperty(value = "报出日期")
|
@ApiModelProperty(value = "报出日期")
|
||||||
@ExcelProperty(value = "报出日期", index = 16)
|
@ExcelProperty(value = "报出日期", index = 17)
|
||||||
@ColumnWidth(20)
|
@ColumnWidth(20)
|
||||||
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime reportDate;
|
private LocalDateTime reportDate;
|
||||||
|
|
|
||||||
|
|
@ -36,10 +36,12 @@ public class AccidentRepositoryImpl extends BaseRepositoryImpl<AccidentMapper, A
|
||||||
params.put("localCorpId", AuthContext.getTenantId());
|
params.put("localCorpId", AuthContext.getTenantId());
|
||||||
}
|
}
|
||||||
IPage<AccidentDO> iPage = new Query<AccidentDO>().getPage(params);
|
IPage<AccidentDO> iPage = new Query<AccidentDO>().getPage(params);
|
||||||
|
|
||||||
IPage<AccidentDO> result = accidentMapper.listPage(iPage, params,menuPerms);
|
IPage<AccidentDO> result = accidentMapper.listPage(iPage, params,menuPerms);
|
||||||
return PageHelper.pageToResponse(result, result.getRecords());
|
return PageHelper.pageToResponse(result, result.getRecords());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<AccidentDO> listAll(Map<String, Object> params, String menuPerms) {
|
public List<AccidentDO> listAll(Map<String, Object> params, String menuPerms) {
|
||||||
return accidentMapper.list(params, menuPerms);
|
return accidentMapper.list(params, menuPerms);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue