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

修试入库

This commit is contained in:
cwchen 2023-12-22 12:32:01 +08:00
parent 308d8e343c
commit 1bbfc1dd73
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java
View File

@ -24,4 +24,7 @@ public class RepairTestInputDto{
/** 规格型号*/ /** 规格型号*/
private String typeId; private String typeId;
/** 维修时间*/
private String wxTime;
} }

27
sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml
View File

@ -67,8 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM ( FROM (
SELECT ANY_VALUE(rid.task_id) AS id, SELECT ANY_VALUE(rid.task_id) AS id,
ANY_VALUE(tt2.`code`) AS repairCode, ANY_VALUE(tt2.`code`) AS repairCode,
ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName)) AS maTypeName, ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName,
ANY_VALUE(GROUP_CONCAT(DISTINCT a.type_id)) AS type_id, ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2,
ANY_VALUE(tt2.create_by) AS wxName, ANY_VALUE(tt2.create_by) AS wxName,
ANY_VALUE(tt2.create_time) AS wxTime, ANY_VALUE(tt2.create_time) AS wxTime,
ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus
@ -77,27 +77,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_dic sd ON tt.task_status = sd.id LEFT JOIN sys_dic sd ON tt.task_status = sd.id
LEFT JOIN tm_task tt2 ON rid.repair_id = tt2.task_id LEFT JOIN tm_task tt2 ON rid.repair_id = tt2.task_id
LEFT JOIN ( LEFT JOIN (
SELECT mt2.type_id,mt2.type_name AS typeName,mt.manage_type SELECT mt.type_id AS typeId,mt.type_name AS typeName,mt.manage_type,mt2.type_id AS typeId2,mt2.type_name AS typeName2
FROM ma_type mt FROM ma_type mt
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3' LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2' LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1' LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
WHERE mt.`level` = '4' WHERE mt.`level` = '4'
)a ON rid.type_id = a.type_id )a ON rid.type_id = a.typeId
<where>
<if test="keyWord!=null and keyWord!=''">
(
INSTR(tt.`code`,#{keyWord}) > 0 OR
INSTR(tt2.create_by,#{keyWord}) > 0
)
</if>
</where>
GROUP BY rid.task_id GROUP BY rid.task_id
ORDER BY tt.create_time DESC ORDER BY tt.create_time DESC
) b ) b
<where> <where>
<if test="deviceTypeId!=null and deviceTypeId!=''"> <if test="deviceTypeId!=null and deviceTypeId!=''">
INSTR(b.type_id,#{deviceTypeId}) > 0 INSTR(b.typeId2,#{deviceTypeId}) > 0
</if>
<if test="wxTime!=null and wxTime!=''">
AND b.wxTime BETWEEN CONCAT(#{wxTime},' 00:00:00') AND CONCAT(#{wxTime},' 23:59:59')
</if>
<if test="keyWord!=null and keyWord!=''">
AND (
INSTR(b.repairCode,#{keyWord}) > 0 OR
INSTR(b.wxName,#{keyWord}) > 0
)
</if> </if>
</where> </where>
</select> </select>