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 00bfa157..f131c606 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 @@ -187,6 +187,14 @@ public class BackApplyController extends BaseController { return backApplyService.audit(record); } + @ApiOperation("退料审核-驳回") + @Log(title = "退料审核列表-驳回", businessType = BusinessType.UPDATE) + @PostMapping("/refuse") + public AjaxResult refuse(@RequestBody BackApplyInfo record) + { + return backApplyService.refuse(record); + } + /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java index 1d074739..1470fddf 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java @@ -44,6 +44,8 @@ public interface BackApplyMapper { int audit(BackApplyInfo bean); + int refuse(BackApplyInfo bean); + List getUseTypeTree(BackApplyInfo bean); /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java index 3378ddb9..f0b8a771 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java @@ -38,6 +38,8 @@ public interface BackApplyService { AjaxResult audit(BackApplyInfo record); + AjaxResult refuse(BackApplyInfo record); + AjaxResult getUseTypeTree(BackApplyInfo bean); /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 315c0af2..8c370b56 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -126,6 +126,24 @@ public class BackApplyServiceImpl implements BackApplyService { } } + @Override + public AjaxResult refuse(BackApplyInfo bean) { + if (!StringUtils.isEmpty(bean.getIds())){ + String[] ids = bean.getIds().split(","); + for (int i=0;i< ids.length;i++){ + String id=ids[i]; + bean.setId(Long.valueOf(id)); + int re =backApplyMapper.refuse(bean); + if (re<1){ + return AjaxResult.error("驳回失败"); + } + } + return AjaxResult.success("驳回成功"); + }else { + return AjaxResult.error("驳回失败,未获取到参数"); + } + } + @Override public AjaxResult getUseTypeTree(BackApplyInfo bean) { List groupList = new ArrayList<>(); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 426b8541..24c124f1 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -257,6 +257,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE bai.id = #{id} + + + UPDATE tm_task tt + LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id + LEFT JOIN back_apply_details bad on bad.parent_id=bai.id + SET tt.task_status = '37',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='3',bai.direct_audit_time=NOW() + WHERE + bai.id = #{id} + + DELETE FROM tm_task_agreement