diff --git a/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml index 04e13da..3aef39c 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml @@ -96,6 +96,9 @@ and oi.execution_status = #{executionStatus} and oi.begin_date = #{beginDate} and oi.end_date = #{endDate} + + and oi.begin_date between to_date(#{beginTime}, 'yyyy-mm-dd') and to_date(#{endTime}, 'yyyy-mm-dd') + and oi.factory_code = #{factoryCode} and is_flag = #{isFlag} and oi.created_by = #{createdBy} @@ -105,6 +108,9 @@ and oi.complete_date = #{completeDate} and oi.is_release = #{isRelease} and oi.work_center_code = #{workCenterCode} + + and oi.begin_date between to_date(#{params.beginTime}, 'yyyy-mm-dd') and to_date(#{params.endTime}, 'yyyy-mm-dd') + and oi.begin_date between to_date(#{params.beginEndTime}, 'yyyy-mm-dd') and to_date(#{params.endEndTime}, 'yyyy-mm-dd') diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml index d9aacee..efbbc0f 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml @@ -53,6 +53,9 @@ and r.shut_type_id = #{shutType} and r.shut_reason = #{shutReason} + + and r.shut_begin_time between #{beginTime} and #{endTime} + and r.shut_begin_time between #{params.beginTime} and #{params.endTime} diff --git a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml index 3e528d6..7c7a093 100644 --- a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml @@ -91,6 +91,12 @@ and rqi.is_flag = #{isFlag} and rqi.updated_by = #{updatedBy} and rqi.updated_time = #{updatedTime} + + AND rqi.inspector_time BETWEEN TO_DATE(#{beginTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + + + AND rqi.inspector_time BETWEEN TO_DATE(#{params.beginTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{params.endTime}, 'YYYY-MM-DD HH24:MI:SS') + AND rqi.inspector_time BETWEEN TO_DATE(#{beginBeginTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endBeginTime}, 'YYYY-MM-DD HH24:MI:SS')