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

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-06-19 14:33:33 +08:00
parent 119b37d3eb 2030b0d41c
commit bd76fb2296
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -827,11 +827,12 @@
sd.id as sdId sd.id as sdId
FROM FROM
ma_machine mm ma_machine mm
LEFT JOIN slt_agreement_info sai on mm.type_id = sai.type_id and mm.ma_id = sai.ma_id
LEFT JOIN ma_type mt on mt.type_id=mm.type_id LEFT JOIN ma_type mt on mt.type_id=mm.type_id
LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
LEFT JOIN sys_dic sd on mm.ma_status=sd.id LEFT JOIN sys_dic sd on mm.ma_status=sd.id
WHERE WHERE
qr_code =#{qrCode} mm.qr_code =#{qrCode} and sai.agreement_id = #{agreementId}
</select> </select>
<select id="backReceiveRecord" resultType="com.bonus.sgzb.app.domain.BackApplyInfo"> <select id="backReceiveRecord" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
SELECT SELECT

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

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