diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index f756493..1939b15 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -49,7 +49,7 @@ mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml minio: -# endpoint: http://127.0.0.1:9000 + # endpoint: http://127.0.0.1:9000 endpoint: http://111.198.10.15:21408 #本地 #测试环境，Access Keys中生成accessKey、secretKey @@ -125,6 +125,6 @@ reminder: #节点--common模块config包 ReminderNodeConfig配置 node: - sample_certificate: 7 #样品证书 + sample_certificate: 30 #样品证书，与原定时间偏移 diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index f756493..1939b15 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -49,7 +49,7 @@ mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml minio: -# endpoint: http://127.0.0.1:9000 + # endpoint: http://127.0.0.1:9000 endpoint: http://111.198.10.15:21408 #本地 #测试环境，Access Keys中生成accessKey、secretKey @@ -125,6 +125,6 @@ reminder: #节点--common模块config包 ReminderNodeConfig配置 node: - sample_certificate: 7 #样品证书 + sample_certificate: 30 #样品证书，与原定时间偏移 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java index d32da8d..552d8ca 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -11,7 +11,7 @@ String NORMAL = "0"; /** - * 即将超期，距离结束即将到30天 + * 即将超期，配置化 */ String ALMOST_EXPIRE = "1"; diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index f756493..1939b15 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -49,7 +49,7 @@ mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml minio: -# endpoint: http://127.0.0.1:9000 + # endpoint: http://127.0.0.1:9000 endpoint: http://111.198.10.15:21408 #本地 #测试环境，Access Keys中生成accessKey、secretKey @@ -125,6 +125,6 @@ reminder: #节点--common模块config包 ReminderNodeConfig配置 node: - sample_certificate: 7 #样品证书 + sample_certificate: 30 #样品证书，与原定时间偏移 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java index d32da8d..552d8ca 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -11,7 +11,7 @@ String NORMAL = "0"; /** - * 即将超期，距离结束即将到30天 + * 即将超期，配置化 */ String ALMOST_EXPIRE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java index 8a8a5f0..8c9803a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -10,5 +10,6 @@ String TO_INCOME = "待收入"; String COMPLETE = "完成"; String OUT_UNDERTAKE = "外包"; + String OUT_MESASUR = "外检"; } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index f756493..1939b15 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -49,7 +49,7 @@ mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml minio: -# endpoint: http://127.0.0.1:9000 + # endpoint: http://127.0.0.1:9000 endpoint: http://111.198.10.15:21408 #本地 #测试环境，Access Keys中生成accessKey、secretKey @@ -125,6 +125,6 @@ reminder: #节点--common模块config包 ReminderNodeConfig配置 node: - sample_certificate: 7 #样品证书 + sample_certificate: 30 #样品证书，与原定时间偏移 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java index d32da8d..552d8ca 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -11,7 +11,7 @@ String NORMAL = "0"; /** - * 即将超期，距离结束即将到30天 + * 即将超期，配置化 */ String ALMOST_EXPIRE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java index 8a8a5f0..8c9803a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -10,5 +10,6 @@ String TO_INCOME = "待收入"; String COMPLETE = "完成"; String OUT_UNDERTAKE = "外包"; + String OUT_MESASUR = "外检"; } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 356824a..7b48432 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -88,8 +88,8 @@ - SELECT orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleSatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + SELECT orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS "measurePeriod", @@ -104,10 +104,10 @@ )csi JOIN ( - SELECT sample_status AS "sampleSatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" + SELECT sample_status AS "sampleSatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo",customer_no AS "customerNo" FROM business_order_sample_relation bosr JOIN ( - SELECT id,order_code + SELECT id,order_code,customer_no FROM business_order WHERE customer_id=#{request.customerId} )bo ON bo.id=bosr.order_id @@ -121,7 +121,7 @@ bi.id, interchange_code AS "interchangeCode", bo.id AS "orderId", - order_code AS "orderNo", + order_code AS "orderCode", certification_company AS "certificationCompany", certification_company_fex AS "certificationCompanyFex", certification_company_email AS "certificationCompanyEmail", diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index 7bee168..df14778 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -30,6 +30,7 @@ private Long orderId; private Long sampleId; private String sampleStatus; + @ApiModelProperty(value = "样品编号", dataType = "String") @ExcelProperty(value = "样品编号", order = 0) private String sampleNo; @@ -86,6 +87,9 @@ @ApiModelProperty(value = "是否加急", dataType = "Integer") private Integer isUrgent; + @ApiModelProperty(value = "是否自检", dataType = "boolean") + private Boolean isSelfMeasure; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index f756493..1939b15 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -49,7 +49,7 @@ mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml minio: -# endpoint: http://127.0.0.1:9000 + # endpoint: http://127.0.0.1:9000 endpoint: http://111.198.10.15:21408 #本地 #测试环境，Access Keys中生成accessKey、secretKey @@ -125,6 +125,6 @@ reminder: #节点--common模块config包 ReminderNodeConfig配置 node: - sample_certificate: 7 #样品证书 + sample_certificate: 30 #样品证书，与原定时间偏移 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java index d32da8d..552d8ca 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -11,7 +11,7 @@ String NORMAL = "0"; /** - * 即将超期，距离结束即将到30天 + * 即将超期，配置化 */ String ALMOST_EXPIRE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java index 8a8a5f0..8c9803a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -10,5 +10,6 @@ String TO_INCOME = "待收入"; String COMPLETE = "完成"; String OUT_UNDERTAKE = "外包"; + String OUT_MESASUR = "外检"; } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 356824a..7b48432 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -88,8 +88,8 @@ - SELECT orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleSatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + SELECT orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS "measurePeriod", @@ -104,10 +104,10 @@ )csi JOIN ( - SELECT sample_status AS "sampleSatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" + SELECT sample_status AS "sampleSatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo",customer_no AS "customerNo" FROM business_order_sample_relation bosr JOIN ( - SELECT id,order_code + SELECT id,order_code,customer_no FROM business_order WHERE customer_id=#{request.customerId} )bo ON bo.id=bosr.order_id @@ -121,7 +121,7 @@ bi.id, interchange_code AS "interchangeCode", bo.id AS "orderId", - order_code AS "orderNo", + order_code AS "orderCode", certification_company AS "certificationCompany", certification_company_fex AS "certificationCompanyFex", certification_company_email AS "certificationCompanyEmail", diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index 7bee168..df14778 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -30,6 +30,7 @@ private Long orderId; private Long sampleId; private String sampleStatus; + @ApiModelProperty(value = "样品编号", dataType = "String") @ExcelProperty(value = "样品编号", order = 0) private String sampleNo; @@ -86,6 +87,9 @@ @ApiModelProperty(value = "是否加急", dataType = "Integer") private Integer isUrgent; + @ApiModelProperty(value = "是否自检", dataType = "boolean") + private Boolean isSelfMeasure; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java index 80b26c2..f821873 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java @@ -46,7 +46,7 @@ * 委托书id */ @ApiModelProperty(value = "委托书编号", dataType = "String") - private String orderNo; + private String orderCode; /** * 证书单位名称 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java index 55e9075..d68cf6c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java @@ -14,7 +14,10 @@ private Long orderId; @ApiModelProperty(value = "委托书代码", dataType = "String") - private String orderNo; + private String customer; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; @ApiModelProperty(value = "样品id", dataType = "String") private Long sampleId; @@ -45,10 +48,10 @@ @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @ApiModelProperty(value = "样品状态", dataType = "String") - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index f756493..1939b15 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -49,7 +49,7 @@ mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml minio: -# endpoint: http://127.0.0.1:9000 + # endpoint: http://127.0.0.1:9000 endpoint: http://111.198.10.15:21408 #本地 #测试环境，Access Keys中生成accessKey、secretKey @@ -125,6 +125,6 @@ reminder: #节点--common模块config包 ReminderNodeConfig配置 node: - sample_certificate: 7 #样品证书 + sample_certificate: 30 #样品证书，与原定时间偏移 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java index d32da8d..552d8ca 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -11,7 +11,7 @@ String NORMAL = "0"; /** - * 即将超期，距离结束即将到30天 + * 即将超期，配置化 */ String ALMOST_EXPIRE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java index 8a8a5f0..8c9803a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -10,5 +10,6 @@ String TO_INCOME = "待收入"; String COMPLETE = "完成"; String OUT_UNDERTAKE = "外包"; + String OUT_MESASUR = "外检"; } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 356824a..7b48432 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -88,8 +88,8 @@