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

后台-退料申请与审核

This commit is contained in:
bns_han 2023-12-22 14:13:53 +08:00
parent 0ec118efb4
commit 7f1e051e42
2 changed files with 113 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,53 +347,63 @@
</select> </select>
<select id="materialList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo"> <select id="materialList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
SELECT subquery1.type_id as typeId, SELECT subquery1.type_id as typeId,
subquery1.typeName typeCode, subquery1.typeName typeCode,
subquery1.typeNames as typeName, subquery1.typeNames as typeName,
subquery1.out_num - COALESCE(subquery2.audit_num, 0) AS num, subquery1.out_num - COALESCE(subquery2.audit_num, 0) AS num
subquery1.ma_code as maCode
FROM ( FROM (
-- 第一个查询作为子查询 -- 第一个查询作为子查询
SELECT mt.type_id, SELECT mt.type_id,
mt.type_name as typeName, mt.type_name as typeName,
CONCAT_WS('/', IFNULL(mt3.type_name, '')) AS typeNames, mt2.type_name AS typeNames,
lod.out_num, SUM(lod.out_num) as out_num
mm.ma_code FROM lease_apply_info lai
FROM tm_task_agreement tta LEFT JOIN tm_task_agreement tta on lai.task_id = tta.task_id
LEFT JOIN lease_apply_info lai on lai.task_id = tta.task_id LEFT JOIN lease_out_details lod on lod.parent_id = lai.id
LEFT JOIN lease_out_details lod on lod.parent_id = lai.id LEFT JOIN tm_task tt on tt.task_id = tta.task_id
LEFT JOIN ma_type mt on mt.type_id = lod.type_id LEFT JOIN ma_type mt on lod.type_id=mt.type_id
LEFT JOIN tm_task tt on tt.task_id = tta.task_id LEFT JOIN ma_type mt1 ON mt1.type_id = lod.type_id
LEFT JOIN ma_type mt1 ON mt1.type_id = lod.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id WHERE tta.agreement_id = #{agreementId}
LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id and tt.task_type = '29'
WHERE tta.agreement_id = #{agreementId} and mt.`level`='4'
and tt.task_type = '29'
and mt.type_id is not null <if test="keyWord != null and keyWord != ''">
) AS subquery1 and mt.type_name like concat('%', #{keyWord}, '%') or
LEFT JOIN and mt2.type_name like concat('%', #{keyWord}, '%')
( </if>
-- 第二个查询作为子查询 GROUP BY mt.type_id
SELECT mt.type_id, ) AS subquery1
mt.type_name, LEFT JOIN
CONCAT_WS('/', IFNULL(mt3.type_name, '')) AS typeNames, (
bad.audit_num -- 第二个查询作为子查询
FROM tm_task tt SELECT mt.type_id,
LEFT JOIN tm_task_agreement tta on tta.task_id = tt.task_id mt.type_name,
LEFT JOIN back_apply_info bai on bai.task_id = tta.task_id mt2.type_name AS typeNames,
LEFT JOIN back_apply_details bad on bad.parent_id = bai.id SUM(bad.audit_num) as audit_num
LEFT JOIN ma_type mt on mt.type_id = bad.type_id FROM back_apply_info bai
LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id LEFT JOIN tm_task tt on tt.task_id=bai.task_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id LEFT JOIN back_apply_details bad on bad.parent_id = bai.id
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id LEFT JOIN tm_task_agreement tta on tta.task_id = tt.task_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id LEFT JOIN ma_type mt on mt.type_id = bad.type_id
WHERE tta.agreement_id = #{agreementId} LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id
and tt.task_type = '36' LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
and mt.type_id is not null LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
) AS subquery2 LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
ON subquery1.type_id = subquery2.type_id WHERE tta.agreement_id = #{agreementId}
and tt.task_type = '36'
and mt.`level`='4'
<if test="keyWord != null and keyWord != ''">
and mt.type_name like concat('%', #{keyWord}, '%') or
and mt2.type_name like concat('%', #{keyWord}, '%')
</if>
GROUP BY mt.type_id
) AS subquery2
ON subquery1.type_id = subquery2.type_id
WHERE
subquery1.out_num - COALESCE(subquery2.audit_num, 0)>0
</select> </select>
<select id="view" resultType="com.bonus.sgzb.app.domain.BackApplyInfo"> <select id="view" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">

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

@ -309,8 +309,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bai.company_id=#{companyId} bai.company_id=#{companyId}
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and bai.`code` like concat('%', #{keyWord}, '%') or and bai.`code` like concat('%', #{keyWord}, '%') or
and bai.back_person like concat('%', #{keyWord}, '%') or bai.back_person like concat('%', #{keyWord}, '%') or
and bai.phone like concat('%', #{keyWord}, '%') bai.phone like concat('%', #{keyWord}, '%')
</if> </if>
<if test="unitId != null and unitId != ''"> <if test="unitId != null and unitId != ''">
and bui.unit_id = #{unitId} and bui.unit_id = #{unitId}
@ -332,58 +332,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="getMaterialList" resultType="com.bonus.sgzb.material.domain.BackApplyInfo"> <select id="getMaterialList" resultType="com.bonus.sgzb.material.domain.BackApplyInfo">
SELECT subquery1.type_id as typeId, SELECT subquery1.type_id as typeId,
subquery1.typeName typeCode, subquery1.typeName typeCode,
subquery1.typeNames as typeName, subquery1.typeNames as typeName,
subquery1.out_num - COALESCE(subquery2.audit_num, 0) AS num, subquery1.out_num - COALESCE(subquery2.audit_num, 0) AS num
subquery1.ma_code as maCode
FROM ( FROM (
-- 第一个查询作为子查询 -- 第一个查询作为子查询
SELECT mt.type_id, SELECT mt.type_id,
mt.type_name as typeName, mt.type_name as typeName,
CONCAT_WS('/', IFNULL(mt3.type_name, '')) AS typeNames, mt2.type_name AS typeNames,
lod.out_num, SUM(lod.out_num) as out_num
mm.ma_code FROM lease_apply_info lai
FROM tm_task_agreement tta LEFT JOIN tm_task_agreement tta on lai.task_id = tta.task_id
LEFT JOIN lease_apply_info lai on lai.task_id = tta.task_id LEFT JOIN lease_out_details lod on lod.parent_id = lai.id
LEFT JOIN lease_out_details lod on lod.parent_id = lai.id LEFT JOIN tm_task tt on tt.task_id = tta.task_id
LEFT JOIN ma_type mt on mt.type_id = lod.type_id LEFT JOIN ma_type mt on lod.type_id=mt.type_id
LEFT JOIN tm_task tt on tt.task_id = tta.task_id LEFT JOIN ma_type mt1 ON mt1.type_id = lod.type_id
LEFT JOIN ma_type mt1 ON mt1.type_id = lod.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id WHERE tta.agreement_id = #{agreementId}
LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id and tt.task_type = '29'
WHERE tta.agreement_id = #{agreementId} and mt.`level`='4'
and tt.task_type = '29'
and mt.type_id is not null
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and mt.type_name like concat('%', #{keyWord}, '%') or and mt.type_name like concat('%', #{keyWord}, '%') or
and mt3.type_name like concat('%', #{keyWord}, '%') or mt2.type_name like concat('%', #{keyWord}, '%')
and mm.ma_code like concat('%', #{keyWord}, '%')
</if> </if>
) AS subquery1 GROUP BY mt.type_id
LEFT JOIN ) AS subquery1
( LEFT JOIN
-- 第二个查询作为子查询 (
SELECT mt.type_id, -- 第二个查询作为子查询
mt.type_name, SELECT mt.type_id,
CONCAT_WS('/', IFNULL(mt3.type_name, '')) AS typeNames, mt.type_name,
bad.audit_num mt2.type_name AS typeNames,
FROM tm_task tt SUM(bad.audit_num) as audit_num
LEFT JOIN tm_task_agreement tta on tta.task_id = tt.task_id FROM back_apply_info bai
LEFT JOIN back_apply_info bai on bai.task_id = tta.task_id LEFT JOIN tm_task tt on tt.task_id=bai.task_id
LEFT JOIN back_apply_details bad on bad.parent_id = bai.id LEFT JOIN back_apply_details bad on bad.parent_id = bai.id
LEFT JOIN ma_type mt on mt.type_id = bad.type_id LEFT JOIN tm_task_agreement tta on tta.task_id = tt.task_id
LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id LEFT JOIN ma_type mt on mt.type_id = bad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
WHERE tta.agreement_id = #{agreementId} LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
and tt.task_type = '36' WHERE tta.agreement_id = #{agreementId}
and mt.type_id is not null and tt.task_type = '36'
) AS subquery2 and mt.`level`='4'
ON subquery1.type_id = subquery2.type_id <if test="keyWord != null and keyWord != ''">
and mt.type_name like concat('%', #{keyWord}, '%') or
mt2.type_name like concat('%', #{keyWord}, '%')
</if>
GROUP BY mt.type_id
) AS subquery2
ON subquery1.type_id = subquery2.type_id
WHERE
subquery1.out_num - COALESCE(subquery2.audit_num, 0)>0
</select> </select>
<select id="selectTaskNumByMonth" resultType="java.lang.Integer"> <select id="selectTaskNumByMonth" resultType="java.lang.Integer">
select count(*) from tm_task where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{date},'%y%m') and task_type = #{taskType} select count(*) from tm_task where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{date},'%y%m') and task_type = #{taskType}
@ -434,8 +439,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bai.id = #{id} bai.id = #{id}
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and mt.type_name like concat('%', #{keyWord}, '%') or and mt.type_name like concat('%', #{keyWord}, '%') or
and mt3.type_name like concat('%', #{keyWord}, '%') or mt3.type_name like concat('%', #{keyWord}, '%') or
and mm.ma_code like concat('%', #{keyWord}, '%') mm.ma_code like concat('%', #{keyWord}, '%')
</if> </if>
) AS result1 ) AS result1
LEFT JOIN LEFT JOIN