diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java index b988a6d..3a7d8ee 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java @@ -13,6 +13,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; @@ -174,6 +175,7 @@ public class AppBackApplyController extends BaseController { */ @Log(title = "退料申请-新增", businessType = BusinessType.INSERT) @PostMapping("addBackTask") + @RequiresPermissions("return:apply:apply") public AjaxResult addBackTask(@RequestBody TmTask task) { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); @@ -213,6 +215,7 @@ public class AppBackApplyController extends BaseController { */ @Log(title = "提交物料型号及数量", businessType = BusinessType.UPDATE) @PostMapping("upload") + @RequiresPermissions("return:apply:apply") public AjaxResult upload(@RequestBody BackApplyInfo record) { try { if (CollUtil.isEmpty(record.getBackApplyDetails())) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 18f064f..aab411c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -12,6 +12,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.common.security.annotation.PreventRepeatSubmit; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -41,6 +42,7 @@ public class BackReceiveController extends BaseController { */ @Log(title = "退料接收列表", businessType = BusinessType.QUERY) @GetMapping("getbackReceiveList") + @RequiresPermissions("return:receive:list") public AjaxResult getbackReceiveList(BackApplyInfo record) { try { if (record.getFlag() == 0) { @@ -63,6 +65,7 @@ public class BackReceiveController extends BaseController { * @return */ @PostMapping("export") +// @RequiresPermissions("return:receive:export") public void export(HttpServletResponse response, BackApplyInfo record) { List list = backReceiveService.getbackReceiveList(record); ExcelUtil util = new ExcelUtil(BackApplyInfo.class); @@ -95,6 +98,7 @@ public class BackReceiveController extends BaseController { */ @Log(title = "退料接收明细-web", businessType = BusinessType.QUERY) @PostMapping("receiveViewWeb") + @RequiresPermissions("return:receive:view") public AjaxResult receiveViewWeb(@RequestBody BackApplyInfo record) { try { startPage(); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/PurchaseInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/PurchaseInputController.java index 6ea7c38..8171b7c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/PurchaseInputController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/PurchaseInputController.java @@ -8,6 +8,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -72,9 +73,9 @@ public class PurchaseInputController extends BaseController { */ @ApiOperation(value = "修改编码管理的入库状态") @PostMapping("/manageStatus") + @RequiresPermissions("warehousing:newTools:auditing") public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { return toAjax(purchaseInputService.modifyManageStatus(maInputVO)); } - } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index ff7156c..f6b47c0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -18,6 +18,8 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.Logical; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -59,9 +61,6 @@ public class TmTaskController extends BaseController { @Autowired private LeaseUserBookService leaseUserBookService; - @Resource - private ITypeService iTypeService; - /** * 领料审核通过，分公司，分管，机具分公司统一接口 @@ -82,6 +81,7 @@ public class TmTaskController extends BaseController { * @return 结果 */ @Log(title = "重庆领料审核通过", businessType = BusinessType.UPDATE) + @RequiresPermissions(value = {"receive:examine:fgs", "receive:examine:nbs"}, logical = Logical.OR) @PostMapping("auditLeaseByCompanyCq") public AjaxResult auditLeaseByCompanyCq(@RequestBody TmTask task) { return toAjax(tmTaskService.updateLeaseTaskAuditInfoCq(task)); @@ -112,6 +112,7 @@ public class TmTaskController extends BaseController { * @return 结果 */ @Log(title = "重庆领料审核驳回", businessType = BusinessType.UPDATE) + @RequiresPermissions(value = {"receive:examine:fgs", "receive:examine:nbs"}, logical = Logical.OR) @PostMapping("rejectLeaseByCompanyCq") public AjaxResult rejectLeaseByCompanyCq(@RequestBody TmTask task) { return toAjax(tmTaskService.updateLeaseTaskRejectInfoCq(task)); @@ -402,6 +403,7 @@ public class TmTaskController extends BaseController { * @return 列表 */ @Log(title = "重庆查询机具领料管理列表", businessType = BusinessType.QUERY) + @RequiresPermissions("picking:auditing:list") @GetMapping(value = "getLeaseManageListAllCq") public AjaxResult getLeaseManageListAllCq(TmTask task, Integer sourceBy) { if (StringUtils.isNull(task)) { @@ -426,6 +428,7 @@ public class TmTaskController extends BaseController { */ @ApiOperation("领料申请/管理导出") @Log(title = "领料申请/管理导出", businessType = BusinessType.EXPORT) +// @RequiresPermissions("picking:auditing:export") @PostMapping("/applyExport") public void applyExport(HttpServletResponse response, TmTask task) { List leaseAuditList = new ArrayList<>(); @@ -551,7 +554,7 @@ public class TmTaskController extends BaseController { tmTaskService.edit(task); return AjaxResult.success("修改成功"); } catch (Exception e) { - return AjaxResult.error("修改失败"+e.getMessage()); + return AjaxResult.error("修改失败" + e.getMessage()); } } @@ -596,6 +599,7 @@ public class TmTaskController extends BaseController { @Log(title = "重庆获取领料管理-详情列表", businessType = BusinessType.QUERY) @GetMapping("/getLeaseListAllCq") + @RequiresPermissions(value = {"picking:auditing:view", "picking:auditing:list"}, logical = Logical.OR) public TableDataInfo getLeaseListAllCq(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) { TmTask task = new TmTask(); task.setTaskId(Long.parseLong(taskId)); @@ -626,8 +630,7 @@ public class TmTaskController extends BaseController { @Log(title = "把设备推送到智慧工程", businessType = BusinessType.QUERY) @ApiOperation(value = "把设备推送到智慧工程") @PostMapping("/pushToIntelligentProject") - public AjaxResult pushToIntelligentProject(@RequestBody List tmTasks) - { + public AjaxResult pushToIntelligentProject(@RequestBody List tmTasks) { logger.info("MaMachineController pushToIntelligentProject 装备推送入口===="); return tmTaskService.pushToIntelligentProject(tmTasks); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/RepairController.java index a4bd549..fd25d18 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/RepairController.java +++ b/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 list = service.exportRepairTaskList(bean); @@ -67,6 +67,7 @@ public class RepairController extends BaseController { @ApiOperation(value = "获取维修任务列表") @Log(title = "维修任务列表", businessType = BusinessType.QUERY) @GetMapping("/getAppRepairTaskList") + @RequiresPermissions("repair:manage:list") public AjaxResult getAppRepairTaskList(RepairTask bean) { List list = service.getRepairTaskList(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index 9343b4c..997bd45 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -12,6 +12,8 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.Logical; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.BackApplyDto; import com.bonus.sgzb.base.api.domain.BackApplyInfo; @@ -45,6 +47,7 @@ public class BackApplyController extends BaseController { */ @ApiOperation(value = "获取退料申请列表-web") @GetMapping("/getBackApplyList") + @RequiresPermissions("return:apply:list") public AjaxResult getBackApplyList(BackApplyInfo bean) { startPage(); List list = backApplyService.getBackApplyList(bean); @@ -86,8 +89,9 @@ public class BackApplyController extends BaseController { /** * 退料申请详情 */ - @ApiOperation(value = "退料申请（查看）") + @ApiOperation(value = "退料申请（查看/退料单）") @GetMapping("/getViewByApply") + @RequiresPermissions(value = {"return:apply:view","return:apply:list"}, logical = Logical.OR) public AjaxResult getViewByApply(BackApplyInfo bean) { if (bean.getViewWeb() == 1) { bean.setFlag(0); @@ -104,8 +108,9 @@ public class BackApplyController extends BaseController { /** * 退料申请详情--用于退料单，不带分页 */ - @ApiOperation(value = "退料申请（退料单、驳回提交）") + @ApiOperation(value = "退料申请（驳回提交）") @GetMapping("/materialReturnNoteByApply") + @RequiresPermissions("return:apply:reject:submit") public AjaxResult materialReturnNoteByApply(BackApplyInfo bean) { bean.setFlag(1); List list = backApplyService.getViewByApply(bean); @@ -128,6 +133,7 @@ public class BackApplyController extends BaseController { */ @ApiOperation(value = "退料审核（审批/退料单）") @GetMapping("/materialReturnNoteByExamine") + @RequiresPermissions("return:receive:list") public AjaxResult materialReturnNoteByExamine(BackApplyInfo bean) { List list = backApplyService.getView(bean); return success(list); @@ -148,6 +154,7 @@ public class BackApplyController extends BaseController { */ @ApiOperation(value = "退料申请删除") @GetMapping("/del") + @RequiresPermissions("return:apply:del") public AjaxResult del(BackApplyInfo bean) { return backApplyService.del(bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java index 02721cb..90b6bdf 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java +++ b/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 list = backRecordService.getBackRecordList(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java index 1320ced..17b3f5a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java +++ b/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 list = leaseRecordService.getLeaseRecordList(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java index 7d37db3..7e6a90f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java @@ -70,7 +70,6 @@ public class PurchaseCheckServiceCenterController extends BaseController * 审核-通过/不通过 */ @ApiOperation(value = "综合服务中心审核") - @RequiresPermissions(value = "warehousing:newTools:list,warehousing:newTools:auditing",logical = Logical.OR) @PutMapping("/manageStatus") public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { return toAjax(purchaseCheckServiceCenterService.modifyManageStatus(maInputVO)); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java index 7377776..ee088a5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java @@ -5,7 +5,9 @@ import javax.servlet.http.HttpServletResponse; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.Logical; import com.bonus.sgzb.common.security.annotation.PreventRepeatSubmit; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService; import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; import com.bonus.sgzb.base.api.domain.MaInputVO; @@ -82,9 +84,9 @@ public class PurchaseMacodeInfoController extends BaseController { */ @ApiOperation(value = "新购入库清单明细") @GetMapping(value = "/putinDetails") + @RequiresPermissions("warehousing:newTools:view") public TableDataInfo putinDetails(PurchaseMacodeInfo purchaseMacodeInfo) { startPage(); - return getDataTable(purchaseMacodeInfoService.selectPutinDetails(purchaseMacodeInfo)); } @@ -123,6 +125,7 @@ public class PurchaseMacodeInfoController extends BaseController { @PreventRepeatSubmit @Log(title = "新购验收任务", businessType = BusinessType.MATERIAL) @PutMapping("/manageStatus") + @RequiresPermissions(value = "warehousing:newTools:auditing") public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputVO)); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java index e2ce754..2f78e42 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletResponse; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.material.domain.RepairAuditDetails; import com.bonus.sgzb.material.domain.RepairPart; import com.bonus.sgzb.material.domain.RepairRecord; @@ -42,6 +43,7 @@ public class RepairAuditDetailsController extends BaseController { */ @ApiOperation("查询修试审核任务列表") @GetMapping("/questList") + @RequiresPermissions("service:auditing:list") public TableDataInfo questList(RepairAuditDetails repairAuditDetails) { startPage(); Map params = repairAuditDetails.getParams(); @@ -80,6 +82,7 @@ public class RepairAuditDetailsController extends BaseController { */ @ApiOperation("查看修饰审核任务详细列表") @GetMapping("/getRepairAuditList") + @RequiresPermissions("service:auditing") public TableDataInfo getRepairAuditList(RepairAuditDetails repairAuditDetails) { startPage(); List list = repairAuditDetailsService.getRepairAuditList(repairAuditDetails); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java index 6a6f70e..466d042 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java +++ b/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 list = repairRecordService.getRepairRecordList(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java index 0a65d02..35286d2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java @@ -6,7 +6,9 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.Logical; import com.bonus.sgzb.common.security.annotation.PreventRepeatSubmit; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.material.domain.RepairTestInputDetailVo; import com.bonus.sgzb.base.api.domain.RepairTestInputDto; import com.bonus.sgzb.material.domain.RepairTestInputVo; @@ -24,7 +26,7 @@ import java.util.List; * 修试入库 */ @RestController -@RequestMapping("/RepairTestInput/") +@RequestMapping("/RepairTestInput") public class RepairTestInputController extends BaseController { @Resource(name = "RepairTestInputService") @@ -32,6 +34,7 @@ public class RepairTestInputController extends BaseController { @ApiOperation(value = "获取修试后入库列表") @GetMapping("getRepairedList") + @RequiresPermissions("warehousing:repair:list") public TableDataInfo getRepairedList(RepairTestInputDto dto){ startPage(); List list = service.getRepairedList(dto); @@ -40,6 +43,7 @@ public class RepairTestInputController extends BaseController { @ApiOperation(value = "获取修试后入库列表") @PostMapping("getAppRepairedList") + @RequiresPermissions("warehousing:repair:list") public AjaxResult getAppRepairedList(@Validated @RequestBody RepairTestInputDto dto){ List list = service.getRepairedList(dto); return AjaxResult.success(list); @@ -47,6 +51,7 @@ public class RepairTestInputController extends BaseController { @ApiOperation(value = "获取修试后入库列表-详情") @GetMapping("getRepairedDetailList") + @RequiresPermissions(value = {"warehousing:repair:view","warehousing:repair:auditing"}, logical = Logical.OR) public TableDataInfo getRepairedDetailList(RepairTestInputDto dto){ startPage(); List list = service.getRepairedDetailList(dto); @@ -55,6 +60,7 @@ public class RepairTestInputController extends BaseController { @ApiOperation(value = "获取修试后入库列表-详情") @PostMapping("getAppRepairedDetailList") + @RequiresPermissions(value = {"warehousing:repair:view","warehousing:repair:auditing"}, logical = Logical.OR) public AjaxResult getAppRepairedDetailList(@Validated @RequestBody RepairTestInputDto dto){ List list = service.getRepairedDetailList(dto); return AjaxResult.success(list); @@ -62,7 +68,7 @@ public class RepairTestInputController extends BaseController { @ApiOperation(value = "修试后入库-入库操作") @PreventRepeatSubmit - //@Log(title = "修试后入库-入库操作", businessType = BusinessType.MATERIAL) + @RequiresPermissions("warehousing:repair:auditing") @PostMapping("inputByType") public AjaxResult inputByType(@RequestBody RepairTestInputDto dto){ return service.inputByType(dto); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java index 29878f2..5298a5a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java @@ -57,7 +57,7 @@ public class SltAgreementInfoController extends BaseController { */ @ApiOperation(value = "根据协议获取结算清单") @PostMapping("/getSltInfo") - @RequiresPermissions("sltAgreementInfo:getSltInfo") + @RequiresPermissions("finis:record:details") public AjaxResult getSltInfo(@RequestBody List list) { SltInfoVo bean = sltAgreementInfoService.getSltInfo(list); return AjaxResult.success(bean); @@ -99,7 +99,7 @@ public class SltAgreementInfoController extends BaseController { } }*/ - @RequiresPermissions("cost:settlement:export") +// @RequiresPermissions("cost:settlement:export") @ApiOperation(value = "月结明细导出") @PostMapping("/exportSltInfoMonth") public void exportSltInfoMonth(HttpServletResponse response, @RequestBody List list) throws IOException { @@ -137,7 +137,7 @@ public class SltAgreementInfoController extends BaseController { */ @ApiOperation(value = "调整天数和日期") @PostMapping("/updateTrimDay") - @RequiresPermissions("sltAgreementInfo:updateTrimDay:list") + @RequiresPermissions("cost:settlement:edit") public AjaxResult updateTrimDay(@RequestBody List sltAgreementInfo) { int bean = sltAgreementInfoService.updateTrimDay(sltAgreementInfo); if (bean == 0) { @@ -151,7 +151,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 list) { List explist = sltAgreementInfoService.getLeaseListOne(list); List leaseInfoList = Convert.toList(LeaseInfo.class, explist); @@ -164,7 +164,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 list) { List explist = sltAgreementInfoService.getLeaseListThree(list); List leaseInfoList = Convert.toList(LeaseInfo.class, explist); @@ -177,7 +177,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 list) { List explist = sltAgreementInfoService.getLoseList(list); List leaseInfoList = Convert.toList(LoseInfo.class, explist); @@ -190,7 +190,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 list) { List explist = sltAgreementInfoService.getRepairList(list); List leaseInfoList = Convert.toList(RepairInfo.class, explist); @@ -203,7 +203,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 list) { List explist = sltAgreementInfoService.getScrapList(list); List leaseInfoList = Convert.toList(ScrapInfo.class, explist); @@ -216,7 +216,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 list) { List explist = sltAgreementInfoService.getPreScrapList(list); List leaseInfoList = Convert.toList(preScrapInfo.class, explist); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/PurchaseInputMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/PurchaseInputMapper.xml index aef1c50..85d2604 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/PurchaseInputMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/PurchaseInputMapper.xml @@ -206,7 +206,7 @@ create_time, remark, company_id from ma_type where type_id = #{typeId} - select IFNULL(input_num,0) from purchase_check_details where task_id = #{taskId} and type_id = #{typeId}