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

Compare commits

base: bonus:4ff2059cc66b0975fc6499c96d3e8dfeda77d92a
Branches Tags
bonus:main
bonus:dev-nx
bonus:dev-nwcc
bonus:dev-nx-sx20240821b
bonus:macode20240820
bonus:dev-nx-sx20240821
bonus:dev-nw
bonus:dev-cq
bonus:dev-cq-rudy20240806b
bonus:dev-cq-rudy20240806
bonus:dev-nx-rudy20240806
bonus:dev-nx-rudy20240805
bonus:dev-nwcc-test
bonus:dev
bonus:flow_dev
bonus:test
bonus:master
..
compare: bonus:0509f945236cd75dd39ee244152ba199576701f8
Branches Tags
bonus:dev-nx
bonus:main
bonus:dev-nwcc
bonus:dev-nx-sx20240821b
bonus:macode20240820
bonus:dev-nx-sx20240821
bonus:dev-nw
bonus:dev-cq
bonus:dev-cq-rudy20240806b
bonus:dev-cq-rudy20240806
bonus:dev-nx-rudy20240806
bonus:dev-nx-rudy20240805
bonus:dev-nwcc-test
bonus:dev
bonus:flow_dev
bonus:test
bonus:master

No commits in common. "4ff2059cc66b0975fc6499c96d3e8dfeda77d92a" and "0509f945236cd75dd39ee244152ba199576701f8" have entirely different histories.
4ff2059cc6 ... 0509f94523

1 changed files with 38 additions and 29 deletions
Show Stats Expand all files Collapse all files

67
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java
View File

@ -35,14 +35,15 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo;
/**
* 报废任务详细
*
*
* @author bonus
* @date 2023-12-15
*/
@RestController
@Api(value = "报废任务详细")
@RequestMapping("/scrap")
public class ScrapApplyDetailsController extends BaseController {
public class ScrapApplyDetailsController extends BaseController
{
@Resource
private IScrapApplyDetailsService scrapApplyDetailsService;
@ -51,14 +52,15 @@ public class ScrapApplyDetailsController extends BaseController {
*/
@ApiOperation("查询报废任务列表")
@GetMapping("/getScrapTaskList")
public TableDataInfo list(ScrapApplyDetails scrapApplyDetails) {
public TableDataInfo list(ScrapApplyDetails scrapApplyDetails)
{
startPage();
Map<String, Object> params = scrapApplyDetails.getParams();
if (!params.isEmpty()) {
if (!params.isEmpty()){
String beginTime = (String) params.get("beginTime");
String endTime = (String) params.get("endTime");
params.put("beginTime", beginTime + " 00:00:00");
params.put("endTime", endTime + " 23:59:59");
params.put("beginTime", beginTime+" 00:00:00");
params.put("endTime", endTime+" 23:59:59");
scrapApplyDetails.setParams(params);
}
List<ScrapApplyDetailsVO> list = scrapApplyDetailsService.selectScrapApplyDetailsList(scrapApplyDetails);
@ -70,13 +72,14 @@ public class ScrapApplyDetailsController extends BaseController {
*/
@Log(title = "导出报废任务列表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ScrapApplyDetails bean) {
public void export(HttpServletResponse response, ScrapApplyDetails bean)
{
Map<String, Object> params = bean.getParams();
if (params != null && !params.isEmpty()) {
if (params!=null && !params.isEmpty()){
String beginTime = (String) params.get("beginTime");
String endTime = (String) params.get("endTime");
params.put("beginTime", beginTime + " 00:00:00");
params.put("endTime", endTime + " 23:59:59");
params.put("beginTime", beginTime+" 00:00:00");
params.put("endTime", endTime+" 23:59:59");
bean.setParams(params);
}
List<ScrapApplyDetailsVO> list = scrapApplyDetailsService.exportScrapApplyDetailsList(bean);
@ -89,7 +92,8 @@ public class ScrapApplyDetailsController extends BaseController {
*/
@ApiOperation("查看报废任务详细列表")
@GetMapping("/getScrapAuditList")
public TableDataInfo getScrapAuditList(ScrapApplyDetails scrapApplyDetails) {
public TableDataInfo getScrapAuditList(ScrapApplyDetails scrapApplyDetails)
{
startPage();
List<ScrapApplyDetails> list = scrapApplyDetailsService.getScrapAuditList(scrapApplyDetails);
return getDataTable(list);
@ -110,7 +114,8 @@ public class ScrapApplyDetailsController extends BaseController {
*/
@ApiOperation("查看报废明细")
@GetMapping("/getScrapRecord")
public TableDataInfo getScrapRecord(ScrapApplyDetails scrapApplyDetails) {
public TableDataInfo getScrapRecord(ScrapApplyDetails scrapApplyDetails)
{
startPage();
List<RepairRecord> list = scrapApplyDetailsService.getScrapRecord(scrapApplyDetails);
return getDataTable(list);
@ -121,7 +126,8 @@ public class ScrapApplyDetailsController extends BaseController {
*/
@ApiOperation("查看报废照片")
@GetMapping("/getFileUrl")
public AjaxResult getFileUrl(String fileIds) {
public AjaxResult getFileUrl(String fileIds)
{
List<String> list = scrapApplyDetailsService.getFileUrl(fileIds);
return AjaxResult.success(list);
}
@ -131,14 +137,15 @@ public class ScrapApplyDetailsController extends BaseController {
*/
@ApiOperation("查询预报废任务列表")
@PostMapping("/getScrapApplyList")
public TableDataInfo getScrapApplyList(ScrapApplyDetails scrapApplyDetails) {
public TableDataInfo getScrapApplyList(ScrapApplyDetails scrapApplyDetails)
{
startPage();
Map<String, Object> params = scrapApplyDetails.getParams();
if (!params.isEmpty()) {
if (!params.isEmpty()){
String beginTime = (String) params.get("beginTime");
String endTime = (String) params.get("endTime");
params.put("beginTime", beginTime + " 00:00:00");
params.put("endTime", endTime + " 23:59:59");
params.put("beginTime", beginTime+" 00:00:00");
params.put("endTime", endTime+" 23:59:59");
scrapApplyDetails.setParams(params);
}
List<ScrapApplyDetailsVO> list = scrapApplyDetailsService.getScrapApplyList(scrapApplyDetails);
@ -162,7 +169,7 @@ public class ScrapApplyDetailsController extends BaseController {
@ApiOperation("报废任务提交审计信息")
@Log(title = "报废任务提交审计信息", businessType = BusinessType.UPDATE)
@PostMapping("/submitScrapTask")
public AjaxResult submitScrapTask(@RequestBody ScrapAudit scrapAudit) {
public AjaxResult submitScrapTask(@RequestBody ScrapAudit scrapAudit){
return toAjax(scrapApplyDetailsService.submitScrapTask(scrapAudit));
}
@ -171,14 +178,15 @@ public class ScrapApplyDetailsController extends BaseController {
*/
@ApiOperation("查询报废审核任务列表")
@PostMapping("/scrapTaskReviewList")
public TableDataInfo scrapTaskReviewList(ScrapApplyDetails scrapApplyDetails) {
public TableDataInfo scrapTaskReviewList(ScrapApplyDetails scrapApplyDetails)
{
startPage();
Map<String, Object> params = scrapApplyDetails.getParams();
if (!params.isEmpty()) {
if (!params.isEmpty()){
String beginTime = (String) params.get("beginTime");
String endTime = (String) params.get("endTime");
params.put("beginTime", beginTime + " 00:00:00");
params.put("endTime", endTime + " 23:59:59");
params.put("beginTime", beginTime+" 00:00:00");
params.put("endTime", endTime+" 23:59:59");
scrapApplyDetails.setParams(params);
}
List<ScrapApplyDetailsVO> list = scrapApplyDetailsService.scrapTaskReviewList(scrapApplyDetails);
@ -206,11 +214,11 @@ public class ScrapApplyDetailsController extends BaseController {
public TableDataInfo obtainDisposalList(@RequestBody ScrapApplyDetails scrapApplyDetails) {
startPage();
Map<String, Object> params = scrapApplyDetails.getParams();
if (!params.isEmpty()) {
if (!params.isEmpty()){
String beginTime = (String) params.get("beginTime");
String endTime = (String) params.get("endTime");
params.put("beginTime", beginTime + " 00:00:00");
params.put("endTime", endTime + " 23:59:59");
params.put("beginTime", beginTime+" 00:00:00");
params.put("endTime", endTime+" 23:59:59");
scrapApplyDetails.setParams(params);
}
List<ScrapApplyDetailsVO> list = scrapApplyDetailsService.obtainDisposalList(scrapApplyDetails);
@ -234,13 +242,14 @@ public class ScrapApplyDetailsController extends BaseController {
*/
@Log(title = "导出预报废审核列表", businessType = BusinessType.EXPORT)
@PostMapping("/exportForecastWaste")
public void exportForecastWaste(HttpServletResponse response, ScrapApplyDetails scrapApplyDetails) {
public void exportForecastWaste(HttpServletResponse response, ScrapApplyDetails scrapApplyDetails)
{
Map<String, Object> params = scrapApplyDetails.getParams();
if (params != null && !params.isEmpty()) {
if (params!=null && !params.isEmpty()){
String beginTime = (String) params.get("beginTime");
String endTime = (String) params.get("endTime");
params.put("beginTime", beginTime + " 00:00:00");
params.put("endTime", endTime + " 23:59:59");
params.put("beginTime", beginTime+" 00:00:00");
params.put("endTime", endTime+" 23:59:59");
scrapApplyDetails.setParams(params);
}
//获取预报废列表