wanglt 4 месяцев назад
Родитель
Сommit
8db235f1d7
1 измененных файлов с 8 добавлено и 8 удалено
  1. 8 8
      ygtx-gxt/src/main/resources/mapper/gxt/GxtRepairOrderMapper.xml

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

@@ -862,8 +862,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     LEFT JOIN sys_user su ON wo.pcs_station_pid = su.dept_id
             WHERE wo.work_order_status IN ('completed','archived') AND wo.repair_method != '2'
               AND su.user_id = #{userId}
-              AND wo.create_time >= STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' )
-              AND wo.create_time <![CDATA[<]]> DATE_ADD( STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' ), INTERVAL 1 MONTH )
+              AND wo.occur_time >= STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' )
+              AND wo.occur_time <![CDATA[<]]> DATE_ADD( STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' ), INTERVAL 1 MONTH )
         ) q ON u.user_id = q.user_id
         LEFT JOIN (
             SELECT
@@ -874,8 +874,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     LEFT JOIN sys_user su ON wo.pcs_station_pid = su.dept_id
             WHERE wo.work_order_status IN ('completed','archived') AND wo.repair_method = '2'
               AND su.user_id = #{userId}
-              AND wo.create_time >= STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' )
-              AND wo.create_time <![CDATA[<]]> DATE_ADD( STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' ), INTERVAL 1 MONTH )
+              AND wo.occur_time >= STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' )
+              AND wo.occur_time <![CDATA[<]]> DATE_ADD( STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' ), INTERVAL 1 MONTH )
         ) qq ON u.user_id = qq.user_id
         LEFT JOIN (
             SELECT
@@ -898,8 +898,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     LEFT JOIN sys_user su ON wo.gxt_center_id = su.dept_id
             WHERE wo.work_order_status IN ('completed','archived') AND wo.repair_method != '2'
               AND su.user_id = #{userId}
-              AND wo.create_time >= STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' )
-              AND wo.create_time <![CDATA[<]]> DATE_ADD( STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' ), INTERVAL 1 MONTH )
+              AND wo.occur_time >= STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' )
+              AND wo.occur_time <![CDATA[<]]> DATE_ADD( STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' ), INTERVAL 1 MONTH )
         ) s ON u.user_id = s.user_id
         LEFT JOIN (
             SELECT
@@ -910,8 +910,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     LEFT JOIN sys_user su ON wo.gxt_center_id = su.dept_id
             WHERE wo.work_order_status IN ('completed','archived') AND wo.repair_method = '2'
               AND su.user_id = #{userId}
-              AND wo.create_time >= STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' )
-              AND wo.create_time <![CDATA[<]]> DATE_ADD( STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' ), INTERVAL 1 MONTH )
+              AND wo.occur_time >= STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' )
+              AND wo.occur_time <![CDATA[<]]> DATE_ADD( STR_TO_DATE( CONCAT( #{monthPeriod}, '-01 00:00:00' ), '%Y-%m-%d %H:%i:%s' ), INTERVAL 1 MONTH )
         ) ss ON u.user_id = ss.user_id
         LEFT JOIN (
             SELECT