diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 161767f..34fc67a 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.10 + 1.3.0.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.10 + 1.3.0.1 com.casic casic-metering-model - 1.2.0.10 + 1.3.0.1 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 161767f..34fc67a 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.10 + 1.3.0.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.10 + 1.3.0.1 com.casic casic-metering-model - 1.2.0.10 + 1.3.0.1 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index f9756db..c5c31d0 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -64,9 +64,10 @@ AGREEMENT_SAVE_FAILED(2425, "合同保存至草稿箱失败"), AGREEMENT_APPLY_SUBMIT_FAILED(2426, "合同提交处理失败"), - - OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), + OUTSOURCE_CERTIFICATE_NO_FILES(2427, "导入文件需要包含Excel文件以及PDF证书文件"), +// OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), IMPORT_NO_DATA(2428, "Excel文件无数据"), + DATE_CONVERT_DATA(2705, "日期格式转换失败"), IMPORT_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 161767f..34fc67a 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.10 + 1.3.0.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.10 + 1.3.0.1 com.casic casic-metering-model - 1.2.0.10 + 1.3.0.1 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index f9756db..c5c31d0 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -64,9 +64,10 @@ AGREEMENT_SAVE_FAILED(2425, "合同保存至草稿箱失败"), AGREEMENT_APPLY_SUBMIT_FAILED(2426, "合同提交处理失败"), - - OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), + OUTSOURCE_CERTIFICATE_NO_FILES(2427, "导入文件需要包含Excel文件以及PDF证书文件"), +// OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), IMPORT_NO_DATA(2428, "Excel文件无数据"), + DATE_CONVERT_DATA(2705, "日期格式转换失败"), IMPORT_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d0337b8..69ed2b9 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.10 + 1.3.0.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.10 + 1.3.0.1 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 161767f..34fc67a 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.10 + 1.3.0.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.10 + 1.3.0.1 com.casic casic-metering-model - 1.2.0.10 + 1.3.0.1 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index f9756db..c5c31d0 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -64,9 +64,10 @@ AGREEMENT_SAVE_FAILED(2425, "合同保存至草稿箱失败"), AGREEMENT_APPLY_SUBMIT_FAILED(2426, "合同提交处理失败"), - - OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), + OUTSOURCE_CERTIFICATE_NO_FILES(2427, "导入文件需要包含Excel文件以及PDF证书文件"), +// OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), IMPORT_NO_DATA(2428, "Excel文件无数据"), + DATE_CONVERT_DATA(2705, "日期格式转换失败"), IMPORT_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d0337b8..69ed2b9 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.10 + 1.3.0.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.10 + 1.3.0.1 diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml index cbc3446..09548e6 100644 --- a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusApprovalMapper.xml @@ -27,7 +27,7 @@ id, approval_no, approval_name, approval_type, approval_status, create_user_id, create_user_name, create_time, update_time, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, delay_time - + ${ew.sqlSegment} @@ -53,23 +66,7 @@ + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + + + select approval.id as id, approval.approval_no as approvalNo, @@ -37,14 +37,27 @@ approval.create_user_id as createUserId, approval.create_user_name as createUserName, approval.create_time as createTime, + approval.approval_reason as approvalReason, + approval.approval_time as approvalTime, + approval.delay_time as delayTime, info.equipment_no as equipmentNo, info.equipment_name as equipmentName, info.model as model, + info.manufacture_no as manufactureNo, + info.manufacturer as manufacturer, info.company_id as companyId, info.dept_id as deptId, - approval.process_id as processId + info.use_position as usePosition, + approval.process_id as processId, + (case when approval.approval_type = '5' + then (select count(equipment_id) from eqpt_equipment_status_relation where approval_id = approval.id) + else null end) as equipmentCount from eqpt_equipment_status_approval approval - left join eqpt_equipment_info info on approval.equipment_id = info.id + left join eqpt_equipment_info_view info on approval.equipment_id = info.id + + +