Merge remote-tracking branch 'origin/master'

zss

2024-07-26 8d3c3fec23edeabe3b40aa1eefc7fdd0c6c57d57

Merge remote-tracking branch 'origin/master'

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -203,6 +203,8 @@
            device.setStorageUrl(dataConfigList.getStorageUrl());
            device.setIp(dataConfigList.getIp());
            device.setFileType(dataConfigList.getFileType());
            device.setMdbEntrustCode(dataConfigList.getMdbEntrustCode());
            device.setMdbSampleCode(dataConfigList.getMdbSampleCode());
            deviceService.updateById(device);
        } else {
            dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());

 cnas-server/src/main/java/com/yuanchu/mom/dto/DataConfigDto.java

@@ -24,4 +24,10 @@

    @ApiModelProperty("设备IP")
    private String ip;

    @ApiModelProperty("数采-委托字段")
    private String mdbEntrustCode;

    @ApiModelProperty("数采-样品字段")
    private String mdbSampleCode;
}

 cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java

@@ -69,4 +69,7 @@

    @ApiModelProperty(value = "检验项目id")
    private Integer structureItemParameterId;

    private String mdbEntrustCode;
    private String mdbSampleCode;
}

 cnas-server/src/main/resources/mapper/DataConfigMapper.xml

@@ -18,6 +18,8 @@
               d.collect_url,
               d.storage_url,
               d.ip,
            d.mdb_entrust_code,
            d.mdb_sample_code,
               ip.inspection_item,
               if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
                  ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass,