人员工时报表问题修改

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/statisticalAnalysis/ProductLinePerformanceMapper.xml

@@ -9,8 +9,7 @@
           izz.name AS productionlineName,
           date_format(d.start_time,'%Y-%m') AS statisticalDate,
           d.start_time,
-          d.end_time,
-          SUM(TIMESTAMPDIFF(MINUTE, d.start_time,d.end_time) / 60) AS statisticalHours
+          d.end_time
         FROM zuihou_base_yj_0000.imcs_z_zone izz,
              zuihou_base_yj_0000.imcs_o_order ioo,
              zuihou_base_yj_0000.imcs_t_task c,
@@ -21,7 +20,7 @@
         AND c.id = d.task_id
         AND d.loading_user_id = e.id
         AND d.exe_status = '3'
-        AND d.loading_user_id IS NOT NULL) tmp1 ${ew.customSqlSegment} GROUP BY tmp1.statisticalDate,tmp1.productionlineId ORDER BY tmp1.statisticalDate,tmp1.productionlineId
+        AND d.loading_user_id IS NOT NULL) tmp1 ${ew.customSqlSegment} GROUP BY tmp1.statisticalDate,tmp1.productionlineId ORDER BY tmp1.productionlineId,tmp1.statisticalDate
     </select>
 
     <select id="queryOperatorDetailPerformance" parameterType="com.github.zuihou.business.operationManagementCenter.entity.TaskNode"  resultType="com.github.zuihou.business.operationManagementCenter.entity.TaskNode">