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

大屏页面调试

This commit is contained in:
mashuai 2024-07-03 17:31:38 +08:00
parent e2115c867f
commit 9a942b3d87
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
View File

@ -341,12 +341,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt2.type_name AS typeName, mt2.type_name AS typeName,
mt2.type_id AS typeId, mt2.type_id AS typeId,
mt.type_name AS typeModelName, mt.type_name AS typeModelName,
lod.out_num AS num, SUM( lod.out_num ) AS num,
lai.`code` AS materialCode, lai.`code` AS materialCode,
bui.unit_name AS unitName, bui.unit_name AS unitName,
bai.unit_id AS unitId, bai.unit_id AS unitId,
bpl.lot_id AS projectId, bpl.lot_id AS projectId,
su.user_name AS userName, mt_full.userName AS userName,
bpl.lot_name AS projectName, bpl.lot_name AS projectName,
sd.dept_name AS companyName sd.dept_name AS companyName
FROM FROM
@ -354,8 +354,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt ON lod.type_id = mt.type_id LEFT JOIN ma_type mt ON lod.type_id = mt.type_id
AND mt.`level` = '4' AND mt.`level` = '4'
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 (
SELECT
mt.type_id,
mt.type_name,
GROUP_CONCAT( su.user_name ) AS userName
FROM
ma_type mt
LEFT JOIN ma_type_keeper mtk ON mt.type_id = mtk.type_id LEFT JOIN ma_type_keeper mtk ON mt.type_id = mtk.type_id
LEFT JOIN sys_user su ON mtk.user_id = su.user_id LEFT JOIN sys_user su ON mtk.user_id = su.user_id
GROUP BY
mt.type_id,
mt.type_name
) mt_full ON mt.type_id = mt_full.type_id
LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
LEFT JOIN lease_apply_info lai ON lod.parent_id = lai.id LEFT JOIN lease_apply_info lai ON lod.parent_id = lai.id
LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
@ -379,6 +390,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeId!=null and typeId != ''"> <if test="typeId!=null and typeId != ''">
AND mt2.type_id = #{typeId} AND mt2.type_id = #{typeId}
</if> </if>
GROUP BY
mt.type_id,
mt.type_name,
lai.`code`
</select> </select>
<select id="getMaterialReturnDetailData" resultType="com.bonus.sgzb.largeScreen.domain.MaterialDetailVo"> <select id="getMaterialReturnDetailData" resultType="com.bonus.sgzb.largeScreen.domain.MaterialDetailVo">
SELECT SELECT
@ -582,7 +597,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN purchase_check_info pci ON pci.task_id = pcd.task_id LEFT JOIN purchase_check_info pci ON pci.task_id = pcd.task_id
where where
1 = 1 1 = 1
<if test="type == 1 and startDate != null "> <if test="startDate != '' and startDate != null ">
AND DATE_FORMAT(pci.arrival_time, '%Y-%m') = #{startDate} AND DATE_FORMAT(pci.arrival_time, '%Y-%m') = #{startDate}
</if> </if>
GROUP BY GROUP BY
@ -599,7 +614,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
where where
iad.input_type = '1' iad.input_type = '1'
<if test="type == 2 and startDate != null "> <if test="startDate != '' and startDate != null ">
AND DATE_FORMAT(iad.create_time, '%Y-%m') = #{startDate} AND DATE_FORMAT(iad.create_time, '%Y-%m') = #{startDate}
</if> </if>
GROUP BY GROUP BY