Merge remote-tracking branch 'origin/master'

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/RepairController.java

@@ -53,7 +53,7 @@ public class RepairController extends BaseController {
      */
     @Log(title = "导出维修任务列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-//    @RequiresPermissions("repair:manage:export")
+    @RequiresPermissions("repair:manage:export")
     public void export(HttpServletResponse response, RepairTask bean)
     {
         List<RepairTask> list = service.exportRepairTaskList(bean);

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java

@@ -52,7 +52,7 @@ public class BackRecordController extends BaseController {
     @ApiOperation("导出综合查询退料记录列表")
     @Log(title = "导出综合查询退料记录列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-//    @RequiresPermissions("return:list:export")
+    @RequiresPermissions("return:list:export")
     public void export(HttpServletResponse response, BackRecord bean)
     {
         List<BackRecord> list = backRecordService.getBackRecordList(bean);

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java

@@ -46,7 +46,7 @@ public class LeaseRecordController extends BaseController {
     @ApiOperation("导出综合查询领料记录列表")
     @Log(title = "导出综合查询领料记录列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-//    @RequiresPermissions("picking:list:export")
+    @RequiresPermissions("picking:list:export")
     public void export(HttpServletResponse response, LeaseRecord bean)
     {
         List<LeaseRecord> list = leaseRecordService.getLeaseRecordList(bean);

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java

@@ -51,7 +51,7 @@ public class RepairRecordController extends BaseController {
     @ApiOperation("导出综合查询维修记录列表")
     @Log(title = "导出综合查询维修记录列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-//    @RequiresPermissions("tools:repair:export")
+    @RequiresPermissions("tools:repair:export")
     public void export(HttpServletResponse response, RepairRecord bean)
     {
         List<RepairRecord> list = repairRecordService.getRepairRecordList(bean);

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java

@@ -74,32 +74,6 @@ public class SltAgreementInfoController extends BaseController {
         return AjaxResult.success(sltAgreementInfoService.getSltInfoMonth(list));
     }
 
-   /* @ApiOperation(value = "月结明细导出")
-    @PostMapping("/exportSltInfoMonth")
-    public void exportSltInfoMonth(HttpServletResponse response, @RequestBody List<AgreementInfo> list) {
-        List<SltAgreementInfo> sltInfoMonth = sltAgreementInfoService.getSltInfoMonth(list);
-        for (AgreementInfo agreementInfo : list) {
-            for (SltAgreementInfo sltAgreementInfo : sltInfoMonth) {
-                // 单个协议导出
-                if (StringUtils.isNotBlank(agreementInfo.getCodeNum())) {
-                    String[] split = agreementInfo.getCodeNum().split(",");
-                    for (String s : split) {
-                        if (s.equals(sltAgreementInfo.getCodeNum().toString())) {
-                            List<SltAgreementInfo> node = sltAgreementInfo.getNode();
-                            ExcelUtil<SltAgreementInfo> util = new ExcelUtil<SltAgreementInfo>(SltAgreementInfo.class);
-                            util.exportExcel(response, node, "月结明细导出数据");
-                        }
-                    }
-                } else {
-                    // 多个协议导出
-                    List<SltAgreementInfo> node = sltAgreementInfo.getNode();
-                    ExcelUtil<SltAgreementInfo> util = new ExcelUtil<SltAgreementInfo>(SltAgreementInfo.class);
-                    util.exportExcel(response, node, "月结明细导出数据");
-                }
-            }
-        }
-    }*/
-
     @RequiresPermissions("cost:settlement:export")
     @ApiOperation(value = "月结明细导出")
     @PostMapping("/exportSltInfoMonth")
@@ -152,7 +126,7 @@ public class SltAgreementInfoController extends BaseController {
      */
     @Log(title = "租赁明细导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportLeaseOne")
-//    @RequiresPermissions("ndertake:export_1")
+    @RequiresPermissions("ndertake:export_1")
     public void exportLeaseOne(HttpServletResponse response, @RequestBody List<AgreementInfo> list) {
         List<SltAgreementInfo> explist = sltAgreementInfoService.getLeaseListOne(list);
         List<LeaseInfo> leaseInfoList = Convert.toList(LeaseInfo.class, explist);
@@ -165,7 +139,7 @@ public class SltAgreementInfoController extends BaseController {
      */
     @Log(title = "租赁明细导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportLeaseThree")
-//    @RequiresPermissions("ndertake:export_2")
+    @RequiresPermissions("ndertake:export_2")
     public void exportLeaseThree(HttpServletResponse response, @RequestBody List<AgreementInfo> list) {
         List<SltAgreementInfo> explist = sltAgreementInfoService.getLeaseListThree(list);
         List<LeaseInfo> leaseInfoList = Convert.toList(LeaseInfo.class, explist);
@@ -178,7 +152,7 @@ public class SltAgreementInfoController extends BaseController {
      */
     @Log(title = "丢失明细导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportLose")
-//    @RequiresPermissions("device:wh:export")
+    @RequiresPermissions("device:wh:export")
     public void exportLose(HttpServletResponse response, @RequestBody List<AgreementInfo> list) {
         List<SltAgreementInfo> explist = sltAgreementInfoService.getLoseList(list);
         List<LoseInfo> leaseInfoList = Convert.toList(LoseInfo.class, explist);
@@ -191,7 +165,7 @@ public class SltAgreementInfoController extends BaseController {
      */
     @Log(title = "维修明细导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportRepair")
-//    @RequiresPermissions("device:repair:export")
+    @RequiresPermissions("device:repair:export")
     public void exportRepair(HttpServletResponse response, @RequestBody List<AgreementInfo> list) {
         List<SltAgreementInfo> explist = sltAgreementInfoService.getRepairList(list);
         List<RepairInfo> leaseInfoList = Convert.toList(RepairInfo.class, explist);
@@ -204,7 +178,7 @@ public class SltAgreementInfoController extends BaseController {
      */
     @Log(title = "报废明细导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportScrap")
-//    @RequiresPermissions("device:scrap:export")
+    @RequiresPermissions("device:scrap:export")
     public void exportScrap(HttpServletResponse response, @RequestBody List<AgreementInfo> list) {
         List<SltAgreementInfo> explist = sltAgreementInfoService.getScrapList(list);
         List<ScrapInfo> leaseInfoList = Convert.toList(ScrapInfo.class, explist);
@@ -217,7 +191,7 @@ public class SltAgreementInfoController extends BaseController {
      */
     @Log(title = "预报废明细导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportPreScrap")
-//    @RequiresPermissions("device:dai:scrap:export")
+    @RequiresPermissions("device:dai:scrap:export")
     public void exportPreScrap(HttpServletResponse response, @RequestBody List<AgreementInfo> list) {
         List<SltAgreementInfo> explist = sltAgreementInfoService.getPreScrapList(list);
         List<preScrapInfo> leaseInfoList = Convert.toList(preScrapInfo.class, explist);