月度工分汇总

ygtx-gxt/src/main/resources/mapper/gxt/GxtMonthFanInspectionMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null"> and wop.user_id = #{userId}</if>
             <if test="deptId != null "> and t.pcs_station_pid = #{deptId}</if>
             <if test="monthPeriod != null  and monthPeriod != ''"> and DATE_FORMAT( t.create_time, '%Y-%m' ) = #{monthPeriod}</if>
-            AND t.inspection_type IS NOT NULL AND t.work_order_status = 'archived'
+            AND t.inspection_type IS NOT NULL AND t.work_order_status IN ('completed','archived')
         </where>
         GROUP BY
         t.model,

ygtx-gxt/src/main/resources/mapper/gxt/GxtMonthRepairProjectMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null"> and rop.user_id=#{userId}</if>
             <if test="deptId != null "> and t.pcs_station_pid = #{deptId}</if>
             <if test="monthPeriod != null  and monthPeriod != ''"> and DATE_FORMAT( t.occur_time, '%Y-%m' ) = #{monthPeriod}</if>
-            AND t.maintenance_type IS NOT NULL AND t.work_order_status = 'archived'
+            AND t.maintenance_type IS NOT NULL AND t.work_order_status IN ('completed','archived')
         </where>
         GROUP BY
         t.maintenance_type

ygtx-gxt/src/main/resources/mapper/gxt/GxtRepairOrderMapper.xml

@@ -246,7 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userId != null">LEFT JOIN gxt_repair_order_person p ON p.order_id = t.id</if>
         <where>
             <if test="userId != null"> and p.user_id=#{userId}</if>
-            <if test="workOrderStatus != null  and workOrderStatus != ''"> and work_order_status = #{workOrderStatus}</if>
+            <if test="workOrderStatus != null  and workOrderStatus != ''"> and work_order_status IN ('completed','archived')</if>
             <if test="pcsStationPid != null "> and pcs_station_pid = #{pcsStationPid}</if>
             <if test="maintenanceType != null and maintenanceType != ''"> and maintenance_type = #{maintenanceType}</if>
             <if test="monthPeriod != null"> and DATE_FORMAT(occur_time, '%Y-%m') = #{monthPeriod}</if>

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -193,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userId != null">LEFT JOIN gxt_work_order_person p ON p.order_id = t.id</if>
         <where>
             <if test="userId != null"> and p.user_id=#{userId}</if>
-            <if test="workOrderStatus != null  and workOrderStatus != ''"> and work_order_status = #{workOrderStatus}</if>
+            <if test="workOrderStatus != null  and workOrderStatus != ''"> and work_order_status IN ('completed','archived')</if>
             <if test="model != null and model != ''"> and t.model = #{model}</if>
             <if test="inspectionType != null and inspectionType != ''"> and FIND_IN_SET(#{inspectionType}, inspection_type) > 0</if>
             <if test="pcsStationPid != null"> and pcs_station_pid = #{pcsStationPid}</if>