Merge remote-tracking branch 'origin/master'

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml

@@ -219,7 +219,7 @@
 
     <select id="getRepairBill" resultType="com.hnac.hzims.operational.access.vo.RepairBillVO">
         SELECT t.EM_CODE AS emCode,p.`GRADE_CODE`,count(t.ID) AS frequency,
-        sum(m.NUMBER) AS amount,t.ACT_HOURS,max(t.PLAN_START_TIME) AS recently
+        sum(m.NUMBER) AS amount,sum(t.ACT_HOURS) actHours,max(t.PLAN_START_TIME) AS recently
         FROM hzims_oper_access_task t
         LEFT JOIN hzims_oper_access_plan p ON t.PLAN_ID = p.ID
         LEFT JOIN hzims_oper_access_material m ON t.ID = m.TASK_ID

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml

@@ -87,9 +87,9 @@
 
     <select id="getWorkTicketBill" resultType="com.hnac.hzims.ticket.workTicket.vo.WorkTicketBillVO">
         select info.em_code as emCode,info.`type`,count(*) as payment,
-        (select count(*) from hzims_work_ticket_info i where flow_description = '结束' and i.id = info.id) as finish,
+        SUM( IF ( info.flow_description = '结束', 1, 0 )) AS finish,
-        (select count(*) from hzims_work_ticket_info i where flow_description = '作废' and i.id = info.id) as invalid,
+        SUM( IF ( info.flow_description IN ( '作废', '错票' ), 1, 0 )) AS invalid,
-        (select count(*) from hzims_ticket_info_evaluate e where evaluate = '合格！' and e.id = eval.id) as qualified
+        SUM( IF ( eval.evaluate = '合格！', 1, 0 )) AS qualified
         from hzims_work_ticket_info info
         LEFT JOIN hzims_ticket_info_evaluate eval ON info.id = eval.ticket_id
         <where>