退料审核bug
This commit is contained in:
parent
d6e6d0deef
commit
4186260ef5
|
|
@ -41,6 +41,9 @@ public class BackApplyDto {
|
|||
@ApiModelProperty(value = "任务状态")
|
||||
private String taskStatus;
|
||||
|
||||
@ApiModelProperty(value = "类型id")
|
||||
private String typeId;
|
||||
|
||||
|
||||
|
||||
private List<BackApplyListDto> backApplyList;
|
||||
|
|
|
|||
|
|
@ -492,6 +492,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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
bai.id = #{id}
|
||||
bai.id = #{id} and bad.type_id = #{typeId}
|
||||
<if test="companyId != null and companyId != ''">
|
||||
and bai.company_id = #{companyId}
|
||||
</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
|
||||
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}
|
||||
<if test="companyId != null and companyId != ''">
|
||||
and bai.company_id = #{companyId}
|
||||
</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue