diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 435d1de..1ca9077 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -24,7 +24,7 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, - csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, + csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 435d1de..1ca9077 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -24,7 +24,7 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, - csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, + csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java index 639e8a8..ade9dde 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java @@ -22,4 +22,7 @@ @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long") private Long measurePersonId; + @ApiModelProperty(value = "应出具证书总数", dataType = "Integer") + private Integer requireCertifications; + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 435d1de..1ca9077 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -24,7 +24,7 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, - csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, + csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java index 639e8a8..ade9dde 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java @@ -22,4 +22,7 @@ @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long") private Long measurePersonId; + @ApiModelProperty(value = "应出具证书总数", dataType = "Integer") + private Integer requireCertifications; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java index fff240e..77844f2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java @@ -47,6 +47,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 435d1de..1ca9077 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -24,7 +24,7 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, - csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, + csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java index 639e8a8..ade9dde 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java @@ -22,4 +22,7 @@ @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long") private Long measurePersonId; + @ApiModelProperty(value = "应出具证书总数", dataType = "Integer") + private Integer requireCertifications; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java index fff240e..77844f2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java @@ -47,6 +47,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java index b168e8c..2987115 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java @@ -19,6 +19,12 @@ @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") private Long deptId; + @ApiModelProperty(value = "培训计划编号", dataType = "String") + private String planNo; + + @ApiModelProperty(value = "培训计划名称", dataType = "String") + private String planName; + /** * 实施单位-手填 */ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 435d1de..1ca9077 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -24,7 +24,7 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, - csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, + csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java index 639e8a8..ade9dde 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java @@ -22,4 +22,7 @@ @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long") private Long measurePersonId; + @ApiModelProperty(value = "应出具证书总数", dataType = "Integer") + private Integer requireCertifications; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java index fff240e..77844f2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java @@ -47,6 +47,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java index b168e8c..2987115 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java @@ -19,6 +19,12 @@ @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") private Long deptId; + @ApiModelProperty(value = "培训计划编号", dataType = "String") + private String planNo; + + @ApiModelProperty(value = "培训计划名称", dataType = "String") + private String planName; + /** * 实施单位-手填 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java index ffc21af..2d10d6f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -47,7 +47,7 @@ * 培训计划编号 */ @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "String") @TableField("plan_no") private String planNo; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 435d1de..1ca9077 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -24,7 +24,7 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, - csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, + csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java index 639e8a8..ade9dde 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java @@ -22,4 +22,7 @@ @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long") private Long measurePersonId; + @ApiModelProperty(value = "应出具证书总数", dataType = "Integer") + private Integer requireCertifications; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java index fff240e..77844f2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java @@ -47,6 +47,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java index b168e8c..2987115 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java @@ -19,6 +19,12 @@ @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") private Long deptId; + @ApiModelProperty(value = "培训计划编号", dataType = "String") + private String planNo; + + @ApiModelProperty(value = "培训计划名称", dataType = "String") + private String planName; + /** * 实施单位-手填 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java index ffc21af..2d10d6f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -47,7 +47,7 @@ * 培训计划编号 */ @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "String") @TableField("plan_no") private String planNo; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index c6f5d95..ca73c6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -564,6 +564,7 @@ labExecutiveInfo.setId(sampleAllocateRequest.getId()); labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId()); labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE); + labExecutiveInfo.setRequireCertifications(sampleAllocateRequest.getRequireCertifications()); if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){ return ReturnUtil.success(); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 435d1de..1ca9077 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -24,7 +24,7 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, - csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, + csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java index 639e8a8..ade9dde 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java @@ -22,4 +22,7 @@ @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long") private Long measurePersonId; + @ApiModelProperty(value = "应出具证书总数", dataType = "Integer") + private Integer requireCertifications; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java index fff240e..77844f2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java @@ -47,6 +47,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java index b168e8c..2987115 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java @@ -19,6 +19,12 @@ @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long") private Long deptId; + @ApiModelProperty(value = "培训计划编号", dataType = "String") + private String planNo; + + @ApiModelProperty(value = "培训计划名称", dataType = "String") + private String planName; + /** * 实施单位-手填 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java index ffc21af..2d10d6f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -47,7 +47,7 @@ * 培训计划编号 */ @ExcelProperty("计划编号") - @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long") + @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "String") @TableField("plan_no") private String planNo; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index c6f5d95..ca73c6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -564,6 +564,7 @@ labExecutiveInfo.setId(sampleAllocateRequest.getId()); labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId()); labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE); + labExecutiveInfo.setRequireCertifications(sampleAllocateRequest.getRequireCertifications()); if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){ return ReturnUtil.success(); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index e3d0750..6545b56 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -408,6 +408,8 @@ wrapper.eq("id", 12344321); return wrapper; } + wrapper.like(StringUtils.isNotBlank(request.getPlanNo()), "plan_no", request.getPlanNo()); + wrapper.like(StringUtils.isNotBlank(request.getPlanName()), "plan_name", request.getPlanName()); wrapper.like(StringUtils.isNotBlank(request.getDirector()), "director", request.getDirector()); wrapper.like(StringUtils.isNotBlank(request.getEffectiveCompany()), "effective_company", request.getEffectiveCompany()); wrapper.like(!Objects.isNull(request.getDeptId()), "dept_id", request.getDeptId());