Compare commits

..

No commits in common. "f507727924c1469a83ff4ee19779889a252c56e0" and "35922d044d3fe638e776fa1aad0f2a6553707a35" have entirely different histories.

3 changed files with 2 additions and 6 deletions

View File

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

View File

@ -495,7 +495,6 @@ 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);
}
}

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
SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW()
WHERE
bai.id = #{id} and bad.type_id = #{typeId}
bai.id = #{id}
<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} and bad.type_id = #{typeId}
bai.id = #{innerId}
<if test="companyId != null and companyId != ''">
and bai.company_id = #{companyId}
</if>