diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskExtendRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskExtendRespVO.java index 00dd818..6167eb9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskExtendRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskExtendRespVO.java @@ -21,6 +21,9 @@ import lombok.Data; */ @Data public class BusinessAssayTaskExtendRespVO extends BusinessAssayTaskRespVO { + + /** 任务单数据类型,横向：horizontal，纵向：‌vertical **/ + private String reportDataType; /** 分析方法名称 **/ private String configAssayMethodName; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java index 6fa4775..ad18e3d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java @@ -139,6 +139,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectList(new LambdaQueryWrapperX().eq(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskDO.getId())); - List businessAssayTaskDataList = businessAssayTaskDataMapper.selectList(new LambdaQueryWrapperX().eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()).eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId())); -// BusinessAssayTaskDataDO businessAssayTaskData = businessAssayTaskDataList.get(0); - //处理数据 + //处理数据 List> datas = new ArrayList<>(); - for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) { - BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null); - - Map map = new HashedMap<>(); - map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId()); - map.put("businessAssayTaskId", businessAssayTaskDataDO.getBusinessAssayTaskId()); - map.put("businessSubSampleId", businessAssayTaskDataDO.getBusinessSubSampleId()); - map.put("businessSubParentSampleId", businessAssayTaskDataDO.getBusinessSubParentSampleId()); - map.put("configAssayMethodId", businessAssayTaskDataDO.getConfigAssayMethodId()); - map.put("businessAssayTaskDetailId", businessAssayTaskDetailDO.getId()); - map.put("sampleCode", businessAssayTaskDetailDO.getSampleCode()); - map.put("sampleName", businessAssayTaskDetailDO.getSampleName()); - map.put("analysisType", "analysis"); - map.put("assayTime", businessAssayTaskJson.get("assayTime")); + //横向数据 + if ("horizontal".equals(reportDataType)) { - BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO(); - projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId()); - List projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2); - for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) { -// map.put("e" + ep.getDicId(), ep); - map.put(ep.getName(), ep.getValue()); - if (StringUtils.isNotEmpty(ep.getFormula())) { - BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO(); - parameterDataSearch.setBusinessAssayProjectDataId(ep.getId()); - List plist = businessAssayParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch); - for (BusinessAssayProjectAndParameterRespVO p : plist) { -// map.put("p" + p.getDicId(), p); - map.put(p.getName(), p.getValue()); - } + List businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectList(new LambdaQueryWrapperX().eq(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskDO.getId())); + List businessAssayTaskDataList = businessAssayTaskDataMapper.selectList(new LambdaQueryWrapperX().eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()).eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId())); + + for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) { + BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null); + + Map map = new HashedMap<>(); + map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId()); + map.put("businessAssayTaskId", businessAssayTaskDataDO.getBusinessAssayTaskId()); + map.put("businessSubSampleId", businessAssayTaskDataDO.getBusinessSubSampleId()); + map.put("businessSubParentSampleId", businessAssayTaskDataDO.getBusinessSubParentSampleId()); + map.put("configAssayMethodId", businessAssayTaskDataDO.getConfigAssayMethodId()); + map.put("businessAssayTaskDetailId", businessAssayTaskDetailDO.getId()); + map.put("sampleCode", businessAssayTaskDetailDO.getSampleCode()); + map.put("sampleName", businessAssayTaskDetailDO.getSampleName()); + map.put("analysisType", "analysis"); + map.put("assayTime", businessAssayTaskJson.get("assayTime")); + + List businessAssayTaskParameterDataList = businessAssayTaskParameterDataMapper.selectByBusinessAssayTaskDataIds(Arrays.asList(businessAssayTaskDataDO.getId())); + for (BusinessAssayProjectAndParameterRespVO businessAssayTaskParameterDataDO : businessAssayTaskParameterDataList) { + map.put(businessAssayTaskParameterDataDO.getName(), businessAssayTaskParameterDataDO.getValue()); } - - } - datas.add(map); - } - List businessQCManagementDataDOList = businessQCManagementDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId()); + BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO(); + projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId()); + List projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2); + for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) { + map.put(ep.getName(), ep.getValue()); + if (StringUtils.isNotEmpty(ep.getFormula())) { + BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO(); + parameterDataSearch.setBusinessAssayProjectDataId(ep.getId()); + List plist = businessAssayParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch); + for (BusinessAssayProjectAndParameterRespVO p : plist) { + map.put(p.getName(), p.getValue()); + } + } + + } + datas.add(map); + } + + List businessQCManagementDataDOList = businessQCManagementDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId()); + + + for (BusinessQCManagementDataDO businessQCManagementData : businessQCManagementDataDOList) { + Map map = new HashedMap<>(); + map.put("businessAssayTaskDataId", businessQCManagementData.getId()); + map.put("businessAssayTaskId", businessQCManagementData.getBusinessAssayTaskId()); + map.put("businessSubSampleId", ""); + map.put("businessSubParentSampleId", ""); + map.put("configAssayMethodId", businessQCManagementData.getConfigAssayMethodId()); + map.put("businessAssayTaskDetailId", ""); + map.put("sampleCode", businessQCManagementData.getSampleCode()); + map.put("sampleName", businessQCManagementData.getSampleName()); + map.put("analysisType", businessQCManagementData.getDictionaryBusinessKey()); + map.put("assayTime", businessAssayTaskJson.get("assayTime")); + + List businessQCManagementSampleParameterDataList = businessQCManagementSampleParameterDataMapper.selectByBusinessQCManagementDataIds(Arrays.asList(businessQCManagementData.getId())); + for (BusinessAssayProjectAndParameterRespVO businessQCManagementSampleParameterData : businessQCManagementSampleParameterDataList) { + map.put(businessQCManagementSampleParameterData.getName(), businessQCManagementSampleParameterData.getValue()); + } + + BusinessQCManagementProjectDataReqVO projectDataSearch2 = new BusinessQCManagementProjectDataReqVO(); + projectDataSearch2.setBusinessQCManagementDataId(businessQCManagementData.getId()); + List projectAndParameterList2 = businessQCManagementProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2); + for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) { + map.put(ep.getName(), ep.getValue()); + if (StringUtils.isNotEmpty(ep.getFormula())) { + BusinessQCManagementParameterDataReqVO parameterDataSearch = new BusinessQCManagementParameterDataReqVO(); + parameterDataSearch.setBusinessQCManagementProjectDataId(ep.getId()); + List plist = businessQCManagementParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch); + for (BusinessAssayProjectAndParameterRespVO p : plist) { + map.put(p.getName(), p.getValue()); + } + } + + } + datas.add(map); + } + + List businessQCCoefficientDataDOList = businessQCCoefficientDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId()); + for (BusinessQCCoefficientDataDO businessQCCoefficientData: businessQCCoefficientDataDOList) { + Map map = new HashedMap<>(); + map.put("businessAssayTaskDataId", businessQCCoefficientData.getId()); + map.put("businessAssayTaskId", businessQCCoefficientData.getBusinessAssayTaskId()); + map.put("businessSubSampleId", ""); + map.put("businessSubParentSampleId", ""); + map.put("configAssayMethodId", businessQCCoefficientData.getConfigAssayMethodId()); + map.put("businessAssayTaskDetailId", ""); + map.put("sampleCode", businessQCCoefficientData.getSampleCode()); + map.put("sampleName", businessQCCoefficientData.getSampleName()); + map.put("analysisType", businessQCCoefficientData.getDictionaryBusinessKey()); + map.put("assayTime", businessAssayTaskJson.get("assayTime")); + + BusinessQCCoefficientParameterDataReqVO parameterDataSearch2 = new BusinessQCCoefficientParameterDataReqVO(); + parameterDataSearch2.setBusinessQCCoefficientDataId(businessQCCoefficientData.getId()); + List plist2 = businessQCCoefficientParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch2); + for (BusinessAssayProjectAndParameterRespVO p : plist2) { + map.put(p.getName(), p.getValue()); + } + datas.add(map); + } + + + } else if ("‌vertical ".equals(reportDataType)) {//纵向数据 + List businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectList(new LambdaQueryWrapperX().eq(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskDO.getId())); + List businessAssayTaskDataList = businessAssayTaskDataMapper.selectList(new LambdaQueryWrapperX().eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()).eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId())); + + for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) { + BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null); + + HashedMap map = new HashedMap<>(); + map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId()); + map.put("businessAssayTaskId", businessAssayTaskDataDO.getBusinessAssayTaskId()); + map.put("businessSubSampleId", businessAssayTaskDataDO.getBusinessSubSampleId()); + map.put("businessSubParentSampleId", businessAssayTaskDataDO.getBusinessSubParentSampleId()); + map.put("configAssayMethodId", businessAssayTaskDataDO.getConfigAssayMethodId()); + map.put("businessAssayTaskDetailId", businessAssayTaskDetailDO.getId()); + map.put("sampleCode", businessAssayTaskDetailDO.getSampleCode()); + map.put("sampleName", businessAssayTaskDetailDO.getSampleName()); + map.put("analysisType", "analysis"); + map.put("assayTime", businessAssayTaskJson.get("assayTime")); + + List businessAssayTaskParameterDataList = businessAssayTaskParameterDataMapper.selectByBusinessAssayTaskDataIds(Arrays.asList(businessAssayTaskDataDO.getId())); + for (BusinessAssayProjectAndParameterRespVO businessAssayTaskParameterDataDO : businessAssayTaskParameterDataList) { + map.put(businessAssayTaskParameterDataDO.getName(), businessAssayTaskParameterDataDO.getValue()); + } + + BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO(); + projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId()); + List projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2); + for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) { + HashedMap newMap = SerializationUtils.clone(map); + newMap.put(ep.getName(), ep.getValue()); + if (StringUtils.isNotEmpty(ep.getFormula())) { + BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO(); + parameterDataSearch.setBusinessAssayProjectDataId(ep.getId()); + List plist = businessAssayParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch); + for (BusinessAssayProjectAndParameterRespVO p : plist) { + newMap.put(p.getName(), p.getValue()); + } + } + datas.add(newMap); + } + } + + List businessQCManagementDataDOList = businessQCManagementDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId()); + + + for (BusinessQCManagementDataDO businessQCManagementData : businessQCManagementDataDOList) { + HashedMap map = new HashedMap<>(); + map.put("businessAssayTaskDataId", businessQCManagementData.getId()); + map.put("businessAssayTaskId", businessQCManagementData.getBusinessAssayTaskId()); + map.put("businessSubSampleId", ""); + map.put("businessSubParentSampleId", ""); + map.put("configAssayMethodId", businessQCManagementData.getConfigAssayMethodId()); + map.put("businessAssayTaskDetailId", ""); + map.put("sampleCode", businessQCManagementData.getSampleCode()); + map.put("sampleName", businessQCManagementData.getSampleName()); + map.put("analysisType", businessQCManagementData.getDictionaryBusinessKey()); + map.put("assayTime", businessAssayTaskJson.get("assayTime")); + + List businessQCManagementSampleParameterDataList = businessQCManagementSampleParameterDataMapper.selectByBusinessQCManagementDataIds(Arrays.asList(businessQCManagementData.getId())); + for (BusinessAssayProjectAndParameterRespVO businessQCManagementSampleParameterData : businessQCManagementSampleParameterDataList) { + map.put(businessQCManagementSampleParameterData.getName(), businessQCManagementSampleParameterData.getValue()); + } + + BusinessQCManagementProjectDataReqVO projectDataSearch2 = new BusinessQCManagementProjectDataReqVO(); + projectDataSearch2.setBusinessQCManagementDataId(businessQCManagementData.getId()); + List projectAndParameterList2 = businessQCManagementProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2); + for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) { + HashedMap newMap = SerializationUtils.clone(map); + newMap.put(ep.getName(), ep.getValue()); + if (StringUtils.isNotEmpty(ep.getFormula())) { + BusinessQCManagementParameterDataReqVO parameterDataSearch = new BusinessQCManagementParameterDataReqVO(); + parameterDataSearch.setBusinessQCManagementProjectDataId(ep.getId()); + List plist = businessQCManagementParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch); + for (BusinessAssayProjectAndParameterRespVO p : plist) { + newMap.put(p.getName(), p.getValue()); + } + } + datas.add(newMap); + } + } + + List businessQCCoefficientDataDOList = businessQCCoefficientDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId()); + for (BusinessQCCoefficientDataDO businessQCCoefficientData: businessQCCoefficientDataDOList) { + Map map = new HashedMap<>(); + map.put("businessAssayTaskDataId", businessQCCoefficientData.getId()); + map.put("businessAssayTaskId", businessQCCoefficientData.getBusinessAssayTaskId()); + map.put("businessSubSampleId", ""); + map.put("businessSubParentSampleId", ""); + map.put("configAssayMethodId", businessQCCoefficientData.getConfigAssayMethodId()); + map.put("businessAssayTaskDetailId", ""); + map.put("sampleCode", businessQCCoefficientData.getSampleCode()); + map.put("sampleName", businessQCCoefficientData.getSampleName()); + map.put("analysisType", businessQCCoefficientData.getDictionaryBusinessKey()); + map.put("assayTime", businessAssayTaskJson.get("assayTime")); + + BusinessQCCoefficientParameterDataReqVO parameterDataSearch2 = new BusinessQCCoefficientParameterDataReqVO(); + parameterDataSearch2.setBusinessQCCoefficientDataId(businessQCCoefficientData.getId()); + List plist2 = businessQCCoefficientParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch2); + for (BusinessAssayProjectAndParameterRespVO p : plist2) { + map.put(p.getName(), p.getValue()); + } + datas.add(map); + } + + } - for (BusinessQCManagementDataDO businessQCManagementData : businessQCManagementDataDOList) { - Map map = new HashedMap<>(); - map.put("businessAssayTaskDataId", businessQCManagementData.getId()); - map.put("businessAssayTaskId", businessQCManagementData.getBusinessAssayTaskId()); - map.put("businessSubSampleId", ""); - map.put("businessSubParentSampleId", ""); - map.put("configAssayMethodId", businessQCManagementData.getConfigAssayMethodId()); - map.put("businessAssayTaskDetailId", ""); - map.put("sampleCode", businessQCManagementData.getSampleCode()); - map.put("sampleName", businessQCManagementData.getSampleName()); - map.put("analysisType", businessQCManagementData.getDictionaryBusinessKey()); - map.put("assayTime", businessAssayTaskJson.get("assayTime")); - - BusinessQCManagementProjectDataReqVO projectDataSearch2 = new BusinessQCManagementProjectDataReqVO(); - projectDataSearch2.setBusinessQCManagementDataId(businessQCManagementData.getId()); - List projectAndParameterList2 = businessQCManagementProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2); - for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) { -// map.put("e" + ep.getDicId(), ep); - map.put(ep.getName(), ep.getValue()); - if (StringUtils.isNotEmpty(ep.getFormula())) { - BusinessQCManagementParameterDataReqVO parameterDataSearch = new BusinessQCManagementParameterDataReqVO(); - parameterDataSearch.setBusinessQCManagementProjectDataId(ep.getId()); - List plist = businessQCManagementParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch); - for (BusinessAssayProjectAndParameterRespVO p : plist) { -// map.put("p" + p.getDicId(), p); - map.put(p.getName(), p.getValue()); - } - } - - } - datas.add(map); - } - - List businessQCCoefficientDataDOList = businessQCCoefficientDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId()); - for (BusinessQCCoefficientDataDO businessQCCoefficientData: businessQCCoefficientDataDOList) { - Map map = new HashedMap<>(); - map.put("businessAssayTaskDataId", businessQCCoefficientData.getId()); - map.put("businessAssayTaskId", businessQCCoefficientData.getBusinessAssayTaskId()); - map.put("businessSubSampleId", ""); - map.put("businessSubParentSampleId", ""); - map.put("configAssayMethodId", businessQCCoefficientData.getConfigAssayMethodId()); - map.put("businessAssayTaskDetailId", ""); - map.put("sampleCode", businessQCCoefficientData.getSampleCode()); - map.put("sampleName", businessQCCoefficientData.getSampleName()); - map.put("analysisType", businessQCCoefficientData.getDictionaryBusinessKey()); - map.put("assayTime", businessAssayTaskJson.get("assayTime")); - - BusinessQCCoefficientParameterDataReqVO parameterDataSearch2 = new BusinessQCCoefficientParameterDataReqVO(); - parameterDataSearch2.setBusinessQCCoefficientDataId(businessQCCoefficientData.getId()); - List plist2 = businessQCCoefficientParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch2); - for (BusinessAssayProjectAndParameterRespVO p : plist2) { -// map.put("p" + p.getDicId(), p); - map.put(p.getName(), p.getValue()); - } - datas.add(map); - } - // resultJsonObject.put("all", datas); // Map>> map = datas.stream().collect(Collectors.groupingBy(g -> (String) g.get("analysisType"))); // for (Map.Entry>> entry : map.entrySet()) { @@ -416,7 +547,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic List> fxList = datas.stream().filter(f -> "analysis".equals(f.get("analysisType")) || "zky".equals(f.get("analysisType")) || "kby".equals(f.get("analysisType")) ).collect(Collectors.toList()); resultJsonObject.put("fx", fxList); List> byList = datas.stream().filter(f -> "by".equals(f.get("analysisType"))).collect(Collectors.toList()); - resultJsonObject.put("by", byList); + resultJsonObject.put("by", byList); return resultJsonObject; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodPageReqVO.java index 7185cd0..98e7b88 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodPageReqVO.java @@ -46,6 +46,9 @@ public class ConfigAssayMethodPageReqVO extends PageParam { @Schema(description = "任务单模板key") private String configReportTemplateKey; + @Schema(description = "任务单数据类型,横向：horizontal，纵向：‌vertical‌", example = "2") + private String reportDataType; + @Schema(description = "任务单编号规则") private String codeRule; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodReqVO.java index 867a515..f82c1f7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodReqVO.java @@ -46,6 +46,9 @@ public class ConfigAssayMethodReqVO { @Schema(description = "任务单模板key") private String configReportTemplateKey; + @Schema(description = "任务单数据类型,横向：horizontal，纵向：‌vertical‌", example = "2") + private String reportDataType; + @Schema(description = "任务单编号规则") private String codeRule; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodRespVO.java index 25188a9..36fc362 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodRespVO.java @@ -56,6 +56,10 @@ public class ConfigAssayMethodRespVO { @ExcelProperty("任务单模板key") private String configReportTemplateKey; + @Schema(description = "任务单数据类型,横向：horizontal，纵向：‌vertical‌", example = "2") + @ExcelProperty("任务单数据类型,横向：horizontal，纵向：‌vertical‌") + private String reportDataType; + @Schema(description = "任务单编号规则", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("任务单编号规则") private String codeRule; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodSaveReqVO.java index b9dac4a..3f97395 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodSaveReqVO.java @@ -47,6 +47,9 @@ public class ConfigAssayMethodSaveReqVO { @Schema(description = "任务单模板key") private String configReportTemplateKey; + @Schema(description = "任务单数据类型,横向：horizontal，纵向：‌vertical‌") + private String reportDataType; + @Schema(description = "任务单编号规则", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "任务单编号规则不能为空") private String codeRule; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodDO.java index 296c205..d10ff91 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodDO.java @@ -87,6 +87,11 @@ public class ConfigAssayMethodDO extends BusinessBaseDO { @TableField("CFG_RPT_TMPL_KY") private String configReportTemplateKey; /** + * 任务单数据类型,横向：horizontal，纵向：‌vertical‌ + */ + @TableField("RPT_DAT_TP") + private String reportDataType; + /** * 任务单编号规则 */ @TableField("CD_RUL") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java index 85ce27a..4006332 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java @@ -4,14 +4,12 @@ import java.util.*; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodPageReqVO; import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodReqVO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO; import org.apache.ibatis.annotations.Mapper; -import com.zt.plat.module.qms.business.config.controller.vo.*; /** * 检测方法配置 Mapper @@ -33,6 +31,7 @@ public interface ConfigAssayMethodMapper extends BaseMapperX