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

宁夏流程及数据权限修改

This commit is contained in:
liang.chao 2024-05-14 17:51:35 +08:00
parent 95b87226fa
commit c20ea17df3
1 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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