diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a296a97..2a8ec31 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -24,6 +24,7 @@ String MEASURE_DATA = "检定数据管理"; String MULTIFUNCTION_CHECK_DATA = "多功能核查数据"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; + String RESISTANCE_CHECK_DATA = "活塞式压力"; String FILE_CHANGE_FORM = "文件更改申请单"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a296a97..2a8ec31 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -24,6 +24,7 @@ String MEASURE_DATA = "检定数据管理"; String MULTIFUNCTION_CHECK_DATA = "多功能核查数据"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; + String RESISTANCE_CHECK_DATA = "活塞式压力"; String FILE_CHANGE_FORM = "文件更改申请单"; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 755ff77..56a707f 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -89,9 +89,11 @@ FROM system_template WHERE template_name= #{templateName} AND template_type= #{coverModuleName} - AND template_desc like concat('%',#{descn},'%') - + + AND template_desc like concat('%',#{descn},'%') + + + + AND template_desc like concat('%',#{descn},'%') + + + + AND template_desc like concat('%',#{descn},'%') + + + + AND template_desc like concat('%',#{descn},'%') + +