bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退料审核bug

This commit is contained in:
mashuai 2024-06-19 13:55:58 +08:00
parent d6e6d0deef
commit 4186260ef5
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java
View File

@ -41,6 +41,9 @@ public class BackApplyDto {
@ApiModelProperty(value = "任务状态") @ApiModelProperty(value = "任务状态")
private String taskStatus; private String taskStatus;
@ApiModelProperty(value = "类型id")
private String typeId;
private List<BackApplyListDto> backApplyList; private List<BackApplyListDto> backApplyList;

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
View File

@ -492,6 +492,7 @@ public class BackApplyServiceImpl implements BackApplyService {
for (BackApplyInfo backApplyDetail : backApplyListDto.getBackApplyDetails()) { for (BackApplyInfo backApplyDetail : backApplyListDto.getBackApplyDetails()) {
dto.setInnerId(backApplyListDto.getId()); dto.setInnerId(backApplyListDto.getId());
dto.setAuditNum(backApplyDetail.getPreNum()); dto.setAuditNum(backApplyDetail.getPreNum());
dto.setTypeId(backApplyDetail.getTypeId());
re = backApplyMapper.auditAll(dto); re = backApplyMapper.auditAll(dto);
} }
} }

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id 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() SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW()
WHERE WHERE
bai.id = #{id} bai.id = #{id} and bad.type_id = #{typeId}
<if test="companyId != null and companyId != ''"> <if test="companyId != null and companyId != ''">
and bai.company_id = #{companyId} and bai.company_id = #{companyId}
</if> </if>
@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id 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() SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW()
WHERE WHERE
bai.id = #{innerId} bai.id = #{innerId} and bad.type_id = #{typeId}
<if test="companyId != null and companyId != ''"> <if test="companyId != null and companyId != ''">
and bai.company_id = #{companyId} and bai.company_id = #{companyId}
</if> </if>