diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 91f2b84..3bcfab8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -107,6 +107,8 @@ String MEASURE_METHOD_TYPE = "bizMeasureMethodType"; //查新结果 String NOVELTY_RESULT = "bizNoveltyResult"; + // 查新状态 + String NOVELTY_STATUS = "bizNoveltyStatus"; //环境条件依据 String ENVIRONMENT_ACCORD = "bizEnvironmentAccord"; //证书类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 91f2b84..3bcfab8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -107,6 +107,8 @@ String MEASURE_METHOD_TYPE = "bizMeasureMethodType"; //查新结果 String NOVELTY_RESULT = "bizNoveltyResult"; + // 查新状态 + String NOVELTY_STATUS = "bizNoveltyStatus"; //环境条件依据 String ENVIRONMENT_ACCORD = "bizEnvironmentAccord"; //证书类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java index 0f351d3..c38068e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java @@ -13,6 +13,12 @@ @Data public class TechniqueFileListRequest { + @ApiModelProperty(value = "实验室编号", dataType = "String") + private String labCode; + + @ApiModelProperty(value = "组别编号", dataType = "String") + private String groupCode; + @ApiModelProperty(value = "文件编号", dataType = "String") private String fileNo; @@ -22,6 +28,12 @@ @ApiModelProperty(value = "文件名", dataType = "String") private String fileName; - @ApiModelProperty(value = "专业组别(字典code)", dataType = "String") - private String professionalGroup; + @ApiModelProperty(value = "启用时间（开始）", dataType = "String") + private String activeDateStart; + + @ApiModelProperty(value = "启用时间（结束）", dataType = "String") + private String activeDateEnd; + + @ApiModelProperty(value = "查新状态（字典值）", dataType = "String") + private String noveltyStatus; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 91f2b84..3bcfab8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -107,6 +107,8 @@ String MEASURE_METHOD_TYPE = "bizMeasureMethodType"; //查新结果 String NOVELTY_RESULT = "bizNoveltyResult"; + // 查新状态 + String NOVELTY_STATUS = "bizNoveltyStatus"; //环境条件依据 String ENVIRONMENT_ACCORD = "bizEnvironmentAccord"; //证书类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java index 0f351d3..c38068e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java @@ -13,6 +13,12 @@ @Data public class TechniqueFileListRequest { + @ApiModelProperty(value = "实验室编号", dataType = "String") + private String labCode; + + @ApiModelProperty(value = "组别编号", dataType = "String") + private String groupCode; + @ApiModelProperty(value = "文件编号", dataType = "String") private String fileNo; @@ -22,6 +28,12 @@ @ApiModelProperty(value = "文件名", dataType = "String") private String fileName; - @ApiModelProperty(value = "专业组别(字典code)", dataType = "String") - private String professionalGroup; + @ApiModelProperty(value = "启用时间（开始）", dataType = "String") + private String activeDateStart; + + @ApiModelProperty(value = "启用时间（结束）", dataType = "String") + private String activeDateEnd; + + @ApiModelProperty(value = "查新状态（字典值）", dataType = "String") + private String noveltyStatus; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTechniqueFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTechniqueFile.java index fb28862..266b680 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTechniqueFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTechniqueFile.java @@ -56,26 +56,26 @@ /** * 版本号 */ - @ApiModelProperty(value = "版本号", dataType = "String") - @TableField("version_no") - private String versionNo; +// @ApiModelProperty(value = "版本号", dataType = "String") +// @TableField("version_no") +// private String versionNo; /** * 专业组别(字典code) */ - @ApiModelProperty(value = "专业组别(字典code)", dataType = "String") - @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) - @TableField("professional_group") - private String professionalGroup; - - @ApiModelProperty(value = "专业组别(字典value)", dataType = "String") - @TableField(exist = false) - private String professionalGroupName; +// @ApiModelProperty(value = "专业组别(字典code)", dataType = "String") +// @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) +// @TableField("professional_group") +// private String professionalGroup; +// +// @ApiModelProperty(value = "专业组别(字典value)", dataType = "String") +// @TableField(exist = false) +// private String professionalGroupName; /** * 实施时间 */ - @ApiModelProperty(value = "实施时间", dataType = "String") + @ApiModelProperty(value = "启用时间", dataType = "String") @TableField("active_date") private String activeDate; @@ -96,9 +96,9 @@ /** * 文件更改申请单id */ - @ApiModelProperty(value = "文件更改申请单id", dataType = "Long") - @TableField("change_form_id") - private Long changeFormId; +// @ApiModelProperty(value = "文件更改申请单id", dataType = "Long") +// @TableField("change_form_id") +// private Long changeFormId; /** * 环境条件要求 @@ -130,4 +130,55 @@ private String updateTime; + @ApiModelProperty(value = "实验室代码", dataType = "String") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + + @ApiModelProperty(value = "组别/部门代码", dataType = "String") + @DictCodeField(message = "部门代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别/部门代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; + + @ApiModelProperty(value = "查新状态，可多个，逗号分割", dataType = "String") + @DictCodeField(message = "查新状态代码描述不合法", cacheName = MeterDictCode.NOVELTY_STATUS) + @TableField("novelty_status") + private String noveltyStatus; + + @ApiModelProperty(value = "查新状态(字典value)，可多个，逗号分割", dataType = "String") + @TableField(exist = false) + private String noveltyStatusName; + + @ApiModelProperty(value = "量传参数", dataType = "String") + @TableField("transmission_params") + private String transmissionParams; + + @ApiModelProperty(value = "温度要求下限", dataType = "String") + @TableField("temperature_low_limit") + private String temperatureLowLimit; + + @ApiModelProperty(value = "温度要求上限", dataType = "String") + @TableField("temperature_high_limit") + private String temperatureHighLimit; + + @ApiModelProperty(value = "湿度要求下限", dataType = "String") + @TableField("humidity_low_limit") + private String humidityLowLimit; + + @ApiModelProperty(value = "湿度要求上限", dataType = "String") + @TableField("humidity_high_limit") + private String humidityHighLimit; + + @ApiModelProperty(value = "最新查新日期", dataType = "String") + @TableField(exist = false) + private String latestNoveltyDate; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 91f2b84..3bcfab8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -107,6 +107,8 @@ String MEASURE_METHOD_TYPE = "bizMeasureMethodType"; //查新结果 String NOVELTY_RESULT = "bizNoveltyResult"; + // 查新状态 + String NOVELTY_STATUS = "bizNoveltyStatus"; //环境条件依据 String ENVIRONMENT_ACCORD = "bizEnvironmentAccord"; //证书类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java index 0f351d3..c38068e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/TechniqueFileListRequest.java @@ -13,6 +13,12 @@ @Data public class TechniqueFileListRequest { + @ApiModelProperty(value = "实验室编号", dataType = "String") + private String labCode; + + @ApiModelProperty(value = "组别编号", dataType = "String") + private String groupCode; + @ApiModelProperty(value = "文件编号", dataType = "String") private String fileNo; @@ -22,6 +28,12 @@ @ApiModelProperty(value = "文件名", dataType = "String") private String fileName; - @ApiModelProperty(value = "专业组别(字典code)", dataType = "String") - private String professionalGroup; + @ApiModelProperty(value = "启用时间（开始）", dataType = "String") + private String activeDateStart; + + @ApiModelProperty(value = "启用时间（结束）", dataType = "String") + private String activeDateEnd; + + @ApiModelProperty(value = "查新状态（字典值）", dataType = "String") + private String noveltyStatus; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTechniqueFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTechniqueFile.java index fb28862..266b680 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTechniqueFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTechniqueFile.java @@ -56,26 +56,26 @@ /** * 版本号 */ - @ApiModelProperty(value = "版本号", dataType = "String") - @TableField("version_no") - private String versionNo; +// @ApiModelProperty(value = "版本号", dataType = "String") +// @TableField("version_no") +// private String versionNo; /** * 专业组别(字典code) */ - @ApiModelProperty(value = "专业组别(字典code)", dataType = "String") - @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) - @TableField("professional_group") - private String professionalGroup; - - @ApiModelProperty(value = "专业组别(字典value)", dataType = "String") - @TableField(exist = false) - private String professionalGroupName; +// @ApiModelProperty(value = "专业组别(字典code)", dataType = "String") +// @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) +// @TableField("professional_group") +// private String professionalGroup; +// +// @ApiModelProperty(value = "专业组别(字典value)", dataType = "String") +// @TableField(exist = false) +// private String professionalGroupName; /** * 实施时间 */ - @ApiModelProperty(value = "实施时间", dataType = "String") + @ApiModelProperty(value = "启用时间", dataType = "String") @TableField("active_date") private String activeDate; @@ -96,9 +96,9 @@ /** * 文件更改申请单id */ - @ApiModelProperty(value = "文件更改申请单id", dataType = "Long") - @TableField("change_form_id") - private Long changeFormId; +// @ApiModelProperty(value = "文件更改申请单id", dataType = "Long") +// @TableField("change_form_id") +// private Long changeFormId; /** * 环境条件要求 @@ -130,4 +130,55 @@ private String updateTime; + @ApiModelProperty(value = "实验室代码", dataType = "String") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + + @ApiModelProperty(value = "组别/部门代码", dataType = "String") + @DictCodeField(message = "部门代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别/部门代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; + + @ApiModelProperty(value = "查新状态，可多个，逗号分割", dataType = "String") + @DictCodeField(message = "查新状态代码描述不合法", cacheName = MeterDictCode.NOVELTY_STATUS) + @TableField("novelty_status") + private String noveltyStatus; + + @ApiModelProperty(value = "查新状态(字典value)，可多个，逗号分割", dataType = "String") + @TableField(exist = false) + private String noveltyStatusName; + + @ApiModelProperty(value = "量传参数", dataType = "String") + @TableField("transmission_params") + private String transmissionParams; + + @ApiModelProperty(value = "温度要求下限", dataType = "String") + @TableField("temperature_low_limit") + private String temperatureLowLimit; + + @ApiModelProperty(value = "温度要求上限", dataType = "String") + @TableField("temperature_high_limit") + private String temperatureHighLimit; + + @ApiModelProperty(value = "湿度要求下限", dataType = "String") + @TableField("humidity_low_limit") + private String humidityLowLimit; + + @ApiModelProperty(value = "湿度要求上限", dataType = "String") + @TableField("humidity_high_limit") + private String humidityHighLimit; + + @ApiModelProperty(value = "最新查新日期", dataType = "String") + @TableField(exist = false) + private String latestNoveltyDate; + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTechniqueFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTechniqueFileServiceImpl.java index 19ac995..ba1a5a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTechniqueFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTechniqueFileServiceImpl.java @@ -33,10 +33,19 @@ @Override public Page listPage(Page page, TechniqueFileListRequest request) throws Exception { QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(request.getLabCode()),"lab_code", request.getLabCode()); + wrapper.eq(StringUtils.isNotBlank(request.getGroupCode()),"group_code", request.getGroupCode()); wrapper.like(StringUtils.isNotBlank(request.getFileNo()),"file_no", request.getFileNo()); wrapper.like(StringUtils.isNotBlank(request.getFileDistributeNo()),"file_distribute_no", request.getFileDistributeNo()); wrapper.like(StringUtils.isNotBlank(request.getFileName()),"file_name", request.getFileName()); - wrapper.eq(StringUtils.isNotBlank(request.getProfessionalGroup()),"professional_group", request.getProfessionalGroup()); + if (StringUtils.isNotBlank(request.getActiveDateStart())) { + wrapper.apply("{0} <= DATE_FORMAT(active_date,'%Y-%m-%d')", request.getActiveDateStart().split(" ")[0]); + } + if (StringUtils.isNotBlank(request.getActiveDateEnd())) { + wrapper.apply("{0} >= DATE_FORMAT(active_date,'%Y-%m-%d')", request.getActiveDateEnd().split(" ")[0]); + } + wrapper.like(StringUtils.isNotBlank(request.getNoveltyStatus()),"novelty_status", request.getNoveltyStatus()); + wrapper.orderByDesc("create_time"); Page techniqueFilePage = techniqueFileMapper.selectPage(page, wrapper); for (BizResourceTechniqueFile record : techniqueFilePage.getRecords()) {