|
@@ -3,18 +3,19 @@
|
|
|
<mapper namespace="com.persagy.dmp.rwd.simple.dao.EquipmentReportMapper">
|
|
|
|
|
|
<select id="queryExpectScrapCountByProjects" resultType="java.util.HashMap">
|
|
|
- select pj.project_id as projectId, pj.name as projectName, count(*) as equipmentTotal,
|
|
|
+ select pj.id as projectId, pj.name as projectName, count(eq.id) as equipmentTotal,
|
|
|
sum(case when
|
|
|
ifnull(json_extract(eq.infos, '$.expectScrapDate'), '9999-12-31') < #{scrapDate}
|
|
|
then 1 else 0 end) as expectScrapToal
|
|
|
- from dt_object eq inner join dt_object pj on eq.project_id = pj.id
|
|
|
+ from dt_object pj left join dt_object eq on eq.project_id = pj.id
|
|
|
and eq.obj_type = 'equipment' and eq.valid = 1
|
|
|
+ where pj.obj_type = 'project' and pj.valid = 1
|
|
|
<if test="projectIds != null and projectIds.size() > 0" >
|
|
|
- where pj.project_id in
|
|
|
+ and pj.project_id in
|
|
|
<foreach collection="projectIds" item="projectId" open="(" close=")" separator="," >
|
|
|
#{projectId}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- group by pj.project_id, pj.name
|
|
|
+ group by pj.id, pj.name
|
|
|
</select>
|
|
|
</mapper>
|