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

app-退料接收

This commit is contained in:
bns_han 2023-12-25 11:54:12 +08:00
parent 8672cf565d
commit ba817cfc02
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
View File

@ -344,6 +344,7 @@
# WHERE # WHERE
# bai.company_id=#{companyId} # bai.company_id=#{companyId}
GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
ORDER BY bai.create_time desc
</select> </select>
<select id="materialList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo"> <select id="materialList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">

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

@ -593,6 +593,7 @@
WHERE WHERE
tt.task_status>='38' tt.task_status>='38'
GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
ORDER BY bai.create_time desc
</select> </select>
<select id="receiveView" resultType="com.bonus.sgzb.app.domain.BackApplyInfo"> <select id="receiveView" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">

6
sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
View File

@ -69,7 +69,7 @@
rd.task_id, rd.task_id,
tt.CODE AS repairCode, tt.CODE AS repairCode,
bui.unit_name AS backUnit, bui.unit_name AS backUnit,
bpi.pro_name AS backPro, bpi.lot_name AS backPro,
su.user_name AS createName, su.user_name AS createName,
tt.create_time AS createTime, tt.create_time AS createTime,
bai.CODE AS backCode, bai.CODE AS backCode,
@ -86,7 +86,7 @@
LEFT JOIN tm_task_agreement tta ON bai.task_id = tta.task_id LEFT JOIN tm_task_agreement tta ON bai.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id
LEFT JOIN bm_unit_info bui ON bai2.unit_id = bui.unit_id LEFT JOIN bm_unit_info bui ON bai2.unit_id = bui.unit_id
LEFT JOIN bm_project_info bpi ON bai2.project_id = bpi.pro_id and bpi.status = '0' and bpi.del_flag = '0' LEFT JOIN bm_project_lot bpi ON bai2.project_id = bpi.lot_id and bpi.status = '0' and bpi.del_flag = '0'
left join sys_user su on rd.create_by = su.user_id left join sys_user su on rd.create_by = su.user_id
left join sys_dic sd on sd.id = tt.task_status left join sys_dic sd on sd.id = tt.task_status
where 1=1 where 1=1
@ -112,7 +112,7 @@
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND ts.create_time between #{startTime} and #{endTime} AND ts.create_time between #{startTime} and #{endTime}
</if> </if>
GROUP BY rd.task_id,bui.unit_name,bpi.pro_name,bai.code,su.user_name GROUP BY rd.task_id,bui.unit_name,bpi.lot_name,bai.code,su.user_name
order by tt.create_time desc order by tt.create_time desc
</select> </select>