diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 7c70b019..7460af0a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -544,7 +544,7 @@ public class TmTaskController extends BaseController { */ @Log(title = "查询机具领料出库列表- app", businessType = BusinessType.QUERY) @GetMapping(value = "getLeaseAuditList") - public AjaxResult getLeaseAuditList(TmTask task, String role) { + public AjaxResult getLeaseAuditList(TmTask task) { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index c9f80e38..17b637e6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -49,9 +49,6 @@ public class TmTaskServiceImpl implements TmTaskService { @Resource private BmFlowRelationService bmFlowRelationService; - @Resource - private TmTaskService tmTaskService; - // 领料申请表Service @Resource private LeaseApplyInfoService leaseApplyInfoService; @@ -253,14 +250,14 @@ public class TmTaskServiceImpl implements TmTaskService { // -----------审批流处理结束 ------------- // 生成领料编码 - String code = tmTaskService.genderLeaseCode(); + String code = genderLeaseCode(); if (StringUtils.isEmpty(code)) { return AjaxResult.error("后台生成CODE编号异常,请重试!"); } task.setCode(code); // 创建任务 - if (tmTaskService.insertSelective(task) < 1) { return AjaxResult.error("创建领料任务失败,请重试!"); } + if (insertSelective(task) < 1) { return AjaxResult.error("创建领料任务失败,请重试!"); } //任务与协议建立关联关系 - if (tmTaskService.insertAgreement(task) < 1) { return AjaxResult.error("领料任务与协议建立关联关系失败,请重试!"); } + if (insertAgreement(task) < 1) { return AjaxResult.error("领料任务与协议建立关联关系失败,请重试!"); } // 获取任务编号 String taskId = task.getId();