|
|
|
|
@ -28,8 +28,11 @@ import org.springblade.desk.basic.util.ExcelExtUtil; |
|
|
|
|
import org.springblade.desk.quality.constant.QAModuleConst; |
|
|
|
|
import org.springblade.desk.quality.excel.LiquidTankReportExcel; |
|
|
|
|
import org.springblade.desk.quality.pojo.entity.LiquidTankReport; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.LiquidTankReportDetailVO; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO; |
|
|
|
|
import org.springblade.desk.quality.service.ILiquidTankReportService; |
|
|
|
|
import org.springblade.desk.quality.service.ILiquidTankTaskCopyService; |
|
|
|
|
import org.springblade.desk.quality.wrapper.LiquidTankReportDetailWrapper; |
|
|
|
|
import org.springblade.desk.quality.wrapper.LiquidTankReportWrapper; |
|
|
|
|
import org.springframework.http.ResponseEntity; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
@ -54,179 +57,183 @@ import java.util.Map; |
|
|
|
|
public class LiquidTankReportController extends BladeController { |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private ILiquidTankReportService service; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 详情 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/detail") |
|
|
|
|
@ApiOperationSupport(order = 10) |
|
|
|
|
@Operation(summary = "详情", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R<LiquidTankReportVO> detail(LiquidTankReport liquidTankReport) { |
|
|
|
|
QueryWrapper<LiquidTankReport> qw = Condition.getQueryWrapper(liquidTankReport); |
|
|
|
|
LiquidTankReport detail = service.getOne(qw); |
|
|
|
|
LiquidTankReportVO detailVO = LiquidTankReportWrapper.build().entityVO(detail); |
|
|
|
|
return R.data(detailVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] list分页 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/list") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "list分页", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R<IPage<LiquidTankReportVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> liquidTankReport, |
|
|
|
|
Query query) { |
|
|
|
|
private ILiquidTankReportService service; |
|
|
|
|
@Resource |
|
|
|
|
private ILiquidTankTaskCopyService liquidTankTaskCopyService; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 详情 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/detail") |
|
|
|
|
@ApiOperationSupport(order = 10) |
|
|
|
|
@Operation(summary = "详情", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R<LiquidTankReportDetailVO> detail(LiquidTankReport liquidTankReport) { |
|
|
|
|
QueryWrapper<LiquidTankReport> qw = Condition.getQueryWrapper(liquidTankReport); |
|
|
|
|
LiquidTankReport detail = service.getOne(qw); |
|
|
|
|
LiquidTankReportDetailVO detailVO = LiquidTankReportDetailWrapper.build().entityVO(detail); |
|
|
|
|
// 直接查询明细列表
|
|
|
|
|
detailVO.setCopyList(liquidTankTaskCopyService.getListByLiquidTankReportId(detailVO.getId())); |
|
|
|
|
return R.data(detailVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] list分页 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/list") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "list分页", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R<IPage<LiquidTankReportVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> liquidTankReport, |
|
|
|
|
Query query) { |
|
|
|
|
QueryWrapper<LiquidTankReport> qw = Condition.getQueryWrapper(liquidTankReport, LiquidTankReport.class); |
|
|
|
|
IPage<LiquidTankReport> pages = service.page(Condition.getPage(query), qw); |
|
|
|
|
IPage<LiquidTankReportVO> pagesVO = LiquidTankReportWrapper.build().pageVO(pages); |
|
|
|
|
return R.data(pagesVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] page分页 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/page") |
|
|
|
|
@ApiOperationSupport(order = 21) |
|
|
|
|
@Operation(summary = "page分页", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R<IPage<LiquidTankReportVO>> page(LiquidTankReportVO liquidTankReport, Query query) { |
|
|
|
|
IPage<LiquidTankReportVO> pagesVO = service.selectLiquidTankReportPage( |
|
|
|
|
Condition.getPage(query), liquidTankReport |
|
|
|
|
); |
|
|
|
|
return R.data(pagesVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
IPage<LiquidTankReport> pages = service.page(Condition.getPage(query), qw); |
|
|
|
|
IPage<LiquidTankReportVO> pagesVO = LiquidTankReportWrapper.build().pageVO(pages); |
|
|
|
|
return R.data(pagesVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] page分页 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/page") |
|
|
|
|
@ApiOperationSupport(order = 21) |
|
|
|
|
@Operation(summary = "page分页", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R<IPage<LiquidTankReportVO>> page(LiquidTankReportVO liquidTankReport, Query query) { |
|
|
|
|
IPage<LiquidTankReportVO> pagesVO = service.selectLiquidTankReportPage( |
|
|
|
|
Condition.getPage(query), liquidTankReport |
|
|
|
|
); |
|
|
|
|
return R.data(pagesVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] list下拉选择 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/listForSelect") |
|
|
|
|
@ApiOperationSupport(order = 22) |
|
|
|
|
@Operation(summary = "list下拉选择", description = "") |
|
|
|
|
@Operation(summary = "list下拉选择", description = "") |
|
|
|
|
public R<List<LiquidTankReportVO>> listForSelect() { |
|
|
|
|
List<LiquidTankReport> list = service.list(); |
|
|
|
|
List<LiquidTankReportVO> listVO = LiquidTankReportWrapper.build().listVO(list); |
|
|
|
|
return R.data(listVO); |
|
|
|
|
List<LiquidTankReport> list = service.list(); |
|
|
|
|
List<LiquidTankReportVO> listVO = LiquidTankReportWrapper.build().listVO(list); |
|
|
|
|
return R.data(listVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 新增一条 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/save") |
|
|
|
|
@ApiOperationSupport(order = 30) |
|
|
|
|
@Operation(summary = "新增一条", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R save(@Valid @RequestBody LiquidTankReport addOne) { |
|
|
|
|
addOne.setId(null); |
|
|
|
|
return R.status(service.save(addOne)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 新增一条 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/save") |
|
|
|
|
@ApiOperationSupport(order = 30) |
|
|
|
|
@Operation(summary = "新增一条", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R save(@Valid @RequestBody LiquidTankReport addOne) { |
|
|
|
|
addOne.setId(null); |
|
|
|
|
return R.status(service.save(addOne)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 新增批量 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/saveBat") |
|
|
|
|
@ApiOperationSupport(order = 31) |
|
|
|
|
@Operation(summary = "新增批量", description = "传入LiquidTankReport List") |
|
|
|
|
public R saveBat(@Valid @RequestBody List<LiquidTankReport> addList) { |
|
|
|
|
addList.forEach(one -> { |
|
|
|
|
one.setId(null); |
|
|
|
|
}); |
|
|
|
|
return R.status(service.saveBatch(addList)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 修改一条 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/update") |
|
|
|
|
@ApiOperationSupport(order = 40) |
|
|
|
|
@Operation(summary = "修改一条", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R update(@Valid @RequestBody LiquidTankReport updateOne) { |
|
|
|
|
return R.status(service.updateById(updateOne)); |
|
|
|
|
} |
|
|
|
|
@PostMapping("/saveBat") |
|
|
|
|
@ApiOperationSupport(order = 31) |
|
|
|
|
@Operation(summary = "新增批量", description = "传入LiquidTankReport List") |
|
|
|
|
public R saveBat(@Valid @RequestBody List<LiquidTankReport> addList) { |
|
|
|
|
addList.forEach(one -> { |
|
|
|
|
one.setId(null); |
|
|
|
|
}); |
|
|
|
|
return R.status(service.saveBatch(addList)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 修改一条 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/update") |
|
|
|
|
@ApiOperationSupport(order = 40) |
|
|
|
|
@Operation(summary = "修改一条", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R update(@Valid @RequestBody LiquidTankReport updateOne) { |
|
|
|
|
return R.status(service.updateById(updateOne)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 修改批量 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/updateBat") |
|
|
|
|
@ApiOperationSupport(order = 41) |
|
|
|
|
@Operation(summary = "修改批量", description = "传入LiquidTankReport List") |
|
|
|
|
@Operation(summary = "修改批量", description = "传入LiquidTankReport List") |
|
|
|
|
public R updateBat(@Valid @RequestBody List<LiquidTankReport> updateList) { |
|
|
|
|
return R.status(service.updateBatchById(updateList)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 新增或修改一条 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/submit") |
|
|
|
|
@ApiOperationSupport(order = 50) |
|
|
|
|
@Operation(summary = "新增或修改一条", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R submit(@Valid @RequestBody LiquidTankReport mergeOne) { |
|
|
|
|
return R.status(service.saveOrUpdate(mergeOne)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 新增或修改一条 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/submit") |
|
|
|
|
@ApiOperationSupport(order = 50) |
|
|
|
|
@Operation(summary = "新增或修改一条", description = "传入LiquidTankReport Obj") |
|
|
|
|
public R submit(@Valid @RequestBody LiquidTankReport mergeOne) { |
|
|
|
|
return R.status(service.saveOrUpdate(mergeOne)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 新增或修改批量 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/submitBat") |
|
|
|
|
@ApiOperationSupport(order = 51) |
|
|
|
|
@Operation(summary = "新增或修改批量", description = "传入LiquidTankReport List") |
|
|
|
|
public R submitBat(@Valid @RequestBody List<LiquidTankReport> mergeList) { |
|
|
|
|
return R.status(service.saveOrUpdateBatch(mergeList)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 逻辑删除 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/remove") |
|
|
|
|
@ApiOperationSupport(order = 61) |
|
|
|
|
@Operation(summary = "逻辑删除", description = "传入ids") |
|
|
|
|
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { |
|
|
|
|
return R.status(service.deleteLogic(Func.toLongList(ids))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 导出Excel |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/exportExcel") |
|
|
|
|
@ApiOperationSupport(order = 70) |
|
|
|
|
@Operation(summary = "导出Excel", description = "传入LiquidTankReport") |
|
|
|
|
public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> liquidTankReport, |
|
|
|
|
BladeUser bladeUser, HttpServletResponse response) { |
|
|
|
|
QueryWrapper<LiquidTankReport> qw = Condition.getQueryWrapper(liquidTankReport, LiquidTankReport.class); |
|
|
|
|
//if (!AuthUtil.isAdministrator()) {
|
|
|
|
|
// queryWrapper.lambda().eq(LiquidTankReport::getTenantId, bladeUser.getTenantId());
|
|
|
|
|
//}
|
|
|
|
|
//queryWrapper.lambda().eq(LiquidTankReportEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
|
|
|
|
|
List<LiquidTankReportExcel> list = service.exportLiquidTankReport(qw); |
|
|
|
|
ExcelUtil.export(response, "[槽液报告]数据" + DateUtil.time(), |
|
|
|
|
"[槽液报告]数据表", list, LiquidTankReportExcel.class); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
@PostMapping("/submitBat") |
|
|
|
|
@ApiOperationSupport(order = 51) |
|
|
|
|
@Operation(summary = "新增或修改批量", description = "传入LiquidTankReport List") |
|
|
|
|
public R submitBat(@Valid @RequestBody List<LiquidTankReport> mergeList) { |
|
|
|
|
return R.status(service.saveOrUpdateBatch(mergeList)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 逻辑删除 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/remove") |
|
|
|
|
@ApiOperationSupport(order = 61) |
|
|
|
|
@Operation(summary = "逻辑删除", description = "传入ids") |
|
|
|
|
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { |
|
|
|
|
return R.status(service.deleteLogic(Func.toLongList(ids))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 导出Excel |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/exportExcel") |
|
|
|
|
@ApiOperationSupport(order = 70) |
|
|
|
|
@Operation(summary = "导出Excel", description = "传入LiquidTankReport") |
|
|
|
|
public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> liquidTankReport, |
|
|
|
|
BladeUser bladeUser, HttpServletResponse response) { |
|
|
|
|
QueryWrapper<LiquidTankReport> qw = Condition.getQueryWrapper(liquidTankReport, LiquidTankReport.class); |
|
|
|
|
//if (!AuthUtil.isAdministrator()) {
|
|
|
|
|
// queryWrapper.lambda().eq(LiquidTankReport::getTenantId, bladeUser.getTenantId());
|
|
|
|
|
//}
|
|
|
|
|
//queryWrapper.lambda().eq(LiquidTankReportEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
|
|
|
|
|
List<LiquidTankReportExcel> list = service.exportLiquidTankReport(qw); |
|
|
|
|
ExcelUtil.export(response, "[槽液报告]数据" + DateUtil.time(), |
|
|
|
|
"[槽液报告]数据表", list, LiquidTankReportExcel.class); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 下载Excel模板 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/downloadExcelTemplate") |
|
|
|
|
@ApiOperationSupport(order = 71) |
|
|
|
|
@Operation(summary = "下载Excel模板", description = "") |
|
|
|
|
public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() { |
|
|
|
|
return ExcelExtUtil.downloadXlsTemplate( |
|
|
|
|
"Excel/QA/ImportTemplate-CycleTestItem.xls", |
|
|
|
|
"导入模版-周期试验项目.xls"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 导入Excel |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/importExcel") |
|
|
|
|
@ApiOperationSupport(order = 72) |
|
|
|
|
@Operation(summary = "导入Excel", description = "MultipartFile") |
|
|
|
|
public R importExcel(@RequestParam("file") MultipartFile file) { |
|
|
|
|
R checkR = ExcelExtUtil.importExcelCheck(file); |
|
|
|
|
if (checkR != null) { |
|
|
|
|
return checkR; |
|
|
|
|
} |
|
|
|
|
List<LiquidTankReport> importList = ExcelUtil.read( |
|
|
|
|
file, 0, 1, LiquidTankReport.class |
|
|
|
|
); |
|
|
|
|
return R.status(service.saveBatch(importList)); |
|
|
|
|
} |
|
|
|
|
@GetMapping("/downloadExcelTemplate") |
|
|
|
|
@ApiOperationSupport(order = 71) |
|
|
|
|
@Operation(summary = "下载Excel模板", description = "") |
|
|
|
|
public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() { |
|
|
|
|
return ExcelExtUtil.downloadXlsTemplate( |
|
|
|
|
"Excel/QA/ImportTemplate-CycleTestItem.xls", |
|
|
|
|
"导入模版-周期试验项目.xls"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [槽液报告] 导入Excel |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/importExcel") |
|
|
|
|
@ApiOperationSupport(order = 72) |
|
|
|
|
@Operation(summary = "导入Excel", description = "MultipartFile") |
|
|
|
|
public R importExcel(@RequestParam("file") MultipartFile file) { |
|
|
|
|
R checkR = ExcelExtUtil.importExcelCheck(file); |
|
|
|
|
if (checkR != null) { |
|
|
|
|
return checkR; |
|
|
|
|
} |
|
|
|
|
List<LiquidTankReport> importList = ExcelUtil.read( |
|
|
|
|
file, 0, 1, LiquidTankReport.class |
|
|
|
|
); |
|
|
|
|
return R.status(service.saveBatch(importList)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
Tom Li
3 months ago