bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码异味

This commit is contained in:
hayu 2024-06-14 18:04:40 +08:00
parent fa1aed07f8
commit 986013197c
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java
View File

@ -44,21 +44,8 @@ public class PurchaseCheckInfoController extends BaseController {
@ApiOperation("查询新购入库任务列表") @ApiOperation("查询新购入库任务列表")
@GetMapping("/putInList") @GetMapping("/putInList")
public TableDataInfo putInList(PurchaseCheckInfo purchaseCheckInfo) { public TableDataInfo putInList(PurchaseCheckInfo purchaseCheckInfo) {
List<PurchaseCheckInfo> list = new ArrayList<>();
//判断该组织是否开启综合服务中心审核
Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
int re = purchaseCheckServiceCenterService.selectExamineType(companyId);
startPage(); startPage();
list = purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo); return getDataTable(purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo));
/*if (re > 0) {
//若依框架多个查询会导致分页失效，需分批处理
startPage();
list = purchaseCheckInfoService.selectPutInListExamine(purchaseCheckInfo);
} else {
startPage();
list = purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo);
}*/
return getDataTable(list);
} }
/** /**
@ -68,8 +55,7 @@ public class PurchaseCheckInfoController extends BaseController {
@GetMapping("/wholeSetDetails") @GetMapping("/wholeSetDetails")
public TableDataInfo wholeSetDetails(PurchaseCheckInfo purchaseCheckInfo) { public TableDataInfo wholeSetDetails(PurchaseCheckInfo purchaseCheckInfo) {
startPage(); startPage();
List<MachinePart> list = purchaseCheckInfoService.getWholeSetDetails(purchaseCheckInfo); return getDataTable(purchaseCheckInfoService.getWholeSetDetails(purchaseCheckInfo));
return getDataTable(list);
} }
/** /**
@ -79,8 +65,7 @@ public class PurchaseCheckInfoController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(PurchaseCheckInfo purchaseCheckInfo) { public TableDataInfo list(PurchaseCheckInfo purchaseCheckInfo) {
startPage(); startPage();
List<PurchaseCheckInfo> list = purchaseCheckInfoService.selectPurchaseCheckInfoList(purchaseCheckInfo); return getDataTable(purchaseCheckInfoService.selectPurchaseCheckInfoList(purchaseCheckInfo));
return getDataTable(list);
} }
/** /**
@ -91,7 +76,7 @@ public class PurchaseCheckInfoController extends BaseController {
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) { public void export(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) {
List<PurchaseCheckInfo> list = purchaseCheckInfoService.exportList(purchaseCheckInfo); List<PurchaseCheckInfo> list = purchaseCheckInfoService.exportList(purchaseCheckInfo);
ExcelUtil<PurchaseCheckInfo> util = new ExcelUtil<PurchaseCheckInfo>(PurchaseCheckInfo.class); ExcelUtil<PurchaseCheckInfo> util = new ExcelUtil<>(PurchaseCheckInfo.class);
util.exportExcel(response, list, "新购验收任务数据"); util.exportExcel(response, list, "新购验收任务数据");
} }
@ -103,7 +88,7 @@ public class PurchaseCheckInfoController extends BaseController {
@PostMapping("/putInExport") @PostMapping("/putInExport")
public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) { public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) {
List<PurchaseInput> list = purchaseCheckInfoService.putInExportList(purchaseCheckInfo); List<PurchaseInput> list = purchaseCheckInfoService.putInExportList(purchaseCheckInfo);
ExcelUtil<PurchaseInput> util = new ExcelUtil<PurchaseInput>(PurchaseInput.class); ExcelUtil<PurchaseInput> util = new ExcelUtil<>(PurchaseInput.class);
util.exportExcel(response, list, "新购工机具入库"); util.exportExcel(response, list, "新购工机具入库");
} }

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java
View File

@ -87,7 +87,7 @@ public class PurchaseCheckServiceCenterController extends BaseController
public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo)
{ {
List<PurchaseInput> list = purchaseCheckServiceCenterService.putInExportList(purchaseCheckInfo); List<PurchaseInput> list = purchaseCheckServiceCenterService.putInExportList(purchaseCheckInfo);
ExcelUtil<PurchaseInput> util = new ExcelUtil<PurchaseInput>(PurchaseInput.class); ExcelUtil<PurchaseInput> util = new ExcelUtil<>(PurchaseInput.class);
util.exportExcel(response, list, "新购工机具入库"); util.exportExcel(response, list, "新购工机具入库");
} }