From d293205c439827812140bea4d0eeaa271ec97232 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 19 Jun 2024 13:59:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E5=AE=A1=E6=A0=B8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/material/domain/BackApplyDto.java | 3 +++ .../sgzb/material/service/impl/BackApplyServiceImpl.java | 1 + .../src/main/resources/mapper/material/BackApplyMapper.xml | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java index aa48ca67..a4289c25 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java @@ -41,6 +41,9 @@ public class BackApplyDto { @ApiModelProperty(value = "任务状态") private String taskStatus; + @ApiModelProperty(value = "类型id") + private String typeId; + private List backApplyList; 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 7cf0bd60..ce7709c4 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 @@ -500,6 +500,7 @@ public class BackApplyServiceImpl implements BackApplyService { for (BackApplyInfo backApplyDetail : backApplyListDto.getBackApplyDetails()) { dto.setInnerId(backApplyListDto.getId()); dto.setAuditNum(backApplyDetail.getPreNum()); + dto.setTypeId(backApplyDetail.getTypeId()); re = backApplyMapper.auditAll(dto); } } 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 36a66f40..7d4b4c52 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 @@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN back_apply_details bad on bad.parent_id=bai.id SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW() WHERE - bad.type_id = #{typeId} + bad.type_id = #{typeId} and bai.id = #{id} and bai.company_id = #{companyId} @@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN back_apply_details bad on bad.parent_id=bai.id SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW() WHERE - bai.id = #{innerId} + bai.id = #{innerId} and bad.type_id = #{typeId} and bai.company_id = #{companyId}