|
|
|
@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; |
|
|
|
import org.springblade.core.tool.utils.DateUtil; |
|
|
|
import org.springblade.core.tool.utils.DateUtil; |
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
import org.springblade.desk.basic.util.ExcelExtUtil; |
|
|
|
import org.springblade.desk.basic.util.ExcelExtUtil; |
|
|
|
|
|
|
|
import org.springblade.desk.quality.constant.ProReTemplateConst; |
|
|
|
import org.springblade.desk.quality.excel.ProReTemplateExcel; |
|
|
|
import org.springblade.desk.quality.excel.ProReTemplateExcel; |
|
|
|
import org.springblade.desk.quality.pojo.entity.ProReTemplate; |
|
|
|
import org.springblade.desk.quality.pojo.entity.ProReTemplate; |
|
|
|
import org.springblade.desk.quality.pojo.vo.ProReTemplateVO; |
|
|
|
import org.springblade.desk.quality.pojo.vo.ProReTemplateVO; |
|
|
|
@ -54,184 +55,213 @@ import java.util.stream.Collectors; |
|
|
|
public class ProReTemplateController extends BladeController { |
|
|
|
public class ProReTemplateController extends BladeController { |
|
|
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
private IProReTemplateService service; |
|
|
|
private IProReTemplateService service; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] 详情 |
|
|
|
* [过程记录模板] 详情 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@GetMapping("/detail") |
|
|
|
@GetMapping("/detail") |
|
|
|
@ApiOperationSupport(order = 10) |
|
|
|
@ApiOperationSupport(order = 10) |
|
|
|
@Operation(summary = "详情", description = "传入ProReTemplate Obj") |
|
|
|
@Operation(summary = "详情", description = "传入ProReTemplate Obj") |
|
|
|
public R<ProReTemplateVO> detail(ProReTemplate proReTemplate) { |
|
|
|
public R<ProReTemplateVO> detail(ProReTemplate proReTemplate) { |
|
|
|
QueryWrapper<ProReTemplate> qw = Condition.getQueryWrapper(proReTemplate); |
|
|
|
QueryWrapper<ProReTemplate> qw = Condition.getQueryWrapper(proReTemplate); |
|
|
|
ProReTemplate detail = service.getOne(qw); |
|
|
|
ProReTemplate detail = service.getOne(qw); |
|
|
|
ProReTemplateVO detailVO = ProReTemplateWrapper.build().entityVO(detail); |
|
|
|
ProReTemplateVO detailVO = ProReTemplateWrapper.build().entityVO(detail); |
|
|
|
service.setVOValue(detailVO); |
|
|
|
service.setVOValue(detailVO); |
|
|
|
return R.data(detailVO); |
|
|
|
return R.data(detailVO); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] list分页 |
|
|
|
* [过程记录模板] list分页 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@GetMapping("/list") |
|
|
|
@GetMapping("/list") |
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
@Operation(summary = "list分页", description = "传入ProReTemplate Obj") |
|
|
|
@Operation(summary = "list分页", description = "传入ProReTemplate Obj") |
|
|
|
public R<IPage<ProReTemplateVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> proReTemplate, |
|
|
|
public R<IPage<ProReTemplateVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> proReTemplate, |
|
|
|
Query query) { |
|
|
|
Query query) { |
|
|
|
QueryWrapper<ProReTemplate> qw = Condition.getQueryWrapper(proReTemplate, ProReTemplate.class); |
|
|
|
QueryWrapper<ProReTemplate> qw = Condition.getQueryWrapper(proReTemplate, ProReTemplate.class); |
|
|
|
IPage<ProReTemplate> pages = service.page(Condition.getPage(query), qw); |
|
|
|
IPage<ProReTemplate> pages = service.page(Condition.getPage(query), qw); |
|
|
|
IPage<ProReTemplateVO> pagesVO = ProReTemplateWrapper.build().pageVO(pages); |
|
|
|
IPage<ProReTemplateVO> pagesVO = ProReTemplateWrapper.build().pageVO(pages); |
|
|
|
pagesVO.getRecords() |
|
|
|
pagesVO.getRecords() |
|
|
|
.stream() |
|
|
|
.stream() |
|
|
|
.peek(service::setVOValue) |
|
|
|
.peek(service::setVOValue) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
.collect(Collectors.toList()); |
|
|
|
return R.data(pagesVO); |
|
|
|
return R.data(pagesVO); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] page分页 |
|
|
|
* [过程记录模板] page分页 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@GetMapping("/page") |
|
|
|
@GetMapping("/page") |
|
|
|
@ApiOperationSupport(order = 21) |
|
|
|
@ApiOperationSupport(order = 21) |
|
|
|
@Operation(summary = "page分页", description = "传入ProReTemplate Obj") |
|
|
|
@Operation(summary = "page分页", description = "传入ProReTemplate Obj") |
|
|
|
public R<IPage<ProReTemplateVO>> page(ProReTemplateVO proReTemplate, Query query) { |
|
|
|
public R<IPage<ProReTemplateVO>> page(ProReTemplateVO proReTemplate, Query query) { |
|
|
|
IPage<ProReTemplateVO> pagesVO = service.selectProReTemplatePage( |
|
|
|
IPage<ProReTemplateVO> pagesVO = service.selectProReTemplatePage( |
|
|
|
Condition.getPage(query), proReTemplate |
|
|
|
Condition.getPage(query), proReTemplate |
|
|
|
); |
|
|
|
); |
|
|
|
return R.data(pagesVO); |
|
|
|
return R.data(pagesVO); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] list下拉选择 |
|
|
|
* [过程记录模板] list下拉选择 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@GetMapping("/listForSelect") |
|
|
|
@GetMapping("/listForSelect") |
|
|
|
@ApiOperationSupport(order = 22) |
|
|
|
@ApiOperationSupport(order = 22) |
|
|
|
@Operation(summary = "list下拉选择", description = "") |
|
|
|
@Operation(summary = "list下拉选择", description = "") |
|
|
|
public R<List<ProReTemplateVO>> listForSelect() { |
|
|
|
public R<List<ProReTemplateVO>> listForSelect() { |
|
|
|
List<ProReTemplate> list = service.list(); |
|
|
|
List<ProReTemplate> list = service.list(); |
|
|
|
List<ProReTemplateVO> listVO = ProReTemplateWrapper.build().listVO(list); |
|
|
|
List<ProReTemplateVO> listVO = ProReTemplateWrapper.build().listVO(list); |
|
|
|
return R.data(listVO); |
|
|
|
return R.data(listVO); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] 新增一条 |
|
|
|
* [过程记录模板] 新增一条 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@PostMapping("/save") |
|
|
|
@PostMapping("/save") |
|
|
|
@ApiOperationSupport(order = 30) |
|
|
|
@ApiOperationSupport(order = 30) |
|
|
|
@Operation(summary = "新增一条", description = "传入ProReTemplate Obj") |
|
|
|
@Operation(summary = "新增一条", description = "传入ProReTemplate Obj") |
|
|
|
public R save(@Valid @RequestBody ProReTemplate addOne) { |
|
|
|
public R save(@Valid @RequestBody ProReTemplate addOne) { |
|
|
|
addOne.setId(null); |
|
|
|
addOne.setId(null); |
|
|
|
return R.status(service.save(addOne)); |
|
|
|
addOne.setStatus(ProReTemplateConst.STATUS_NEW); |
|
|
|
} |
|
|
|
addOne.setApprovalStatus(1); |
|
|
|
|
|
|
|
return R.status(service.save(addOne)); |
|
|
|
/** |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* [过程记录模板] 新增批量 |
|
|
|
* [过程记录模板] 新增批量 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@PostMapping("/saveBat") |
|
|
|
@PostMapping("/saveBat") |
|
|
|
@ApiOperationSupport(order = 31) |
|
|
|
@ApiOperationSupport(order = 31) |
|
|
|
@Operation(summary = "新增批量", description = "传入ProReTemplate List") |
|
|
|
@Operation(summary = "新增批量", description = "传入ProReTemplate List") |
|
|
|
public R saveBat(@Valid @RequestBody List<ProReTemplate> addList) { |
|
|
|
public R saveBat(@Valid @RequestBody List<ProReTemplate> addList) { |
|
|
|
addList.forEach(one -> { |
|
|
|
addList.forEach(one -> { |
|
|
|
one.setId(null); |
|
|
|
one.setId(null); |
|
|
|
}); |
|
|
|
}); |
|
|
|
return R.status(service.saveBatch(addList)); |
|
|
|
return R.status(service.saveBatch(addList)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] 修改一条 |
|
|
|
* [过程记录模板] 修改一条 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@PostMapping("/update") |
|
|
|
@PostMapping("/update") |
|
|
|
@ApiOperationSupport(order = 40) |
|
|
|
@ApiOperationSupport(order = 40) |
|
|
|
@Operation(summary = "修改一条", description = "传入ProReTemplate Obj") |
|
|
|
@Operation(summary = "修改一条", description = "传入ProReTemplate Obj") |
|
|
|
public R update(@Valid @RequestBody ProReTemplate updateOne) { |
|
|
|
public R update(@Valid @RequestBody ProReTemplate updateOne) { |
|
|
|
return R.status(service.updateById(updateOne)); |
|
|
|
return R.status(service.updateById(updateOne)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* [过程记录模板] 修改一条 |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
@PostMapping("/updateDetail") |
|
|
|
|
|
|
|
@ApiOperationSupport(order = 42) |
|
|
|
|
|
|
|
@Operation(summary = "修改一条明细", description = "传入ProReTemplate Obj") |
|
|
|
|
|
|
|
public R updateDetail(@Valid @RequestBody ProReTemplateVO updateDetail) { |
|
|
|
|
|
|
|
return service.updateDetail(updateDetail); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] 修改批量 |
|
|
|
* [过程记录模板] 修改批量 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@PostMapping("/updateBat") |
|
|
|
@PostMapping("/updateBat") |
|
|
|
@ApiOperationSupport(order = 41) |
|
|
|
@ApiOperationSupport(order = 41) |
|
|
|
@Operation(summary = "修改批量", description = "传入ProReTemplate List") |
|
|
|
@Operation(summary = "修改批量", description = "传入ProReTemplate List") |
|
|
|
public R updateBat(@Valid @RequestBody List<ProReTemplate> updateList) { |
|
|
|
public R updateBat(@Valid @RequestBody List<ProReTemplate> updateList) { |
|
|
|
return R.status(service.updateBatchById(updateList)); |
|
|
|
return R.status(service.updateBatchById(updateList)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] 新增或修改一条 |
|
|
|
* [过程记录模板] 新增或修改一条 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@PostMapping("/submit") |
|
|
|
@PostMapping("/submit") |
|
|
|
@ApiOperationSupport(order = 50) |
|
|
|
@ApiOperationSupport(order = 50) |
|
|
|
@Operation(summary = "新增或修改一条", description = "传入ProReTemplate Obj") |
|
|
|
@Operation(summary = "新增或修改一条", description = "传入ProReTemplate Obj") |
|
|
|
public R submit(@Valid @RequestBody ProReTemplate mergeOne) { |
|
|
|
public R submit(@Valid @RequestBody ProReTemplate mergeOne) { |
|
|
|
return R.status(service.saveOrUpdate(mergeOne)); |
|
|
|
return R.status(service.saveOrUpdate(mergeOne)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] 新增或修改批量 |
|
|
|
* [过程记录模板] 新增或修改批量 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@PostMapping("/submitBat") |
|
|
|
@PostMapping("/submitBat") |
|
|
|
@ApiOperationSupport(order = 51) |
|
|
|
@ApiOperationSupport(order = 51) |
|
|
|
@Operation(summary = "新增或修改批量", description = "传入ProReTemplate List") |
|
|
|
@Operation(summary = "新增或修改批量", description = "传入ProReTemplate List") |
|
|
|
public R submitBat(@Valid @RequestBody List<ProReTemplate> mergeList) { |
|
|
|
public R submitBat(@Valid @RequestBody List<ProReTemplate> mergeList) { |
|
|
|
return R.status(service.saveOrUpdateBatch(mergeList)); |
|
|
|
return R.status(service.saveOrUpdateBatch(mergeList)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] 逻辑删除 |
|
|
|
* [过程记录模板] 逻辑删除 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@PostMapping("/remove") |
|
|
|
@PostMapping("/remove") |
|
|
|
@ApiOperationSupport(order = 61) |
|
|
|
@ApiOperationSupport(order = 61) |
|
|
|
@Operation(summary = "逻辑删除", description = "传入ids") |
|
|
|
@Operation(summary = "逻辑删除", description = "传入ids") |
|
|
|
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { |
|
|
|
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { |
|
|
|
return R.status(service.deleteLogic(Func.toLongList(ids))); |
|
|
|
return R.status(service.deleteLogic(Func.toLongList(ids))); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
@GetMapping("/removeFromDetail") |
|
|
|
* [过程记录模板] 导出Excel |
|
|
|
@ApiOperationSupport(order = 61) |
|
|
|
*/ |
|
|
|
@Operation(summary = "逻辑删除FromDetail", description = "传入ids") |
|
|
|
@GetMapping("/exportExcel") |
|
|
|
public R removeFromDetail(@Parameter(description = "", required = true) @RequestParam Long tankId) { |
|
|
|
@ApiOperationSupport(order = 70) |
|
|
|
return service.removeFromDetail(tankId); |
|
|
|
@Operation(summary = "导出Excel", description = "传入ProReTemplate") |
|
|
|
} |
|
|
|
public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> proReTemplate, |
|
|
|
|
|
|
|
BladeUser bladeUser, HttpServletResponse response) { |
|
|
|
/** |
|
|
|
QueryWrapper<ProReTemplate> qw = Condition.getQueryWrapper(proReTemplate, ProReTemplate.class); |
|
|
|
* [过程记录模板] 导出Excel |
|
|
|
//if (!AuthUtil.isAdministrator()) {
|
|
|
|
*/ |
|
|
|
// queryWrapper.lambda().eq(ProReTemplate::getTenantId, bladeUser.getTenantId());
|
|
|
|
@GetMapping("/exportExcel") |
|
|
|
//}
|
|
|
|
@ApiOperationSupport(order = 70) |
|
|
|
//queryWrapper.lambda().eq(ProReTemplateEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
|
|
|
|
@Operation(summary = "导出Excel", description = "传入ProReTemplate") |
|
|
|
List<ProReTemplateExcel> list = service.exportProReTemplate(qw); |
|
|
|
public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> proReTemplate, |
|
|
|
ExcelUtil.export(response, "[过程记录模板]数据" + DateUtil.time(), |
|
|
|
BladeUser bladeUser, HttpServletResponse response) { |
|
|
|
"[过程记录模板]数据表", list, ProReTemplateExcel.class); |
|
|
|
QueryWrapper<ProReTemplate> qw = Condition.getQueryWrapper(proReTemplate, ProReTemplate.class); |
|
|
|
} |
|
|
|
//if (!AuthUtil.isAdministrator()) {
|
|
|
|
|
|
|
|
// queryWrapper.lambda().eq(ProReTemplate::getTenantId, bladeUser.getTenantId());
|
|
|
|
/** |
|
|
|
//}
|
|
|
|
|
|
|
|
//queryWrapper.lambda().eq(ProReTemplateEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
|
|
|
|
|
|
|
|
List<ProReTemplateExcel> list = service.exportProReTemplate(qw); |
|
|
|
|
|
|
|
ExcelUtil.export(response, "[过程记录模板]数据" + DateUtil.time(), |
|
|
|
|
|
|
|
"[过程记录模板]数据表", list, ProReTemplateExcel.class); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* [过程记录模板] 下载Excel模板 |
|
|
|
* [过程记录模板] 下载Excel模板 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@GetMapping("/downloadExcelTemplate") |
|
|
|
@GetMapping("/downloadExcelTemplate") |
|
|
|
@ApiOperationSupport(order = 71) |
|
|
|
@ApiOperationSupport(order = 71) |
|
|
|
@Operation(summary = "下载Excel模板", description = "") |
|
|
|
@Operation(summary = "下载Excel模板", description = "") |
|
|
|
public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() { |
|
|
|
public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() { |
|
|
|
return ExcelExtUtil.downloadXlsTemplate( |
|
|
|
return ExcelExtUtil.downloadXlsTemplate( |
|
|
|
"Excel/QA/ImportTemplate-CycleTestItem.xls", |
|
|
|
"Excel/QA/ImportTemplate-CycleTestItem.xls", |
|
|
|
"导入模版-周期试验项目.xls"); |
|
|
|
"导入模版-周期试验项目.xls"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* [过程记录模板] 导入Excel |
|
|
|
* [过程记录模板] 导入Excel |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@PostMapping("/importExcel") |
|
|
|
@PostMapping("/importExcel") |
|
|
|
@ApiOperationSupport(order = 72) |
|
|
|
@ApiOperationSupport(order = 72) |
|
|
|
@Operation(summary = "导入Excel", description = "MultipartFile") |
|
|
|
@Operation(summary = "导入Excel", description = "MultipartFile") |
|
|
|
public R importExcel(@RequestParam("file") MultipartFile file) { |
|
|
|
public R importExcel(@RequestParam("file") MultipartFile file) { |
|
|
|
R checkR = ExcelExtUtil.importExcelCheck(file); |
|
|
|
R checkR = ExcelExtUtil.importExcelCheck(file); |
|
|
|
if (checkR != null) { |
|
|
|
if (checkR != null) { |
|
|
|
return checkR; |
|
|
|
return checkR; |
|
|
|
} |
|
|
|
} |
|
|
|
List<ProReTemplate> importList = ExcelUtil.read( |
|
|
|
List<ProReTemplate> importList = ExcelUtil.read( |
|
|
|
file, 0, 1, ProReTemplate.class |
|
|
|
file, 0, 1, ProReTemplate.class |
|
|
|
); |
|
|
|
); |
|
|
|
return R.status(service.saveBatch(importList)); |
|
|
|
return R.status(service.saveBatch(importList)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* [过程记录模板] 逻辑删除 |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
@GetMapping("/copy") |
|
|
|
|
|
|
|
@ApiOperationSupport(order = 80) |
|
|
|
|
|
|
|
@Operation(summary = "copy", description = "传入id") |
|
|
|
|
|
|
|
public R copy(@Parameter(description = "主键", required = true) @RequestParam Long id) { |
|
|
|
|
|
|
|
return service.copy(id); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
Tom Li
4 months ago