|
@@ -42,6 +42,7 @@
|
|
|
<result column="worker_name" property="workerName" jdbcType="VARCHAR"/>
|
|
|
<result column="repair_diff" property="repairDiff" jdbcType="BIGINT"/>
|
|
|
<result column="star_level" property="starLevel" jdbcType="INTEGER"/>
|
|
|
+ <result column="device_position" property="devicePosition" jdbcType="VARCHAR"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="Base_Column_List">
|
|
@@ -143,22 +144,22 @@
|
|
|
AND <![CDATA[ mr.work_date = #{request.currentTime}]]>
|
|
|
</if>
|
|
|
<if test="request.beginTime!=null">
|
|
|
- AND <![CDATA[ mr.plan_date >= #{request.beginTime}]]>
|
|
|
+ AND <![CDATA[ mr.work_date >= #{request.beginTime}]]>
|
|
|
</if>
|
|
|
<if test="request.endTime!=null">
|
|
|
- AND <![CDATA[ mr.plan_date <= #{request.endTime}]]>
|
|
|
+ AND <![CDATA[ mr.work_date <= #{request.endTime}]]>
|
|
|
</if>
|
|
|
</select>
|
|
|
|
|
|
<!--app端 保养任务统计 (1:保养中、2:已完成) -->
|
|
|
<select id="countRecordByWorkerId" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenanceCount"
|
|
|
parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest">
|
|
|
- SELECT t.plan_date,
|
|
|
+ SELECT t.planDate,
|
|
|
MAX(CASE t.status WHEN '1' THEN t.total ELSE 0 END) inProgress,
|
|
|
MAX(CASE t.status WHEN '2' THEN t.total ELSE 0 END) complete
|
|
|
FROM (
|
|
|
SELECT mr.status,
|
|
|
- mr.plan_date,
|
|
|
+ mr.work_date as planDate,
|
|
|
count(1) total
|
|
|
FROM maintenance_record mr
|
|
|
LEFT JOIN project p ON mr.project_id = p.id
|
|
@@ -178,15 +179,15 @@
|
|
|
<otherwise/>
|
|
|
</choose>
|
|
|
<if test="request.beginTime!=null">
|
|
|
- AND <![CDATA[ mr.plan_date >= #{request.beginTime}]]>
|
|
|
+ AND <![CDATA[ mr.work_date >= #{request.beginTime}]]>
|
|
|
</if>
|
|
|
<if test="request.endTime!=null">
|
|
|
- AND <![CDATA[ mr.plan_date <= #{request.endTime}]]>
|
|
|
+ AND <![CDATA[ mr.work_date <= #{request.endTime}]]>
|
|
|
</if>
|
|
|
- GROUP BY plan_date,
|
|
|
+ GROUP BY planDate,
|
|
|
status
|
|
|
) t
|
|
|
- GROUP BY t.plan_date
|
|
|
+ GROUP BY t.planDate
|
|
|
</select>
|
|
|
|
|
|
<select id="findRecordByLiftId"
|
|
@@ -268,6 +269,7 @@
|
|
|
mr.*,
|
|
|
li.use_company_code,
|
|
|
li.registration_code,
|
|
|
+ li.device_position,
|
|
|
li.category,
|
|
|
mc.name AS mt_company_name,
|
|
|
ui.`name` AS worker_name,
|