diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java index 27dc5f3..3930658 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java @@ -11,8 +11,8 @@ * @Date: 2023/02/07 10:51 */ public enum SampleStatusEnum { - TO_RECEIVE("1", null), //待收入 - TO_HANDOUT("2", CheckCompletionEnum.UNCHECK), //待分发 + TO_RECEIVE("1", CheckCompletionEnum.UNCHECK), //待收入 + TO_HANDOUT("2", CheckCompletionEnum.IN_CHECK), //待分发 IN_MEASURE("3", CheckCompletionEnum.IN_CHECK), //检测中 MEASURE_COMPLETE("4", CheckCompletionEnum.IN_CHECK), //检测完 TO_GIVE_BACK("5", CheckCompletionEnum.CHECKED), //待归还 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java index 27dc5f3..3930658 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java @@ -11,8 +11,8 @@ * @Date: 2023/02/07 10:51 */ public enum SampleStatusEnum { - TO_RECEIVE("1", null), //待收入 - TO_HANDOUT("2", CheckCompletionEnum.UNCHECK), //待分发 + TO_RECEIVE("1", CheckCompletionEnum.UNCHECK), //待收入 + TO_HANDOUT("2", CheckCompletionEnum.IN_CHECK), //待分发 IN_MEASURE("3", CheckCompletionEnum.IN_CHECK), //检测中 MEASURE_COMPLETE("4", CheckCompletionEnum.IN_CHECK), //检测完 TO_GIVE_BACK("5", CheckCompletionEnum.CHECKED), //待归还 diff --git a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml index ac7b375..403d14e 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml @@ -20,9 +20,9 @@ SELECT e.equipment_name, count( e.id ) as `count`, - count( check_completion = '1' or check_completion is null) AS uncheck, - count( check_completion = '2' ) AS incheck, - count( check_completion = '3' ) AS checked + sum( case when check_completion = '1' or check_completion is null then 1 else 0 end ) AS uncheck, + sum( case when check_completion = '2' then 1 else 0 end ) AS incheck, + sum( case when check_completion = '3' then 1 else 0 end) AS checked FROM `eqpt_plan_equipment_relation` r LEFT JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id @@ -93,19 +93,46 @@ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java index 27dc5f3..3930658 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java @@ -11,8 +11,8 @@ * @Date: 2023/02/07 10:51 */ public enum SampleStatusEnum { - TO_RECEIVE("1", null), //待收入 - TO_HANDOUT("2", CheckCompletionEnum.UNCHECK), //待分发 + TO_RECEIVE("1", CheckCompletionEnum.UNCHECK), //待收入 + TO_HANDOUT("2", CheckCompletionEnum.IN_CHECK), //待分发 IN_MEASURE("3", CheckCompletionEnum.IN_CHECK), //检测中 MEASURE_COMPLETE("4", CheckCompletionEnum.IN_CHECK), //检测完 TO_GIVE_BACK("5", CheckCompletionEnum.CHECKED), //待归还 diff --git a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml index ac7b375..403d14e 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml @@ -20,9 +20,9 @@ SELECT e.equipment_name, count( e.id ) as `count`, - count( check_completion = '1' or check_completion is null) AS uncheck, - count( check_completion = '2' ) AS incheck, - count( check_completion = '3' ) AS checked + sum( case when check_completion = '1' or check_completion is null then 1 else 0 end ) AS uncheck, + sum( case when check_completion = '2' then 1 else 0 end ) AS incheck, + sum( case when check_completion = '3' then 1 else 0 end) AS checked FROM `eqpt_plan_equipment_relation` r LEFT JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id @@ -93,19 +93,46 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml index d489b42..31ba08b 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml @@ -33,11 +33,12 @@ + - id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time + id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time,business_ability_file diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java index 27dc5f3..3930658 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java @@ -11,8 +11,8 @@ * @Date: 2023/02/07 10:51 */ public enum SampleStatusEnum { - TO_RECEIVE("1", null), //待收入 - TO_HANDOUT("2", CheckCompletionEnum.UNCHECK), //待分发 + TO_RECEIVE("1", CheckCompletionEnum.UNCHECK), //待收入 + TO_HANDOUT("2", CheckCompletionEnum.IN_CHECK), //待分发 IN_MEASURE("3", CheckCompletionEnum.IN_CHECK), //检测中 MEASURE_COMPLETE("4", CheckCompletionEnum.IN_CHECK), //检测完 TO_GIVE_BACK("5", CheckCompletionEnum.CHECKED), //待归还 diff --git a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml index ac7b375..403d14e 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml @@ -20,9 +20,9 @@ SELECT e.equipment_name, count( e.id ) as `count`, - count( check_completion = '1' or check_completion is null) AS uncheck, - count( check_completion = '2' ) AS incheck, - count( check_completion = '3' ) AS checked + sum( case when check_completion = '1' or check_completion is null then 1 else 0 end ) AS uncheck, + sum( case when check_completion = '2' then 1 else 0 end ) AS incheck, + sum( case when check_completion = '3' then 1 else 0 end) AS checked FROM `eqpt_plan_equipment_relation` r LEFT JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id @@ -93,19 +93,46 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml index d489b42..31ba08b 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml @@ -33,11 +33,12 @@ + - id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time + id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time,business_ability_file diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java index 1fc1f9c..5b3c155 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java @@ -27,12 +27,12 @@ private final IPlanEquipmentRelationService relationService; private final IEquipmentInfoService equipmentInfoService; - @ApiOperation("任务单接收") - @PostMapping("/orderReceive") - public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { - relationService.orderReceive(orderReceive); - return ReturnUtil.success(); - } +// @ApiOperation("任务单接收") +// @PostMapping("/orderReceive") +// public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { +// relationService.orderReceive(orderReceive); +// return ReturnUtil.success(); +// } @ApiOperation("任务单样品状态更新") @@ -45,7 +45,7 @@ @ApiOperation("证书新增/编辑") @PostMapping("/certificateUpdate") public ReturnDTO certificateUpdate(@RequestBody CertificateUpdate updateForm) { - equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),"西昌卫星发射中心计量测试站",updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); + equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),updateForm.getMeasureCompany(),updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); return ReturnUtil.success(); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java index 27dc5f3..3930658 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java @@ -11,8 +11,8 @@ * @Date: 2023/02/07 10:51 */ public enum SampleStatusEnum { - TO_RECEIVE("1", null), //待收入 - TO_HANDOUT("2", CheckCompletionEnum.UNCHECK), //待分发 + TO_RECEIVE("1", CheckCompletionEnum.UNCHECK), //待收入 + TO_HANDOUT("2", CheckCompletionEnum.IN_CHECK), //待分发 IN_MEASURE("3", CheckCompletionEnum.IN_CHECK), //检测中 MEASURE_COMPLETE("4", CheckCompletionEnum.IN_CHECK), //检测完 TO_GIVE_BACK("5", CheckCompletionEnum.CHECKED), //待归还 diff --git a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml index ac7b375..403d14e 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml @@ -20,9 +20,9 @@ SELECT e.equipment_name, count( e.id ) as `count`, - count( check_completion = '1' or check_completion is null) AS uncheck, - count( check_completion = '2' ) AS incheck, - count( check_completion = '3' ) AS checked + sum( case when check_completion = '1' or check_completion is null then 1 else 0 end ) AS uncheck, + sum( case when check_completion = '2' then 1 else 0 end ) AS incheck, + sum( case when check_completion = '3' then 1 else 0 end) AS checked FROM `eqpt_plan_equipment_relation` r LEFT JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id @@ -93,19 +93,46 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml index d489b42..31ba08b 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml @@ -33,11 +33,12 @@ + - id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time + id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time,business_ability_file diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java index 1fc1f9c..5b3c155 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java @@ -27,12 +27,12 @@ private final IPlanEquipmentRelationService relationService; private final IEquipmentInfoService equipmentInfoService; - @ApiOperation("任务单接收") - @PostMapping("/orderReceive") - public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { - relationService.orderReceive(orderReceive); - return ReturnUtil.success(); - } +// @ApiOperation("任务单接收") +// @PostMapping("/orderReceive") +// public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { +// relationService.orderReceive(orderReceive); +// return ReturnUtil.success(); +// } @ApiOperation("任务单样品状态更新") @@ -45,7 +45,7 @@ @ApiOperation("证书新增/编辑") @PostMapping("/certificateUpdate") public ReturnDTO certificateUpdate(@RequestBody CertificateUpdate updateForm) { - equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),"西昌卫星发射中心计量测试站",updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); + equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),updateForm.getMeasureCompany(),updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); return ReturnUtil.success(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java index 606b0ba..f4fc9bb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java @@ -19,6 +19,9 @@ @ApiModelProperty("检定部门id") private Long measureDeptId; + @ApiModelProperty("检定校准单位") + private String measureCompany; + @ApiModelProperty("检校时间") private Date calibrationTime; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java index 27dc5f3..3930658 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java @@ -11,8 +11,8 @@ * @Date: 2023/02/07 10:51 */ public enum SampleStatusEnum { - TO_RECEIVE("1", null), //待收入 - TO_HANDOUT("2", CheckCompletionEnum.UNCHECK), //待分发 + TO_RECEIVE("1", CheckCompletionEnum.UNCHECK), //待收入 + TO_HANDOUT("2", CheckCompletionEnum.IN_CHECK), //待分发 IN_MEASURE("3", CheckCompletionEnum.IN_CHECK), //检测中 MEASURE_COMPLETE("4", CheckCompletionEnum.IN_CHECK), //检测完 TO_GIVE_BACK("5", CheckCompletionEnum.CHECKED), //待归还 diff --git a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml index ac7b375..403d14e 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml @@ -20,9 +20,9 @@ SELECT e.equipment_name, count( e.id ) as `count`, - count( check_completion = '1' or check_completion is null) AS uncheck, - count( check_completion = '2' ) AS incheck, - count( check_completion = '3' ) AS checked + sum( case when check_completion = '1' or check_completion is null then 1 else 0 end ) AS uncheck, + sum( case when check_completion = '2' then 1 else 0 end ) AS incheck, + sum( case when check_completion = '3' then 1 else 0 end) AS checked FROM `eqpt_plan_equipment_relation` r LEFT JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id @@ -93,19 +93,46 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml index d489b42..31ba08b 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml @@ -33,11 +33,12 @@ + - id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time + id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time,business_ability_file diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java index 1fc1f9c..5b3c155 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java @@ -27,12 +27,12 @@ private final IPlanEquipmentRelationService relationService; private final IEquipmentInfoService equipmentInfoService; - @ApiOperation("任务单接收") - @PostMapping("/orderReceive") - public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { - relationService.orderReceive(orderReceive); - return ReturnUtil.success(); - } +// @ApiOperation("任务单接收") +// @PostMapping("/orderReceive") +// public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { +// relationService.orderReceive(orderReceive); +// return ReturnUtil.success(); +// } @ApiOperation("任务单样品状态更新") @@ -45,7 +45,7 @@ @ApiOperation("证书新增/编辑") @PostMapping("/certificateUpdate") public ReturnDTO certificateUpdate(@RequestBody CertificateUpdate updateForm) { - equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),"西昌卫星发射中心计量测试站",updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); + equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),updateForm.getMeasureCompany(),updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); return ReturnUtil.success(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java index 606b0ba..f4fc9bb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java @@ -19,6 +19,9 @@ @ApiModelProperty("检定部门id") private Long measureDeptId; + @ApiModelProperty("检定校准单位") + private String measureCompany; + @ApiModelProperty("检校时间") private Date calibrationTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java index b27b122..ba049f5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java @@ -19,6 +19,11 @@ @ApiModelProperty(value = "样品状态",required = true) private String sampleStatus; - @ApiModelProperty(value = "检定完成时间",required = false) + @ApiModelProperty(value = "实际送检时间(设备收入时传)",required = false) + private Date realDeliverTime; + @ApiModelProperty(value = "检定完成时间(完成时传)",required = false) private Date finishTime; + + @ApiModelProperty(value = "检定校准单位(外送任务单传)",hidden = true) + private String measureCompany; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java index 27dc5f3..3930658 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java @@ -11,8 +11,8 @@ * @Date: 2023/02/07 10:51 */ public enum SampleStatusEnum { - TO_RECEIVE("1", null), //待收入 - TO_HANDOUT("2", CheckCompletionEnum.UNCHECK), //待分发 + TO_RECEIVE("1", CheckCompletionEnum.UNCHECK), //待收入 + TO_HANDOUT("2", CheckCompletionEnum.IN_CHECK), //待分发 IN_MEASURE("3", CheckCompletionEnum.IN_CHECK), //检测中 MEASURE_COMPLETE("4", CheckCompletionEnum.IN_CHECK), //检测完 TO_GIVE_BACK("5", CheckCompletionEnum.CHECKED), //待归还 diff --git a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml index ac7b375..403d14e 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml @@ -20,9 +20,9 @@ SELECT e.equipment_name, count( e.id ) as `count`, - count( check_completion = '1' or check_completion is null) AS uncheck, - count( check_completion = '2' ) AS incheck, - count( check_completion = '3' ) AS checked + sum( case when check_completion = '1' or check_completion is null then 1 else 0 end ) AS uncheck, + sum( case when check_completion = '2' then 1 else 0 end ) AS incheck, + sum( case when check_completion = '3' then 1 else 0 end) AS checked FROM `eqpt_plan_equipment_relation` r LEFT JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id @@ -93,19 +93,46 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml index d489b42..31ba08b 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml @@ -33,11 +33,12 @@ + - id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time + id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time,business_ability_file diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java index 1fc1f9c..5b3c155 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java @@ -27,12 +27,12 @@ private final IPlanEquipmentRelationService relationService; private final IEquipmentInfoService equipmentInfoService; - @ApiOperation("任务单接收") - @PostMapping("/orderReceive") - public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { - relationService.orderReceive(orderReceive); - return ReturnUtil.success(); - } +// @ApiOperation("任务单接收") +// @PostMapping("/orderReceive") +// public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { +// relationService.orderReceive(orderReceive); +// return ReturnUtil.success(); +// } @ApiOperation("任务单样品状态更新") @@ -45,7 +45,7 @@ @ApiOperation("证书新增/编辑") @PostMapping("/certificateUpdate") public ReturnDTO certificateUpdate(@RequestBody CertificateUpdate updateForm) { - equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),"西昌卫星发射中心计量测试站",updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); + equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),updateForm.getMeasureCompany(),updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); return ReturnUtil.success(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java index 606b0ba..f4fc9bb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java @@ -19,6 +19,9 @@ @ApiModelProperty("检定部门id") private Long measureDeptId; + @ApiModelProperty("检定校准单位") + private String measureCompany; + @ApiModelProperty("检校时间") private Date calibrationTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java index b27b122..ba049f5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java @@ -19,6 +19,11 @@ @ApiModelProperty(value = "样品状态",required = true) private String sampleStatus; - @ApiModelProperty(value = "检定完成时间",required = false) + @ApiModelProperty(value = "实际送检时间(设备收入时传)",required = false) + private Date realDeliverTime; + @ApiModelProperty(value = "检定完成时间(完成时传)",required = false) private Date finishTime; + + @ApiModelProperty(value = "检定校准单位(外送任务单传)",hidden = true) + private String measureCompany; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 2fb2345..3e72827 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -118,7 +118,8 @@ private String equipmentManufactureNo; @ApiModelProperty(value = "生产厂家", dataType = "String") - @ExcelProperty(value = "出厂编号",index = 4) + @ExcelProperty(value = "生产厂家",index = 5) + @TableField(exist = false) private String equipmentManufacturer; /** diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java index 27dc5f3..3930658 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java @@ -11,8 +11,8 @@ * @Date: 2023/02/07 10:51 */ public enum SampleStatusEnum { - TO_RECEIVE("1", null), //待收入 - TO_HANDOUT("2", CheckCompletionEnum.UNCHECK), //待分发 + TO_RECEIVE("1", CheckCompletionEnum.UNCHECK), //待收入 + TO_HANDOUT("2", CheckCompletionEnum.IN_CHECK), //待分发 IN_MEASURE("3", CheckCompletionEnum.IN_CHECK), //检测中 MEASURE_COMPLETE("4", CheckCompletionEnum.IN_CHECK), //检测完 TO_GIVE_BACK("5", CheckCompletionEnum.CHECKED), //待归还 diff --git a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml index ac7b375..403d14e 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml @@ -20,9 +20,9 @@ SELECT e.equipment_name, count( e.id ) as `count`, - count( check_completion = '1' or check_completion is null) AS uncheck, - count( check_completion = '2' ) AS incheck, - count( check_completion = '3' ) AS checked + sum( case when check_completion = '1' or check_completion is null then 1 else 0 end ) AS uncheck, + sum( case when check_completion = '2' then 1 else 0 end ) AS incheck, + sum( case when check_completion = '3' then 1 else 0 end) AS checked FROM `eqpt_plan_equipment_relation` r LEFT JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id @@ -93,19 +93,46 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml index d489b42..31ba08b 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml @@ -33,11 +33,12 @@ + - id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time + id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time,business_ability_file diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java index 1fc1f9c..5b3c155 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java @@ -27,12 +27,12 @@ private final IPlanEquipmentRelationService relationService; private final IEquipmentInfoService equipmentInfoService; - @ApiOperation("任务单接收") - @PostMapping("/orderReceive") - public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { - relationService.orderReceive(orderReceive); - return ReturnUtil.success(); - } +// @ApiOperation("任务单接收") +// @PostMapping("/orderReceive") +// public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { +// relationService.orderReceive(orderReceive); +// return ReturnUtil.success(); +// } @ApiOperation("任务单样品状态更新") @@ -45,7 +45,7 @@ @ApiOperation("证书新增/编辑") @PostMapping("/certificateUpdate") public ReturnDTO certificateUpdate(@RequestBody CertificateUpdate updateForm) { - equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),"西昌卫星发射中心计量测试站",updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); + equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),updateForm.getMeasureCompany(),updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); return ReturnUtil.success(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java index 606b0ba..f4fc9bb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java @@ -19,6 +19,9 @@ @ApiModelProperty("检定部门id") private Long measureDeptId; + @ApiModelProperty("检定校准单位") + private String measureCompany; + @ApiModelProperty("检校时间") private Date calibrationTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java index b27b122..ba049f5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java @@ -19,6 +19,11 @@ @ApiModelProperty(value = "样品状态",required = true) private String sampleStatus; - @ApiModelProperty(value = "检定完成时间",required = false) + @ApiModelProperty(value = "实际送检时间(设备收入时传)",required = false) + private Date realDeliverTime; + @ApiModelProperty(value = "检定完成时间(完成时传)",required = false) private Date finishTime; + + @ApiModelProperty(value = "检定校准单位(外送任务单传)",hidden = true) + private String measureCompany; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 2fb2345..3e72827 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -118,7 +118,8 @@ private String equipmentManufactureNo; @ApiModelProperty(value = "生产厂家", dataType = "String") - @ExcelProperty(value = "出厂编号",index = 4) + @ExcelProperty(value = "生产厂家",index = 5) + @TableField(exist = false) private String equipmentManufacturer; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java index aa1db6b..f58a480 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java @@ -200,7 +200,7 @@ @ApiModelProperty("业务能力文件") @TableField("business_ability_file") - private String business_ability_file; + private String businessAbilityFile; /** * 备注 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java index 27dc5f3..3930658 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java @@ -11,8 +11,8 @@ * @Date: 2023/02/07 10:51 */ public enum SampleStatusEnum { - TO_RECEIVE("1", null), //待收入 - TO_HANDOUT("2", CheckCompletionEnum.UNCHECK), //待分发 + TO_RECEIVE("1", CheckCompletionEnum.UNCHECK), //待收入 + TO_HANDOUT("2", CheckCompletionEnum.IN_CHECK), //待分发 IN_MEASURE("3", CheckCompletionEnum.IN_CHECK), //检测中 MEASURE_COMPLETE("4", CheckCompletionEnum.IN_CHECK), //检测完 TO_GIVE_BACK("5", CheckCompletionEnum.CHECKED), //待归还 diff --git a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml index ac7b375..403d14e 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml @@ -20,9 +20,9 @@ SELECT e.equipment_name, count( e.id ) as `count`, - count( check_completion = '1' or check_completion is null) AS uncheck, - count( check_completion = '2' ) AS incheck, - count( check_completion = '3' ) AS checked + sum( case when check_completion = '1' or check_completion is null then 1 else 0 end ) AS uncheck, + sum( case when check_completion = '2' then 1 else 0 end ) AS incheck, + sum( case when check_completion = '3' then 1 else 0 end) AS checked FROM `eqpt_plan_equipment_relation` r LEFT JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id @@ -93,19 +93,46 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml index d489b42..31ba08b 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml @@ -33,11 +33,12 @@ + - id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time + id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time,business_ability_file diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java index 1fc1f9c..5b3c155 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java @@ -27,12 +27,12 @@ private final IPlanEquipmentRelationService relationService; private final IEquipmentInfoService equipmentInfoService; - @ApiOperation("任务单接收") - @PostMapping("/orderReceive") - public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { - relationService.orderReceive(orderReceive); - return ReturnUtil.success(); - } +// @ApiOperation("任务单接收") +// @PostMapping("/orderReceive") +// public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { +// relationService.orderReceive(orderReceive); +// return ReturnUtil.success(); +// } @ApiOperation("任务单样品状态更新") @@ -45,7 +45,7 @@ @ApiOperation("证书新增/编辑") @PostMapping("/certificateUpdate") public ReturnDTO certificateUpdate(@RequestBody CertificateUpdate updateForm) { - equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),"西昌卫星发射中心计量测试站",updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); + equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),updateForm.getMeasureCompany(),updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); return ReturnUtil.success(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java index 606b0ba..f4fc9bb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java @@ -19,6 +19,9 @@ @ApiModelProperty("检定部门id") private Long measureDeptId; + @ApiModelProperty("检定校准单位") + private String measureCompany; + @ApiModelProperty("检校时间") private Date calibrationTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java index b27b122..ba049f5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java @@ -19,6 +19,11 @@ @ApiModelProperty(value = "样品状态",required = true) private String sampleStatus; - @ApiModelProperty(value = "检定完成时间",required = false) + @ApiModelProperty(value = "实际送检时间(设备收入时传)",required = false) + private Date realDeliverTime; + @ApiModelProperty(value = "检定完成时间(完成时传)",required = false) private Date finishTime; + + @ApiModelProperty(value = "检定校准单位(外送任务单传)",hidden = true) + private String measureCompany; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 2fb2345..3e72827 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -118,7 +118,8 @@ private String equipmentManufactureNo; @ApiModelProperty(value = "生产厂家", dataType = "String") - @ExcelProperty(value = "出厂编号",index = 4) + @ExcelProperty(value = "生产厂家",index = 5) + @TableField(exist = false) private String equipmentManufacturer; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java index aa1db6b..f58a480 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java @@ -200,7 +200,7 @@ @ApiModelProperty("业务能力文件") @TableField("business_ability_file") - private String business_ability_file; + private String businessAbilityFile; /** * 备注 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java index f820297..0f3e30c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java @@ -17,6 +17,7 @@ import com.casic.missiles.enums.plan.CheckCompletionEnum; import com.casic.missiles.enums.plan.ExecuteStatusEnum; import com.casic.missiles.enums.plan.SampleStatusEnum; +import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.equipment.EquipmentAttachment; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.model.plan.OrderReceive; @@ -24,6 +25,7 @@ import com.casic.missiles.mapper.plan.PlanEquipmentRelationMapper; import com.casic.missiles.model.plan.PlanNotifyRelation; import com.casic.missiles.model.plan.SampleStatueUpdate; +import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -52,6 +54,7 @@ private final IEquipmentInfoService equipmentInfoService; private final ISystemDeptService deptService; + private final IBizBusinessOrderInfoService bizBusinessOrderInfoService; private final AbstractPermissionContext permissionContext; @@ -173,9 +176,21 @@ @Override public void sampleStatusUpdate(SampleStatueUpdate sampleStatueUpdate) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("checkCompletion", SampleStatusEnum.getByStatus(sampleStatueUpdate.getSampleStatus()).getCheckCompletion()); + updateWrapper.set("check_completion", SampleStatusEnum.getByStatus(sampleStatueUpdate.getSampleStatus()).getCheckCompletion()); if(ObjectUtil.isNotEmpty(sampleStatueUpdate.getFinishTime())){ - updateWrapper.set("checkFinishTime",sampleStatueUpdate); + updateWrapper.set("check_finish_time",sampleStatueUpdate.getFinishTime()); + } + if(ObjectUtil.isNotEmpty(sampleStatueUpdate.getRealDeliverTime())){ + updateWrapper.set("real_deliver_time",sampleStatueUpdate.getRealDeliverTime()); + if(StrUtil.isNotEmpty(sampleStatueUpdate.getMeasureCompany())){ + updateWrapper.set("real_measure_company",sampleStatueUpdate.getMeasureCompany()); + }else { + BizBusinessOrderInfo bizBusinessOrderInfo = bizBusinessOrderInfoService.getById(sampleStatueUpdate.getOrderId()); + if(ObjectUtil.isNotEmpty(bizBusinessOrderInfo)){ + updateWrapper.set("real_measure_company",bizBusinessOrderInfo.getMeasureCompany()); + } + } + } updateWrapper.eq("equipment_id",sampleStatueUpdate.getSampleId()); updateWrapper.exists(String.format("select id from eqpt_plan b where b.id = eqpt_plan_equipment_relation.plan_id and b.year = %d", Calendar.getInstance().get(Calendar.YEAR))); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java index 27dc5f3..3930658 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/SampleStatusEnum.java @@ -11,8 +11,8 @@ * @Date: 2023/02/07 10:51 */ public enum SampleStatusEnum { - TO_RECEIVE("1", null), //待收入 - TO_HANDOUT("2", CheckCompletionEnum.UNCHECK), //待分发 + TO_RECEIVE("1", CheckCompletionEnum.UNCHECK), //待收入 + TO_HANDOUT("2", CheckCompletionEnum.IN_CHECK), //待分发 IN_MEASURE("3", CheckCompletionEnum.IN_CHECK), //检测中 MEASURE_COMPLETE("4", CheckCompletionEnum.IN_CHECK), //检测完 TO_GIVE_BACK("5", CheckCompletionEnum.CHECKED), //待归还 diff --git a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml index ac7b375..403d14e 100644 --- a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml @@ -20,9 +20,9 @@ SELECT e.equipment_name, count( e.id ) as `count`, - count( check_completion = '1' or check_completion is null) AS uncheck, - count( check_completion = '2' ) AS incheck, - count( check_completion = '3' ) AS checked + sum( case when check_completion = '1' or check_completion is null then 1 else 0 end ) AS uncheck, + sum( case when check_completion = '2' then 1 else 0 end ) AS incheck, + sum( case when check_completion = '3' then 1 else 0 end) AS checked FROM `eqpt_plan_equipment_relation` r LEFT JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id @@ -93,19 +93,46 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml index d489b42..31ba08b 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractorMapper.xml @@ -33,11 +33,12 @@ + - id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time + id, subcontractor_no, company_name, company_simple_name, business_content, scale, business_scale, performance_rating, overall_evaluation, tax_number, bank_account, bank_name, bank_number, postcode, director_name, contact_number, fax, telephone, email, web_address, address, iinvoice_address, test_ablity, remark, attachments, process_id, approval_status, create_time, update_time,business_ability_file diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java index 1fc1f9c..5b3c155 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizUpdateController.java @@ -27,12 +27,12 @@ private final IPlanEquipmentRelationService relationService; private final IEquipmentInfoService equipmentInfoService; - @ApiOperation("任务单接收") - @PostMapping("/orderReceive") - public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { - relationService.orderReceive(orderReceive); - return ReturnUtil.success(); - } +// @ApiOperation("任务单接收") +// @PostMapping("/orderReceive") +// public ReturnDTO receive(@RequestBody @Valid OrderReceive orderReceive) { +// relationService.orderReceive(orderReceive); +// return ReturnUtil.success(); +// } @ApiOperation("任务单样品状态更新") @@ -45,7 +45,7 @@ @ApiOperation("证书新增/编辑") @PostMapping("/certificateUpdate") public ReturnDTO certificateUpdate(@RequestBody CertificateUpdate updateForm) { - equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),"西昌卫星发射中心计量测试站",updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); + equipmentInfoService.updateCertificateInfo(updateForm.getSampleId(),updateForm.getMeasureCompany(),updateForm.getCalibrationTime(),updateForm.getExpirationDate(),null); return ReturnUtil.success(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java index 606b0ba..f4fc9bb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/CertificateUpdate.java @@ -19,6 +19,9 @@ @ApiModelProperty("检定部门id") private Long measureDeptId; + @ApiModelProperty("检定校准单位") + private String measureCompany; + @ApiModelProperty("检校时间") private Date calibrationTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java index b27b122..ba049f5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/SampleStatueUpdate.java @@ -19,6 +19,11 @@ @ApiModelProperty(value = "样品状态",required = true) private String sampleStatus; - @ApiModelProperty(value = "检定完成时间",required = false) + @ApiModelProperty(value = "实际送检时间(设备收入时传)",required = false) + private Date realDeliverTime; + @ApiModelProperty(value = "检定完成时间(完成时传)",required = false) private Date finishTime; + + @ApiModelProperty(value = "检定校准单位(外送任务单传)",hidden = true) + private String measureCompany; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 2fb2345..3e72827 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -118,7 +118,8 @@ private String equipmentManufactureNo; @ApiModelProperty(value = "生产厂家", dataType = "String") - @ExcelProperty(value = "出厂编号",index = 4) + @ExcelProperty(value = "生产厂家",index = 5) + @TableField(exist = false) private String equipmentManufacturer; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java index aa1db6b..f58a480 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java @@ -200,7 +200,7 @@ @ApiModelProperty("业务能力文件") @TableField("business_ability_file") - private String business_ability_file; + private String businessAbilityFile; /** * 备注 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java index f820297..0f3e30c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/PlanEquipmentRelationServiceImpl.java @@ -17,6 +17,7 @@ import com.casic.missiles.enums.plan.CheckCompletionEnum; import com.casic.missiles.enums.plan.ExecuteStatusEnum; import com.casic.missiles.enums.plan.SampleStatusEnum; +import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.equipment.EquipmentAttachment; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.model.plan.OrderReceive; @@ -24,6 +25,7 @@ import com.casic.missiles.mapper.plan.PlanEquipmentRelationMapper; import com.casic.missiles.model.plan.PlanNotifyRelation; import com.casic.missiles.model.plan.SampleStatueUpdate; +import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -52,6 +54,7 @@ private final IEquipmentInfoService equipmentInfoService; private final ISystemDeptService deptService; + private final IBizBusinessOrderInfoService bizBusinessOrderInfoService; private final AbstractPermissionContext permissionContext; @@ -173,9 +176,21 @@ @Override public void sampleStatusUpdate(SampleStatueUpdate sampleStatueUpdate) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("checkCompletion", SampleStatusEnum.getByStatus(sampleStatueUpdate.getSampleStatus()).getCheckCompletion()); + updateWrapper.set("check_completion", SampleStatusEnum.getByStatus(sampleStatueUpdate.getSampleStatus()).getCheckCompletion()); if(ObjectUtil.isNotEmpty(sampleStatueUpdate.getFinishTime())){ - updateWrapper.set("checkFinishTime",sampleStatueUpdate); + updateWrapper.set("check_finish_time",sampleStatueUpdate.getFinishTime()); + } + if(ObjectUtil.isNotEmpty(sampleStatueUpdate.getRealDeliverTime())){ + updateWrapper.set("real_deliver_time",sampleStatueUpdate.getRealDeliverTime()); + if(StrUtil.isNotEmpty(sampleStatueUpdate.getMeasureCompany())){ + updateWrapper.set("real_measure_company",sampleStatueUpdate.getMeasureCompany()); + }else { + BizBusinessOrderInfo bizBusinessOrderInfo = bizBusinessOrderInfoService.getById(sampleStatueUpdate.getOrderId()); + if(ObjectUtil.isNotEmpty(bizBusinessOrderInfo)){ + updateWrapper.set("real_measure_company",bizBusinessOrderInfo.getMeasureCompany()); + } + } + } updateWrapper.eq("equipment_id",sampleStatueUpdate.getSampleId()); updateWrapper.exists(String.format("select id from eqpt_plan b where b.id = eqpt_plan_equipment_relation.plan_id and b.year = %d", Calendar.getInstance().get(Calendar.YEAR))); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 94d601d..0f473ab 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -9,8 +9,11 @@ import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.enums.ApprovalStatusEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; +import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.mapper.subcontract.SubcontractOrderMapper; +import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; import com.casic.missiles.service.subcontract.ISubcontractOrderRelationService; @@ -22,6 +25,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Date; import java.util.List; import static com.casic.missiles.enums.PrefixCodeEnum.SUBCONTRACT_ORDER_PREFIX; @@ -68,18 +72,27 @@ } @Override - public SubcontractOrderForm detail(Long OrderId) { - SubcontractOrder Order = this.getById(OrderId); + public SubcontractOrderForm detail(Long orderId) { + SubcontractOrder Order = this.getById(orderId); SubcontractOrderForm form = new SubcontractOrderForm(); BeanUtil.copyProperties(Order,form); + + if(StrUtil.isEmpty(form.getCreateDeptName())){ + form.setCreateDeptName(systemDeptService.getParentsDeptName(form.getCreateDeptId())); + } + if(StrUtil.isEmpty(form.getCreateCompanyName())){ + form.setCreateCompanyName(systemDeptService.getDeptName(form.getCreateCompanyId())); + } + Subcontractor subcontractor = subcontractorService.getById(form.getSubcontractorId()); if(ObjectUtil.isNotEmpty(subcontractor)){ + form.setSubcontractorNo(subcontractor.getSubcontractorNo()); form.setSubcontractorCompanyName(subcontractor.getCompanyName()); form.setFax(subcontractor.getFax()); form.setAddress(subcontractor.getAddress()); form.setPostcode(subcontractor.getPostcode()); } - form.setEquipmentList(relationService.listByOrder(OrderId)); + form.setEquipmentList(relationService.listByOrder(orderId)); return form; } @@ -100,7 +113,8 @@ queryWrapper.like("order_no", queryForm.getOrderNo()); } if (StrUtil.isNotEmpty(queryForm.getSubcontractorCompanyName())) { - queryWrapper.like("subcontractor_company_name", queryForm.getSubcontractorCompanyName()); + String sql = String.format("(select id from eqpt_subcontractor where id = subcontractor_id and company_name like '%%%s%%')",queryForm.getSubcontractorCompanyName()); + queryWrapper.exists(sql); } if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) { queryWrapper.like("create_user_name", queryForm.getCreateUserName()); @@ -124,6 +138,34 @@ } @Override + public void finishApproval(Long approvalId) { + super.finishApproval(approvalId); + Subcontractor subcontractor = subcontractorService.getById(approvalId); + List relationList = relationService.listByOrder(approvalId); + for (SubcontractOrderRelation relation : relationList) { + SampleStatueUpdate updateInfo = new SampleStatueUpdate(); + updateInfo.setOrderId(approvalId); + updateInfo.setSampleId(relation.getEquipmentId()); + updateInfo.setSampleStatus(SampleStatusEnum.GIVE_BACK_COMPLETE.getSampleStatus()); + updateInfo.setFinishTime(new Date()); + updateInfo.setRealDeliverTime(new Date()); + updateInfo.setMeasureCompany(subcontractor.getCompanyName()); + } + } + + @Override + public SubcontractOrder warpper(SubcontractOrder obj) { + super.warpper(obj); + if(StrUtil.isEmpty(obj.getCreateDeptName())){ + obj.setCreateDeptName(systemDeptService.getParentsDeptName(obj.getCreateDeptId())); + } + if(StrUtil.isEmpty(obj.getCreateCompanyName())){ + obj.setCreateCompanyName(systemDeptService.getDeptName(obj.getCreateCompanyId())); + } + return obj; + } + + @Override public void setBizNo(SubcontractOrder obj) { obj.setBizNo(obj.getOrderNo()); }