月度工分汇总-样式优化

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtMonthScoreServiceImpl.java

@@ -113,6 +113,7 @@ public class GxtMonthScoreServiceImpl implements IGxtMonthScoreService
         workOrder.setInspectionType(inspectionTypeId);
         workOrder.setPcsStationPid(pid);
         workOrder.setMonthPeriod(monthPeriod);
+        workOrder.setWorkOrderStatus("archived");
         addBusinessDataScopeFilter(workOrder);
         return gxtWorkOrderMapper.selectGxtWorkOrderListByMonth(workOrder);
     }
@@ -489,6 +490,7 @@ public class GxtMonthScoreServiceImpl implements IGxtMonthScoreService
         repairOrder.setMaintenanceType(maintenanceType);
         repairOrder.setPcsStationPid(pid);
         repairOrder.setMonthPeriod(monthPeriod);
+        repairOrder.setWorkOrderStatus("archived");
         addBusinessDataScopeFilter(repairOrder);
         return gxtRepairOrderMapper.selectGxtRepairOrderListByMonth(repairOrder);
     }

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

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

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

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

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

@@ -249,6 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order_id
         ) p ON p.order_id = t.id
         <where>
+            <if test="workOrderStatus != null  and workOrderStatus != ''"> and work_order_status = #{workOrderStatus}</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

@@ -200,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order_id
         ) p ON p.order_id = t.id
         <where>
+            <if test="workOrderStatus != null  and workOrderStatus != ''"> and work_order_status = #{workOrderStatus}</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>